diff options
181 files changed, 3406 insertions, 33681 deletions
diff --git a/experimental/aqbanking/APKBUILD b/experimental/aqbanking/APKBUILD index 409bc3d42..6a66aa41a 100644 --- a/experimental/aqbanking/APKBUILD +++ b/experimental/aqbanking/APKBUILD @@ -11,7 +11,7 @@ depends="" depends_dev="" makedepends="$depends_dev gmp-dev gwenhywfar-dev xmlsec-dev" subpackages="$pkgname-dev $pkgname-doc" -source="aqbanking-$pkgver.tar.gz::https://www.aquamaniac.de/sites/download/download.php?package=03&release=217&file=02&dummy=aqbanking-$pkgver.tar.gz" +source="aqbanking-$pkgver.tar.gz::https://www.aquamaniac.de/rdm/attachments/download/277/$pkgname-$pkgver.tar.gz" build() { cd "$builddir" diff --git a/experimental/gwenhywfar/APKBUILD b/experimental/gwenhywfar/APKBUILD index 3ec3fee13..2b56970e9 100644 --- a/experimental/gwenhywfar/APKBUILD +++ b/experimental/gwenhywfar/APKBUILD @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev gnutls-dev libgcrypt-dev libgpg-error-dev cmd:which gtk+2.0-dev" subpackages="$pkgname-dev $pkgname-gtk2 $pkgname-qt5" -source="gwenhywfar-$pkgver.tar.gz::https://www.aquamaniac.de/sites/download/download.php?package=01&release=208&file=02&dummy=gwenhywfar-$pkgver.tar.gz" +source="gwenhywfar-$pkgver.tar.gz::https://www.aquamaniac.de/rdm/attachments/download/304/$pkgname-$pkgver.tar.gz" build() { cd "$builddir" diff --git a/experimental/hexchat/APKBUILD b/experimental/hexchat/APKBUILD deleted file mode 100644 index 29119ddfb..000000000 --- a/experimental/hexchat/APKBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer: -pkgname=hexchat -pkgver=2.14.1 -pkgrel=0 -pkgdesc="Popular and easy to use graphical IRC (chat) client" -url="https://hexchat.github.io" -arch="all" -license="GPL-2.0+" -depends="" -makedepends="dbus-glib-dev glib-dev gtk+2.0-dev iso-codes-dev libcanberra-dev - libnotify-dev libproxy-dev libsexy-dev meson ninja openssl-dev - perl-dev pciutils-dev python3-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-perl:_perl - $pkgname-py:_python" -source="https://dl.hexchat.net/hexchat/hexchat-$pkgver.tar.xz" - -prepare() { - cd "$builddir" - default_prepare - mkdir -p _build -} - -build() { - cd "$builddir"/_build - meson -Dprefix=/usr -Dwith-lua=false - ninja -} - -check() { - cd "$builddir"/_build - ninja test -} - -package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install -} - -_perl() { - pkgdesc="Perl plugin for HexChat" - depends="$pkgname=$pkgver-r$pkgrel" - install_if="$pkgname=$pkgver-r$pkgrel perl" - mkdir -p "$subpkgdir"/usr/lib/hexchat/plugins - mv "$pkgdir"/usr/lib/hexchat/plugins/perl.so \ - "$subpkgdir"/usr/lib/hexchat/plugins -} - -_python() { - pkgdesc="Python plugin for HexChat" - depends="$pkgname=$pkgver-r$pkgrel" - install_if="$pkgname=$pkgver-r$pkgrel perl3" - mkdir -p "$subpkgdir"/usr/lib/hexchat/plugins - mv "$pkgdir"/usr/lib/hexchat/plugins/python.so \ - "$subpkgdir"/usr/lib/hexchat/plugins -} - -sha512sums="2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd hexchat-2.14.1.tar.xz" diff --git a/experimental/zfs-utils/APKBUILD b/experimental/zfs-utils/APKBUILD index 71213e3d6..b9221e20f 100644 --- a/experimental/zfs-utils/APKBUILD +++ b/experimental/zfs-utils/APKBUILD @@ -46,4 +46,4 @@ package() { rm -r "$pkgdir/usr/share/zfs/zfs-tests" } -sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 zfs-0.8.3.tar.gz" +sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 zfs-0.8.3.tar.gz" diff --git a/experimental/zfs/APKBUILD b/experimental/zfs/APKBUILD index db467f0c5..eec9aa6bd 100644 --- a/experimental/zfs/APKBUILD +++ b/experimental/zfs/APKBUILD @@ -61,8 +61,8 @@ dev() { rm -r "$pkgdir/usr/src" } -sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 zfs-0.8.3.tar.gz +sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 zfs-0.8.3.tar.gz 47dc563fc1daa4c67096d2316ed2cea6aeaf4ca9e0daa41f2036a4ff3dcb542c88534ac25033a23e8fa97a9b82e56a8933f9fa56bae8a1fa07c1b15eb18f68f8 fix-autoconf-redirection-for-dash.patch a74bb30ef2e5f28fdc7b0cfe915f2841762ec8f6cd2368d2e4ba8627443e8e0754011a88b743e27519d191464e35e6c923510451f2a86d7e1a4ad3c5b737015f Linux-5.6-compat-time_t-2c3a83701dd1.patch a791406265a6e1501e743b6f13764736439a14a9dfc1feaabc5fc82e27de1b2adf56b566c162fc42313f311fbf76c3213f7c2c05a518de36f96887e3d462e94a Linux-5.6-compat-timestamp_truncate-795699a6cc28.patch -9c78793a5840bc5fb5bb44a210124c1c8f09ce0ddfe88b91be8dbde5465763912308b89cd87300fd05b898076366528612c34a9c2f834d3b6573aa68eb442ec3 Linux-5.6-compat-ktime_get_raw_ts64-ff5587d65137.patch"
\ No newline at end of file +9c78793a5840bc5fb5bb44a210124c1c8f09ce0ddfe88b91be8dbde5465763912308b89cd87300fd05b898076366528612c34a9c2f834d3b6573aa68eb442ec3 Linux-5.6-compat-ktime_get_raw_ts64-ff5587d65137.patch" diff --git a/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch b/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch deleted file mode 100644 index 929370b9d..000000000 --- a/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 185ba65457e991ebd0f6e64266380df5e11cc489 Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Thu, 19 Oct 2017 17:24:40 +0000 -Subject: [PATCH 01/16] ash: add support for command_not_found_handle hook - function, like bash - -This implements support for the command_not_found_handle hook function, which is -useful for allowing package managers to suggest packages which could provide the -command. - -Unlike bash, however, we ignore exit codes from the hook function and always return -the correct POSIX error code (EX_NOTFOUND). - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - shell/ash.c | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/shell/ash.c b/shell/ash.c -index b73a79975..7ceb91920 100644 ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -132,6 +132,15 @@ - //config: you to run the specified command or builtin, - //config: even when there is a function with the same name. - //config: -+//config:config ASH_COMMAND_NOT_FOUND_HOOK -+//config: bool "command_not_found_handle hook support" -+//config: default y -+//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH -+//config: help -+//config: Enable support for the 'command_not_found_handle' hook function, -+//config: from GNU bash, which allows for alternative command not found -+//config: handling. -+//config: - //config:endif # ash options - - //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) -@@ -13166,8 +13175,19 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) - /* We failed. If there was an entry for this command, delete it */ - if (cmdp && updatetbl) - delete_cmd_entry(); -- if (act & DO_ERR) -- ash_msg("%s: %s", name, errmsg(e, "not found")); -+ if (act & DO_ERR) { -+#ifdef CONFIG_ASH_COMMAND_NOT_FOUND_HOOK -+#define HOOKFN_NAME "command_not_found_handle" -+ char hookfn_name[] = HOOKFN_NAME; -+ struct tblentry *hookp = cmdlookup(hookfn_name, 0); -+ if (hookp != NULL && hookp->cmdtype == CMDFUNCTION) { -+ evalfun(hookp->param.func, 2, (char *[]){ hookfn_name, name }, 0); -+ entry->cmdtype = CMDUNKNOWN; -+ return; -+ } else -+#endif -+ ash_msg("%s: %s", name, errmsg(e, "not found")); -+ } - entry->cmdtype = CMDUNKNOWN; - return; - --- -2.16.2 - diff --git a/legacy/busybox/0001-ash-exec-busybox.static.patch b/legacy/busybox/0001-ash-exec-busybox.static.patch deleted file mode 100644 index fdf134960..000000000 --- a/legacy/busybox/0001-ash-exec-busybox.static.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 134582e8dd1c85cbcf1fc047956a57fcd642e46a Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 4 Aug 2016 11:03:07 +0200 -Subject: [PATCH 01/11] ash: exec busybox.static - ---- - shell/ash.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/shell/ash.c b/shell/ash.c -index b7635a823..e613ee6bb 100644 ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -7721,6 +7721,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char ** - } - /* re-exec ourselves with the new arguments */ - execve(bb_busybox_exec_path, argv, envp); -+ execve("/bin/busybox.static",argv,envp); -+ execve("/bin/busybox",argv,envp); - /* If they called chroot or otherwise made the binary no longer - * executable, fall through */ - } --- -2.13.2 - diff --git a/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch b/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch deleted file mode 100644 index 4680b920e..000000000 --- a/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d80eecb86812c1fbda652f9b995060c26ba0b155 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Sun, 29 Apr 2018 14:05:43 +0200 -Subject: [PATCH] cat: fix cat -e and cat -v erroneously numbering 1st line - -function old new delta -cat_main 418 421 +3 - -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - coreutils/cat.c | 6 +++--- - testsuite/cat.tests | 21 +++++++++++++++++++++ - 2 files changed, 24 insertions(+), 3 deletions(-) - create mode 100755 testsuite/cat.tests - -diff --git a/coreutils/cat.c b/coreutils/cat.c -index 5f02233ca..fb735f994 100644 ---- a/coreutils/cat.c -+++ b/coreutils/cat.c -@@ -112,10 +112,10 @@ static int catv(unsigned opts, char **argv) - int retval = EXIT_SUCCESS; - int fd; - #if ENABLE_FEATURE_CATN -- unsigned lineno = 0; -- unsigned eol_char = (opts & (CAT_OPT_n|CAT_OPT_b)) ? '\n' : 0x100; -+ bool eol_seen = (opts & (CAT_OPT_n|CAT_OPT_b)); -+ unsigned eol_char = (eol_seen ? '\n' : 0x100); - unsigned skip_num_on = (opts & CAT_OPT_b) ? '\n' : 0x100; -- bool eol_seen = 1; -+ unsigned lineno = 0; - #endif - - BUILD_BUG_ON(CAT_OPT_e != VISIBLE_ENDLINE); -diff --git a/testsuite/cat.tests b/testsuite/cat.tests -new file mode 100755 -index 000000000..404ebedeb ---- /dev/null -+++ b/testsuite/cat.tests -@@ -0,0 +1,21 @@ -+#!/bin/sh -+ -+# Copyright 2018 by Denys Vlasenko <vda.linux@googlemail.com> -+# Licensed under GPLv2, see file LICENSE in this source tree. -+ -+. ./testing.sh -+ -+# testing "description" "command" "result" "infile" "stdin" -+testing 'cat -e' \ -+ 'cat -e' \ -+ 'foo$\n' \ -+ '' \ -+ 'foo\n' -+ -+testing 'cat -v' \ -+ 'cat -v' \ -+ 'foo\n' \ -+ '' \ -+ 'foo\n' -+ -+exit $FAILCOUNT --- -2.17.0 - diff --git a/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch b/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch deleted file mode 100644 index 3780b039e..000000000 --- a/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 948090c675f8b60b74c7357fcafb1cc8c179e0a6 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Mon, 28 May 2018 14:36:26 +0200 -Subject: [PATCH] wget: emit a message that certificate verification is not - implemented - -function old new delta -spawn_ssl_client 185 209 +24 - -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - networking/wget.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/networking/wget.c b/networking/wget.c -index d1d85230c..cd92b3a28 100644 ---- a/networking/wget.c -+++ b/networking/wget.c -@@ -136,6 +136,7 @@ - //usage: "Retrieve files via HTTP or FTP\n" - //usage: IF_FEATURE_WGET_LONG_OPTIONS( - //usage: "\n --spider Only check URL existence: $? is 0 if exists" -+///////: "\n --no-check-certificate Don't validate the server's certificate" - //usage: ) - //usage: "\n -c Continue retrieval of aborted transfer" - //usage: "\n -q Quiet" -@@ -267,6 +268,7 @@ enum { - WGET_OPT_HEADER = (1 << 10) * ENABLE_FEATURE_WGET_LONG_OPTIONS, - WGET_OPT_POST_DATA = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS, - WGET_OPT_SPIDER = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS, -+ WGET_OPT_NO_CHECK_CERT = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS, - }; - - enum { -@@ -765,6 +767,9 @@ static void spawn_ssl_client(const char *host, int network_fd) - int pid; - char *servername, *p; - -+ if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) -+ bb_error_msg("note: TLS certificate validation not implemented"); -+ - servername = xstrdup(host); - p = strrchr(servername, ':'); - if (p) *p = '\0'; -@@ -1353,10 +1358,9 @@ IF_DESKTOP( "tries\0" Required_argument "t") - "header\0" Required_argument "\xff" - "post-data\0" Required_argument "\xfe" - "spider\0" No_argument "\xfd" -+ "no-check-certificate\0" No_argument "\xfc" - /* Ignored (we always use PASV): */ - IF_DESKTOP( "passive-ftp\0" No_argument "\xf0") -- /* Ignored (we don't do ssl) */ --IF_DESKTOP( "no-check-certificate\0" No_argument "\xf0") - /* Ignored (we don't support caching) */ - IF_DESKTOP( "no-cache\0" No_argument "\xf0") - IF_DESKTOP( "no-verbose\0" No_argument "\xf0") -@@ -1416,6 +1420,7 @@ IF_DESKTOP( "no-parent\0" No_argument "\xf0") - if (option_mask32 & WGET_OPT_HEADER) bb_error_msg("--header"); - if (option_mask32 & WGET_OPT_POST_DATA) bb_error_msg("--post-data"); - if (option_mask32 & WGET_OPT_SPIDER) bb_error_msg("--spider"); -+ if (option_mask32 & WGET_OPT_NO_CHECK_CERT) bb_error_msg("--no-check-certificate"); - exit(0); - #endif - argv += optind; --- -2.17.0 - diff --git a/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch b/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch deleted file mode 100644 index 8c8e4ee7a..000000000 --- a/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8937e2dfb3dbfa23597853e9605f930b3607fa63 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 27 Dec 2016 20:46:59 +0100 -Subject: [PATCH 02/11] app location for cpio, vi and lspci - -Adjust location to where alpine linux installs them ---- - archival/cpio.c | 2 +- - editors/vi.c | 2 +- - util-linux/lspci.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/archival/cpio.c b/archival/cpio.c -index 683f0bb1f..45362b6bc 100644 ---- a/archival/cpio.c -+++ b/archival/cpio.c -@@ -43,7 +43,7 @@ - //config: help - //config: Passthrough mode. Rarely used. - --//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP)) -+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) - //kbuild:lib-$(CONFIG_CPIO) += cpio.o - - //usage:#define cpio_trivial_usage -diff --git a/editors/vi.c b/editors/vi.c -index 76d1f261b..73d0a67a9 100644 ---- a/editors/vi.c -+++ b/editors/vi.c -@@ -163,7 +163,7 @@ - //config: Unless you want more (or less) frequent "undo points" while typing, - //config: you should probably leave this unchanged. - --//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) -+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) - - //kbuild:lib-$(CONFIG_VI) += vi.o - -diff --git a/util-linux/lspci.c b/util-linux/lspci.c -index 8b38a2366..f918f0972 100644 ---- a/util-linux/lspci.c -+++ b/util-linux/lspci.c -@@ -16,7 +16,7 @@ - //config: - //config: This version uses sysfs (/sys/bus/pci/devices) only. - --//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) -+//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_SBIN, BB_SUID_DROP)) - - //kbuild:lib-$(CONFIG_LSPCI) += lspci.o - --- -2.13.2 - diff --git a/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch deleted file mode 100644 index 72df8ecf9..000000000 --- a/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bce882404ab41d32d5d9def274e49264717135b2 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 28 Nov 2017 13:23:17 +0100 -Subject: [PATCH 02/16] fsck: resolve LABEL=.../UUID=... spec to device - ---- - e2fsprogs/fsck.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c -index 1c285bb92..5af38c0aa 100644 ---- a/e2fsprogs/fsck.c -+++ b/e2fsprogs/fsck.c -@@ -60,6 +60,7 @@ - //usage: "\n -t TYPE List of filesystem types to check" - - #include "libbb.h" -+#include "volume_id.h" - #include "common_bufsiz.h" - - /* "progress indicator" code is somewhat buggy and ext[23] specific. -@@ -523,12 +524,13 @@ static int wait_many(int flags) - * Execute a particular fsck program, and link it into the list of - * child processes we are waiting for. - */ --static void execute(const char *type, const char *device, -+static void execute(const char *type, const char *spec, - const char *mntpt /*, int interactive */) - { - int i; - struct fsck_instance *inst; - pid_t pid; -+ char *device = (char *)spec; - - G.args[0] = xasprintf("fsck.%s", type); - -@@ -543,7 +545,8 @@ static void execute(const char *type, const char *device, - } - #endif - -- G.args[G.num_args - 2] = (char*)device; -+ resolve_mount_spec(&device); -+ G.args[G.num_args - 2] = device; - /* G.args[G.num_args - 1] = NULL; - already is */ - - if (G.verbose || G.noexecute) { -@@ -972,9 +975,6 @@ int fsck_main(int argc UNUSED_PARAM, char **argv) - - /* "/dev/blk" or "/path" or "UUID=xxx" or "LABEL=xxx" */ - if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) { --// FIXME: must check that arg is a blkdev, or resolve --// "/path", "UUID=xxx" or "LABEL=xxx" into block device name --// ("UUID=xxx"/"LABEL=xxx" can probably shifted to fsck.auto duties) - devices = xrealloc_vector(devices, 2, num_devices); - devices[num_devices++] = arg; - continue; --- -2.16.2 - diff --git a/legacy/busybox/0003-ash-exec-busybox.static.patch b/legacy/busybox/0003-ash-exec-busybox.static.patch deleted file mode 100644 index 94239a2eb..000000000 --- a/legacy/busybox/0003-ash-exec-busybox.static.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 36b6cc36d1f259e4ac76a1c2de743113845ff4cd Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 4 Aug 2016 11:03:07 +0200 -Subject: [PATCH 03/16] ash: exec busybox.static - ---- - shell/ash.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/shell/ash.c b/shell/ash.c -index 7ceb91920..d04096a9b 100644 ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -7845,6 +7845,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c - } - /* re-exec ourselves with the new arguments */ - execve(bb_busybox_exec_path, argv, envp); -+ execve("/bin/busybox.static",argv,envp); -+ execve("/bin/busybox",argv,envp); - /* If they called chroot or otherwise made the binary no longer - * executable, fall through */ - } --- -2.16.2 - diff --git a/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch b/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch deleted file mode 100644 index 5671ee1b0..000000000 --- a/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 18415adc1cd9993a95d100dd773daf69b8ec819e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 4 Aug 2016 11:08:35 +0200 -Subject: [PATCH 03/11] udhcpc: set default discover retries to 5 - -Some slower nics needs more attempts to get a lease ---- - networking/udhcp/dhcpc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 1a66c610e..43aac1b85 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -1191,7 +1191,7 @@ static void client_background(void) - //usage: "\n -s,--script PROG Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" - //usage: "\n -p,--pidfile FILE Create pidfile" - //usage: "\n -B,--broadcast Request broadcast replies" --//usage: "\n -t,--retries N Send up to N discover packets (default 3)" -+//usage: "\n -t,--retries N Send up to N discover packets (default 5)" - //usage: "\n -T,--timeout SEC Pause between packets (default 3)" - //usage: "\n -A,--tryagain SEC Wait if lease is not obtained (default 20)" - //usage: "\n -n,--now Exit if lease is not obtained" -@@ -1274,7 +1274,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - llist_t *list_x = NULL; - int tryagain_timeout = 20; - int discover_timeout = 3; -- int discover_retries = 3; -+ int discover_retries = 5; - uint32_t server_addr = server_addr; /* for compiler */ - uint32_t requested_ip = 0; - uint32_t xid = xid; /* for compiler */ --- -2.13.2 - diff --git a/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch deleted file mode 100644 index 7f105cb67..000000000 --- a/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9bbc93f12f7cff8fb51a0bf89907d9875f5c14e6 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 27 Dec 2016 20:46:59 +0100 -Subject: [PATCH 04/16] app location for cpio, vi and lspci - -Adjust location to where alpine linux installs them ---- - archival/cpio.c | 2 +- - editors/vi.c | 2 +- - util-linux/lspci.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/archival/cpio.c b/archival/cpio.c -index 1d6cbd1e2..0c14f79e7 100644 ---- a/archival/cpio.c -+++ b/archival/cpio.c -@@ -39,7 +39,7 @@ - //config: help - //config: Passthrough mode. Rarely used. - --//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP)) -+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) - - //kbuild:lib-$(CONFIG_CPIO) += cpio.o - -diff --git a/editors/vi.c b/editors/vi.c -index cdfb27cc5..20077727e 100644 ---- a/editors/vi.c -+++ b/editors/vi.c -@@ -161,7 +161,7 @@ - //config: Unless you want more (or less) frequent "undo points" while typing, - //config: you should probably leave this unchanged. - --//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) -+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) - - //kbuild:lib-$(CONFIG_VI) += vi.o - -diff --git a/util-linux/lspci.c b/util-linux/lspci.c -index 0000fbfda..34189d2b5 100644 ---- a/util-linux/lspci.c -+++ b/util-linux/lspci.c -@@ -16,7 +16,7 @@ - //config: - //config: This version uses sysfs (/sys/bus/pci/devices) only. - --//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci)) -+//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_SBIN, BB_SUID_DROP, lspci)) - - //kbuild:lib-$(CONFIG_LSPCI) += lspci.o - --- -2.16.2 - diff --git a/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch b/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch deleted file mode 100644 index 77fa5ed76..000000000 --- a/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch +++ /dev/null @@ -1,197 +0,0 @@ -From bef770d1ee4179e380dff24305d9b6d899147add Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 29 Mar 2016 18:59:22 +0200 -Subject: [PATCH 04/11] ping: make ping work without root privileges - ---- - networking/ping.c | 103 +++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 87 insertions(+), 16 deletions(-) - -diff --git a/networking/ping.c b/networking/ping.c -index 94fb007f5..26e40e1fc 100644 ---- a/networking/ping.c -+++ b/networking/ping.c -@@ -155,6 +155,7 @@ enum { - pingsock = 0, - }; - -+static int using_dgram; - static void - #if ENABLE_PING6 - create_icmp_socket(len_and_sockaddr *lsa) -@@ -171,9 +172,23 @@ create_icmp_socket(void) - #endif - sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */ - if (sock < 0) { -- if (errno == EPERM) -- bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); -- bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); -+ if (errno != EPERM) -+ bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); -+#if defined(__linux__) || defined(__APPLE__) -+ /* We don't have root privileges. Try SOCK_DGRAM instead. -+ * Linux needs net.ipv4.ping_group_range for this to work. -+ * MacOSX allows ICMP_ECHO, ICMP_TSTAMP or ICMP_MASKREQ -+ */ -+#if ENABLE_PING6 -+ if (lsa->u.sa.sa_family == AF_INET6) -+ sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6); -+ else -+#endif -+ sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */ -+ if (sock < 0) -+#endif -+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); -+ using_dgram = 1; - } - - xmove_fd(sock, pingsock); -@@ -226,10 +241,12 @@ static void ping4(len_and_sockaddr *lsa) - bb_perror_msg("recvfrom"); - continue; - } -- if (c >= 76) { /* ip + icmp */ -- struct iphdr *iphdr = (struct iphdr *) G.packet; -+ if (c >= 76 || using_dgram && (c == 64)) { /* ip + icmp */ -+ if(!using_dgram) { -+ struct iphdr *iphdr = (struct iphdr *) G.packet; - -- pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ -+ pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ -+ } else pkt = (struct icmp *) G.packet; - if (pkt->icmp_id != G.myid) - continue; /* not our ping */ - if (pkt->icmp_type == ICMP_ECHOREPLY) -@@ -627,19 +644,21 @@ static void unpack_tail(int sz, uint32_t *tp, - } - static void unpack4(char *buf, int sz, struct sockaddr_in *from) - { -- struct icmp *icmppkt; - struct iphdr *iphdr; -+ struct icmp *icmppkt; - int hlen; - - /* discard if too short */ - if (sz < (datalen + ICMP_MINLEN)) - return; -+ if(!using_dgram) { -+ /* check IP header */ -+ iphdr = (struct iphdr *) buf; -+ hlen = iphdr->ihl << 2; -+ sz -= hlen; -+ icmppkt = (struct icmp *) (buf + hlen); -+ } else icmppkt = (struct icmp *) buf; - -- /* check IP header */ -- iphdr = (struct iphdr *) buf; -- hlen = iphdr->ihl << 2; -- sz -= hlen; -- icmppkt = (struct icmp *) (buf + hlen); - if (icmppkt->icmp_id != myid) - return; /* not our ping */ - -@@ -651,7 +670,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from) - tp = (uint32_t *) icmppkt->icmp_data; - unpack_tail(sz, tp, - inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr), -- recv_seq, iphdr->ttl); -+ recv_seq, using_dgram ? 42 : iphdr->ttl); - } else if (icmppkt->icmp_type != ICMP_ECHO) { - bb_error_msg("warning: got ICMP %d (%s)", - icmppkt->icmp_type, -@@ -695,11 +714,31 @@ static void ping4(len_and_sockaddr *lsa) - int sockopt; - - pingaddr.sin = lsa->u.sin; -- if (source_lsa) { -+ if (source_lsa && !using_dgram) { - if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF, - &source_lsa->u.sa, source_lsa->len)) - bb_error_msg_and_die("can't set multicast source interface"); - xbind(pingsock, &source_lsa->u.sa, source_lsa->len); -+ } else if(using_dgram) { -+ struct sockaddr_in sa; -+ socklen_t sl; -+ -+ sa.sin_family = AF_INET; -+ sa.sin_port = 0; -+ sa.sin_addr.s_addr = source_lsa ? -+ source_lsa->u.sin.sin_addr.s_addr : 0; -+ sl = sizeof(sa); -+ -+ if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ myid = sa.sin_port; - } - - /* enable broadcast pings */ -@@ -716,6 +755,15 @@ static void ping4(len_and_sockaddr *lsa) - setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl); - } - -+ if(using_dgram) { -+ int hold = 65536; -+ if (setsockopt(pingsock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold))) -+ perror("WARNING: setsockopt(IP_RECVTTL)"); -+ if (setsockopt(pingsock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold))) -+ perror("WARNING: setsockopt(IP_RETOPTS)"); -+ -+ } -+ - signal(SIGINT, print_stats_and_exit); - - /* start the ping's going ... */ -@@ -749,10 +797,33 @@ static void ping6(len_and_sockaddr *lsa) - char control_buf[CMSG_SPACE(36)]; - - pingaddr.sin6 = lsa->u.sin6; -- if (source_lsa) -+ if (source_lsa && !using_dgram) - xbind(pingsock, &source_lsa->u.sa, source_lsa->len); -+ else if(using_dgram) { -+ struct sockaddr_in6 sa = {0}; -+ socklen_t sl; -+ -+ sa.sin6_family = AF_INET6; -+ sa.sin6_port = 0; -+ if(source_lsa) { -+ memcpy(&sa.sin6_addr, &source_lsa->u.sin6.sin6_addr, sizeof(struct in6_addr)); -+ } -+ sl = sizeof(sa); -+ -+ if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ myid = sa.sin6_port; -+ } - - #ifdef ICMP6_FILTER -+ if(!using_dgram) - { - struct icmp6_filter filt; - if (!(option_mask32 & OPT_VERBOSE)) { -@@ -880,7 +951,7 @@ static int common_ping_main(int opt, char **argv) - if (opt & OPT_p) - G.pattern = xstrtou_range(str_p, 16, 0, 255); - -- myid = (uint16_t) getpid(); -+ if (!using_dgram) myid = (uint16_t) getpid(); - hostname = argv[optind]; - #if ENABLE_PING6 - { --- -2.13.2 - diff --git a/legacy/busybox/0005-fbsplash-support-console-switching.patch b/legacy/busybox/0005-fbsplash-support-console-switching.patch deleted file mode 100644 index 792c2d6c8..000000000 --- a/legacy/busybox/0005-fbsplash-support-console-switching.patch +++ /dev/null @@ -1,187 +0,0 @@ -From a8f7d33f47cc28732cd04573ae1fb6a1ca6e9617 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Mon, 24 Sep 2012 07:58:29 +0300 -Subject: [PATCH 05/11] fbsplash: support console switching -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - miscutils/fbsplash.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 76 insertions(+), 7 deletions(-) - -diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index fc6c9b953..ec5947314 100644 ---- a/miscutils/fbsplash.c -+++ b/miscutils/fbsplash.c -@@ -47,7 +47,7 @@ - //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o - - //usage:#define fbsplash_trivial_usage --//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" -+//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD] [-T tty]" - //usage:#define fbsplash_full_usage "\n\n" - //usage: " -s Image" - //usage: "\n -c Hide cursor" -@@ -57,11 +57,17 @@ - //usage: "\n BAR_R,BAR_G,BAR_B" - //usage: "\n -f Control pipe (else exit after drawing image)" - //usage: "\n commands: 'NN' (% for progress bar) or 'exit'" -+//usage: "\n -T Switch to TTY to hide all console messages" - - #include "libbb.h" - #include "common_bufsiz.h" - #include <linux/fb.h> - -+#include <sys/vt.h> -+#include <sys/ioctl.h> -+#include <linux/tiocl.h> -+#include <linux/kd.h> -+ - /* If you want logging messages on /tmp/fbsplash.log... */ - #define DEBUG 0 - -@@ -73,6 +79,8 @@ struct globals { - unsigned char *addr; // pointer to framebuffer memory - unsigned ns[7]; // n-parameters - const char *image_filename; -+ int silent_tty, fd_tty_s; -+ bool do_not_draw; - struct fb_var_screeninfo scr_var; - struct fb_fix_screeninfo scr_fix; - unsigned bytes_per_pixel; -@@ -483,6 +491,11 @@ static void init(const char *cfg_filename) - config_close(parser); - } - -+static void sighandler(int sig) -+{ -+ ioctl(G.fd_tty_s, VT_RELDISP, sig == SIGUSR1 ? 1 : 2); -+ G.do_not_draw = (sig != SIGUSR2); -+} - - int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int fbsplash_main(int argc UNUSED_PARAM, char **argv) -@@ -492,6 +505,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - char *num_buf; - unsigned num; - bool bCursorOff; -+ int fd_tty0, active_vt; -+ struct vt_stat vtstat; -+ struct vt_mode vt; - - INIT_G(); - -@@ -499,8 +515,10 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - fb_device = "/dev/fb0"; - cfg_filename = NULL; - fifo_filename = NULL; -- bCursorOff = 1 & getopt32(argv, "cs:d:i:f:", -- &G.image_filename, &fb_device, &cfg_filename, &fifo_filename); -+ opt_complementary = "T+"; // numeric params -+ bCursorOff = 1 & getopt32(argv, "cs:d:i:f:T:", -+ &G.image_filename, &fb_device, &cfg_filename, &fifo_filename, -+ &G.silent_tty); - - // parse configuration file - if (cfg_filename) -@@ -510,11 +528,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - if (!G.image_filename) - bb_show_usage(); - -+ fd_tty0 = get_console_fd_or_die(); -+ if (G.silent_tty) { -+ char buf[16]; -+ -+ /* Initialize TTY */ -+ bb_signals((1LL << SIGUSR1) | (1LL << SIGUSR2), sighandler); -+ snprintf(buf, sizeof(buf), "/dev/tty%d", G.silent_tty); -+ G.fd_tty_s = xopen(buf, O_RDWR | O_NOCTTY); -+ -+ /* Activate TTY */ -+ xioctl(fd_tty0, VT_GETSTATE, &vtstat); -+ active_vt = vtstat.v_active; -+ console_make_active(fd_tty0, G.silent_tty); -+ -+ /* Get notifications on console changes */ -+ vt.mode = VT_PROCESS; -+ vt.waitv = 0; -+ vt.relsig = SIGUSR1; -+ vt.acqsig = SIGUSR2; -+ ioctl(G.fd_tty_s, VT_SETMODE, &vt); -+ -+ /* Redirect all kernel messages to tty1 so that they don't get -+ * printed over our silent splash image. And clear it. */ -+ buf[0] = TIOCL_SETKMSGREDIRECT; -+ buf[1] = 1; -+ ioctl(G.fd_tty_s, TIOCLINUX, buf); -+ full_write(G.fd_tty_s, "\e[H\e[2J" "\e[?17;0c", 7+8); -+ ioctl(G.fd_tty_s, KDSETMODE, KD_GRAPHICS); -+ } else { -+ G.fd_tty_s = STDOUT_FILENO; -+ } -+ - fb_open(fb_device); - - if (fifo_filename && bCursorOff) { - // hide cursor (BEFORE any fb ops) -- full_write(STDOUT_FILENO, "\033[?25l", 6); -+ full_write(G.fd_tty_s, "\033[?25l", 6); - } - - fb_drawimage(); -@@ -522,6 +572,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - if (!fifo_filename) - return EXIT_SUCCESS; - -+ sig_block(SIGUSR1); - fp = xfopen_stdin(fifo_filename); - if (fp != stdin) { - // For named pipes, we want to support this: -@@ -537,8 +588,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - // and become an additional writer :) - open(fifo_filename, O_WRONLY); // errors are ignored - } -- - fb_drawprogressbar(0); -+ sig_unblock(SIGUSR1); -+ - // Block on read, waiting for some input. - // Use of <stdio.h> style I/O allows to correctly - // handle a case when we have many buffered lines -@@ -553,12 +605,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - #if DEBUG - DEBUG_MESSAGE(itoa(num)); - #endif -- fb_drawprogressbar(num); -+ sig_block(SIGUSR1); -+ if (!G.do_not_draw) -+ fb_drawprogressbar(num); -+ sig_unblock(SIGUSR1); - } - free(num_buf); - } - -- if (bCursorOff) // restore cursor -+ if (G.silent_tty) { -+ usleep(100*1000); -+ -+ ioctl(G.fd_tty_s, VT_RELDISP, 1); -+ ioctl(G.fd_tty_s, KDSETMODE, KD_TEXT); -+ vt.mode = VT_AUTO; -+ vt.waitv = 0; -+ ioctl(G.fd_tty_s, VT_SETMODE, &vt); -+ close(G.fd_tty_s); -+ -+ xioctl(fd_tty0, VT_GETSTATE, &vtstat); -+ if (vtstat.v_active == G.silent_tty) -+ console_make_active(fd_tty0, active_vt); -+ ioctl(fd_tty0, VT_DISALLOCATE, (void *)(ptrdiff_t)G.silent_tty); -+ } else if (bCursorOff) // restore cursor - full_write(STDOUT_FILENO, "\033[?25h", 6); - - return EXIT_SUCCESS; --- -2.13.2 - diff --git a/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch deleted file mode 100644 index 181acdb9a..000000000 --- a/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b67940090709f3bbd868557dd4d5317cb807250d Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 4 Aug 2016 11:08:35 +0200 -Subject: [PATCH 05/16] udhcpc: set default discover retries to 5 - -Some slower nics needs more attempts to get a lease ---- - networking/udhcp/dhcpc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 55f21c187..cc1d22c8e 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -1203,7 +1203,7 @@ static void client_background(void) - //usage: "\n -p FILE Create pidfile" - //usage: "\n -B Request broadcast replies" - //usage: "\n -t N Send up to N discover packets (default 3)" --//usage: "\n -T SEC Pause between packets (default 3)" -+//usage: "\n -T SEC Pause between packets (default 5)" - //usage: "\n -A SEC Wait if lease is not obtained (default 20)" - //usage: "\n -n Exit if lease is not obtained" - //usage: "\n -q Exit after obtaining lease" -@@ -1247,7 +1247,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - llist_t *list_x = NULL; - int tryagain_timeout = 20; - int discover_timeout = 3; -- int discover_retries = 3; -+ int discover_retries = 5; - uint32_t server_addr = server_addr; /* for compiler */ - uint32_t requested_ip = 0; - uint32_t xid = xid; /* for compiler */ --- -2.16.2 - diff --git a/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch deleted file mode 100644 index 65c423178..000000000 --- a/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 64e2d2e495f82ef7ccc952bfa4216d1ff8ab3481 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Fri, 21 Nov 2014 16:06:34 +0200 -Subject: [PATCH 06/11] fbsplash: support image and bar alignment and - positioning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - miscutils/fbsplash.c | 91 +++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 76 insertions(+), 15 deletions(-) - -diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index ec5947314..34bbf81f5 100644 ---- a/miscutils/fbsplash.c -+++ b/miscutils/fbsplash.c -@@ -53,6 +53,7 @@ - //usage: "\n -c Hide cursor" - //usage: "\n -d Framebuffer device (default /dev/fb0)" - //usage: "\n -i Config file (var=value):" -+//usage: "\n IMAGE_ALIGN" - //usage: "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" - //usage: "\n BAR_R,BAR_G,BAR_B" - //usage: "\n -f Control pipe (else exit after drawing image)" -@@ -71,13 +72,38 @@ - /* If you want logging messages on /tmp/fbsplash.log... */ - #define DEBUG 0 - -+enum { -+ image_align, -+ -+ image_posx, -+ image_posy, -+ bar_width, -+ bar_height, -+ bar_posx, -+ bar_posy, -+ bar_colr, -+ bar_colg, -+ bar_colb, -+ -+ debug -+}; -+ -+#define nimage_align ns[image_align] -+#define nbar_width ns[bar_width] -+#define nbar_height ns[bar_height] -+#define nbar_posx ns[bar_posx] -+#define nbar_posy ns[bar_posy] -+#define nbar_colr ns[bar_colr] -+#define nbar_colg ns[bar_colg] -+#define nbar_colb ns[bar_colb] -+ - struct globals { - #if DEBUG - bool bdebug_messages; // enable/disable logging - FILE *logfile_fd; // log file - #endif - unsigned char *addr; // pointer to framebuffer memory -- unsigned ns[7]; // n-parameters -+ unsigned ns[debug+1]; // n-parameters - const char *image_filename; - int silent_tty, fd_tty_s; - bool do_not_draw; -@@ -94,14 +120,6 @@ struct globals { - SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ - } while (0) - --#define nbar_width ns[0] // progress bar width --#define nbar_height ns[1] // progress bar height --#define nbar_posx ns[2] // progress bar horizontal position --#define nbar_posy ns[3] // progress bar vertical position --#define nbar_colr ns[4] // progress bar color red component --#define nbar_colg ns[5] // progress bar color green component --#define nbar_colb ns[6] // progress bar color blue component -- - #if DEBUG - #define DEBUG_MESSAGE(strMessage, args...) \ - if (G.bdebug_messages) { \ -@@ -382,7 +400,7 @@ static void fb_drawimage(void) - FILE *theme_file; - char *read_ptr; - unsigned char *pixline; -- unsigned i, j, width, height, line_size; -+ int i, j, width, height, line_size, xoffs, yoffs, xstart; - - if (LONE_DASH(G.image_filename)) { - theme_file = stdin; -@@ -432,18 +450,46 @@ static void fb_drawimage(void) - line_size = width*3; - pixline = xmalloc(line_size); - -+#if 0 - if (width > G.scr_var.xres) - width = G.scr_var.xres; - if (height > G.scr_var.yres) - height = G.scr_var.yres; -- for (j = 0; j < height; j++) { -+#endif -+ -+ xoffs = yoffs = 0; -+ switch (G.nimage_align % 3) { -+ case 1: xoffs = (G.scr_var.xres - width) / 2; break; -+ case 2: xoffs = G.scr_var.xres - width; break; -+ } -+ xstart = 0; -+ if (xoffs < 0) { -+ xstart = -xoffs; -+ width -= xstart; -+ xoffs = 0; -+ } -+ xoffs *= G.bytes_per_pixel; -+ if (width > G.scr_var.xres) -+ width = G.scr_var.xres; -+ -+ switch (G.nimage_align / 3) { -+ case 1: yoffs = (G.scr_var.yres - height) / 2; break; -+ case 2: yoffs = G.scr_var.yres - height; break; -+ } -+ -+ for (j = 0; j < height && yoffs < G.scr_var.yres; j++, yoffs++) { - unsigned char *pixel; - unsigned char *src; - - if (fread(pixline, 1, line_size, theme_file) != line_size) - bb_error_msg_and_die("bad PPM file '%s'", G.image_filename); -+ -+ if (yoffs < 0) -+ continue; -+ - pixel = pixline; -- src = G.addr + j * G.scr_fix.line_length; -+ src = G.addr + yoffs * G.scr_fix.line_length + xoffs; -+ - for (i = 0; i < width; i++) { - unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]); - fb_write_pixel(src, thispix); -@@ -462,9 +508,17 @@ static void fb_drawimage(void) - */ - static void init(const char *cfg_filename) - { -+ static const char align_names[] ALIGN1 = -+ "LT\0" "CT\0" "RT\0" -+ "LM\0" "CM\0" "RM\0" -+ "LB\0" "CB\0" "RB\0"; - static const char param_names[] ALIGN1 = -+ "IMAGE_ALIGN\0" -+ -+ "IMAGE_X\0" "IMAGE_Y\0" - "BAR_WIDTH\0" "BAR_HEIGHT\0" - "BAR_LEFT\0" "BAR_TOP\0" -+ - "BAR_R\0" "BAR_G\0" "BAR_B\0" - #if DEBUG - "DEBUG\0" -@@ -474,14 +528,21 @@ static void init(const char *cfg_filename) - parser_t *parser = config_open2(cfg_filename, xfopen_stdin); - while (config_read(parser, token, 2, 2, "#=", - (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) { -- unsigned val = xatoi_positive(token[1]); -+ unsigned val; - int i = index_in_strings(param_names, token[0]); -+ - if (i < 0) - bb_error_msg_and_die("syntax error: %s", token[0]); -- if (i >= 0 && i < 7) -+ -+ if (i <= image_align) -+ val = index_in_strings(align_names, token[1]); -+ else -+ val = xatoi_positive(token[1]); -+ -+ if (i < debug) - G.ns[i] = val; - #if DEBUG -- if (i == 7) { -+ if (i == debug) { - G.bdebug_messages = val; - if (G.bdebug_messages) - G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log"); --- -2.13.2 - diff --git a/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch deleted file mode 100644 index 630619b4a..000000000 --- a/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 21d74f2989d0046e5b7c586f5a052643d5da8dcc Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 29 Mar 2016 18:59:22 +0200 -Subject: [PATCH 06/16] ping: make ping work without root privileges - ---- - networking/ping.c | 103 +++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 87 insertions(+), 16 deletions(-) - -diff --git a/networking/ping.c b/networking/ping.c -index d1d59d545..c0ebc0f9a 100644 ---- a/networking/ping.c -+++ b/networking/ping.c -@@ -163,6 +163,7 @@ enum { - pingsock = 0, - }; - -+static int using_dgram; - static void - #if ENABLE_PING6 - create_icmp_socket(len_and_sockaddr *lsa) -@@ -179,9 +180,23 @@ create_icmp_socket(void) - #endif - sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */ - if (sock < 0) { -- if (errno == EPERM) -- bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); -- bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); -+ if (errno != EPERM) -+ bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); -+#if defined(__linux__) || defined(__APPLE__) -+ /* We don't have root privileges. Try SOCK_DGRAM instead. -+ * Linux needs net.ipv4.ping_group_range for this to work. -+ * MacOSX allows ICMP_ECHO, ICMP_TSTAMP or ICMP_MASKREQ -+ */ -+#if ENABLE_PING6 -+ if (lsa->u.sa.sa_family == AF_INET6) -+ sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6); -+ else -+#endif -+ sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */ -+ if (sock < 0) -+#endif -+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); -+ using_dgram = 1; - } - - xmove_fd(sock, pingsock); -@@ -234,10 +249,12 @@ static void ping4(len_and_sockaddr *lsa) - bb_perror_msg("recvfrom"); - continue; - } -- if (c >= 76) { /* ip + icmp */ -- struct iphdr *iphdr = (struct iphdr *) G.packet; -+ if (c >= 76 || using_dgram && (c == 64)) { /* ip + icmp */ -+ if(!using_dgram) { -+ struct iphdr *iphdr = (struct iphdr *) G.packet; - -- pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ -+ pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ -+ } else pkt = (struct icmp *) G.packet; - if (pkt->icmp_id != G.myid) - continue; /* not our ping */ - if (pkt->icmp_type == ICMP_ECHOREPLY) -@@ -634,19 +651,21 @@ static void unpack_tail(int sz, uint32_t *tp, - } - static void unpack4(char *buf, int sz, struct sockaddr_in *from) - { -- struct icmp *icmppkt; - struct iphdr *iphdr; -+ struct icmp *icmppkt; - int hlen; - - /* discard if too short */ - if (sz < (datalen + ICMP_MINLEN)) - return; -+ if(!using_dgram) { -+ /* check IP header */ -+ iphdr = (struct iphdr *) buf; -+ hlen = iphdr->ihl << 2; -+ sz -= hlen; -+ icmppkt = (struct icmp *) (buf + hlen); -+ } else icmppkt = (struct icmp *) buf; - -- /* check IP header */ -- iphdr = (struct iphdr *) buf; -- hlen = iphdr->ihl << 2; -- sz -= hlen; -- icmppkt = (struct icmp *) (buf + hlen); - if (icmppkt->icmp_id != myid) - return; /* not our ping */ - -@@ -658,7 +677,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from) - tp = (uint32_t *) icmppkt->icmp_data; - unpack_tail(sz, tp, - inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr), -- recv_seq, iphdr->ttl); -+ recv_seq, using_dgram ? 42 : iphdr->ttl); - } else if (icmppkt->icmp_type != ICMP_ECHO) { - bb_error_msg("warning: got ICMP %d (%s)", - icmppkt->icmp_type, -@@ -702,11 +721,31 @@ static void ping4(len_and_sockaddr *lsa) - int sockopt; - - pingaddr.sin = lsa->u.sin; -- if (source_lsa) { -+ if (source_lsa && !using_dgram) { - if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF, - &source_lsa->u.sa, source_lsa->len)) - bb_error_msg_and_die("can't set multicast source interface"); - xbind(pingsock, &source_lsa->u.sa, source_lsa->len); -+ } else if(using_dgram) { -+ struct sockaddr_in sa; -+ socklen_t sl; -+ -+ sa.sin_family = AF_INET; -+ sa.sin_port = 0; -+ sa.sin_addr.s_addr = source_lsa ? -+ source_lsa->u.sin.sin_addr.s_addr : 0; -+ sl = sizeof(sa); -+ -+ if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ myid = sa.sin_port; - } - - /* enable broadcast pings */ -@@ -723,6 +762,15 @@ static void ping4(len_and_sockaddr *lsa) - setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl); - } - -+ if(using_dgram) { -+ int hold = 65536; -+ if (setsockopt(pingsock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold))) -+ perror("WARNING: setsockopt(IP_RECVTTL)"); -+ if (setsockopt(pingsock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold))) -+ perror("WARNING: setsockopt(IP_RETOPTS)"); -+ -+ } -+ - signal(SIGINT, print_stats_and_exit); - - /* start the ping's going ... */ -@@ -756,10 +804,33 @@ static void ping6(len_and_sockaddr *lsa) - char control_buf[CMSG_SPACE(36)]; - - pingaddr.sin6 = lsa->u.sin6; -- if (source_lsa) -+ if (source_lsa && !using_dgram) - xbind(pingsock, &source_lsa->u.sa, source_lsa->len); -+ else if(using_dgram) { -+ struct sockaddr_in6 sa = {0}; -+ socklen_t sl; -+ -+ sa.sin6_family = AF_INET6; -+ sa.sin6_port = 0; -+ if(source_lsa) { -+ memcpy(&sa.sin6_addr, &source_lsa->u.sin6.sin6_addr, sizeof(struct in6_addr)); -+ } -+ sl = sizeof(sa); -+ -+ if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ myid = sa.sin6_port; -+ } - - #ifdef ICMP6_FILTER -+ if(!using_dgram) - { - struct icmp6_filter filt; - if (!(option_mask32 & OPT_VERBOSE)) { -@@ -890,7 +961,7 @@ static int common_ping_main(int opt, char **argv) - if (opt & OPT_p) - G.pattern = xstrtou_range(str_p, 16, 0, 255); - -- myid = (uint16_t) getpid(); -+ if (!using_dgram) myid = (uint16_t) getpid(); - hostname = argv[optind]; - #if ENABLE_PING6 - { --- -2.16.2 - diff --git a/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch deleted file mode 100644 index 8b89902de..000000000 --- a/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch +++ /dev/null @@ -1,516 +0,0 @@ -From ab4df89615fc2c5726b4ce55546e4dc098211a0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Sun, 25 Oct 2015 22:21:41 +0200 -Subject: [PATCH 07/11] depmod: support generating kmod binary index files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows to use busybox depmod, and run daemons -using libkmod (or even kmod modprobe if needed). - -About +1500 bytes when enabled. This patch merges some -depmod code paths, so when this is disabled it shrinks -the code size a little bit. - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - modutils/Config.src | 9 ++ - modutils/depmod.c | 281 ++++++++++++++++++++++++++++++++++++++++++---------- - modutils/modprobe.c | 15 --- - modutils/modutils.c | 31 ++++++ - modutils/modutils.h | 16 +++ - 5 files changed, 286 insertions(+), 66 deletions(-) - -diff --git a/modutils/Config.src b/modutils/Config.src -index 9b76c83d2..9e3b9b71e 100644 ---- a/modutils/Config.src -+++ b/modutils/Config.src -@@ -152,6 +152,15 @@ config FEATURE_MODUTILS_ALIAS - - Say Y if unsure. - -+config FEATURE_MODUTILS_BIN -+ bool "Support for the kmod .bin file format" -+ default n -+ depends on DEPMOD && !MODPROBE_SMALL -+ help -+ Generate kmod compatible binary index files for .dep, .alias, -+ .symbols and .builtin files. Allows mixing use of busybox -+ modutils and kmod (binaries and library). -+ - config FEATURE_MODUTILS_SYMBOLS - bool "Support module.symbols file" - default y -diff --git a/modutils/depmod.c b/modutils/depmod.c -index b7965ebd2..73ba7d0f4 100644 ---- a/modutils/depmod.c -+++ b/modutils/depmod.c -@@ -2,7 +2,7 @@ - /* - * depmod - generate modules.dep - * Copyright (c) 2008 Bernhard Reutner-Fischer -- * Copyrihgt (c) 2008 Timo Teras <timo.teras@iki.fi> -+ * Copyrihgt (c) 2008-2015 Timo Teras <timo.teras@iki.fi> - * Copyright (c) 2008 Vladimir Dronnikov - * - * Licensed under GPLv2 or later, see file LICENSE in this source tree. -@@ -26,6 +26,24 @@ - #include "modutils.h" - #include <sys/utsname.h> /* uname() */ - -+#define INDEX_MINCHAR 32 -+#define INDEX_MAXCHAR 128 -+ -+typedef struct index_node { -+ char *prefix; -+ llist_t *values; -+ struct index_node *children[INDEX_MAXCHAR-INDEX_MINCHAR]; -+} index_node; -+ -+struct globals { -+ module_db db; -+ index_node *root_node; -+} FIX_ALIASING; -+#define G (*ptr_to_globals) -+#define INIT_G() do { \ -+ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ -+} while (0) -+ - /* - * Theory of operation: - * - iterate over all modules and record their full path -@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA - - for (ptr = image; ptr < image + len - 10; ptr++) { - if (is_prefixed_with(ptr, "depends=")) { -- char *u; -- - ptr += 8; -- for (u = ptr; *u; u++) -- if (*u == '-') -- *u = '_'; -- ptr += string_to_llist(ptr, &e->deps, ","); -+ string_to_llist(replace_underscores(ptr), &e->deps, ","); - } else if (ENABLE_FEATURE_MODUTILS_ALIAS - && is_prefixed_with(ptr, "alias=") - ) { -- llist_add_to(&e->aliases, xstrdup(ptr + 6)); -- ptr += strlen(ptr); -+ llist_add_to(&e->aliases, replace_underscores(xstrdup(ptr + 6))); - } else if (ENABLE_FEATURE_MODUTILS_SYMBOLS - && is_prefixed_with(ptr, "__ksymtab_") - ) { -@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA - ) { - continue; - } -- llist_add_to(&e->symbols, xstrdup(ptr)); -- ptr += strlen(ptr); -- } -+ llist_add_to(&e->symbols, xasprintf("symbol:%s", ptr)); -+ } else -+ continue; -+ ptr += strlen(ptr); - } - free(image); - -@@ -108,12 +121,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add - } - } - --static void xfreopen_write(const char *file, FILE *f) --{ -- if (freopen(file, "w", f) == NULL) -- bb_perror_msg_and_die("can't open '%s'", file); --} -- - //usage:#if !ENABLE_MODPROBE_SMALL - //usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..." - //usage:#define depmod_full_usage "\n\n" -@@ -167,6 +174,169 @@ enum { - OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */ - }; - -+/* Support for the mod binary index generation */ -+ -+static void index_init(const char *filename) -+{ -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ index_node *n; -+ -+ n = xzalloc(sizeof(index_node)); -+ n->prefix = xstrdup(""); -+ G.root_node = n; -+ } -+ -+ if (filename && !(option_mask32 & OPT_n)) { -+ if (freopen(filename, "w", stdout) == NULL) -+ bb_perror_msg_and_die("can't open '%s'", filename); -+ } -+} -+ -+static void index_add(const char *key, char *value, const char *prefix) -+{ -+ if (prefix && *prefix) -+ printf("%s%s %s\n", prefix, key, value); -+ else if (prefix) -+ printf("%s\n", value); -+ -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ index_node *cur = G.root_node, *n; -+ unsigned i = 0, j, ch; -+ -+ while (1) { -+ /* Ensure node->prefix is a prefix of &str[i]. -+ * If it is not already, then we must split node. */ -+ for (j = 0; cur->prefix[j]; j++) { -+ ch = cur->prefix[j]; -+ if (ch != key[i+j]) { -+ /* New child is copy of node with prefix[j+1..N] */ -+ n = xzalloc(sizeof(index_node)); -+ n->prefix = xstrdup(&cur->prefix[j+1]); -+ n->values = cur->values; -+ memcpy(n->children, cur->children, sizeof(n->children)); -+ -+ /* Parent has prefix[0..j], child at prefix[j] */ -+ cur->prefix[j] = '\0'; -+ cur->values = NULL; -+ memset(cur->children, 0, sizeof(cur->children)); -+ cur->children[ch-INDEX_MINCHAR] = n; -+ break; -+ } -+ } -+ i += j; -+ -+ ch = key[i]; -+ if (ch == 0) -+ break; -+ -+ if (ch < INDEX_MINCHAR || ch >= INDEX_MAXCHAR) -+ bb_error_msg_and_die("bad module name"); -+ -+ ch -= INDEX_MINCHAR; -+ if (!cur->children[ch]) { -+ n = xzalloc(sizeof(index_node)); -+ cur->children[ch] = n; -+ n->prefix = xstrdup(&key[i+1]); -+ cur = n; -+ break; -+ } -+ -+ /* Descend into child node and continue */ -+ cur = cur->children[ch]; -+ i++; -+ } -+ -+ llist_add_to(&cur->values, value); -+ } -+} -+ -+static uint32_t index_write_node(FILE *out, index_node *n, void (*freeit)(void *data)) -+{ -+ uint32_t child_offs[INDEX_MAXCHAR-INDEX_MINCHAR]; -+ uint32_t offset; -+ uint8_t first = 255, last = 0; -+ unsigned i; -+ -+ for (i = 0; i < INDEX_MAXCHAR-INDEX_MINCHAR; i++) { -+ child_offs[i] = 0; -+ if (!n->children[i]) -+ continue; -+ child_offs[i] = index_write_node(out, n->children[i], freeit); -+ if (first > INDEX_MAXCHAR) -+ first = i; -+ last = i; -+ } -+ -+ offset = ftell(out); -+ -+ if (n->prefix[0]) { -+ fputs(n->prefix, out); -+ fputc('\0', out); -+ offset |= INDEX_NODE_PREFIX; -+ } -+ -+ if (first < INDEX_MAXCHAR) { -+ fputc(first + INDEX_MINCHAR, out); -+ fputc(last + INDEX_MINCHAR, out); -+ fwrite(child_offs + first, sizeof(uint32_t), last - first + 1, out); -+ offset |= INDEX_NODE_CHILDS; -+ } -+ -+ if (n->values) { -+ const llist_t *v; -+ unsigned int cnt; -+ uint32_t u; -+ -+ n->values = llist_rev(n->values); -+ for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++); -+ u = htonl(cnt); -+ fwrite(&u, sizeof(u), 1, out); -+ for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++) { -+ u = htonl(cnt); -+ fwrite(&u, sizeof(u), 1, out); -+ fputs(v->data, out); -+ fputc('\0', out); -+ } -+ offset |= INDEX_NODE_VALUES; -+ } -+ -+ llist_free(n->values, freeit); -+ free(n->prefix); -+ free(n); -+ -+ return htonl(offset); -+} -+ -+static void index_dump(const char *filename, int deps_file) -+{ -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ FILE *out; -+ uint32_t header[3] = { -+ htonl(INDEX_MAGIC), -+ htonl(INDEX_VERSION), -+ }; -+ -+ if (option_mask32 & OPT_n) -+ filename = "/dev/null"; -+ else -+ filename = xasprintf("tmp.%s.bin", filename); -+ -+ out = xfopen_for_write(filename); -+ fwrite(header, sizeof(uint32_t), 3, out); -+ header[2] = index_write_node(out, G.root_node, deps_file ? free : 0); -+ rewind(out); -+ G.root_node = NULL; -+ fwrite(header, sizeof(uint32_t), 3, out); -+ if (fclose(out)) { -+ remove(filename); -+ bb_error_msg_and_die(bb_msg_write_error); -+ } -+ /* .bin files are mmap'ed; not renaming it may crash -+ * long standing daemon using libkmod */ -+ rename_or_warn(filename, filename + 4); -+ } -+} -+ - int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int depmod_main(int argc UNUSED_PARAM, char **argv) - { -@@ -178,6 +348,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) - unsigned i; - int tmp; - -+ INIT_G(); -+ - getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); - argv += optind; - -@@ -210,53 +382,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) - } - - /* Generate dependency and alias files */ -- if (!(option_mask32 & OPT_n)) -- xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout); -- -+ index_init(CONFIG_DEFAULT_DEPMOD_FILE); - moddb_foreach_module(&modules, m, i) { -- printf("%s:", m->name); -- -+ char *buf = xasprintf("%s:", m->name); - order_dep_list(&modules, m, m->deps); -+ - while (m->dnext != m) { - dep = m->dnext; -- printf(" %s", dep->name); -- -+ buf = gather_options_str(buf, dep->name); - /* unlink current entry */ - dep->dnext->dprev = dep->dprev; - dep->dprev->dnext = dep->dnext; - dep->dnext = dep->dprev = dep; - } -- bb_putchar('\n'); -+ index_add(m->modname, buf, ""); - } -- --#if ENABLE_FEATURE_MODUTILS_ALIAS -- if (!(option_mask32 & OPT_n)) -- xfreopen_write("modules.alias", stdout); -- moddb_foreach_module(&modules, m, i) { -- while (m->aliases) { -- /* -- * Last word used to be a basename -- * (filename with path and .ko.* stripped) -- * at the time of module-init-tools 3.4. -- * kmod v.12 uses module name, i.e., s/-/_/g. -- */ -- printf("alias %s %s\n", -- (char*)llist_pop(&m->aliases), -- m->modname); -+ index_dump(CONFIG_DEFAULT_DEPMOD_FILE, 1); -+ -+ if (ENABLE_FEATURE_MODUTILS_ALIAS) { -+ index_init("modules.alias"); -+ moddb_foreach_module(&modules, m, i) { -+ while (m->aliases) { -+ /* -+ * Last word used to be a basename -+ * (filename with path and .ko.* stripped) -+ * at the time of module-init-tools 3.4. -+ * kmod v.12 uses module name, i.e., s/-/_/g. -+ */ -+ index_add((char*)llist_pop(&m->aliases), m->modname, "alias "); -+ } - } -+ index_dump("modules.alias", 0); - } --#endif --#if ENABLE_FEATURE_MODUTILS_SYMBOLS -- if (!(option_mask32 & OPT_n)) -- xfreopen_write("modules.symbols", stdout); -- moddb_foreach_module(&modules, m, i) { -- while (m->symbols) { -- printf("alias symbol:%s %s\n", -- (char*)llist_pop(&m->symbols), -- m->modname); -+ if (ENABLE_FEATURE_MODUTILS_SYMBOLS) { -+ index_init("modules.symbols"); -+ moddb_foreach_module(&modules, m, i) { -+ while (m->symbols) { -+ index_add((char*)llist_pop(&m->symbols), m->modname, "alias "); -+ } -+ } -+ index_dump("modules.symbols", 0); -+ } -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ char line[PATH_MAX], modname[MODULE_NAME_LEN]; -+ FILE *in; -+ -+ index_init(NULL); -+ in = xfopen_for_read("modules.builtin"); -+ while (fgets(line, sizeof(line), in) != NULL) { -+ filename2modname(line, modname); -+ index_add(modname, (char *) "", 0); - } -+ fclose(in); -+ index_dump("modules.builtin", 0); - } --#endif - - if (ENABLE_FEATURE_CLEAN_UP) - moddb_free(&modules); -diff --git a/modutils/modprobe.c b/modutils/modprobe.c -index 51ede9204..d1fcc0b7f 100644 ---- a/modutils/modprobe.c -+++ b/modutils/modprobe.c -@@ -192,21 +192,6 @@ struct globals { - - static int read_config(const char *path); - --static char *gather_options_str(char *opts, const char *append) --{ -- /* Speed-optimized. We call gather_options_str many times. */ -- if (append) { -- if (opts == NULL) { -- opts = xstrdup(append); -- } else { -- int optlen = strlen(opts); -- opts = xrealloc(opts, optlen + strlen(append) + 2); -- sprintf(opts + optlen, " %s", append); -- } -- } -- return opts; --} -- - static struct module_entry *get_or_add_modentry(const char *module) - { - return moddb_get_or_create(&G.db, module); -diff --git a/modutils/modutils.c b/modutils/modutils.c -index 6f7cd9721..257089af4 100644 ---- a/modutils/modutils.c -+++ b/modutils/modutils.c -@@ -66,6 +66,21 @@ void FAST_FUNC moddb_free(module_db *db) - } - } - -+char * FAST_FUNC gather_options_str(char *opts, const char *append) -+{ -+ /* Speed-optimized. We call gather_options_str many times. */ -+ if (append) { -+ if (opts == NULL) { -+ opts = xstrdup(append); -+ } else { -+ int optlen = strlen(opts); -+ opts = xrealloc(opts, optlen + strlen(append) + 2); -+ sprintf(opts + optlen, " %s", append); -+ } -+ } -+ return opts; -+} -+ - void FAST_FUNC replace(char *s, char what, char with) - { - while (*s) { -@@ -75,6 +90,22 @@ void FAST_FUNC replace(char *s, char what, char with) - } - } - -+char* FAST_FUNC replace_underscores(char *s) -+{ -+ int i; -+ for (i = 0; s[i]; i++) { -+ switch (s[i]) { -+ case '-': -+ s[i] = '_'; -+ break; -+ case '[': -+ i += strcspn(&s[i], "]"); -+ break; -+ } -+ } -+ return s; -+} -+ - int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim) - { - char *tok; -diff --git a/modutils/modutils.h b/modutils/modutils.h -index 4a702e97c..73e816028 100644 ---- a/modutils/modutils.h -+++ b/modutils/modutils.h -@@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN - #define MODULE_NAME_LEN 256 - #define MODULE_HASH_SIZE 256 - -+/* .bin index format definitions */ -+#define INDEX_MAGIC 0xB007F457 -+#define INDEX_VERSION_MAJOR 0x0002 -+#define INDEX_VERSION_MINOR 0x0001 -+#define INDEX_VERSION ((INDEX_VERSION_MAJOR<<16)|INDEX_VERSION_MINOR) -+ -+enum node_offset { -+ INDEX_NODE_FLAGS = 0xF0000000, /* Flags in high nibble */ -+ INDEX_NODE_PREFIX = 0x80000000, -+ INDEX_NODE_VALUES = 0x40000000, -+ INDEX_NODE_CHILDS = 0x20000000, -+ INDEX_NODE_MASK = 0x0FFFFFFF, /* Offset value */ -+}; -+ - typedef struct module_entry { - struct module_entry *next; - char *name, *modname; -@@ -47,7 +61,9 @@ module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC; - module_entry *moddb_get_or_create(module_db *db, const char *s) FAST_FUNC; - void moddb_free(module_db *db) FAST_FUNC; - -+char *gather_options_str(char *opts, const char *append) FAST_FUNC; - void replace(char *s, char what, char with) FAST_FUNC; -+char *replace_underscores(char *s) FAST_FUNC; - int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; - char *filename2modname(const char *filename, char *modname) FAST_FUNC; - #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS --- -2.13.2 - diff --git a/legacy/busybox/0007-fbsplash-support-console-switching.patch b/legacy/busybox/0007-fbsplash-support-console-switching.patch deleted file mode 100644 index ef226d009..000000000 --- a/legacy/busybox/0007-fbsplash-support-console-switching.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 377e2f20c1034de1195fd900fc637821952cfa49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Mon, 24 Sep 2012 07:58:29 +0300 -Subject: [PATCH 07/16] fbsplash: support console switching - ---- - miscutils/fbsplash.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 75 insertions(+), 7 deletions(-) - -diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index 5b2e5ac56..bc80f728c 100644 ---- a/miscutils/fbsplash.c -+++ b/miscutils/fbsplash.c -@@ -47,7 +47,7 @@ - //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o - - //usage:#define fbsplash_trivial_usage --//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" -+//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD] [-T tty]" - //usage:#define fbsplash_full_usage "\n\n" - //usage: " -s Image" - //usage: "\n -c Hide cursor" -@@ -57,11 +57,17 @@ - //usage: "\n BAR_R,BAR_G,BAR_B" - //usage: "\n -f Control pipe (else exit after drawing image)" - //usage: "\n commands: 'NN' (% for progress bar) or 'exit'" -+//usage: "\n -T Switch to TTY to hide all console messages" - - #include "libbb.h" - #include "common_bufsiz.h" - #include <linux/fb.h> - -+#include <sys/vt.h> -+#include <sys/ioctl.h> -+#include <linux/tiocl.h> -+#include <linux/kd.h> -+ - /* If you want logging messages on /tmp/fbsplash.log... */ - #define DEBUG 0 - -@@ -75,6 +81,8 @@ struct globals { - unsigned char *addr; // pointer to framebuffer memory - unsigned ns[7]; // n-parameters - const char *image_filename; -+ int silent_tty, fd_tty_s; -+ bool do_not_draw; - struct fb_var_screeninfo scr_var; - struct fb_fix_screeninfo scr_fix; - unsigned bytes_per_pixel; -@@ -485,6 +493,11 @@ static void init(const char *cfg_filename) - config_close(parser); - } - -+static void sighandler(int sig) -+{ -+ ioctl(G.fd_tty_s, VT_RELDISP, sig == SIGUSR1 ? 1 : 2); -+ G.do_not_draw = (sig != SIGUSR2); -+} - - int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int fbsplash_main(int argc UNUSED_PARAM, char **argv) -@@ -494,6 +507,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - char *num_buf; - unsigned num; - bool bCursorOff; -+ int fd_tty0, active_vt; -+ struct vt_stat vtstat; -+ struct vt_mode vt; - - INIT_G(); - -@@ -501,8 +517,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - fb_device = "/dev/fb0"; - cfg_filename = NULL; - fifo_filename = NULL; -- bCursorOff = 1 & getopt32(argv, "cs:d:i:f:", -- &G.image_filename, &fb_device, &cfg_filename, &fifo_filename); -+ bCursorOff = 1 & getopt32(argv, "cs:d:i:f:T:", -+ &G.image_filename, &fb_device, &cfg_filename, &fifo_filename, -+ &G.silent_tty); - - // parse configuration file - if (cfg_filename) -@@ -512,11 +529,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - if (!G.image_filename) - bb_show_usage(); - -+ fd_tty0 = get_console_fd_or_die(); -+ if (G.silent_tty) { -+ char buf[16]; -+ -+ /* Initialize TTY */ -+ bb_signals((1LL << SIGUSR1) | (1LL << SIGUSR2), sighandler); -+ snprintf(buf, sizeof(buf), "/dev/tty%d", G.silent_tty); -+ G.fd_tty_s = xopen(buf, O_RDWR | O_NOCTTY); -+ -+ /* Activate TTY */ -+ xioctl(fd_tty0, VT_GETSTATE, &vtstat); -+ active_vt = vtstat.v_active; -+ console_make_active(fd_tty0, G.silent_tty); -+ -+ /* Get notifications on console changes */ -+ vt.mode = VT_PROCESS; -+ vt.waitv = 0; -+ vt.relsig = SIGUSR1; -+ vt.acqsig = SIGUSR2; -+ ioctl(G.fd_tty_s, VT_SETMODE, &vt); -+ -+ /* Redirect all kernel messages to tty1 so that they don't get -+ * printed over our silent splash image. And clear it. */ -+ buf[0] = TIOCL_SETKMSGREDIRECT; -+ buf[1] = 1; -+ ioctl(G.fd_tty_s, TIOCLINUX, buf); -+ full_write(G.fd_tty_s, "\e[H\e[2J" "\e[?17;0c", 7+8); -+ ioctl(G.fd_tty_s, KDSETMODE, KD_GRAPHICS); -+ } else { -+ G.fd_tty_s = STDOUT_FILENO; -+ } -+ - fb_open(fb_device); - - if (fifo_filename && bCursorOff) { - // hide cursor (BEFORE any fb ops) -- full_write(STDOUT_FILENO, ESC"[?25l", 6); -+ full_write(G.fd_tty_s, ESC"[?25l", 6); - } - - fb_drawimage(); -@@ -524,6 +573,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - if (!fifo_filename) - return EXIT_SUCCESS; - -+ sig_block(SIGUSR1); - fp = xfopen_stdin(fifo_filename); - if (fp != stdin) { - // For named pipes, we want to support this: -@@ -539,8 +589,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - // and become an additional writer :) - open(fifo_filename, O_WRONLY); // errors are ignored - } -- - fb_drawprogressbar(0); -+ sig_unblock(SIGUSR1); -+ - // Block on read, waiting for some input. - // Use of <stdio.h> style I/O allows to correctly - // handle a case when we have many buffered lines -@@ -555,12 +606,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) - #if DEBUG - DEBUG_MESSAGE(itoa(num)); - #endif -- fb_drawprogressbar(num); -+ sig_block(SIGUSR1); -+ if (!G.do_not_draw) -+ fb_drawprogressbar(num); -+ sig_unblock(SIGUSR1); - } - free(num_buf); - } - -- if (bCursorOff) // restore cursor -+ if (G.silent_tty) { -+ usleep(100*1000); -+ -+ ioctl(G.fd_tty_s, VT_RELDISP, 1); -+ ioctl(G.fd_tty_s, KDSETMODE, KD_TEXT); -+ vt.mode = VT_AUTO; -+ vt.waitv = 0; -+ ioctl(G.fd_tty_s, VT_SETMODE, &vt); -+ close(G.fd_tty_s); -+ -+ xioctl(fd_tty0, VT_GETSTATE, &vtstat); -+ if (vtstat.v_active == G.silent_tty) -+ console_make_active(fd_tty0, active_vt); -+ ioctl(fd_tty0, VT_DISALLOCATE, (void *)(ptrdiff_t)G.silent_tty); -+ } else if (bCursorOff) // restore cursor - full_write(STDOUT_FILENO, ESC"[?25h", 6); - - return EXIT_SUCCESS; --- -2.16.2 - diff --git a/legacy/busybox/0008-diff-add-support-for-no-dereference.patch b/legacy/busybox/0008-diff-add-support-for-no-dereference.patch deleted file mode 100644 index 95063a863..000000000 --- a/legacy/busybox/0008-diff-add-support-for-no-dereference.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d70be9891718ffb94ea9946cc3540b1b62eced77 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 25 Jul 2014 15:28:33 +0200 -Subject: [PATCH 08/11] diff: add support for --no-dereference - -Add flag for not following symlinks when recursing - -function old new delta -.rodata 7934 7967 +33 -diff_longopts 253 270 +17 -packed_usage 1704 1720 +16 -diff_main 1665 1662 -3 ------------------------------------------------------------------------------- -(add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3) Total: 63 bytes - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - editors/diff.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/editors/diff.c b/editors/diff.c -index 7687518f3..f07cafb19 100644 ---- a/editors/diff.c -+++ b/editors/diff.c -@@ -115,6 +115,9 @@ - //usage: "\n -N Treat absent files as empty" - //usage: "\n -q Output only whether files differ" - //usage: "\n -r Recurse" -+//usage: IF_LONG_OPTS( -+//usage: "\n --no-dereference Don't follow symlinks" -+//usage: ) - //usage: "\n -S Start with FILE when comparing directories" - //usage: "\n -T Make tabs line up by prefixing a tab when necessary" - //usage: "\n -s Report when two files are the same" -@@ -156,6 +159,7 @@ enum { /* Commandline flags */ - FLAG_p, /* not implemented */ - FLAG_B, - FLAG_E, /* not implemented */ -+ FLAG_no_deref, - }; - #define FLAG(x) (1 << FLAG_##x) - -@@ -869,7 +873,8 @@ static void diffdir(char *p[2], const char *s_start) - * Using list.len to specify its length, - * add_to_dirlist will remove it. */ - list[i].len = strlen(p[i]); -- recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS, -+ recursive_action(p[i], ACTION_RECURSE | -+ ((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS), - add_to_dirlist, skip_dir, &list[i], 0); - /* Sort dl alphabetically. - * GNU diff does this ignoring any number of trailing dots. -@@ -966,6 +971,7 @@ static const char diff_longopts[] ALIGN1 = - "report-identical-files\0" No_argument "s" - "starting-file\0" Required_argument "S" - "minimal\0" No_argument "d" -+ "no-dereference\0" No_argument "\xff" - ; - #endif - --- -2.13.2 - diff --git a/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch b/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch deleted file mode 100644 index b0cb5cc3d..000000000 --- a/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 97fcb49bfbe74fa17a52e63b2196d8a5c3b27d93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Fri, 21 Nov 2014 16:06:34 +0200 -Subject: [PATCH 08/16] fbsplash: support image and bar alignment and - positioning - ---- - miscutils/fbsplash.c | 91 +++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 76 insertions(+), 15 deletions(-) - -diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index bc80f728c..9089131b8 100644 ---- a/miscutils/fbsplash.c -+++ b/miscutils/fbsplash.c -@@ -53,6 +53,7 @@ - //usage: "\n -c Hide cursor" - //usage: "\n -d Framebuffer device (default /dev/fb0)" - //usage: "\n -i Config file (var=value):" -+//usage: "\n IMAGE_ALIGN" - //usage: "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" - //usage: "\n BAR_R,BAR_G,BAR_B" - //usage: "\n -f Control pipe (else exit after drawing image)" -@@ -73,13 +74,38 @@ - - #define ESC "\033" - -+enum { -+ image_align, -+ -+ image_posx, -+ image_posy, -+ bar_width, -+ bar_height, -+ bar_posx, -+ bar_posy, -+ bar_colr, -+ bar_colg, -+ bar_colb, -+ -+ debug -+}; -+ -+#define nimage_align ns[image_align] -+#define nbar_width ns[bar_width] -+#define nbar_height ns[bar_height] -+#define nbar_posx ns[bar_posx] -+#define nbar_posy ns[bar_posy] -+#define nbar_colr ns[bar_colr] -+#define nbar_colg ns[bar_colg] -+#define nbar_colb ns[bar_colb] -+ - struct globals { - #if DEBUG - bool bdebug_messages; // enable/disable logging - FILE *logfile_fd; // log file - #endif - unsigned char *addr; // pointer to framebuffer memory -- unsigned ns[7]; // n-parameters -+ unsigned ns[debug+1]; // n-parameters - const char *image_filename; - int silent_tty, fd_tty_s; - bool do_not_draw; -@@ -96,14 +122,6 @@ struct globals { - SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ - } while (0) - --#define nbar_width ns[0] // progress bar width --#define nbar_height ns[1] // progress bar height --#define nbar_posx ns[2] // progress bar horizontal position --#define nbar_posy ns[3] // progress bar vertical position --#define nbar_colr ns[4] // progress bar color red component --#define nbar_colg ns[5] // progress bar color green component --#define nbar_colb ns[6] // progress bar color blue component -- - #if DEBUG - #define DEBUG_MESSAGE(strMessage, args...) \ - if (G.bdebug_messages) { \ -@@ -384,7 +402,7 @@ static void fb_drawimage(void) - FILE *theme_file; - char *read_ptr; - unsigned char *pixline; -- unsigned i, j, width, height, line_size; -+ int i, j, width, height, line_size, xoffs, yoffs, xstart; - - if (LONE_DASH(G.image_filename)) { - theme_file = stdin; -@@ -434,18 +452,46 @@ static void fb_drawimage(void) - line_size = width*3; - pixline = xmalloc(line_size); - -+#if 0 - if (width > G.scr_var.xres) - width = G.scr_var.xres; - if (height > G.scr_var.yres) - height = G.scr_var.yres; -- for (j = 0; j < height; j++) { -+#endif -+ -+ xoffs = yoffs = 0; -+ switch (G.nimage_align % 3) { -+ case 1: xoffs = (G.scr_var.xres - width) / 2; break; -+ case 2: xoffs = G.scr_var.xres - width; break; -+ } -+ xstart = 0; -+ if (xoffs < 0) { -+ xstart = -xoffs; -+ width -= xstart; -+ xoffs = 0; -+ } -+ xoffs *= G.bytes_per_pixel; -+ if (width > G.scr_var.xres) -+ width = G.scr_var.xres; -+ -+ switch (G.nimage_align / 3) { -+ case 1: yoffs = (G.scr_var.yres - height) / 2; break; -+ case 2: yoffs = G.scr_var.yres - height; break; -+ } -+ -+ for (j = 0; j < height && yoffs < G.scr_var.yres; j++, yoffs++) { - unsigned char *pixel; - unsigned char *src; - - if (fread(pixline, 1, line_size, theme_file) != line_size) - bb_error_msg_and_die("bad PPM file '%s'", G.image_filename); -+ -+ if (yoffs < 0) -+ continue; -+ - pixel = pixline; -- src = G.addr + j * G.scr_fix.line_length; -+ src = G.addr + yoffs * G.scr_fix.line_length + xoffs; -+ - for (i = 0; i < width; i++) { - unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]); - fb_write_pixel(src, thispix); -@@ -464,9 +510,17 @@ static void fb_drawimage(void) - */ - static void init(const char *cfg_filename) - { -+ static const char align_names[] ALIGN1 = -+ "LT\0" "CT\0" "RT\0" -+ "LM\0" "CM\0" "RM\0" -+ "LB\0" "CB\0" "RB\0"; - static const char param_names[] ALIGN1 = -+ "IMAGE_ALIGN\0" -+ -+ "IMAGE_X\0" "IMAGE_Y\0" - "BAR_WIDTH\0" "BAR_HEIGHT\0" - "BAR_LEFT\0" "BAR_TOP\0" -+ - "BAR_R\0" "BAR_G\0" "BAR_B\0" - #if DEBUG - "DEBUG\0" -@@ -476,14 +530,21 @@ static void init(const char *cfg_filename) - parser_t *parser = config_open2(cfg_filename, xfopen_stdin); - while (config_read(parser, token, 2, 2, "#=", - (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) { -- unsigned val = xatoi_positive(token[1]); -+ unsigned val; - int i = index_in_strings(param_names, token[0]); -+ - if (i < 0) - bb_error_msg_and_die("syntax error: %s", token[0]); -- if (i >= 0 && i < 7) -+ -+ if (i <= image_align) -+ val = index_in_strings(align_names, token[1]); -+ else -+ val = xatoi_positive(token[1]); -+ -+ if (i < debug) - G.ns[i] = val; - #if DEBUG -- if (i == 7) { -+ if (i == debug) { - G.bdebug_messages = val; - if (G.bdebug_messages) - G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log"); --- -2.16.2 - diff --git a/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch b/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch deleted file mode 100644 index 2034f5c88..000000000 --- a/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch +++ /dev/null @@ -1,510 +0,0 @@ -From d13cb44f10d730eeac83340f71ea95b6faa0c142 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Sun, 25 Oct 2015 22:21:41 +0200 -Subject: [PATCH 09/16] depmod: support generating kmod binary index files - -This allows to use busybox depmod, and run daemons using libkmod (or -even kmod modprobe if needed). - -About +1500 bytes when enabled. This patch merges some depmod code -paths, so when this is disabled it shrinks the code size a little bit. ---- - modutils/Config.src | 9 ++ - modutils/depmod.c | 281 ++++++++++++++++++++++++++++++++++++++++++---------- - modutils/modprobe.c | 15 --- - modutils/modutils.c | 31 ++++++ - modutils/modutils.h | 16 +++ - 5 files changed, 286 insertions(+), 66 deletions(-) - -diff --git a/modutils/Config.src b/modutils/Config.src -index e413702bb..1be7434a5 100644 ---- a/modutils/Config.src -+++ b/modutils/Config.src -@@ -152,6 +152,15 @@ config FEATURE_MODUTILS_ALIAS - - Say Y if unsure. - -+config FEATURE_MODUTILS_BIN -+ bool "Support for the kmod .bin file format" -+ default n -+ depends on DEPMOD && !MODPROBE_SMALL -+ help -+ Generate kmod compatible binary index files for .dep, .alias, -+ .symbols and .builtin files. Allows mixing use of busybox -+ modutils and kmod (binaries and library). -+ - config FEATURE_MODUTILS_SYMBOLS - bool "Support module.symbols file" - default y -diff --git a/modutils/depmod.c b/modutils/depmod.c -index 004c67a11..05c1a9bce 100644 ---- a/modutils/depmod.c -+++ b/modutils/depmod.c -@@ -2,7 +2,7 @@ - /* - * depmod - generate modules.dep - * Copyright (c) 2008 Bernhard Reutner-Fischer -- * Copyrihgt (c) 2008 Timo Teras <timo.teras@iki.fi> -+ * Copyrihgt (c) 2008-2015 Timo Teras <timo.teras@iki.fi> - * Copyright (c) 2008 Vladimir Dronnikov - * - * Licensed under GPLv2 or later, see file LICENSE in this source tree. -@@ -26,6 +26,24 @@ - #include "modutils.h" - #include <sys/utsname.h> /* uname() */ - -+#define INDEX_MINCHAR 32 -+#define INDEX_MAXCHAR 128 -+ -+typedef struct index_node { -+ char *prefix; -+ llist_t *values; -+ struct index_node *children[INDEX_MAXCHAR-INDEX_MINCHAR]; -+} index_node; -+ -+struct globals { -+ module_db db; -+ index_node *root_node; -+} FIX_ALIASING; -+#define G (*ptr_to_globals) -+#define INIT_G() do { \ -+ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ -+} while (0) -+ - /* - * Theory of operation: - * - iterate over all modules and record their full path -@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA - - for (ptr = image; ptr < image + len - 10; ptr++) { - if (is_prefixed_with(ptr, "depends=")) { -- char *u; -- - ptr += 8; -- for (u = ptr; *u; u++) -- if (*u == '-') -- *u = '_'; -- ptr += string_to_llist(ptr, &e->deps, ","); -+ string_to_llist(replace_underscores(ptr), &e->deps, ","); - } else if (ENABLE_FEATURE_MODUTILS_ALIAS - && is_prefixed_with(ptr, "alias=") - ) { -- llist_add_to(&e->aliases, xstrdup(ptr + 6)); -- ptr += strlen(ptr); -+ llist_add_to(&e->aliases, replace_underscores(xstrdup(ptr + 6))); - } else if (ENABLE_FEATURE_MODUTILS_SYMBOLS - && is_prefixed_with(ptr, "__ksymtab_") - ) { -@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA - ) { - continue; - } -- llist_add_to(&e->symbols, xstrdup(ptr)); -- ptr += strlen(ptr); -- } -+ llist_add_to(&e->symbols, xasprintf("symbol:%s", ptr)); -+ } else -+ continue; -+ ptr += strlen(ptr); - } - free(image); - -@@ -108,12 +121,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add - } - } - --static void xfreopen_write(const char *file, FILE *f) --{ -- if (freopen(file, "w", f) == NULL) -- bb_perror_msg_and_die("can't open '%s'", file); --} -- - //usage:#if !ENABLE_MODPROBE_SMALL - //usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..." - //usage:#define depmod_full_usage "\n\n" -@@ -167,6 +174,169 @@ enum { - OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */ - }; - -+/* Support for the mod binary index generation */ -+ -+static void index_init(const char *filename) -+{ -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ index_node *n; -+ -+ n = xzalloc(sizeof(index_node)); -+ n->prefix = xstrdup(""); -+ G.root_node = n; -+ } -+ -+ if (filename && !(option_mask32 & OPT_n)) { -+ if (freopen(filename, "w", stdout) == NULL) -+ bb_perror_msg_and_die("can't open '%s'", filename); -+ } -+} -+ -+static void index_add(const char *key, char *value, const char *prefix) -+{ -+ if (prefix && *prefix) -+ printf("%s%s %s\n", prefix, key, value); -+ else if (prefix) -+ printf("%s\n", value); -+ -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ index_node *cur = G.root_node, *n; -+ unsigned i = 0, j, ch; -+ -+ while (1) { -+ /* Ensure node->prefix is a prefix of &str[i]. -+ * If it is not already, then we must split node. */ -+ for (j = 0; cur->prefix[j]; j++) { -+ ch = cur->prefix[j]; -+ if (ch != key[i+j]) { -+ /* New child is copy of node with prefix[j+1..N] */ -+ n = xzalloc(sizeof(index_node)); -+ n->prefix = xstrdup(&cur->prefix[j+1]); -+ n->values = cur->values; -+ memcpy(n->children, cur->children, sizeof(n->children)); -+ -+ /* Parent has prefix[0..j], child at prefix[j] */ -+ cur->prefix[j] = '\0'; -+ cur->values = NULL; -+ memset(cur->children, 0, sizeof(cur->children)); -+ cur->children[ch-INDEX_MINCHAR] = n; -+ break; -+ } -+ } -+ i += j; -+ -+ ch = key[i]; -+ if (ch == 0) -+ break; -+ -+ if (ch < INDEX_MINCHAR || ch >= INDEX_MAXCHAR) -+ bb_error_msg_and_die("bad module name"); -+ -+ ch -= INDEX_MINCHAR; -+ if (!cur->children[ch]) { -+ n = xzalloc(sizeof(index_node)); -+ cur->children[ch] = n; -+ n->prefix = xstrdup(&key[i+1]); -+ cur = n; -+ break; -+ } -+ -+ /* Descend into child node and continue */ -+ cur = cur->children[ch]; -+ i++; -+ } -+ -+ llist_add_to(&cur->values, value); -+ } -+} -+ -+static uint32_t index_write_node(FILE *out, index_node *n, void (*freeit)(void *data)) -+{ -+ uint32_t child_offs[INDEX_MAXCHAR-INDEX_MINCHAR]; -+ uint32_t offset; -+ uint8_t first = 255, last = 0; -+ unsigned i; -+ -+ for (i = 0; i < INDEX_MAXCHAR-INDEX_MINCHAR; i++) { -+ child_offs[i] = 0; -+ if (!n->children[i]) -+ continue; -+ child_offs[i] = index_write_node(out, n->children[i], freeit); -+ if (first > INDEX_MAXCHAR) -+ first = i; -+ last = i; -+ } -+ -+ offset = ftell(out); -+ -+ if (n->prefix[0]) { -+ fputs(n->prefix, out); -+ fputc('\0', out); -+ offset |= INDEX_NODE_PREFIX; -+ } -+ -+ if (first < INDEX_MAXCHAR) { -+ fputc(first + INDEX_MINCHAR, out); -+ fputc(last + INDEX_MINCHAR, out); -+ fwrite(child_offs + first, sizeof(uint32_t), last - first + 1, out); -+ offset |= INDEX_NODE_CHILDS; -+ } -+ -+ if (n->values) { -+ const llist_t *v; -+ unsigned int cnt; -+ uint32_t u; -+ -+ n->values = llist_rev(n->values); -+ for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++); -+ u = htonl(cnt); -+ fwrite(&u, sizeof(u), 1, out); -+ for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++) { -+ u = htonl(cnt); -+ fwrite(&u, sizeof(u), 1, out); -+ fputs(v->data, out); -+ fputc('\0', out); -+ } -+ offset |= INDEX_NODE_VALUES; -+ } -+ -+ llist_free(n->values, freeit); -+ free(n->prefix); -+ free(n); -+ -+ return htonl(offset); -+} -+ -+static void index_dump(const char *filename, int deps_file) -+{ -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ FILE *out; -+ uint32_t header[3] = { -+ htonl(INDEX_MAGIC), -+ htonl(INDEX_VERSION), -+ }; -+ -+ if (option_mask32 & OPT_n) -+ filename = "/dev/null"; -+ else -+ filename = xasprintf("tmp.%s.bin", filename); -+ -+ out = xfopen_for_write(filename); -+ fwrite(header, sizeof(uint32_t), 3, out); -+ header[2] = index_write_node(out, G.root_node, deps_file ? free : 0); -+ rewind(out); -+ G.root_node = NULL; -+ fwrite(header, sizeof(uint32_t), 3, out); -+ if (fclose(out)) { -+ remove(filename); -+ bb_error_msg_and_die(bb_msg_write_error); -+ } -+ /* .bin files are mmap'ed; not renaming it may crash -+ * long standing daemon using libkmod */ -+ rename_or_warn(filename, filename + 4); -+ } -+} -+ - int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int depmod_main(int argc UNUSED_PARAM, char **argv) - { -@@ -178,6 +348,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) - unsigned i; - int tmp; - -+ INIT_G(); -+ - getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); - argv += optind; - -@@ -210,53 +382,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) - } - - /* Generate dependency and alias files */ -- if (!(option_mask32 & OPT_n)) -- xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout); -- -+ index_init(CONFIG_DEFAULT_DEPMOD_FILE); - moddb_foreach_module(&modules, m, i) { -- printf("%s:", m->name); -- -+ char *buf = xasprintf("%s:", m->name); - order_dep_list(&modules, m, m->deps); -+ - while (m->dnext != m) { - dep = m->dnext; -- printf(" %s", dep->name); -- -+ buf = gather_options_str(buf, dep->name); - /* unlink current entry */ - dep->dnext->dprev = dep->dprev; - dep->dprev->dnext = dep->dnext; - dep->dnext = dep->dprev = dep; - } -- bb_putchar('\n'); -+ index_add(m->modname, buf, ""); - } -- --#if ENABLE_FEATURE_MODUTILS_ALIAS -- if (!(option_mask32 & OPT_n)) -- xfreopen_write("modules.alias", stdout); -- moddb_foreach_module(&modules, m, i) { -- while (m->aliases) { -- /* -- * Last word used to be a basename -- * (filename with path and .ko.* stripped) -- * at the time of module-init-tools 3.4. -- * kmod v.12 uses module name, i.e., s/-/_/g. -- */ -- printf("alias %s %s\n", -- (char*)llist_pop(&m->aliases), -- m->modname); -+ index_dump(CONFIG_DEFAULT_DEPMOD_FILE, 1); -+ -+ if (ENABLE_FEATURE_MODUTILS_ALIAS) { -+ index_init("modules.alias"); -+ moddb_foreach_module(&modules, m, i) { -+ while (m->aliases) { -+ /* -+ * Last word used to be a basename -+ * (filename with path and .ko.* stripped) -+ * at the time of module-init-tools 3.4. -+ * kmod v.12 uses module name, i.e., s/-/_/g. -+ */ -+ index_add((char*)llist_pop(&m->aliases), m->modname, "alias "); -+ } - } -+ index_dump("modules.alias", 0); - } --#endif --#if ENABLE_FEATURE_MODUTILS_SYMBOLS -- if (!(option_mask32 & OPT_n)) -- xfreopen_write("modules.symbols", stdout); -- moddb_foreach_module(&modules, m, i) { -- while (m->symbols) { -- printf("alias symbol:%s %s\n", -- (char*)llist_pop(&m->symbols), -- m->modname); -+ if (ENABLE_FEATURE_MODUTILS_SYMBOLS) { -+ index_init("modules.symbols"); -+ moddb_foreach_module(&modules, m, i) { -+ while (m->symbols) { -+ index_add((char*)llist_pop(&m->symbols), m->modname, "alias "); -+ } -+ } -+ index_dump("modules.symbols", 0); -+ } -+ if (ENABLE_FEATURE_MODUTILS_BIN) { -+ char line[PATH_MAX], modname[MODULE_NAME_LEN]; -+ FILE *in; -+ -+ index_init(NULL); -+ in = xfopen_for_read("modules.builtin"); -+ while (fgets(line, sizeof(line), in) != NULL) { -+ filename2modname(line, modname); -+ index_add(modname, (char *) "", 0); - } -+ fclose(in); -+ index_dump("modules.builtin", 0); - } --#endif - - if (ENABLE_FEATURE_CLEAN_UP) - moddb_free(&modules); -diff --git a/modutils/modprobe.c b/modutils/modprobe.c -index 59f6d54f3..0a398a60f 100644 ---- a/modutils/modprobe.c -+++ b/modutils/modprobe.c -@@ -192,21 +192,6 @@ struct globals { - - static int read_config(const char *path); - --static char *gather_options_str(char *opts, const char *append) --{ -- /* Speed-optimized. We call gather_options_str many times. */ -- if (append) { -- if (opts == NULL) { -- opts = xstrdup(append); -- } else { -- int optlen = strlen(opts); -- opts = xrealloc(opts, optlen + strlen(append) + 2); -- sprintf(opts + optlen, " %s", append); -- } -- } -- return opts; --} -- - static struct module_entry *get_or_add_modentry(const char *module) - { - return moddb_get_or_create(&G.db, module); -diff --git a/modutils/modutils.c b/modutils/modutils.c -index 6f7cd9721..257089af4 100644 ---- a/modutils/modutils.c -+++ b/modutils/modutils.c -@@ -66,6 +66,21 @@ void FAST_FUNC moddb_free(module_db *db) - } - } - -+char * FAST_FUNC gather_options_str(char *opts, const char *append) -+{ -+ /* Speed-optimized. We call gather_options_str many times. */ -+ if (append) { -+ if (opts == NULL) { -+ opts = xstrdup(append); -+ } else { -+ int optlen = strlen(opts); -+ opts = xrealloc(opts, optlen + strlen(append) + 2); -+ sprintf(opts + optlen, " %s", append); -+ } -+ } -+ return opts; -+} -+ - void FAST_FUNC replace(char *s, char what, char with) - { - while (*s) { -@@ -75,6 +90,22 @@ void FAST_FUNC replace(char *s, char what, char with) - } - } - -+char* FAST_FUNC replace_underscores(char *s) -+{ -+ int i; -+ for (i = 0; s[i]; i++) { -+ switch (s[i]) { -+ case '-': -+ s[i] = '_'; -+ break; -+ case '[': -+ i += strcspn(&s[i], "]"); -+ break; -+ } -+ } -+ return s; -+} -+ - int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim) - { - char *tok; -diff --git a/modutils/modutils.h b/modutils/modutils.h -index 4a702e97c..73e816028 100644 ---- a/modutils/modutils.h -+++ b/modutils/modutils.h -@@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN - #define MODULE_NAME_LEN 256 - #define MODULE_HASH_SIZE 256 - -+/* .bin index format definitions */ -+#define INDEX_MAGIC 0xB007F457 -+#define INDEX_VERSION_MAJOR 0x0002 -+#define INDEX_VERSION_MINOR 0x0001 -+#define INDEX_VERSION ((INDEX_VERSION_MAJOR<<16)|INDEX_VERSION_MINOR) -+ -+enum node_offset { -+ INDEX_NODE_FLAGS = 0xF0000000, /* Flags in high nibble */ -+ INDEX_NODE_PREFIX = 0x80000000, -+ INDEX_NODE_VALUES = 0x40000000, -+ INDEX_NODE_CHILDS = 0x20000000, -+ INDEX_NODE_MASK = 0x0FFFFFFF, /* Offset value */ -+}; -+ - typedef struct module_entry { - struct module_entry *next; - char *name, *modname; -@@ -47,7 +61,9 @@ module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC; - module_entry *moddb_get_or_create(module_db *db, const char *s) FAST_FUNC; - void moddb_free(module_db *db) FAST_FUNC; - -+char *gather_options_str(char *opts, const char *append) FAST_FUNC; - void replace(char *s, char what, char with) FAST_FUNC; -+char *replace_underscores(char *s) FAST_FUNC; - int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; - char *filename2modname(const char *filename, char *modname) FAST_FUNC; - #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS --- -2.16.2 - diff --git a/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch deleted file mode 100644 index 2624675c4..000000000 --- a/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 1cb2e911c47f1b798ee610deabbea21ba6fb6961 Mon Sep 17 00:00:00 2001 -From: Shiz <hi@shiz.me> -Date: Mon, 8 May 2017 23:09:13 +0200 -Subject: [PATCH 09/11] sysklogd: add -Z option to adjust message timezones - -Some syslog() implementations like musl's[1] always send timestamps in UTC. -This change adds a new option to syslogd, -Z, to assume incoming timestamps -are always UTC and adjust them to the local timezone (of the syslogd) before -logging. - -[1]: http://www.openwall.com/lists/musl/2014/01/29/1 - -Signed-off-by: Shiz <hi@shiz.me> ---- - sysklogd/syslogd.c | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c -index d64ff278f..159336ed7 100644 ---- a/sysklogd/syslogd.c -+++ b/sysklogd/syslogd.c -@@ -122,6 +122,7 @@ - //usage: "(this version of syslogd ignores /etc/syslog.conf)\n" - //usage: ) - //usage: "\n -n Run in foreground" -+//usage: "\n -Z Adjust incoming UTC times to local time" - //usage: IF_FEATURE_REMOTE_LOG( - //usage: "\n -R HOST[:PORT] Log to HOST:PORT (default PORT:514)" - //usage: "\n -L Log locally and via network (default is network only if -R)" -@@ -233,6 +234,8 @@ typedef struct logRule_t { - /*int markInterval;*/ \ - /* level of messages to be logged */ \ - int logLevel; \ -+ /* whether to adjust message timezone */\ -+ int adjustTimezone; \ - IF_FEATURE_ROTATE_LOGFILE( \ - /* max size of file before rotation */ \ - unsigned logFileSize; \ -@@ -316,6 +319,7 @@ enum { - OPTBIT_outfile, // -O - OPTBIT_loglevel, // -l - OPTBIT_small, // -S -+ OPTBIT_adjusttz, // -Z - IF_FEATURE_ROTATE_LOGFILE(OPTBIT_filesize ,) // -s - IF_FEATURE_ROTATE_LOGFILE(OPTBIT_rotatecnt ,) // -b - IF_FEATURE_REMOTE_LOG( OPTBIT_remotelog ,) // -R -@@ -330,6 +334,7 @@ enum { - OPT_outfile = 1 << OPTBIT_outfile , - OPT_loglevel = 1 << OPTBIT_loglevel, - OPT_small = 1 << OPTBIT_small , -+ OPT_adjusttz = 1 << OPTBIT_adjusttz, - OPT_filesize = IF_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_filesize )) + 0, - OPT_rotatecnt = IF_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_rotatecnt )) + 0, - OPT_remotelog = IF_FEATURE_REMOTE_LOG( (1 << OPTBIT_remotelog )) + 0, -@@ -339,7 +344,7 @@ enum { - OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0, - OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0, - }; --#define OPTION_STR "m:nO:l:S" \ -+#define OPTION_STR "m:nO:l:SZ" \ - IF_FEATURE_ROTATE_LOGFILE("s:" ) \ - IF_FEATURE_ROTATE_LOGFILE("b:" ) \ - IF_FEATURE_REMOTE_LOG( "R:*") \ -@@ -815,17 +820,23 @@ static void timestamp_and_log(int pri, char *msg, int len) - { - char *timestamp; - time_t now; -+ struct tm nowtm = { .tm_isdst = 0 }; - - /* Jan 18 00:11:22 msg... */ - /* 01234567890123456 */ - if (len < 16 || msg[3] != ' ' || msg[6] != ' ' - || msg[9] != ':' || msg[12] != ':' || msg[15] != ' ' - ) { -- time(&now); -+ now = time(NULL); - timestamp = ctime(&now) + 4; /* skip day of week */ - } else { -- now = 0; -- timestamp = msg; -+ if (G.adjustTimezone && strptime(msg, "%b %e %T", &nowtm)) { -+ now = mktime(&nowtm) - timezone; -+ timestamp = ctime(&now) + 4; /* skip day of week */ -+ } else { -+ now = 0; -+ timestamp = msg; -+ } - msg += 16; - } - timestamp[15] = '\0'; -@@ -1130,6 +1141,10 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv) - if (opts & OPT_loglevel) // -l - G.logLevel = xatou_range(opt_l, 1, 8); - //if (opts & OPT_small) // -S -+ if (opts & OPT_adjusttz) { // -Z -+ G.adjustTimezone = 1; -+ tzset(); -+ } - #if ENABLE_FEATURE_ROTATE_LOGFILE - if (opts & OPT_filesize) // -s - G.logFileSize = xatou_range(opt_s, 0, INT_MAX/1024) * 1024; --- -2.13.2 - diff --git a/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch deleted file mode 100644 index a45c46d09..000000000 --- a/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 1c8c2316f98c2e4894c4c1686f0aa7937fcc0a17 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 25 Jul 2014 15:28:33 +0200 -Subject: [PATCH 10/16] Add flag for not following symlinks when recursing - -function old new delta -.rodata 7934 7967 +33 -diff_longopts 253 270 +17 -packed_usage 1704 1720 +16 -diff_main 1665 1662 -3 ------------------------------------------------------------------------------- -(add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3) Total: 63 bytes ---- - editors/diff.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/editors/diff.c b/editors/diff.c -index 1462a9b18..2c899578e 100644 ---- a/editors/diff.c -+++ b/editors/diff.c -@@ -113,6 +113,9 @@ - //usage: "\n -N Treat absent files as empty" - //usage: "\n -q Output only whether files differ" - //usage: "\n -r Recurse" -+//usage: IF_LONG_OPTS( -+//usage: "\n --no-dereference Don't follow symlinks" -+//usage: ) - //usage: "\n -S Start with FILE when comparing directories" - //usage: "\n -T Make tabs line up by prefixing a tab when necessary" - //usage: "\n -s Report when two files are the same" -@@ -154,6 +157,7 @@ enum { /* Commandline flags */ - FLAG_p, /* not implemented */ - FLAG_B, - FLAG_E, /* not implemented */ -+ FLAG_no_deref, - }; - #define FLAG(x) (1 << FLAG_##x) - -@@ -867,7 +871,8 @@ static void diffdir(char *p[2], const char *s_start) - * Using list.len to specify its length, - * add_to_dirlist will remove it. */ - list[i].len = strlen(p[i]); -- recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS, -+ recursive_action(p[i], ACTION_RECURSE | -+ ((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS), - add_to_dirlist, skip_dir, &list[i], 0); - /* Sort dl alphabetically. - * GNU diff does this ignoring any number of trailing dots. -@@ -964,6 +969,7 @@ static const char diff_longopts[] ALIGN1 = - "report-identical-files\0" No_argument "s" - "starting-file\0" Required_argument "S" - "minimal\0" No_argument "d" -+ "no-dereference\0" No_argument "\xff" - ; - # define GETOPT32 getopt32long - # define LONGOPTS ,diff_longopts --- -2.16.2 - diff --git a/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch b/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch deleted file mode 100644 index 75fe62dfd..000000000 --- a/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a663349a9ae6d62bfad1243a8781fb254065b480 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 6 Jul 2017 13:39:15 +0200 -Subject: [PATCH 10/11] udhcpc: Don't background if -n is given - -we need add -b to our udhcpc options to prevent boot forever if there are no -dhcp server. We also need a way for users to disable this behavior by making -it possible to set -n option at runtime. ---- - networking/udhcp/dhcpc.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 43aac1b85..bf53dd559 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -1504,19 +1504,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - } - leasefail: - udhcp_run_script(NULL, "leasefail"); -+ if (opt & OPT_n) { /* abort if no lease */ -+ bb_error_msg("no lease, failing"); -+ retval = 1; -+ goto ret; -+ } - #if BB_MMU /* -b is not supported on NOMMU */ - if (opt & OPT_b) { /* background if no lease */ - bb_error_msg("no lease, forking to background"); - client_background(); - /* do not background again! */ - opt = ((opt & ~OPT_b) | OPT_f); -- } else --#endif -- if (opt & OPT_n) { /* abort if no lease */ -- bb_error_msg("no lease, failing"); -- retval = 1; -- goto ret; - } -+#endif - /* wait before trying again */ - timeout = tryagain_timeout; - packet_num = 0; --- -2.13.2 - diff --git a/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch deleted file mode 100644 index b4ba240c4..000000000 --- a/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 889a08dc0ae0d6b76692e6ed811f431c5b5db53c Mon Sep 17 00:00:00 2001 -From: Shiz <hi@shiz.me> -Date: Mon, 8 May 2017 23:09:13 +0200 -Subject: [PATCH 11/16] sysklogd: add -Z option to adjust message timezones - -Some syslog() implementations like musl's[1] always send timestamps in UTC. -This change adds a new option to syslogd, -Z, to assume incoming timestamps -are always UTC and adjust them to the local timezone (of the syslogd) before -logging. - -[1]: http://www.openwall.com/lists/musl/2014/01/29/1 - -Signed-off-by: Shiz <hi@shiz.me> ---- - sysklogd/syslogd.c | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c -index 4265f4f90..eca955891 100644 ---- a/sysklogd/syslogd.c -+++ b/sysklogd/syslogd.c -@@ -122,6 +122,7 @@ - //usage: "(this version of syslogd ignores /etc/syslog.conf)\n" - //usage: ) - //usage: "\n -n Run in foreground" -+//usage: "\n -Z Adjust incoming UTC times to local time" - //usage: IF_FEATURE_REMOTE_LOG( - //usage: "\n -R HOST[:PORT] Log to HOST:PORT (default PORT:514)" - //usage: "\n -L Log locally and via network (default is network only if -R)" -@@ -233,6 +234,8 @@ typedef struct logRule_t { - /*int markInterval;*/ \ - /* level of messages to be logged */ \ - int logLevel; \ -+ /* whether to adjust message timezone */\ -+ int adjustTimezone; \ - IF_FEATURE_ROTATE_LOGFILE( \ - /* max size of file before rotation */ \ - unsigned logFileSize; \ -@@ -316,6 +319,7 @@ enum { - OPTBIT_outfile, // -O - OPTBIT_loglevel, // -l - OPTBIT_small, // -S -+ OPTBIT_adjusttz, // -Z - IF_FEATURE_ROTATE_LOGFILE(OPTBIT_filesize ,) // -s - IF_FEATURE_ROTATE_LOGFILE(OPTBIT_rotatecnt ,) // -b - IF_FEATURE_REMOTE_LOG( OPTBIT_remotelog ,) // -R -@@ -330,6 +334,7 @@ enum { - OPT_outfile = 1 << OPTBIT_outfile , - OPT_loglevel = 1 << OPTBIT_loglevel, - OPT_small = 1 << OPTBIT_small , -+ OPT_adjusttz = 1 << OPTBIT_adjusttz, - OPT_filesize = IF_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_filesize )) + 0, - OPT_rotatecnt = IF_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_rotatecnt )) + 0, - OPT_remotelog = IF_FEATURE_REMOTE_LOG( (1 << OPTBIT_remotelog )) + 0, -@@ -339,7 +344,7 @@ enum { - OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0, - OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0, - }; --#define OPTION_STR "m:nO:l:S" \ -+#define OPTION_STR "m:nO:l:SZ" \ - IF_FEATURE_ROTATE_LOGFILE("s:" ) \ - IF_FEATURE_ROTATE_LOGFILE("b:" ) \ - IF_FEATURE_REMOTE_LOG( "R:*") \ -@@ -815,17 +820,23 @@ static void timestamp_and_log(int pri, char *msg, int len) - { - char *timestamp; - time_t now; -+ struct tm nowtm = { .tm_isdst = 0 }; - - /* Jan 18 00:11:22 msg... */ - /* 01234567890123456 */ - if (len < 16 || msg[3] != ' ' || msg[6] != ' ' - || msg[9] != ':' || msg[12] != ':' || msg[15] != ' ' - ) { -- time(&now); -+ now = time(NULL); - timestamp = ctime(&now) + 4; /* skip day of week */ - } else { -- now = 0; -- timestamp = msg; -+ if (G.adjustTimezone && strptime(msg, "%b %e %T", &nowtm)) { -+ now = mktime(&nowtm) - timezone; -+ timestamp = ctime(&now) + 4; /* skip day of week */ -+ } else { -+ now = 0; -+ timestamp = msg; -+ } - msg += 16; - } - timestamp[15] = '\0'; -@@ -1129,6 +1140,10 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv) - if (opts & OPT_loglevel) // -l - G.logLevel = xatou_range(opt_l, 1, 8); - //if (opts & OPT_small) // -S -+ if (opts & OPT_adjusttz) { // -Z -+ G.adjustTimezone = 1; -+ tzset(); -+ } - #if ENABLE_FEATURE_ROTATE_LOGFILE - if (opts & OPT_filesize) // -s - G.logFileSize = xatou_range(opt_s, 0, INT_MAX/1024) * 1024; --- -2.16.2 - diff --git a/legacy/busybox/0011-testsuite-fix-cpio-tests.patch b/legacy/busybox/0011-testsuite-fix-cpio-tests.patch deleted file mode 100644 index a6eb803de..000000000 --- a/legacy/busybox/0011-testsuite-fix-cpio-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 9a522cf388e321b47f9462bbbd7726323095f8db Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 6 Jul 2017 13:41:32 +0200 -Subject: [PATCH 11/11] testsuite: fix cpio tests - -The cpio tests don't search for the right output line correctly, -using a hardcoded tail offset. Instead, grep for the file entry -just added. - -The reverse-hunk patch tests seem to get the output order wrong, -and the tests pass when this is corrected. ---- - testsuite/cpio.tests | 6 +++--- - testsuite/patch.tests | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests -index 88ec086b6..40f72c363 100755 ---- a/testsuite/cpio.tests -+++ b/testsuite/cpio.tests -@@ -129,7 +129,7 @@ SKIP= - - optional FEATURE_CPIO_O - testing "cpio uses by default uid/gid" \ --"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \ -+"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \ - "\ - $user/$group - 0 -@@ -138,7 +138,7 @@ SKIP= - - optional FEATURE_CPIO_O - testing "cpio -R with create" \ --"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \ -+"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \ - "\ - 1234/5678 - 0 -@@ -147,7 +147,7 @@ SKIP= - - optional FEATURE_CPIO_O - testing "cpio -R with extract" \ --"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \ -+"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \ - "\ - 8765/4321 - 0 -diff --git a/testsuite/patch.tests b/testsuite/patch.tests -index 39205242c..1d48e90be 100755 ---- a/testsuite/patch.tests -+++ b/testsuite/patch.tests -@@ -75,12 +75,12 @@ zxc - testing "patch detects already applied hunk" \ - 'patch 2>&1; echo $?; cat input' \ - "\ -+patching file input - Possibly reversed hunk 1 at 4 - Hunk 1 FAILED 1/1. - abc - +def - 123 --patching file input - 1 - abc - def -@@ -103,12 +103,12 @@ def - testing "patch detects already applied hunk at the EOF" \ - 'patch 2>&1; echo $?; cat input' \ - "\ -+patching file input - Possibly reversed hunk 1 at 4 - Hunk 1 FAILED 1/1. - abc - 123 - +456 --patching file input - 1 - abc - 123 --- -2.13.2 - diff --git a/legacy/busybox/0012-microcom-segfault.patch b/legacy/busybox/0012-microcom-segfault.patch deleted file mode 100644 index 4789079b3..000000000 --- a/legacy/busybox/0012-microcom-segfault.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fd8a0116a29ea4014fac7fbdba2636fc7b51ffc2 Mon Sep 17 00:00:00 2001 -From: Marian Buschsieweke <marian.buschsieweke@ovgu.de> -Date: Wed, 2 Aug 2017 23:36:08 +0200 -Subject: [PATCH] miscutils/microcom: Fixed segfault - -microcom did not check if required parameter TTY is present. Thus, -bb_basename() was called with a NULL pointer if TTY was missing. -This commit adds the missing check. ---- - miscutils/microcom.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/miscutils/microcom.c b/miscutils/microcom.c -index 14b9f3baf..38f6425c1 100644 ---- a/miscutils/microcom.c -+++ b/miscutils/microcom.c -@@ -78,6 +78,11 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) - // argc -= optind; - argv += optind; - -+ if (*argv == NULL){ -+ bb_show_usage(); -+ return EXIT_FAILURE; -+ } -+ - // try to create lock file in /var/lock - device_lock_file = (char *)bb_basename(argv[0]); - device_lock_file = xasprintf("/var/lock/LCK..%s", device_lock_file); --- -2.13.3 - diff --git a/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch deleted file mode 100644 index 50719b003..000000000 --- a/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7f3d0620051c30e2047593092aa054565756b57f Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 6 Jul 2017 13:39:15 +0200 -Subject: [PATCH 12/16] udhcpc: Don't background if -n is given - -we need add -b to our udhcpc options to prevent boot forever if there are no -dhcp server. We also need a way for users to disable this behavior by making -it possible to set -n option at runtime. ---- - networking/udhcp/dhcpc.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index cc1d22c8e..10b846b0a 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -1479,19 +1479,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - } - leasefail: - udhcp_run_script(NULL, "leasefail"); -+ if (opt & OPT_n) { /* abort if no lease */ -+ bb_error_msg("no lease, failing"); -+ retval = 1; -+ goto ret; -+ } - #if BB_MMU /* -b is not supported on NOMMU */ - if (opt & OPT_b) { /* background if no lease */ - bb_error_msg("no lease, forking to background"); - client_background(); - /* do not background again! */ - opt = ((opt & ~OPT_b) | OPT_f); -- } else --#endif -- if (opt & OPT_n) { /* abort if no lease */ -- bb_error_msg("no lease, failing"); -- retval = 1; -- goto ret; - } -+#endif - /* wait before trying again */ - timeout = tryagain_timeout; - packet_num = 0; --- -2.16.2 - diff --git a/legacy/busybox/0013-testsuite-fix-cpio-tests.patch b/legacy/busybox/0013-testsuite-fix-cpio-tests.patch deleted file mode 100644 index a9ba0c4d0..000000000 --- a/legacy/busybox/0013-testsuite-fix-cpio-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 495a53387a12bffe393dcd0d6de2bc64374d38d2 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 6 Jul 2017 13:41:32 +0200 -Subject: [PATCH 13/16] testsuite: fix cpio tests - -The cpio tests don't search for the right output line correctly, -using a hardcoded tail offset. Instead, grep for the file entry -just added. - -The reverse-hunk patch tests seem to get the output order wrong, -and the tests pass when this is corrected. ---- - testsuite/cpio.tests | 6 +++--- - testsuite/patch.tests | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests -index 88ec086b6..40f72c363 100755 ---- a/testsuite/cpio.tests -+++ b/testsuite/cpio.tests -@@ -129,7 +129,7 @@ SKIP= - - optional FEATURE_CPIO_O - testing "cpio uses by default uid/gid" \ --"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \ -+"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \ - "\ - $user/$group - 0 -@@ -138,7 +138,7 @@ SKIP= - - optional FEATURE_CPIO_O - testing "cpio -R with create" \ --"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \ -+"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \ - "\ - 1234/5678 - 0 -@@ -147,7 +147,7 @@ SKIP= - - optional FEATURE_CPIO_O - testing "cpio -R with extract" \ --"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \ -+"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \ - "\ - 8765/4321 - 0 -diff --git a/testsuite/patch.tests b/testsuite/patch.tests -index 39205242c..1d48e90be 100755 ---- a/testsuite/patch.tests -+++ b/testsuite/patch.tests -@@ -75,12 +75,12 @@ zxc - testing "patch detects already applied hunk" \ - 'patch 2>&1; echo $?; cat input' \ - "\ -+patching file input - Possibly reversed hunk 1 at 4 - Hunk 1 FAILED 1/1. - abc - +def - 123 --patching file input - 1 - abc - def -@@ -103,12 +103,12 @@ def - testing "patch detects already applied hunk at the EOF" \ - 'patch 2>&1; echo $?; cat input' \ - "\ -+patching file input - Possibly reversed hunk 1 at 4 - Hunk 1 FAILED 1/1. - abc - 123 - +456 --patching file input - 1 - abc - 123 --- -2.16.2 - diff --git a/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch b/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch deleted file mode 100644 index 59114460a..000000000 --- a/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2881266313824ed1c2d422ea905e25509f9bc924 Mon Sep 17 00:00:00 2001 -From: Marian Buschsieweke <marian.buschsieweke@ovgu.de> -Date: Wed, 2 Aug 2017 23:36:08 +0200 -Subject: [PATCH 14/16] miscutils/microcom: Fixed segfault - -microcom did not check if required parameter TTY is present. Thus, -bb_basename() was called with a NULL pointer if TTY was missing. -This commit adds the missing check. ---- - miscutils/microcom.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/miscutils/microcom.c b/miscutils/microcom.c -index fa090057e..96ea02b16 100644 ---- a/miscutils/microcom.c -+++ b/miscutils/microcom.c -@@ -76,6 +76,11 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) - // argc -= optind; - argv += optind; - -+ if (*argv == NULL){ -+ bb_show_usage(); -+ return EXIT_FAILURE; -+ } -+ - // try to create lock file in /var/lock - device_lock_file = (char *)bb_basename(argv[0]); - device_lock_file = xasprintf("/var/lock/LCK..%s", device_lock_file); --- -2.16.2 - diff --git a/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch b/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch deleted file mode 100644 index 9fc6f7e68..000000000 --- a/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 13c7e0cc7767b84e183ddbc3400171874478bf06 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Fri, 26 Jan 2018 15:15:43 +0100 -Subject: [PATCH 15/16] ash: introduce a config option to search current - directory for sourced files - ---- - shell/ash.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/shell/ash.c b/shell/ash.c -index d04096a9b..5dd184360 100644 ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -132,6 +132,13 @@ - //config: you to run the specified command or builtin, - //config: even when there is a function with the same name. - //config: -+//config:config ASH_BASH_SOURCE_CURDIR -+//config: bool "'source' and '.' builtins search current directory after $PATH" -+//config: default n # do not encourage non-standard behavior -+//config: depends ASH_BASH_COMPAT -+//config: help -+//config: This is not compliant with standards. Avoid if possible. -+//config: - //config:config ASH_COMMAND_NOT_FOUND_HOOK - //config: bool "command_not_found_handle hook support" - //config: default y -@@ -12919,10 +12926,14 @@ find_dot_file(char *name) - if (fullname != name) - stunalloc(fullname); - } -+ /* not found in PATH */ - -- /* not found in the PATH */ -+#if ENABLE_ASH_BASH_SOURCE_CURDIR -+ return name; -+#else - ash_msg_and_raise_error("%s: not found", name); - /* NOTREACHED */ -+#endif - } - - static int FAST_FUNC --- -2.16.2 - diff --git a/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch b/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch deleted file mode 100644 index c8013403f..000000000 --- a/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9d37e0e491d53e71c2e3ede1e002790e1026b9c6 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Wed, 7 Mar 2018 03:59:52 +0100 -Subject: [PATCH 16/16] top: handle much larger VSZ values - -function old new delta -display_process_list 1018 999 -19 - -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - procps/top.c | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/procps/top.c b/procps/top.c -index b777c494e..9bb3eed29 100644 ---- a/procps/top.c -+++ b/procps/top.c -@@ -607,7 +607,6 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width) - }; - - top_status_t *s; -- char vsz_str_buf[8]; - unsigned long total_memory = display_header(scr_width, &lines_rem); /* or use total_vsz? */ - /* xxx_shift and xxx_scale variables allow us to replace - * expensive divides with multiply and shift */ -@@ -688,19 +687,18 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width) - lines_rem = ntop - G_scroll_ofs; - s = top + G_scroll_ofs; - while (--lines_rem >= 0) { -+ char vsz_str_buf[8]; - unsigned col; -+ - CALC_STAT(pmem, (s->vsz*pmem_scale + pmem_half) >> pmem_shift); - #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE - CALC_STAT(pcpu, (s->pcpu*pcpu_scale + pcpu_half) >> pcpu_shift); - #endif - -- if (s->vsz >= 100000) -- sprintf(vsz_str_buf, "%6ldm", s->vsz/1024); -- else -- sprintf(vsz_str_buf, "%7lu", s->vsz); -+ smart_ulltoa5(s->vsz, vsz_str_buf, " mgtpezy"); - /* PID PPID USER STAT VSZ %VSZ [%CPU] COMMAND */ - col = snprintf(line_buf, scr_width, -- "\n" "%5u%6u %-8.8s %s%s" FMT -+ "\n" "%5u%6u %-8.8s %s %.5s" FMT - IF_FEATURE_TOP_SMP_PROCESS(" %3d") - IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(FMT) - " ", -@@ -710,7 +708,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width) - IF_FEATURE_TOP_SMP_PROCESS(, s->last_seen_on_cpu) - IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(, SHOW_STAT(pcpu)) - ); -- if ((int)(col + 1) < scr_width) -+ if ((int)(scr_width - col) > 1) - read_cmdline(line_buf + col, scr_width - col, s->pid, s->comm); - fputs(line_buf, stdout); - /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu, --- -2.16.2 - diff --git a/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch b/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch deleted file mode 100644 index bdf24b783..000000000 --- a/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 444a2f6be54186ae9ade1f2c3d4356cd62a720c5 Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Fri, 23 Mar 2018 14:56:52 +0200 -Subject: [PATCH] ifupdown: do not fail if interface disappears during ifdown - -Interface may not exist because it got deleted by an ifdown hook script -earlier. This may happen when a virtual interface, such as VLAN, has multiple -iface blocks defined. - -Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> ---- - networking/ifupdown.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/networking/ifupdown.c b/networking/ifupdown.c -index 534c9f0c7..35d13c5e1 100644 ---- a/networking/ifupdown.c -+++ b/networking/ifupdown.c -@@ -141,6 +141,7 @@ - #include "libbb.h" - #include "common_bufsiz.h" - /* After libbb.h, since it needs sys/types.h on some systems */ -+#include <net/if.h> - #include <sys/utsname.h> - #include <fnmatch.h> - -@@ -503,6 +504,7 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec) - - static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec) - { -+ if (!if_nametoindex(ifd->iface)) return 1; - # if ENABLE_FEATURE_IFUPDOWN_IP - return execute("ip link set %iface% down", ifd, exec); - # else -@@ -598,6 +600,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec) - static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec) - { - int result; -+ if (!if_nametoindex(ifd->iface)) return 2; - # if ENABLE_FEATURE_IFUPDOWN_IP - /* Optional "label LBL" is necessary if interface is an alias (eth0:0), - * otherwise "ip addr flush dev eth0:0" flushes all addresses on eth0. --- -2.14.3 - diff --git a/legacy/busybox/APKBUILD b/legacy/busybox/APKBUILD deleted file mode 100644 index 44b3e352d..000000000 --- a/legacy/busybox/APKBUILD +++ /dev/null @@ -1,223 +0,0 @@ -# Contributor: Łukasz Jendrysik <scadu@yandex.com> -# Contributor: Oliver Smith <ollieparanoid@bitmessage.ch> -# Maintainer: -pkgname=busybox -pkgver=1.28.4 -pkgrel=2 -pkgdesc="Size optimized toolbox of many common UNIX utilities" -url="https://busybox.net" -arch="all" -license="GPL-2.0-only AND GPL-2.0+" -makedepends_build="openssl-dev" -makedepends_host="linux-headers" -makedepends="$makedepends_build $makedepends_host" -checkdepends="zip" -provides="/sbin/init" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall - $pkgname-extras.post-install $pkgname-extras.pre-deinstall" -subpackages="$pkgname-static $pkgname-suid $pkgname-extras $pkgname-binsh" -options="suid !check" -triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*" -source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 - 0001-ash-add-support-for-command_not_found_handle-hook-fu.patch - 0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch - 0003-ash-exec-busybox.static.patch - 0004-app-location-for-cpio-vi-and-lspci.patch - 0005-udhcpc-set-default-discover-retries-to-5.patch - 0006-ping-make-ping-work-without-root-privileges.patch - 0007-fbsplash-support-console-switching.patch - 0008-fbsplash-support-image-and-bar-alignment-and-positio.patch - 0009-depmod-support-generating-kmod-binary-index-files.patch - 0010-Add-flag-for-not-following-symlinks-when-recursing.patch - 0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch - 0012-udhcpc-Don-t-background-if-n-is-given.patch - 0013-testsuite-fix-cpio-tests.patch - 0014-miscutils-microcom-Fixed-segfault.patch - 0015-ash-introduce-a-config-option-to-search-current-dire.patch - 0016-top-handle-much-larger-VSZ-values.patch - 0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch - - 0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch - - 0001-wget-emit-a-message-that-certificate-verification-is.patch - - acpid.logrotate - busyboxconfig - busyboxconfig-extras - bbsuid.c - dad.if-up - nologin.c - " - -# secfixes: -# 1.27.2-r4: -# - CVE-2017-16544 -# - CVE-2017-15873 -# - CVE-2017-15874 - -builddir="$srcdir"/$pkgname-$pkgver - -_staticdir="$srcdir"/build-static -_dyndir="$srcdir"/build-dynamic -_dyndir_extras="$srcdir"/build-dynamic-extras -_config="$srcdir"/busyboxconfig -_config_extras="$srcdir"/busyboxconfig-extras - -prepare() { - default_prepare - - cd "$builddir" - mkdir -p "$_staticdir" "$_dyndir" "$_dyndir_extras" - cp "$srcdir"/nologin.c loginutils/ -} - -build() { - # build bbsuid - msg "Building bbsuid" - ${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} \ - ${LDFLAGS} "$srcdir"/bbsuid.c -o "$_dyndir"/bbsuid - - # build dynamic - cd "$_dyndir" - msg "Building dynamic busybox" - cp "$_config" .config - [ "$CLIBC" = musl ] && sed -i \ - -e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \ - .config - make -C "$builddir" O="$PWD" silentoldconfig - make - - # build dynamic (extras) - cd "$_dyndir_extras" - msg "Building dynamic busybox-extras" - cp "$_config_extras" .config - [ "$CLIBC" = musl ] && sed -i \ - -e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \ - .config - make -C "$builddir" O="$PWD" silentoldconfig - make - - # build static - cd "$_staticdir" - msg "Building static busybox" - # enable internal ssl_client for static build - sed -e "s/.*CONFIG_PIE.*/\# CONFIG_PIE is not set/" \ - -e "s/.*CONFIG_STATIC.*/CONFIG_STATIC=y/" \ - -e "s/.*CONFIG_SSL_CLIENT.*/CONFIG_SSL_CLIENT=y/" \ - "$_config" > .config - # musl does not support GNU regex - [ "$CLIBC" = musl ] && sed -i \ - -e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \ - .config - make -C "$builddir" O="$PWD" silentoldconfig - make - mv busybox busybox.static -} - -check() { - cd "$_dyndir" - SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check - - cd "$_dyndir_extras" - SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check -} - -package() { - cd "$_dyndir" - mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \ - "$pkgdir"/var/cache/misc "$pkgdir"/bin "$pkgdir"/sbin - chmod 1777 "$pkgdir"/tmp - install -m755 busybox "$pkgdir"/bin/busybox || return 1 - # we need /bin/sh to be able to execute post-install - ln -s /bin/busybox "$pkgdir"/bin/sh - - #ifupdown needs those dirs to be present - mkdir -p \ - "$pkgdir"/etc/network/if-down.d \ - "$pkgdir"/etc/network/if-post-down.d \ - "$pkgdir"/etc/network/if-post-up.d \ - "$pkgdir"/etc/network/if-pre-down.d \ - "$pkgdir"/etc/network/if-pre-up.d \ - "$pkgdir"/etc/network/if-up.d - install -m775 "$srcdir"/dad.if-up "$pkgdir"/etc/network/if-up.d/dad - - install -Dm644 "$srcdir"/acpid.logrotate \ - "$pkgdir/etc/logrotate.d/acpid" - - mkdir -p "$pkgdir"/var/lib/udhcpd - install -Dm644 "$builddir"/examples/udhcp/udhcpd.conf \ - "$pkgdir"/etc/udhcpd.conf - cat >"$pkgdir"/etc/securetty <<EOF -console -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty7 -tty8 -tty9 -tty10 -tty11 -EOF -} - -extras() { - pkgdesc="Additional binaries of Busybox" - depends="${pkgname}" - install -Dm755 "$_dyndir_extras"/busybox "$subpkgdir"/bin/busybox-extras -} - -suid() { - pkgdesc="suid binaries of Busybox" - depends="${pkgname}" - - cd "$_dyndir" - mkdir -p "$subpkgdir"/bin - install -m4111 bbsuid "$subpkgdir"/bin/bbsuid -} - -static() { - pkgdesc="Statically linked Busybox" - mkdir -p "$subpkgdir"/bin - install -m755 "$_staticdir"/busybox.static \ - "$subpkgdir"/bin/busybox.static -} - -binsh() { - pkgdesc="Provide /bin/sh with BusyBox ash" - depends="${pkgname}" - provides="/bin/sh" - provider_priority=0 - - mkdir -p "$subpkgdir"/bin - mv "$pkgdir"/bin/sh "$subpkgdir"/bin -} - -sha512sums="92471617fcf3c1e28b468f3de2c83a1041f5ba5106580cc791e9c4cd602b7ccffabc51ce0807881ed734a89c3089113048265d6659a4d595528bd9150288d2ed busybox-1.28.4.tar.bz2 -51d4d58baff825a51d476bd4594cb8980ec2aa4d0c864a0eec39ccbbadd1ae9f1cd1b20f492a735ffcdf7c925573594f3c4363b0561c8aa7b91ef534bfc7b2e0 0001-ash-add-support-for-command_not_found_handle-hook-fu.patch -5d2fd3e521ee29d970f377363e3a3144eaf9f7714bc57494d743ded9e39c1ad93ea8759b2febd9c3786968b41e61b8d01ce2361aa997df177b644d63718470ba 0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch -cc5e5ce7a822ef51eb6b8065e1b802bc9d690857b8123cb4decf51b09c4ef655784401a68dd26e0a681fbb64bd2c0fed4001be6e33cac9049e516587ea53c17d 0003-ash-exec-busybox.static.patch -5f0611d21d1dc106d43ba23234babd41a2167d7032f3b09e825ae3dc9f9aaeb8d1882f59341daff99adecdfb8ba52a5c9fb423c8df3168b2e2304c5bd0ac4991 0004-app-location-for-cpio-vi-and-lspci.patch -bd4bb1f29f0287aa2ae4e43d791072802ba4f8863ea968612410a2819f7afaec5c0c731b4d91f360461ebfe26942f21e9ff69cbd5fb7d9800e62ef59fe954ab2 0005-udhcpc-set-default-discover-retries-to-5.patch -f03f852b97f3875d3051b225e6ffe52ed02ae8a8550287b3e09c2ef4d63914e1ab045ba5e2bc2dc2f3c8bf643485de4ebb36b97c74a8a6e49b6ba0261f2ddb94 0006-ping-make-ping-work-without-root-privileges.patch -a7b4ddb838f51e86040246e11a4b0df7bce37ed5159634bd2a8f388cf57be0551e6e63887b71b530a8a7b86dbdda6bbb3a090173f040050ea864b5f07674395d 0007-fbsplash-support-console-switching.patch -f8655833f71715629a4a93997939ca295cacb35f17843a36cb6fda285213bdbd258b2f84e321f81859491971412a520f697748ebd6fb46808f830f4ccfa77af4 0008-fbsplash-support-image-and-bar-alignment-and-positio.patch -f69031d048aa5e087cb6597ad2f7b39b520a5ef3713731e9090c5b65680cd7075bdf3a9443725fac49dce4345bc3345dc702b95d618d45a6d3be8682844784f4 0009-depmod-support-generating-kmod-binary-index-files.patch -b558f3ceb63e39545c3219796da64a7962bb53515a4eedea2bf9d81057774096b429145f0cd98da2542e3bdadaf92fb11d710fb1879768c9980bf58ccd104b6e 0010-Add-flag-for-not-following-symlinks-when-recursing.patch -f81d7966133d40a5d79cab4a4edf695bf7cc1f06cf2382c4ed99eea3a72cd222fe36c7b92e427262f67a81fcc2e7f6bff5986b32362c38da3c5163a49fd1ecab 0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch -a96aa81d2f0104b5c28f02e80b3f77dbce77af93c174c09015a34850474d69e42c160fc8061c62f03465b6f793ead109dde7b0cc367d1e87694805d823f19d7e 0012-udhcpc-Don-t-background-if-n-is-given.patch -40c125a2ba19bcfaec46084bef98acb775a7f2521d854df41411afcfbc3025a1bdd029b0baf74550923db2541c23c1e9df5d5ded799d1d46dd7cf86a495e4c57 0013-testsuite-fix-cpio-tests.patch -4cbd38a3c2730ae38e34c5973bb63e40609c32f700d4943cc0e922394e8ee522d1512eb19c7885f5cee49834ab22b2594cb07164cacffefa39964a3b863f4e50 0014-miscutils-microcom-Fixed-segfault.patch -832eb44c52d2caad4bf6ea79fb17f10c116de3e90ed79038dabe3736d8e74507d1e0cb6f4f7689b4dd506b92437d8df7862038fc0213ecda259e40baf9d9b3de 0015-ash-introduce-a-config-option-to-search-current-dire.patch -185f11578dc3c3637f1acd1285c71b9e31f4244c57cd85b0848912c085a7a8c833d4c935ab1cadcb9852cf3185c7ffb08db8ea728fb19ab6e6fa90d89f13c75b 0016-top-handle-much-larger-VSZ-values.patch -d90d6b3406760fe3df6dbed46a0f4d1c02a69d5184ebc86d8c1692bc4576532127283ba3ff9a81e64f3660c279b8ee324dac7a426350873c45957067648651c6 0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch -0dbe3ee424c0a6e4aba4f551f6b6b9ee087655a03747a40906961b141d40b1cbb2345438f17887a1b78d880cb3a7ad0116936dd7c05e95160febfd299423e83b 0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch -90f9e95f6f953df2cf579f701b3135bad910f514e94b3e23b953acec12b10f33aa9200169dc7b454c6a04fbd992a370e6ca835406f9b5495951e0a8416137000 0001-wget-emit-a-message-that-certificate-verification-is.patch -a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate -d65dc165488a179ab19482ad74e350df9dfdccf2363b26424d2d145e27ab0819cd0cfdfb79b4a2bd0bd7c6eda3b95ea61f3c264357986e78c4675df94d487aec busyboxconfig -0efbe22e2fd56993d92b6542d4ccffb2b42d50495be085c98f417a71f503b4071e2f092afcec77f78064d33ffb0922c28daa3cb9958e6d7fb26d5a660abd90f4 busyboxconfig-extras -0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c -a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up -061f7417c1cbf0424a5fab77e2f5912aa1593f39b33ea294af4c03518ca712d793a77ea82ff1f36e9cb98751d9faacb9d0240cdf0894efd8f26c13c28a692404 nologin.c" diff --git a/legacy/busybox/acpid.logrotate b/legacy/busybox/acpid.logrotate deleted file mode 100644 index a37763540..000000000 --- a/legacy/busybox/acpid.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/acpid.log { - missingok - notifempty - sharedscripts - postrotate - /etc/init.d/acpid --ifstarted restart || true - endscript -} diff --git a/legacy/busybox/bbsuid.c b/legacy/busybox/bbsuid.c deleted file mode 100644 index 24d0d7d3e..000000000 --- a/legacy/busybox/bbsuid.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2008 Natanael Copa <natanael.copa@gmail.com> - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. See http://www.gnu.org/ for details. - * - */ - -#include <sys/stat.h> -#include <sys/types.h> - -#include <libgen.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <err.h> - -#define BBSUID_PATH "/bin/bbsuid" - -const static char * applets[] = { - "/bin/mount", - "/bin/umount", - "/bin/su", - "/usr/bin/crontab", - "/usr/bin/passwd", - "/usr/bin/traceroute", - "/usr/bin/traceroute6", - "/usr/bin/vlock", - NULL -}; - - -static const char *applet_from_path(const char *str) -{ - const char *p = strrchr(str, '/'); - if (p == NULL) - p = str; - else - p++; - return p; -} - -static int is_valid_applet(const char *str) -{ - int i; - for (i = 0; applets[i] != NULL; i++) { - const char *a = applet_from_path(applets[i]); - if (strcmp(applet_from_path(str), a) == 0) - return 1; - } - return 0; -} - -int exec_busybox(const char *app, int argc, char **argv) -{ - char **newargv = malloc((argc + 2) * sizeof(char *)); - int i; - newargv[0] = "/bin/busybox"; - newargv[1] = (char *)app; - for (i = 1; i < argc; i++) - newargv[i+1] = argv[i]; - newargv[argc+1] = NULL; - execv(newargv[0], newargv); - perror(newargv[0]); - free(newargv); - return 1; -} - -static int install_links(void) -{ - int i, r = 0; - /* we don't want others than root to install the symlinks */ - if (getuid() != 0) - errx(1, "Only root can install symlinks"); - - for (i = 0; applets[i] != NULL; i++) { - const char *a = applets[i]; - struct stat st; - if (lstat(a, &st) == 0 && S_ISLNK(st.st_mode)) - unlink(a); - if (symlink(BBSUID_PATH, a) < 0) - r++; - } - - return r; -} - -int main(int argc, char **argv) -{ - const char *app = applet_from_path(argv[0]); - - if (strcmp(app, "bbsuid") == 0) { - if (argc == 2 && strcmp(argv[1], "--install") == 0) - return install_links(); - errx(1, "Use --install to install symlinks"); - } - - if (is_valid_applet(app)) - return exec_busybox(app, argc, argv); - - errx(1, "%s is not a valid applet", app); - return 1; -} - diff --git a/legacy/busybox/busybox-extras.post-install b/legacy/busybox/busybox-extras.post-install deleted file mode 100644 index a0327a691..000000000 --- a/legacy/busybox/busybox-extras.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Create all symlinks -exec /bin/busybox-extras --install -s diff --git a/legacy/busybox/busybox-extras.pre-deinstall b/legacy/busybox/busybox-extras.pre-deinstall deleted file mode 100644 index 15461302c..000000000 --- a/legacy/busybox/busybox-extras.pre-deinstall +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Remove all symlinks to busybox-extras -cd / -for link in $(busybox-extras --list --full); do - if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox-extras" ]; then - rm "$link" - fi -done diff --git a/legacy/busybox/busybox.post-install b/legacy/busybox/busybox.post-install deleted file mode 100644 index a986b2f76..000000000 --- a/legacy/busybox/busybox.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# We need the symlinks early -exec /bin/busybox --install -s diff --git a/legacy/busybox/busybox.post-upgrade b/legacy/busybox/busybox.post-upgrade deleted file mode 100644 index 291ed7a6d..000000000 --- a/legacy/busybox/busybox.post-upgrade +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# remove links that has been relocated -for link in /bin/install /bin/ip /bin/vi /usr/bin/lspci; do - if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then - rm "$link" - fi -done -for link in /bin/ping /bin/ping6; do - if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/bbsuid" ]; then - rm "$link" - fi -done - -# remove links of programs moved to busybox-extras -for link in /usr/bin/telnet /usr/sbin/httpd /usr/bin/ftpget /usr/bin/ftpput \ - /usr/sbin/ftpd /usr/bin/tftp /usr/sbin/fakeidentd /usr/sbin/dnsd \ - /usr/sbin/inetd /usr/sbin/udhcpd; do - if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then - rm "$link" - echo "NOTE: $link has been moved to the package 'busybox-extras'" - fi -done - -# We need the symlinks early -exec /bin/busybox --install -s diff --git a/legacy/busybox/busybox.pre-deinstall b/legacy/busybox/busybox.pre-deinstall deleted file mode 100644 index f1e10ba92..000000000 --- a/legacy/busybox/busybox.pre-deinstall +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Remove all symlinks to busybox -cd / -for link in $(busybox --list-full); do - if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then - rm "$link" - fi -done diff --git a/legacy/busybox/busybox.trigger b/legacy/busybox/busybox.trigger deleted file mode 100644 index e531a45b8..000000000 --- a/legacy/busybox/busybox.trigger +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -do_bb_install= - -for i in "$@"; do - case "$i" in - /lib/modules/*) - if [ -d "$i" ]; then - /bin/busybox depmod ${i#/lib/modules/} - fi - ;; - *) do_bb_install=yes;; - esac -done - -if [ -n "$do_bb_install" ]; then - [ -e /bin/bbsuid ] && /bin/bbsuid --install - [ -e /bin/busybox-extras ] && /bin/busybox-extras --install -s - /bin/busybox --install -s -fi diff --git a/legacy/busybox/busyboxconfig b/legacy/busybox/busyboxconfig deleted file mode 100644 index d2ea6fd75..000000000 --- a/legacy/busybox/busyboxconfig +++ /dev/null @@ -1,1155 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.28.2 -# Wed Mar 28 12:24:02 2018 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Settings -# -CONFIG_DESKTOP=y -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_FEDORA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -CONFIG_LONG_OPTS=y -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_LFS=y -# CONFIG_PAM is not set -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_PID_FILE_PATH="/var/run" -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_PIE=y -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" -# CONFIG_USE_PORTABLE_CODE is not set - -# -# Installation Options ("make install" behavior) -# -# CONFIG_INSTALL_APPLET_SYMLINKS is not set -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -CONFIG_INSTALL_APPLET_DONT=y -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="/home/ncopa/aports/main/busybox/pkg/busybox" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_DEBUG_SANITIZE is not set -# CONFIG_UNIT_TEST is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Library Tuning -# -# CONFIG_FEATURE_USE_BSS_TAIL is not set -CONFIG_FEATURE_RTMINMAX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SMALL=0 -CONFIG_SHA3_SMALL=0 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=8192 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -CONFIG_FEATURE_REVERSE_SEARCH=y -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_UNICODE_SUPPORT=y -CONFIG_UNICODE_USING_LOCALE=y -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=1114111 -CONFIG_UNICODE_COMBINING_WCHARS=y -CONFIG_UNICODE_WIDE_WCHARS=y -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -CONFIG_UNICODE_PRESERVE_BROKEN=y -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=16 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -# CONFIG_IOCTL_HEX2STR_ERROR is not set -CONFIG_FEATURE_HWIB=y - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_FEATURE_SEAMLESS_XZ=y -CONFIG_FEATURE_SEAMLESS_LZMA=y -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_GUNZIP=y -CONFIG_ZCAT=y -CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y -CONFIG_BUNZIP2=y -CONFIG_BZCAT=y -CONFIG_UNLZMA=y -CONFIG_LZCAT=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZCAT=y -# CONFIG_XZ is not set -CONFIG_BZIP2=y -CONFIG_FEATURE_BZIP2_DECOMPRESS=y -CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y -CONFIG_FEATURE_CPIO_P=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -CONFIG_GZIP=y -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -CONFIG_GZIP_FAST=2 -CONFIG_FEATURE_GZIP_LEVELS=y -CONFIG_FEATURE_GZIP_DECOMPRESS=y -CONFIG_LZOP=y -CONFIG_UNLZOP=y -CONFIG_LZOPCAT=y -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM is not set -# CONFIG_RPM2CPIO is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -CONFIG_FEATURE_TAR_UNAME_GNAME=y -CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y -# CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNZIP=y -CONFIG_FEATURE_UNZIP_CDF=y -CONFIG_FEATURE_UNZIP_BZIP2=y -CONFIG_FEATURE_UNZIP_LZMA=y -CONFIG_FEATURE_UNZIP_XZ=y -CONFIG_FEATURE_LZMA_FAST=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -CONFIG_FEATURE_CATN=y -CONFIG_FEATURE_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_FEATURE_CP_LONG_OPTIONS=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_FEATURE_DD_STATUS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_FANCY=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPAND=y -CONFIG_UNEXPAND=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FACTOR=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_FSYNC=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_GROUPS=y -CONFIG_INSTALL=y -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -CONFIG_LINK=y -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_WIDTH=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MKTEMP=y -CONFIG_MV=y -CONFIG_NICE=y -CONFIG_NL=y -CONFIG_NOHUP=y -CONFIG_NPROC=y -CONFIG_OD=y -CONFIG_PASTE=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -CONFIG_SHRED=y -CONFIG_SHUF=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_FEATURE_STAT_FILESYSTEM=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_FEATURE_SYNC_FANCY=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_TEST1=y -CONFIG_TEST2=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TIMEOUT=y -CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y -CONFIG_FEATURE_TOUCH_SUSV3=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TRUNCATE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNAME_OSNAME="Linux" -CONFIG_BB_ARCH=y -CONFIG_UNIQ=y -CONFIG_UNLINK=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_BASE64=y -CONFIG_UUENCODE=y -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHO is not set -# CONFIG_W is not set -# CONFIG_USERS is not set -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -# CONFIG_FGCONSOLE is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y -CONFIG_DEFAULT_SETFONT_DIR="/usr/share" - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Debian Utilities -# -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -CONFIG_WHICH=y - -# -# klibc-utils -# -# CONFIG_MINIPS is not set -# CONFIG_NUKE is not set -# CONFIG_RESUME is not set -# CONFIG_RUN_INIT is not set - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_UNDO=y -CONFIG_FEATURE_VI_UNDO_QUEUE=y -CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_EXEC_PLUS=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -CONFIG_FEATURE_FIND_DELETE=y -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_FEATURE_FIND_LINKS=y -CONFIG_GREP=y -CONFIG_EGREP=y -CONFIG_FGREP=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y -CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y -CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y -CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -CONFIG_POWEROFF=y -CONFIG_REBOOT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -# CONFIG_LINUXRC is not set -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=0 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_INIT_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_INIT_TERMINAL_TYPE="linux" -# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADD_SHELL=y -CONFIG_REMOVE_SHELL=y -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_LAST_ID=256000 -CONFIG_FIRST_SYSTEM_ID=100 -CONFIG_LAST_SYSTEM_ID=999 -CONFIG_CHPASSWD=y -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512" -CONFIG_CRYPTPW=y -CONFIG_MKPASSWD=y -CONFIG_DELUSER=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_GETTY=y -CONFIG_LOGIN=y -CONFIG_LOGIN_SESSION_AS_CHILD=y -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_NOLOGIN=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY=y -# CONFIG_SULOGIN is not set -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -CONFIG_FSCK=y -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_MODPROBE_SMALL is not set -CONFIG_DEPMOD=y -CONFIG_INSMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODINFO=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_RMMOD=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_BIN=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" - -# -# Linux System Utilities -# -CONFIG_ACPID=y -CONFIG_FEATURE_ACPID_COMPAT=y -CONFIG_BLKDISCARD=y -CONFIG_BLKID=y -CONFIG_FEATURE_BLKID_TYPE=y -CONFIG_BLOCKDEV=y -CONFIG_CAL=y -# CONFIG_CHRT is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FALLOCATE=y -CONFIG_FATATTR=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -CONFIG_FEATURE_FDISK_WRITABLE=y -CONFIG_FEATURE_AIX_LABEL=y -CONFIG_FEATURE_SGI_LABEL=y -CONFIG_FEATURE_SUN_LABEL=y -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_GPT_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -CONFIG_FINDFS=y -CONFIG_FLOCK=y -CONFIG_FDFLUSH=y -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_FSFREEZE is not set -CONFIG_FSTRIM=y -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_XXD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IONICE=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LOSETUP=y -CONFIG_LSPCI=y -CONFIG_LSUSB=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MESG=y -CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y -# CONFIG_MKE2FS is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -CONFIG_MKDOSFS=y -CONFIG_MKFS_VFAT=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_UUID=y -CONFIG_MORE=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -# CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -# CONFIG_FEATURE_MOUNT_OTHERTAB is not set -CONFIG_MOUNTPOINT=y -CONFIG_NSENTER=y -# CONFIG_PIVOT_ROOT is not set -CONFIG_RDATE=y -CONFIG_RDEV=y -CONFIG_READPROFILE=y -CONFIG_RENICE=y -CONFIG_REV=y -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -CONFIG_LINUX32=y -CONFIG_LINUX64=y -CONFIG_SETPRIV=y -CONFIG_FEATURE_SETPRIV_DUMP=y -CONFIG_FEATURE_SETPRIV_CAPABILITIES=y -CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y -CONFIG_SETSID=y -CONFIG_SWAPON=y -CONFIG_FEATURE_SWAPON_DISCARD=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWAPOFF=y -CONFIG_FEATURE_SWAPONOFF_LABEL=y -CONFIG_SWITCH_ROOT=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_UEVENT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y -CONFIG_UNSHARE=y -# CONFIG_WALL is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -CONFIG_FEATURE_VOLUMEID_BCACHE=y -CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_EXFAT=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_F2FS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -# CONFIG_FEATURE_VOLUMEID_HFS is not set -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_MINIX=y -CONFIG_FEATURE_VOLUMEID_NILFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -CONFIG_FEATURE_VOLUMEID_SQUASHFS=y -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -CONFIG_FEATURE_VOLUMEID_UBIFS=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_XFS=y - -# -# Miscellaneous Utilities -# -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_FEATURE_COMPRESS_BBCONFIG=y -CONFIG_BEEP=y -CONFIG_FEATURE_BEEP_FREQ=440 -CONFIG_FEATURE_BEEP_LENGTH_MS=30 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -CONFIG_CONSPY=y -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -CONFIG_FEATURE_CROND_CALL_SENDMAIL=y -CONFIG_FEATURE_CROND_SPECIAL_TIMES=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" -CONFIG_CRONTAB=y -CONFIG_DC=y -CONFIG_FEATURE_DC_LIBM=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -CONFIG_FBSPLASH=y -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASHCP is not set -CONFIG_HDPARM=y -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_HEXEDIT is not set -# CONFIG_I2CGET is not set -# CONFIG_I2CSET is not set -# CONFIG_I2CDUMP is not set -# CONFIG_I2CDETECT is not set -CONFIG_INOTIFYD=y -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_TRUNCATE=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_ASK_TERMINAL=y -CONFIG_FEATURE_LESS_DASHCMD=y -CONFIG_FEATURE_LESS_LINENUMS=y -# CONFIG_LSSCSI is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -CONFIG_MICROCOM=y -# CONFIG_MT is not set -CONFIG_NANDWRITE=y -CONFIG_NANDDUMP=y -CONFIG_PARTPROBE=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -CONFIG_RFKILL=y -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETFATTR is not set -CONFIG_SETSERIAL=y -CONFIG_STRINGS=y -CONFIG_TIME=y -CONFIG_TTYSIZE=y -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_UBIRENAME is not set -CONFIG_VOLNAME=y -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_UNIX_LOCAL=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -CONFIG_VERBOSE_RESOLUTION_ERRORS=y -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -CONFIG_FEATURE_BRCTL_FANCY=y -CONFIG_FEATURE_BRCTL_SHOW=y -# CONFIG_DNSD is not set -CONFIG_ETHER_WAKE=y -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTPD_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -CONFIG_DNSDOMAINNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y -# CONFIG_IFPLUGD is not set -CONFIG_IFUP=y -CONFIG_IFDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPNEIGH=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_NEIGH=y -CONFIG_FEATURE_IP_RARE_PROTOCOLS=y -CONFIG_IPCALC=y -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -CONFIG_FEATURE_IPCALC_FANCY=y -# CONFIG_FAKEIDENTD is not set -CONFIG_NAMEIF=y -CONFIG_FEATURE_NAMEIF_EXTENDED=y -CONFIG_NBDCLIENT=y -CONFIG_NC=y -# CONFIG_NETCAT is not set -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NC_110_COMPAT=y -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -CONFIG_NTPD=y -CONFIG_FEATURE_NTPD_SERVER=y -CONFIG_FEATURE_NTPD_CONF=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -CONFIG_SLATTACH=y -# CONFIG_SSL_CLIENT is not set -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_FEATURE_TELNET_WIDTH is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTPD is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TLS is not set -CONFIG_TRACEROUTE=y -CONFIG_TRACEROUTE6=y -CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y -CONFIG_TUNCTL=y -CONFIG_FEATURE_TUNCTL_UG=y -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_TIMEOUT=y -CONFIG_FEATURE_WGET_HTTPS=y -# CONFIG_FEATURE_WGET_OPENSSL is not set -CONFIG_WHOIS=y -# CONFIG_ZCIP is not set -# CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -CONFIG_DUMPLEASES=y -# CONFIG_DHCPRELAY is not set -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y -CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" -CONFIG_UDHCPC6=y -CONFIG_FEATURE_UDHCPC6_RFC3646=y -CONFIG_FEATURE_UDHCPC6_RFC4704=y -CONFIG_FEATURE_UDHCPC6_RFC4833=y - -# -# Common options for DHCP applets -# -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_FEATURE_UDHCP_RFC3397=y -CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b" - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -CONFIG_MAKEMIME=y -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -CONFIG_REFORMIME=y -CONFIG_FEATURE_REFORMIME_COMPAT=y -CONFIG_SENDMAIL=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_IOSTAT=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_LSOF=y -CONFIG_MPSTAT=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PKILL=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PMAP=y -CONFIG_POWERTOP=y -CONFIG_FEATURE_POWERTOP_INTERACTIVE=y -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_LONG is not set -CONFIG_FEATURE_PS_TIME=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -CONFIG_PSTREE=y -CONFIG_PWDX=y -CONFIG_SMEMCAP=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_INTERACTIVE=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_SMP_CPU=y -# CONFIG_FEATURE_TOP_DECIMALS is not set -CONFIG_FEATURE_TOP_SMP_PROCESS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_UPTIME=y -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -CONFIG_WATCH=y -# CONFIG_FEATURE_SHOW_THREADS is not set - -# -# Runit Utilities -# -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVC is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHCON is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RUNCON is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SESTATUS is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_RESTORECON is not set -# CONFIG_SETSEBOOL is not set - -# -# Shells -# -CONFIG_SH_IS_ASH=y -# CONFIG_SH_IS_HUSH is not set -# CONFIG_SH_IS_NONE is not set -# CONFIG_BASH_IS_ASH is not set -# CONFIG_BASH_IS_HUSH is not set -CONFIG_BASH_IS_NONE=y -CONFIG_ASH=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_INTERNAL_GLOB=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_ASH_IDLE_TIMEOUT=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_ECHO=y -CONFIG_ASH_PRINTF=y -CONFIG_ASH_TEST=y -CONFIG_ASH_HELP=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_BASH_SOURCE_CURDIR=y -CONFIG_ASH_COMMAND_NOT_FOUND_HOOK=y -# CONFIG_CTTYHACK is not set -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_HUSH_ECHO is not set -# CONFIG_HUSH_PRINTF is not set -# CONFIG_HUSH_TEST is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_EXPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_READONLY is not set -# CONFIG_HUSH_KILL is not set -# CONFIG_HUSH_WAIT is not set -# CONFIG_HUSH_TRAP is not set -# CONFIG_HUSH_TYPE is not set -# CONFIG_HUSH_TIMES is not set -# CONFIG_HUSH_READ is not set -# CONFIG_HUSH_SET is not set -# CONFIG_HUSH_UNSET is not set -# CONFIG_HUSH_ULIMIT is not set -# CONFIG_HUSH_UMASK is not set -# CONFIG_HUSH_GETOPTS is not set -# CONFIG_HUSH_MEMLEAK is not set - -# -# Options common to all shells -# -CONFIG_FEATURE_SH_MATH=y -CONFIG_FEATURE_SH_MATH_64=y -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_FEATURE_SH_READ_FRAC=y -CONFIG_FEATURE_SH_HISTFILESIZE=y - -# -# System Logging Utilities -# -CONFIG_KLOGD=y - -# -# klogd should not be used together with syslog to kernel printk buffer -# -CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_SYSLOGD_DUP=y -CONFIG_FEATURE_SYSLOGD_CFG=y -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_FEATURE_KMSG_SYSLOG=y diff --git a/legacy/busybox/busyboxconfig-extras b/legacy/busybox/busyboxconfig-extras deleted file mode 100644 index ed9c572a9..000000000 --- a/legacy/busybox/busyboxconfig-extras +++ /dev/null @@ -1,1131 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.28.2 -# Wed Mar 28 12:24:25 2018 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Settings -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_FEDORA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_LONG_OPTS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_LFS=y -# CONFIG_PAM is not set -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_PID_FILE_PATH="" -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_PIE=y -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" -# CONFIG_USE_PORTABLE_CODE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_DEBUG_SANITIZE is not set -# CONFIG_UNIT_TEST is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Library Tuning -# -# CONFIG_FEATURE_USE_BSS_TAIL is not set -# CONFIG_FEATURE_RTMINMAX is not set -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SMALL=1 -CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_EDITING is not set -CONFIG_FEATURE_EDITING_MAX_LEN=0 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=0 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -# CONFIG_FEATURE_REVERSE_SEARCH is not set -# CONFIG_FEATURE_TAB_COMPLETION is not set -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_UNICODE_SUPPORT is not set -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=0 -CONFIG_LAST_SUPPORTED_WCHAR=0 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -# CONFIG_FEATURE_NON_POSIX_CP is not set -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -# CONFIG_FEATURE_USE_SENDFILE is not set -CONFIG_FEATURE_COPYBUF_KB=4 -# CONFIG_FEATURE_SKIP_ROOTFS is not set -# CONFIG_MONOTONIC_SYSCALL is not set -# CONFIG_IOCTL_HEX2STR_ERROR is not set -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -CONFIG_FEATURE_SEAMLESS_GZ=y -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_GUNZIP is not set -# CONFIG_ZCAT is not set -# CONFIG_FEATURE_GUNZIP_LONG_OPTIONS is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZCAT is not set -# CONFIG_UNLZMA is not set -# CONFIG_LZCAT is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZCAT is not set -# CONFIG_XZ is not set -# CONFIG_BZIP2 is not set -# CONFIG_FEATURE_BZIP2_DECOMPRESS is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -CONFIG_GZIP_FAST=0 -# CONFIG_FEATURE_GZIP_LEVELS is not set -# CONFIG_FEATURE_GZIP_DECOMPRESS is not set -# CONFIG_LZOP is not set -# CONFIG_UNLZOP is not set -# CONFIG_LZOPCAT is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNZIP is not set -# CONFIG_FEATURE_UNZIP_CDF is not set -# CONFIG_FEATURE_UNZIP_BZIP2 is not set -# CONFIG_FEATURE_UNZIP_LZMA is not set -# CONFIG_FEATURE_UNZIP_XZ is not set -# CONFIG_FEATURE_LZMA_FAST is not set - -# -# Coreutils -# -# CONFIG_BASENAME is not set -# CONFIG_CAT is not set -# CONFIG_FEATURE_CATN is not set -# CONFIG_FEATURE_CATV is not set -# CONFIG_CHGRP is not set -# CONFIG_CHMOD is not set -# CONFIG_CHOWN is not set -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -# CONFIG_CHROOT is not set -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -# CONFIG_CP is not set -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -# CONFIG_CUT is not set -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -# CONFIG_DD is not set -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -# CONFIG_FEATURE_DD_STATUS is not set -# CONFIG_DF is not set -# CONFIG_FEATURE_DF_FANCY is not set -# CONFIG_DIRNAME is not set -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -# CONFIG_DU is not set -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -# CONFIG_ECHO is not set -# CONFIG_FEATURE_FANCY_ECHO is not set -# CONFIG_ENV is not set -# CONFIG_EXPAND is not set -# CONFIG_UNEXPAND is not set -# CONFIG_EXPR is not set -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FACTOR is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -# CONFIG_HEAD is not set -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_GROUPS is not set -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LINK is not set -# CONFIG_LN is not set -# CONFIG_LOGNAME is not set -# CONFIG_LS is not set -# CONFIG_FEATURE_LS_FILETYPES is not set -# CONFIG_FEATURE_LS_FOLLOWLINKS is not set -# CONFIG_FEATURE_LS_RECURSIVE is not set -# CONFIG_FEATURE_LS_WIDTH is not set -# CONFIG_FEATURE_LS_SORTFILES is not set -# CONFIG_FEATURE_LS_TIMESTAMPS is not set -# CONFIG_FEATURE_LS_USERNAME is not set -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set -# CONFIG_SHA3SUM is not set -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set -# CONFIG_MKDIR is not set -# CONFIG_MKFIFO is not set -# CONFIG_MKNOD is not set -# CONFIG_MKTEMP is not set -# CONFIG_MV is not set -# CONFIG_NICE is not set -# CONFIG_NL is not set -# CONFIG_NOHUP is not set -# CONFIG_NPROC is not set -# CONFIG_OD is not set -# CONFIG_PASTE is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -# CONFIG_PWD is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_REALPATH is not set -# CONFIG_RM is not set -# CONFIG_RMDIR is not set -# CONFIG_SEQ is not set -# CONFIG_SHRED is not set -# CONFIG_SHUF is not set -# CONFIG_SLEEP is not set -# CONFIG_FEATURE_FANCY_SLEEP is not set -# CONFIG_FEATURE_FLOAT_SLEEP is not set -# CONFIG_SORT is not set -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_FEATURE_STAT_FILESYSTEM is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -# CONFIG_FEATURE_SYNC_FANCY is not set -# CONFIG_TAC is not set -# CONFIG_TAIL is not set -# CONFIG_FEATURE_FANCY_TAIL is not set -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -# CONFIG_TEST is not set -# CONFIG_TEST1 is not set -# CONFIG_TEST2 is not set -# CONFIG_FEATURE_TEST_64 is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TOUCH is not set -# CONFIG_FEATURE_TOUCH_NODEREF is not set -# CONFIG_FEATURE_TOUCH_SUSV3 is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set -# CONFIG_TRUNCATE is not set -# CONFIG_TTY is not set -# CONFIG_UNAME is not set -CONFIG_UNAME_OSNAME="" -CONFIG_BB_ARCH=y -# CONFIG_UNIQ is not set -# CONFIG_UNLINK is not set -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_BASE64 is not set -# CONFIG_UUENCODE is not set -# CONFIG_WC is not set -# CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHO is not set -# CONFIG_W is not set -# CONFIG_USERS is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options -# -# CONFIG_FEATURE_VERBOSE is not set -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set -# CONFIG_FEATURE_HUMAN_READABLE is not set - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_KBD_MODE is not set -# CONFIG_LOADFONT is not set -# CONFIG_SETFONT is not set -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_FEATURE_LOADFONT_PSF2 is not set -# CONFIG_FEATURE_LOADFONT_RAW is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Debian Utilities -# -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_WHICH is not set - -# -# klibc-utils -# -# CONFIG_MINIPS is not set -# CONFIG_NUKE is not set -# CONFIG_RESUME is not set -# CONFIG_RUN_INIT is not set - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_FEATURE_AWK_GNU_EXTENSIONS is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -# CONFIG_SED is not set -# CONFIG_VI is not set -CONFIG_FEATURE_VI_MAX_LEN=0 -# CONFIG_FEATURE_VI_8BIT is not set -# CONFIG_FEATURE_VI_COLON is not set -# CONFIG_FEATURE_VI_YANKMARK is not set -# CONFIG_FEATURE_VI_SEARCH is not set -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -# CONFIG_FEATURE_VI_ASK_TERMINAL is not set -# CONFIG_FEATURE_VI_UNDO is not set -# CONFIG_FEATURE_VI_UNDO_QUEUE is not set -CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_EXEC_PLUS is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -# CONFIG_GREP is not set -# CONFIG_EGREP is not set -# CONFIG_FGREP is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set -# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set -# CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set -# CONFIG_LINUXRC is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_INIT_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_LAST_ID=0 -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_CHPASSWD is not set -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" -# CONFIG_CRYPTPW is not set -# CONFIG_MKPASSWD is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_NOLOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_DEPMOD is not set -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODINFO is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_RMMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_BIN is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKDISCARD is not set -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set -# CONFIG_BLOCKDEV is not set -# CONFIG_CAL is not set -# CONFIG_CHRT is not set -# CONFIG_DMESG is not set -# CONFIG_FEATURE_DMESG_PRETTY is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FALLOCATE is not set -# CONFIG_FATATTR is not set -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_FSFREEZE is not set -# CONFIG_FSTRIM is not set -# CONFIG_GETOPT is not set -# CONFIG_FEATURE_GETOPT_LONG is not set -# CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_XXD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IONICE is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_LOSETUP is not set -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MESG is not set -# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set -# CONFIG_MKE2FS is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKDOSFS is not set -# CONFIG_MKFS_VFAT is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -# CONFIG_MOUNT is not set -# CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_FEATURE_MOUNT_CIFS is not set -# CONFIG_FEATURE_MOUNT_FLAGS is not set -# CONFIG_FEATURE_MOUNT_FSTAB is not set -# CONFIG_FEATURE_MOUNT_OTHERTAB is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_NSENTER is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RENICE is not set -# CONFIG_REV is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_LINUX32 is not set -# CONFIG_LINUX64 is not set -# CONFIG_SETPRIV is not set -# CONFIG_FEATURE_SETPRIV_DUMP is not set -# CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set -# CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set -# CONFIG_SETSID is not set -# CONFIG_SWAPON is not set -# CONFIG_FEATURE_SWAPON_DISCARD is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -# CONFIG_SWAPOFF is not set -# CONFIG_FEATURE_SWAPONOFF_LABEL is not set -# CONFIG_SWITCH_ROOT is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_UEVENT is not set -# CONFIG_UMOUNT is not set -# CONFIG_FEATURE_UMOUNT_ALL is not set -# CONFIG_UNSHARE is not set -# CONFIG_WALL is not set -# CONFIG_FEATURE_MOUNT_LOOP is not set -# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set -# CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_BCACHE is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_EXFAT is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_F2FS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_MINIX is not set -# CONFIG_FEATURE_VOLUMEID_NILFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_UBIFS is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CONSPY is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASHCP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_HEXEDIT is not set -# CONFIG_I2CGET is not set -# CONFIG_I2CSET is not set -# CONFIG_I2CDUMP is not set -# CONFIG_I2CDETECT is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LESS is not set -CONFIG_FEATURE_LESS_MAXLINES=0 -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_TRUNCATE is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_LSSCSI is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MT is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_PARTPROBE is not set -# CONFIG_RAIDAUTORUN is not set -CONFIG_READAHEAD=y -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETFATTR is not set -# CONFIG_SETSERIAL is not set -# CONFIG_STRINGS is not set -# CONFIG_TIME is not set -# CONFIG_TTYSIZE is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_UBIRENAME is not set -# CONFIG_VOLNAME is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_FEATURE_UNIX_LOCAL is not set -# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -# CONFIG_ETHER_WAKE is not set -CONFIG_FTPD=y -CONFIG_FEATURE_FTPD_WRITE=y -CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y -CONFIG_FEATURE_FTPD_AUTHENTICATION=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_DNSDOMAINNAME is not set -CONFIG_HTTPD=y -CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_SETUID=y -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_FEATURE_HTTPD_ERROR_PAGES=y -CONFIG_FEATURE_HTTPD_PROXY=y -CONFIG_FEATURE_HTTPD_GZIP=y -# CONFIG_IFCONFIG is not set -# CONFIG_FEATURE_IFCONFIG_STATUS is not set -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUP is not set -# CONFIG_IFDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -CONFIG_INETD=y -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPNEIGH is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -CONFIG_FEATURE_IP_ROUTE_DIR="" -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_NEIGH is not set -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -CONFIG_FAKEIDENTD=y -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NBDCLIENT is not set -# CONFIG_NC is not set -# CONFIG_NETCAT is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -# CONFIG_NC_110_COMPAT is not set -# CONFIG_NETSTAT is not set -# CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set -# CONFIG_NSLOOKUP is not set -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_FEATURE_NTPD_CONF is not set -# CONFIG_PING is not set -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING is not set -# CONFIG_PSCAN is not set -# CONFIG_ROUTE is not set -# CONFIG_SLATTACH is not set -# CONFIG_SSL_CLIENT is not set -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_FEATURE_TELNET_WIDTH=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_FEATURE_TELNETD_INETD_WAIT=y -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_PROGRESS_BAR=y -CONFIG_TFTPD=y - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TLS is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_VCONFIG is not set -# CONFIG_WGET is not set -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_TIMEOUT is not set -# CONFIG_FEATURE_WGET_HTTPS is not set -# CONFIG_FEATURE_WGET_OPENSSL is not set -# CONFIG_WHOIS is not set -# CONFIG_ZCIP is not set -CONFIG_UDHCPD=y -CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y -CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y -CONFIG_DHCPD_LEASES_FILE="/var/lib/udhcpd/udhcpd.leases" -# CONFIG_DUMPLEASES is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set - -# -# Common options for DHCP applets -# -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_FEATURE_UDHCP_RFC3397=y -CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" - -# -# Process Utilities -# -# CONFIG_FREE is not set -# CONFIG_FUSER is not set -# CONFIG_IOSTAT is not set -# CONFIG_KILL is not set -# CONFIG_KILLALL is not set -# CONFIG_KILLALL5 is not set -# CONFIG_LSOF is not set -# CONFIG_MPSTAT is not set -# CONFIG_NMETER is not set -# CONFIG_PGREP is not set -# CONFIG_PKILL is not set -# CONFIG_PIDOF is not set -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set -# CONFIG_PS is not set -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_LONG is not set -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_PSTREE is not set -# CONFIG_PWDX is not set -# CONFIG_SMEMCAP is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_INTERACTIVE is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_UPTIME is not set -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -# CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set - -# -# Runit Utilities -# -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVC is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHCON is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RUNCON is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SESTATUS is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_RESTORECON is not set -# CONFIG_SETSEBOOL is not set - -# -# Shells -# -# CONFIG_SH_IS_ASH is not set -# CONFIG_SH_IS_HUSH is not set -CONFIG_SH_IS_NONE=y -# CONFIG_BASH_IS_ASH is not set -# CONFIG_BASH_IS_HUSH is not set -CONFIG_BASH_IS_NONE=y -# CONFIG_ASH is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -# CONFIG_ASH_INTERNAL_GLOB is not set -# CONFIG_ASH_BASH_COMPAT is not set -# CONFIG_ASH_JOB_CONTROL is not set -# CONFIG_ASH_ALIAS is not set -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_ASH_IDLE_TIMEOUT is not set -# CONFIG_ASH_MAIL is not set -# CONFIG_ASH_ECHO is not set -# CONFIG_ASH_PRINTF is not set -# CONFIG_ASH_TEST is not set -# CONFIG_ASH_HELP is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_BASH_SOURCE_CURDIR is not set -# CONFIG_ASH_COMMAND_NOT_FOUND_HOOK is not set -# CONFIG_CTTYHACK is not set -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_HUSH_ECHO is not set -# CONFIG_HUSH_PRINTF is not set -# CONFIG_HUSH_TEST is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_EXPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_READONLY is not set -# CONFIG_HUSH_KILL is not set -# CONFIG_HUSH_WAIT is not set -# CONFIG_HUSH_TRAP is not set -# CONFIG_HUSH_TYPE is not set -# CONFIG_HUSH_TIMES is not set -# CONFIG_HUSH_READ is not set -# CONFIG_HUSH_SET is not set -# CONFIG_HUSH_UNSET is not set -# CONFIG_HUSH_ULIMIT is not set -# CONFIG_HUSH_UMASK is not set -# CONFIG_HUSH_GETOPTS is not set -# CONFIG_HUSH_MEMLEAK is not set - -# -# Options common to all shells -# -# CONFIG_FEATURE_SH_MATH is not set -# CONFIG_FEATURE_SH_MATH_64 is not set -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_FEATURE_SH_READ_FRAC is not set -# CONFIG_FEATURE_SH_HISTFILESIZE is not set - -# -# System Logging Utilities -# -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_SYSLOGD_CFG is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_FEATURE_KMSG_SYSLOG is not set diff --git a/legacy/busybox/dad.if-up b/legacy/busybox/dad.if-up deleted file mode 100644 index e76bb60bf..000000000 --- a/legacy/busybox/dad.if-up +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Block ifup until DAD completion -# Copyright (c) 2016 Kaarle Ritvanen - -while ip address show dev $IFACE | grep -q " tentative "; do - sleep 0.2 -done diff --git a/legacy/busybox/external_ssl_client.patch b/legacy/busybox/external_ssl_client.patch deleted file mode 100644 index 8adb7b41b..000000000 --- a/legacy/busybox/external_ssl_client.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/networking/wget.c b/networking/wget.c -index cd92b3a28..a12c921cd 100644 ---- a/networking/wget.c -+++ b/networking/wget.c -@@ -50,7 +50,6 @@ - //config: bool "Support HTTPS using internal TLS code" - //config: default y - //config: depends on WGET --//config: select TLS - //config: help - //config: wget will use internal TLS code to connect to https:// URLs. - //config: Note: -@@ -767,8 +766,8 @@ static void spawn_ssl_client(const char *host, int network_fd) - int pid; - char *servername, *p; - -- if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) -- bb_error_msg("note: TLS certificate validation not implemented"); -+ if (ENABLE_SSL_CLIENT && !(option_mask32 & WGET_OPT_NO_CHECK_CERT)) -+ bb_error_msg_and_die("note: TLS certificate validation not implemented"); - - servername = xstrdup(host); - p = strrchr(servername, ':'); -@@ -785,21 +784,25 @@ static void spawn_ssl_client(const char *host, int network_fd) - close(sp[0]); - xmove_fd(sp[1], 0); - xdup2(0, 1); -- if (BB_MMU) { -+ if (BB_MMU && ENABLE_TLS && (option_mask32 & WGET_OPT_NO_CHECK_CERT)) { - tls_state_t *tls = new_tls_state(); - tls->ifd = tls->ofd = network_fd; - tls_handshake(tls, servername); - tls_run_copy_loop(tls); - exit(0); - } else { -- char *argv[5]; -+ char *argv[6]; - xmove_fd(network_fd, 3); - argv[0] = (char*)"ssl_client"; - argv[1] = (char*)"-s3"; - //TODO: if (!is_ip_address(servername))... - argv[2] = (char*)"-n"; - argv[3] = servername; -- argv[4] = NULL; -+ if (!ENABLE_SSL_CLIENT &&(option_mask32 & WGET_OPT_NO_CHECK_CERT)) { -+ argv[4] = (char*)"-I"; -+ argv[5] = NULL; -+ } else -+ argv[4] = NULL; - BB_EXECVP(argv[0], argv); - bb_perror_msg_and_die("can't execute '%s'", argv[0]); - } diff --git a/legacy/busybox/nologin.c b/legacy/busybox/nologin.c deleted file mode 100644 index 75ad89eda..000000000 --- a/legacy/busybox/nologin.c +++ /dev/null @@ -1,38 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * nologin implementation for busybox - * - * Licensed under GPLv2 or later, see file LICENSE in this source tree. - */ - -//config:config NOLOGIN -//config: bool "nologin" -//config: default n -//config: help -//config: nologin is a tool that is supposed to be the shell for user accounts -//config: that are not supposed to login. - -//applet:IF_NOLOGIN(APPLET(nologin, BB_DIR_SBIN, BB_SUID_DROP)) -//kbuild:lib-$(CONFIG_NOLOGIN) += nologin.o - -//usage:#define nologin_trivial_usage -//usage: "" -//usage:#define nologin_full_usage "\n\n" -//usage: "politely refuse a login\n" - -#include "libbb.h" -#include <syslog.h> - -#define _NOLOGIN_TXT "/etc/nologin.txt" - -int nologin_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int nologin_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) -{ - int fd; - fd = open(_NOLOGIN_TXT, O_RDONLY); - if (bb_copyfd_eof(fd, STDOUT_FILENO) == -1) - bb_error_msg_and_die("this account is not available"); - close(fd); - return 1; -} - diff --git a/legacy/busybox/ssl_client.c b/legacy/busybox/ssl_client.c deleted file mode 100644 index 8aa558e70..000000000 --- a/legacy/busybox/ssl_client.c +++ /dev/null @@ -1,158 +0,0 @@ -#include <err.h> -#include <errno.h> -#include <poll.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> - -#include <tls.h> - -#define BUFSIZE 16384 - -#define TLS_DEBUG 0 - -#if TLS_DEBUG -# define dbg(...) fprintf(stderr, __VA_ARGS__) -#else -# define dbg(...) ((void)0) -#endif - -static void copy_from_stdin_to_tls(struct tls *ctx, int *fd) -{ - static size_t buf[BUFSIZE]; - ssize_t n; - int i = 0; - dbg("DEBUG: data from STDIN\n"); - do { - n = read(STDIN_FILENO, buf, sizeof(buf)); - dbg("read %zu\n", n); - } while (n < 0 && errno == EINTR); - - if (n < 1) { - *fd = -1; - return; - } - - while (n > 0) { - ssize_t r = tls_write(ctx, &buf[i], n); - if (r == TLS_WANT_POLLIN || r == TLS_WANT_POLLOUT) - continue; - if (r < 0) - err(1, "tls_write: %s", tls_error(ctx)); - i += r; - n -= r; - } -} - -static int copy_from_tls_to_stdout(struct tls *ctx) -{ - static size_t buf[BUFSIZE]; - ssize_t n,r; - int i = 0; - - dbg("DEBUG: data from TLS\n"); - do { - n = tls_read(ctx, buf, sizeof(buf)); - } while (n == TLS_WANT_POLLIN || r == TLS_WANT_POLLOUT); - if (n < 0) - err(1, "tls read: %s", tls_error(ctx)); - - if (n == 0) - return 1; - - while (n) { - r = write(STDOUT_FILENO, &buf[i], n); - if (r < 0) - err(1, "write"); - i += r; - n -= r; - } - return 0; -} - -int do_poll(struct pollfd *fds, int nfds) -{ - int r; - while ((r = poll(fds, nfds, -1)) < 0) { - if (errno != EINTR && errno != ENOMEM) - err(1, "poll"); - } - return r; -} - -static void copy_loop(struct tls *ctx, int sfd) -{ - struct pollfd fds[2] = { - { .fd = STDIN_FILENO, .events = POLLIN }, - { .fd = sfd, .events = POLLIN }, - }; - - while (1) { - int r = do_poll(fds, 2); - if (fds[0].revents) - copy_from_stdin_to_tls(ctx, &fds[0].fd); - - if (fds[1].revents && copy_from_tls_to_stdout(ctx)) - break; - } -} - -void usage(const char *prog, int ret) { - printf("usage: %s [-s FD] [-I] -n SNI\n", prog); - exit(ret); -} - -int main(int argc, char *argv[]) -{ - int c, sfd = 1;; - const char *sni = NULL; - struct tls_config *tc; - struct tls *ctx; - int insecure = 0; - - while ((c = getopt(argc, argv, "hs:n:I")) != -1) { - switch (c) { - case 'h': - usage(argv[0], 0); - break; - case 's': - sfd = atoi(optarg); - break; - case 'n': - sni = optarg; - break; - case 'I': - insecure = 1; - break; - case '?': - usage(argv[0], 1); - } - } - - if (tls_init() == -1) - errx(1, "tls_init() failed"); - - if ((ctx = tls_client()) == NULL) - errx(1, "tls_client() failed"); - - if (insecure) { - if ((tc = tls_config_new()) == NULL) - errx(1, "tls_config_new() failed"); - tls_config_insecure_noverifycert(tc); - tls_config_insecure_noverifyname(tc); - tls_config_insecure_noverifytime(tc); - if (tls_configure(ctx, tc) == -1) - err(1, "tls_configure: %s", tls_error(ctx)); - tls_config_free(tc); - } - - if (tls_connect_fds(ctx, sfd, sfd, sni) == -1) - errx(1, "%s: TLS connect failed", sni); - - if (tls_handshake(ctx) == -1) - errx(1, "%s: %s", sni, tls_error(ctx)); - - copy_loop(ctx, sfd); - tls_close(ctx); - return 0; -} diff --git a/legacy/busybox/top-buffer-overflow.patch b/legacy/busybox/top-buffer-overflow.patch deleted file mode 100644 index 14b23c648..000000000 --- a/legacy/busybox/top-buffer-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- busybox-1.27.0.orig/procps/top.c -+++ busybox-1.27.0/procps/top.c -@@ -694,10 +694,14 @@ - CALC_STAT(pcpu, (s->pcpu*pcpu_scale + pcpu_half) >> pcpu_shift); - #endif - -- if (s->vsz >= 100000) -- sprintf(vsz_str_buf, "%6ldm", s->vsz/1024); -+ if ((s->vsz / (1024 * 1024)) >= 100000) -+ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%6ldt", s->vsz/(1024 * 1024 * 1024)); -+ else if ((s->vsz / 1024) >= 100000) -+ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%6ldg", s->vsz/(1024 * 1024)); -+ else if (s->vsz >= 100000) -+ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%6ldm", s->vsz/1024); - else -- sprintf(vsz_str_buf, "%7lu", s->vsz); -+ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%7lu", s->vsz); - /* PID PPID USER STAT VSZ %VSZ [%CPU] COMMAND */ - col = snprintf(line_buf, scr_width, - "\n" "%5u%6u %-8.8s %s%s" FMT diff --git a/legacy/cdrtools/APKBUILD b/legacy/cdrtools/APKBUILD deleted file mode 100644 index 39a3021c8..000000000 --- a/legacy/cdrtools/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=cdrtools -pkgver=3.01 -pkgrel=1 -pkgdesc="Highly portable CD/DVD/Blu-Ray command line recording software" -url="http://schilytools.sourceforge.net/" -arch="all" -options="suid" -license="CDDL-1.0" -depends="" -makedepends="attr-dev byacc expat-dev openssl-dev smake" -subpackages="$pkgname-doc" -source="https://download.sourceforge.net/cdrtools/cdrtools-$pkgver.tar.bz2" - -build() { - cd "$builddir" - smake INS_BASE=/usr -} - -check() { - cd "$builddir" - smake check -} - -package() { - cd "$builddir" - smake INS_BASE=/usr DESTDIR="$pkgdir" install - - mv "$pkgdir"/usr/share/man/man3 "$pkgdir"/usr/share/man/man3sch - rename .3 .3sch "$pkgdir"/usr/share/man/man3sch/*.3 -} - -sha512sums="54f06496e47184e324fc9d8b1153d3c806ed43c3c57e2a8d79a79afe12aa5334e82fa500fe1b1bf49307ad7dfabe687f6e1ad914fc2f0c5c429d8e6a34c293eb cdrtools-3.01.tar.bz2" diff --git a/legacy/corindon-red/APKBUILD b/legacy/corindon-red/APKBUILD deleted file mode 100644 index 0cd8da56a..000000000 --- a/legacy/corindon-red/APKBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=corindon-red -pkgver=1.0 -pkgrel=0 -pkgdesc="Corindon theme for Aurorae (Red)" -url="https://store.kde.org/p/1002602/" -arch="noarch" -license="GPL-2.0+" -options="!check" # No test suite. -depends="" -makedepends="" -source="https://dl.opendesktop.org/api/files/downloadfile/id/1460740699/s/90b6b780028e72203f2a0fba41edf43a/t/1520219138/u//122445-corindon-red.tar.gz" - -package() { - mkdir -p "$pkgdir"/usr/share/aurorae/themes - mv "$srcdir"/corindon-red "$pkgdir"/usr/share/aurorae/themes/ -} - -sha512sums="9be72e3404eac6c7f0093038b1f873064883ed62ab81486133ef1d9ce50a9ede43d68ed61ebc3280289433abf8a794ca6591c906f51636dec5c1fa197626a630 122445-corindon-red.tar.gz" diff --git a/legacy/lbxproxy/APKBUILD b/legacy/lbxproxy/APKBUILD deleted file mode 100644 index f0da569fc..000000000 --- a/legacy/lbxproxy/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=lbxproxy -pkgver=1.0.3 -pkgrel=0 -pkgdesc="X11 proxy server for the Low Bandwidth extension" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="" -makedepends="libice-dev liblbxutil-dev libx11-dev libxext-dev util-macros - xorgproto-dev" -subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/lbxproxy-$pkgver.tar.bz2" - -prepare() { - default_prepare - chmod a+w config.sub - update_config_sub -} - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="e025101ba6743f98717958c3ff561df3f0fea7b491b2a41639cb8a84ffe9d82d980dcaaa8f50408e3a1a8ecfbd29fbe599a16a0f5de454b05ff82bc2629f68f2 lbxproxy-1.0.3.tar.bz2" diff --git a/legacy/libxfont/APKBUILD b/legacy/libxfont/APKBUILD deleted file mode 100644 index c98112974..000000000 --- a/legacy/libxfont/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=libxfont -pkgver=1.5.4 -pkgrel=0 -pkgdesc="X11 Font library" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="xtrans" -makedepends="freetype-dev libfontenc-dev util-macros xmlto xorgproto-dev" -subpackages="$pkgname-dev" -source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2" -builddir="$srcdir/libXfont-$pkgver" - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2" diff --git a/legacy/mkcfm/APKBUILD b/legacy/mkcfm/APKBUILD deleted file mode 100644 index ab4c152a3..000000000 --- a/legacy/mkcfm/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=mkcfm -pkgver=1.0.1 -pkgrel=0 -pkgdesc="Utility for creating summaries of font metric files" -url="https://www.X.Org/" -arch="all" -license="MIT" -depends="" -makedepends="libfontenc-dev libfs-dev libx11-dev libxfont-dev" -subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/mkcfm-$pkgver.tar.gz - constise.patch - " - -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="fabd9e2a711b960356178f9b52a2e720c4f33699c125dd82831d7e5a84f33dee230ff1d4c1a4019900fc190779f1c7770a775037c06a226723038e6440900fd2 mkcfm-1.0.1.tar.gz -6dffe376f23a18c536004df70788c2725098c5a8d068538a98be0e1fbcda93709ba7968c862095d5bb807be652978ba9fd5b3f097eb8dc88343ade0989dc3a83 constise.patch" diff --git a/legacy/mkcfm/constise.patch b/legacy/mkcfm/constise.patch deleted file mode 100644 index aff209ecf..000000000 --- a/legacy/mkcfm/constise.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mkcfm-1.0.1/mkcfm.c.old 2005-12-08 17:54:40.000000000 +0000 -+++ mkcfm-1.0.1/mkcfm.c 2018-12-31 07:32:01.460000000 +0000 -@@ -194,7 +194,7 @@ - - - Atom --MakeAtom(char *p, unsigned len, int makeit) -+MakeAtom(const char *p, unsigned len, int makeit) - { - return *p; - } diff --git a/legacy/mkfontdir/APKBUILD b/legacy/mkfontdir/APKBUILD deleted file mode 100644 index 45629cd20..000000000 --- a/legacy/mkfontdir/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=mkfontdir -pkgver=1.0.7 -pkgrel=3 -pkgdesc="Font file index utility from X.Org" -url="https://www.X.Org/" -arch="noarch" -license="X11 AND MIT" -depends="encodings mkfontscale" -makedepends="util-macros" -subpackages="$pkgname-doc" -triggers="$pkgname.trigger=/usr/share/fonts/* - $pkgname.trigger=/usr/share/fonts/X11/*" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - update_config_sub - default_prepare -} - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f mkfontdir-1.0.7.tar.bz2" diff --git a/legacy/mkfontdir/mkfontdir.trigger b/legacy/mkfontdir/mkfontdir.trigger deleted file mode 100644 index 3024d71f1..000000000 --- a/legacy/mkfontdir/mkfontdir.trigger +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -for i in "$@"; do - mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i" -done - diff --git a/legacy/paxmark/APKBUILD b/legacy/paxmark/APKBUILD deleted file mode 100644 index 3c9c69400..000000000 --- a/legacy/paxmark/APKBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Contributor: Timo Teräs <timo.teras@iki.fi> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=paxmark -pkgver=0.11 -pkgrel=1 -pkgdesc="Manage PaX marking of executables" -url="https://alpinelinux.org" -arch="noarch" -options="!check" -license="GPL-2.0-only" -depends="attr bash" -makedepends="" -install="" -subpackages="" -source="paxmark" - -package() { - mkdir -p "$pkgdir"/usr/sbin - install -m755 "$srcdir"/paxmark "$pkgdir"/usr/sbin - ln -s paxmark "$pkgdir"/usr/sbin/paxmark.sh -} - -sha512sums="ed904790bfa6c86e216e2c8c1ed8fb1f997b7d1a55f997459655e402d8eec6447095709e38472cf909ea4d03e623e3e0eeddc0da57378901fe9d18d8c14b68d8 paxmark" diff --git a/legacy/paxmark/paxmark b/legacy/paxmark/paxmark deleted file mode 100644 index 87a84f4f7..000000000 --- a/legacy/paxmark/paxmark +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -ret=0 -flags="${1//[!zPpEeMmRrSs]}" -[ -n "${flags}" ] || exit 0 -shift - -# Create XATTR_PAX marking using attr -xval="" -[ "${flags//[!P]}" ] && xval="${xval}P" -[ "${flags//[!p]}" -a -z "${flags//[!P]}" ] && xval="${xval}p" -[ "${flags//[!E]}" ] && xval="${xval}E" -[ "${flags//[!e]}" -a -z "${flags//[!E]}" ] && xval="${xval}e" -[ -z "${flags//[!zEe]}" ] && xval="${xval}e" -[ "${flags//[!M]}" ] && xval="${xval}M" -[ "${flags//[!m]}" -a -z "${flags//[!M]}" ] && xval="${xval}m" -[ "${flags//[!R]}" ] && xval="${xval}R" -[ "${flags//[!r]}" -a -z "${flags//[!R]}" ] && xval="${xval}r" -[ "${flags//[!S]}" ] && xval="${xval}S" -[ "${flags//[!s]}" -a -z "${flags//[!S]}" ] && xval="${xval}s" - -for f in "$@"; do - if [ -n "FAKEROOTKEY" ]; then - # fakeroot does not set xattr's on disk. - # explicitly do that, because the marked binary might - # be executed next during install. - LD_PRELOAD="" FAKEROOTKEY="" attr -q -s pax.flags -V "${xval}" "${f}" >/dev/null || ret=1 - fi - attr -q -s pax.flags -V "${xval}" "${f}" >/dev/null || ret=1 -done - -exit $ret - diff --git a/legacy/proxymngr/APKBUILD b/legacy/proxymngr/APKBUILD deleted file mode 100644 index 4d4d220e6..000000000 --- a/legacy/proxymngr/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=proxymngr -pkgver=1.0.4 -pkgrel=0 -pkgdesc="X11 proxy manager service" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="lbxproxy" -makedepends="libice-dev libxt-dev util-macros xorgproto-dev" -subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/proxymngr-$pkgver.tar.bz2" - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="dce0d93558e674ce82197476d204488505079c8aa5192387e57c06844c4ea83da1cf45238e0a63e2bbf9867388ca1175125b6d7b4036085be89b3de353887fd2 proxymngr-1.0.4.tar.bz2" diff --git a/legacy/smake/APKBUILD b/legacy/smake/APKBUILD deleted file mode 100644 index 809060c9b..000000000 --- a/legacy/smake/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=smake -pkgver=1.2.5 -pkgrel=0 -pkgdesc="Highly portable Unix make implementation" -url="https://sourceforge.net/projects/s-make/" -arch="all" -options="!check" # No test suite. -license="CDDL-1.0 AND GPL-2.0-only" -depends="" -makedepends="" -subpackages="$pkgname-doc" -source="https://download.sourceforge.net/s-make/smake-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - default_prepare - sed -i -e "s|opt/schily|usr|" \ - $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') -} - -build() { - cd "$builddir" - export MAKEFLAGS="" - make INS_BASE=/usr -} - -package() { - cd "$builddir" - export MAKEFLAGS="" - make INS_BASE=/usr DESTDIR="$pkgdir" install -} - -sha512sums="15131f57942d6ea611602afa1f3d3d3d1892b0e7f0f6e5b1ace7f69f1acb7bd09403b8c70e380204cff75512f5824daef81d59205d758c93f2583b40caa873a8 smake-1.2.5.tar.bz2" diff --git a/legacy/which/APKBUILD b/legacy/which/APKBUILD deleted file mode 100644 index c150c3f1c..000000000 --- a/legacy/which/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: Sheila Aman <sheila@vulpine.house> -pkgname=which -pkgver=2.21 -pkgrel=2 -pkgdesc="A utility to show the full path of commands" -url="http://savannah.gnu.org/projects/which" -arch="all" -license="GPL-2.0+ AND LGPL-2.0+ AND GPL-3.0+" -makedepends="" -subpackages="$pkgname-doc" -source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" -provider_priority=1 - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 which-2.21.tar.gz" diff --git a/legacy/xbacklight/APKBUILD b/legacy/xbacklight/APKBUILD deleted file mode 100644 index 215baad9a..000000000 --- a/legacy/xbacklight/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=xbacklight -pkgver=1.2.2 -pkgrel=0 -pkgdesc="X11 backlight brightness adjustment utility" -url="https://www.X.Org/" -arch="all" -license="MIT" -depends="!acpilight" # both provide /usr/bin/xbacklight -makedepends="util-macros xcb-util-dev" -subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xbacklight-$pkgver.tar.bz2" - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec xbacklight-1.2.2.tar.bz2" diff --git a/scripts/healthchecks b/scripts/healthchecks new file mode 100755 index 000000000..3e8773566 --- /dev/null +++ b/scripts/healthchecks @@ -0,0 +1,230 @@ +#!/bin/sh -e + +## +# The purpose of this script is to validate APKBUILD source URLs +# and to cache them in a distfiles-compatible format. +# +# Usage: ./healthchecks [MAINTAINER] +# +# The optional 'MAINTAINER' argument is passed to 'grep' and is +# used to filter out non-matching packages. Example: 'Dan'. +# +# In addition to server and file availability checks, expected +# and actual (computed) checksums are compared. Files which are +# already present in the cache directory are skipped. +# +# Currently, up to approximately 9 GB of data may be downloaded. + + +#--------------------------------------------------------------- +# internal + +## +# Configurable paths. +# +HERE="$(dirname $(readlink -f ${0}))"; +TEMP="$(mktemp -d)"; # tmp dir for intermediate files +SAVE="/var/www/source/archive"; # successful download cache dir + + +## +# Globals. +# +what=; # package location and name +name=; # direct file name +down=; # direct download URL +okay=; # status of last file downloaded + + +#--------------------------------------------------------------- +# support routines + +## +# try_down +# +# Attempts to download the requested file and name accordingly. +# +# Input: 'name' and 'down' global variables, a file name and URL +# respectively. Redirects are followed during file download. If +# successful, file is moved to a cache. Failures are recorded. +# +try_down () +{ + printf " - %s (%s)\n" "${down}" "${name}"; + + okay=0; + test -f "${name}" && return; + + ## + # Download the file and set global 'okay' to curl retval. + # + curl --connect-timeout 10 -sLo "${TEMP}/${name}" "${down}" || okay=${?}; + + + ## + # The return code may be wrong. Look for HTML documents. + # + file -i "${TEMP}/${name}" | grep 1>/dev/null text/html && okay=-1; + + + ## + # Record any possible failure if new, otherwise delete it. + # + if test ${okay} -ne 0; then + grep 1>/dev/null "${name}" "${SAVE}/_savefail.txt" && return; + printf >> "${SAVE}/_savefail.txt" "%s\t%s %s\n" \ + "${okay}" "${name}" "${down}" \ + ; + return; + else + sed -i "${SAVE}/_savefail.txt" -e "/\b${name}\b/d"; + fi + + + ## + # Successful download; move the file to the cache directory. + # + mv "${TEMP}/${name}" "${name}"; +} + + +## +# get_what APKBUILD +# +# Parses the absolute path of an APKBUILD file (argument) into a +# global 'what' variable updated to contain the category/name of +# the package in question. +# +get_what () +{ + deep=$(echo ${1} | tr -cd '/' | wc -c); + what=$(echo ${1%/APKBUILD} | cut -d'/' -f$((${deep}-1)),${deep}); +} + + +## +# gen_sums +# +# Generates a SHA512 checksum when an entry for the package does +# not already exist. +# +# Input: 'name' and 'down' global variables, a file name and URL +# respectively. Appends two lines to SHA512SUMS file, expected +# and actual. Duplicate lines can be removed to show issues. +# +# Subsequent execution of this script with new input will result +# in an inconsistent sort order, but will not cause breakage. +# +gen_sums () +{ + grep 1>/dev/null "${name}" "${SAVE}/SHA512SUMS" && return; + + printf "%s\n" "${sha512sums}" \ + | grep "${name}" >> "${SAVE}/SHA512SUMS" \ + ; + + sha512sum >> "${SAVE}/SHA512SUMS" "${name}"; +} + + +#--------------------------------------------------------------- +# main loop + +mkdir -p "${SAVE}"; +touch "${SAVE}/_savefail.txt"; +touch "${SAVE}/SHA512SUMS"; + +printf "We will now begin processing matching packages:\n"; + +find "${HERE}/.." -type f -name APKBUILD | sort | while read k; do + + ## + # Source the APKBUILD to set up environment for analysis. + # + . "${k}"; + + + ## + # If a maintainer is specified, filter out non-matches. + # + if test ${#} -eq 1; then + grep 1>/dev/null Maintainer:\ ${1} ${k} || continue; + fi + + + ## + # Determine how many directories deep the APKBUILD file is, + # then print the package name and location. + # + get_what "${k}"; + printf "\n * %s\n" "${what}"; + + + ## + # Each word in the 'source' variable is one of these cases: + # + # 1. FILENAME::URL (contains '//' and '::') + # + # 2. URL (contains '//' and not '::') + # + # 3. FILENAME (does not contain '::' or '//') + # + # We only care about cases 1 and 2; case 3 is ignored. + # + mkdir -p "${SAVE}/${pkgname}-${pkgver}"; + cd "${SAVE}/${pkgname}-${pkgver}"; + for f in ${source}; do + + ## + # Case 1: FILENAME::URL + # + if test $(echo ${f} | grep // | grep ::); then + name=${f%::*}; + down=${f#*::}; + + ## + # Case 2: URL + # + elif test $(echo ${f} | grep // | grep -v ::); then + name=${f##*/}; + down=${f}; + + ## + # Case 3: FILENAME (NOP). + # + else + continue; + fi + + + ## + # Attempt to download the current file. Sets 'okay'. + # + try_down; + test ${okay} -eq 0 || continue; + + + ## + # The file exists; checksum it. + # + gen_sums; + + done + +done + + +#--------------------------------------------------------------- +# analysis + +printf "\nThe following source files failed to download:\n\n"; +cat "${SAVE}/_savefail.txt"; + +printf "\nThe following source files exist but mismatch:\n\n"; +uniq -u "${SAVE}/SHA512SUMS" | tee "${SAVE}/_hashfail.txt"; + + +#--------------------------------------------------------------- +# cleanup + +rm -fr "${TEMP}"; diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 7a0353025..858e842b1 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=curl -pkgver=7.78.0 +pkgver=7.79.1 pkgrel=0 pkgdesc="A URL retrival utility and library" url="https://curl.haxx.se" @@ -105,8 +105,8 @@ build() { check() { # -p: print log contents on test failure - # !1592: requires DNS access - make check TFLAGS='-p !1592' + # ignore: 557: fails under valgrind only + make check TFLAGS='-p ~557' } package() { @@ -119,4 +119,4 @@ libcurl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -sha512sums="f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a curl-7.78.0.tar.xz" +sha512sums="1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d curl-7.79.1.tar.xz" diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD index ef7ba098e..ccc617c40 100644 --- a/system/debianutils/APKBUILD +++ b/system/debianutils/APKBUILD @@ -11,7 +11,8 @@ license="BSD-3-Clause AND GPL-2.0+" depends="coreutils mawk" # awk, cat, and rm are required by add-shell makedepends="grep" # early package, declare these subpackages="$pkgname-doc $pkgname-which::noarch" -source="http://ftp.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.xz" +# find timestamp here: https://snapshot.debian.org/package/debianutils/ +source="https://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.xz" build() { ./configure \ diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc index 93902d2bb..2bd793c17 100644 --- a/system/easy-kernel/config-ppc +++ b/system/easy-kernel/config-ppc @@ -1990,7 +1990,7 @@ CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_PMU=y CONFIG_ADB_PMU_LED=y -CONFIG_ADB_PMU_LED_DISK=y +# CONFIG_ADB_PMU_LED_DISK is not set CONFIG_PMAC_APM_EMU=m CONFIG_PMAC_MEDIABAY=y CONFIG_PMAC_BACKLIGHT=y diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index a0fcc2a88..f24fa4ca2 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.8.0.0 +pkgver=2.8.1.0 pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -62,4 +62,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz" +sha512sums="4e20ff5cd82941914a639abe2481efd93a7ada6d2431b65813793cc7801463179bc1c58ee73e889747038c859e5fd6e7e668b758fa1785da03e549547ca3c94c execline-2.8.1.0.tar.gz" diff --git a/system/expat/APKBUILD b/system/expat/APKBUILD index 4ec70f244..788bf71f3 100644 --- a/system/expat/APKBUILD +++ b/system/expat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=expat -pkgver=2.2.9 +pkgver=2.4.1 pkgrel=0 pkgdesc="XML parser library written in C" url="https://libexpat.github.io/" @@ -13,6 +13,8 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2" # secfixes: +# 2.4.1-r0: +# - CVE-2013-0340 # 2.2.1-r0: # - CVE-2016-9063 # 2.2.0-r1: @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir/" install } -sha512sums="8ea4b89a171dfda8267c8b7a0295516d169bf7f46587ebe460fe0ae7a31478a119ae2a7eaa09b3ce46b107ec7cd2274ea66d91c08b8a4ad6b98ba984cdd4e15b expat-2.2.9.tar.bz2" +sha512sums="b24e19c3f91e0f3d1ad3b08a810b8874e272ddfc6d4fd8f79c14c13eddf410648343b9f69fba2ce165be46c143cecf8d66cf446b4930da42f92def555ecd3408 expat-2.4.1.tar.bz2" diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index 4066aff0b..cc7b0eefa 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -12,7 +12,8 @@ makedepends_host="libcap-dev acl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" checkdepends="bash sharutils" subpackages="$pkgname-doc" -source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz +# find timestamp here: https://snapshot.debian.org/package/fakeroot/ +source="https://snapshot.debian.org/archive/debian/20190908T172415Z/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz fakeroot-hide-dlsym-errors.patch fakeroot-no64.patch fakeroot-stdint.patch diff --git a/system/gzip/APKBUILD b/system/gzip/APKBUILD index 8528c74e6..f619822ed 100644 --- a/system/gzip/APKBUILD +++ b/system/gzip/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=gzip -pkgver=1.10 +pkgver=1.11 pkgrel=0 pkgdesc="The GNU data compression program" subpackages="$pkgname-doc" @@ -45,4 +45,4 @@ package() { ln -sf /bin/gunzip "$pkgdir"/usr/bin/uncompress } -sha512sums="7939043e74554ced0c1c05d354ab4eb36cd6dce89ad79d02ccdc5ed6b7ee390759689b2d47c07227b9b44a62851afe7c76c4cae9f92527d999f3f1b4df1cccff gzip-1.10.tar.gz" +sha512sums="73ab4912a17b7f04eac310f6eafe0ffd696bebebf7e2be5b85828a899e46f630d8a7837d32db9d3b7e3de6b4c06a0c73c5aa85d8591fd41c68fc3a79b56ec655 gzip-1.11.tar.gz" diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index ee22a4922..529af2696 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 -pkgver=5.5.0 +pkgver=5.14.0 pkgrel=0 pkgdesc="Advanced IP routing and network device configuration tools" url="https://wiki.linuxfoundation.org/networking/iproute2" @@ -10,7 +10,8 @@ arch="all" options="!check" license="GPL-2.0-only" depends="" -makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev bsd-compat-headers" +makedepends="bison flex bash db-dev libelf-dev libmnl-dev libcap-dev bsd-compat-headers + libbpf-dev" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz" @@ -24,13 +25,7 @@ prepare() { } build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var + ./configure make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib } @@ -55,4 +50,4 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78 iproute2-5.5.0.tar.xz" +sha512sums="e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c iproute2-5.14.0.tar.xz" diff --git a/system/isl/APKBUILD b/system/isl/APKBUILD index 27509d8cf..710c57a68 100644 --- a/system/isl/APKBUILD +++ b/system/isl/APKBUILD @@ -14,7 +14,7 @@ makedepends_host="$depends_dev" makedepends="$makedepends_host" replaces="cloog" subpackages="$pkgname-dev" -source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/project/libisl/isl-$pkgver.tar.bz2" build() { ./configure \ diff --git a/system/libbpf/10-include-stddef.patch b/system/libbpf/10-include-stddef.patch new file mode 100644 index 000000000..e3fe4d1a9 --- /dev/null +++ b/system/libbpf/10-include-stddef.patch @@ -0,0 +1,12 @@ +diff --git a/src/libbpf.c b/src/libbpf.c +index b38dcbe..bc3ac5d 100644 +--- a/src/libbpf.c ++++ b/src/libbpf.c +@@ -29,6 +29,7 @@ + #include <linux/filter.h> + #include <linux/list.h> + #include <linux/limits.h> ++#include <linux/stddef.h> + #include <linux/perf_event.h> + #include <linux/ring_buffer.h> + #include <sys/stat.h> diff --git a/system/libbpf/20-consolidate-lib-dirs.patch b/system/libbpf/20-consolidate-lib-dirs.patch new file mode 100644 index 000000000..0455ae8de --- /dev/null +++ b/system/libbpf/20-consolidate-lib-dirs.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile 2021-10-06 21:38:50.758641729 +0000 ++++ b/src/Makefile 2021-10-06 21:39:12.096413542 +0000 +@@ -62,7 +62,7 @@ + DESTDIR ?= + + ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),) +- LIBSUBDIR := lib64 ++ LIBSUBDIR := lib + else + LIBSUBDIR := lib + endif diff --git a/system/libbpf/APKBUILD b/system/libbpf/APKBUILD new file mode 100644 index 000000000..296878162 --- /dev/null +++ b/system/libbpf/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=libbpf +pkgver=0.5.0 +pkgrel=0 +pkgdesc="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space" +url="https://github.com/libbpf/libbpf" +arch="all" +options="!check" # no tests +license="LGPL-2.1 OR BSD-2-Clause" +depends="" +makedepends="zlib-dev libelf-dev linux-headers" +subpackages="$pkgname-dev" +source="libbpf-$pkgver.tar.gz::https://github.com/libbpf/libbpf/archive/refs/tags/v$pkgver.tar.gz + 10-include-stddef.patch + 20-consolidate-lib-dirs.patch + " + +build() { + cd src + make +} + +package() { + cd src + make DESTDIR="$pkgdir" install +} + +sha512sums="3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85 libbpf-0.5.0.tar.gz +946e445ffa4c5df42ebac77b7a1c6478b37dc7b55e0883aee195c6a8c4f8718b4dbf98b7c6d3016e1619e59440d8e4a76dad1e843114dfe2f9a2610e5cbb7943 10-include-stddef.patch +9398dd33df9e93f7bd4f68d6bb1da3731075e2f95fdcc3b9cc471e823c2f6700351d458976b804d3f56be50b824a8ce7cda482945a1e78522a3973b22bdbf4d5 20-consolidate-lib-dirs.patch" diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index 77a888240..24eaafdc3 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 -pkgver=2.03.09 +pkgver=2.03.13 pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" @@ -19,6 +19,7 @@ source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz fix-stdio-usage.patch mallinfo.patch mlockall-default-config.patch + add-sys-file.patch lvm.initd lvm.confd dmeventd.initd @@ -38,7 +39,7 @@ build () { export ac_cv_func_malloc_0_nonnull=yes export ac_cv_func_realloc_0_nonnull=yes - ./configure \ + CFLAGS="-DHAVE_SYS_FILE_H" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -87,10 +88,11 @@ udev() { } -sha512sums="8540e46a6025ab14b592ccd9493b3224ffc0f962739a0a8de6d7b25c65c6ad96fc83ddb0e3d877b123a5e1b104476d0c20ccee2ead6d322257ec82ad1e3362d4 LVM2.2.03.09.tgz +sha512sums="8b4fb6da5dd46ddeb754436189072bea79be594fab6d57d9be63c6ce3e3cb68d38601a2c031c493681321281cfb1f1459ace19974c00beb569364f44863cfc4a LVM2.2.03.13.tgz bc4473c2f48ff6cab121f92211cd1b67589a6abadd8e32ffa366fed6ddbf9c87be695aa54a6e97b5b79203bf1a7d22cdb5974da84d38b4977592ef7a061612e7 fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch -d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch +0f1feeddf35a7208a240b13d87f479eeb5410ccb534ccd62714355b10721c4eff77d725c72a2b5270320bef12828c32d60003f187db990fad3fef37ec08c1dff mlockall-default-config.patch +be5236a6b7ab91547603a266620b4f626854e3022036e2ed4b7e64b03941ddef3892804473c3440d913f41f820bccd78281a3979a822cae5c29304e21295ab1a add-sys-file.patch a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd ca06220065525e93347efb7a5746a367cf55cb03574e50eed29bd7c4eae036bdd199b52c42d81811b6e742649e73ab8e66525f663bed66f9d1d82d0efde50332 dmeventd.initd" diff --git a/system/lvm2/add-sys-file.patch b/system/lvm2/add-sys-file.patch new file mode 100644 index 000000000..d21f5cdfc --- /dev/null +++ b/system/lvm2/add-sys-file.patch @@ -0,0 +1,20 @@ +--- ./lib/device/dev-cache.c 2021-10-04 10:26:46.747943865 +0000 ++++ ./lib/device/dev-cache.c 2021-10-04 10:23:55.715876227 +0000 +@@ -29,6 +29,7 @@ + #include <unistd.h> + #include <dirent.h> + #include <locale.h> ++#include <sys/file.h> + + struct dev_iter { + struct btree_iter *current; +--- ./tools/lvmdevices.c 2021-10-04 10:34:16.660694727 +0000 ++++ ./tools/lvmdevices.c 2021-10-04 10:34:33.718908403 +0000 +@@ -16,6 +16,7 @@ + #include "lib/cache/lvmcache.h" + #include "lib/device/device_id.h" + #include "lib/device/dev-type.h" ++#include <sys/file.h> + + static void _search_devs_for_pvids(struct cmd_context *cmd, struct dm_list *search_pvids, struct dm_list *found_devs) + { diff --git a/system/lvm2/mlockall-default-config.patch b/system/lvm2/mlockall-default-config.patch index 1daadeff3..898611ec7 100644 --- a/system/lvm2/mlockall-default-config.patch +++ b/system/lvm2/mlockall-default-config.patch @@ -1,15 +1,14 @@ ---- ./conf/example.conf.in.orig -+++ ./conf/example.conf.in -@@ -1352,7 +1352,7 @@ - # Use the old behavior of mlockall to pin all memory. +--- ./conf/example.conf.in.old 2021-10-04 09:59:13.191167497 +0000 ++++ ./conf/example.conf.in 2021-10-04 09:59:41.718184441 +0000 +@@ -1696,7 +1696,7 @@ # Prior to version 2.02.62, LVM used mlockall() to pin the whole # process's memory while activating devices. -- use_mlockall = 0 + # This configuration option has an automatic default value. +- # use_mlockall = 0 + use_mlockall = 1 # Configuration option activation/monitoring. - # Monitor LVs that are activated. -diff --git a/lib/config/defaults.h b/lib/config/defaults.h + # Monitor LVs that are activated.diff --git a/lib/config/defaults.h b/lib/config/defaults.h index 8ab1fde..57b2443 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h diff --git a/system/lz4/APKBUILD b/system/lz4/APKBUILD index b17306752..522ad2efe 100644 --- a/system/lz4/APKBUILD +++ b/system/lz4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lz4 -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="LZ4: Extremely Fast Compression algorithm" url="https://github.com/lz4/lz4" @@ -15,16 +15,20 @@ case "$CARCH" in armhf) options="!check" ;; # FIXME esac +# secfixes: +# 1.9.3-r0: +# - CVE-2021-3520 + build() { make PREFIX="/usr" } check() { - make test + make -j1 check } package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1 lz4-1.9.2.tar.gz" +sha512sums="c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c lz4-1.9.3.tar.gz" diff --git a/system/lzip/APKBUILD b/system/lzip/APKBUILD index d086f754d..50d1fa90a 100644 --- a/system/lzip/APKBUILD +++ b/system/lzip/APKBUILD @@ -1,7 +1,7 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lzip -pkgver=1.21 +pkgver=1.22 pkgrel=0 pkgdesc="Lossless data compressor" url="https://www.nongnu.org/lzip/lzip.html" @@ -28,4 +28,4 @@ package() { make DESTDIR=$pkgdir install } -sha512sums="02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362 lzip-1.21.tar.gz" +sha512sums="318de74effdbdfa79070d28919459a85bf1efe662b818b8af2a3daa964b6c24e3386c37de360c6d5b8b624d549b5c9ed777c6234561129c477e03d92ac2db206 lzip-1.22.tar.gz" diff --git a/system/man-pages/APKBUILD b/system/man-pages/APKBUILD index 81f54970d..311e8aecd 100644 --- a/system/man-pages/APKBUILD +++ b/system/man-pages/APKBUILD @@ -11,7 +11,7 @@ options="!strip !check" # just manpages license="GPL-2.0+ AND POSIX" depends="" makedepends="" -source="https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.xz +source="https://cdn.kernel.org/pub/linux/docs/$pkgname/Archive/$pkgname-$pkgver.tar.xz https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.xz " diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index 36128c5cb..945aad789 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd -pkgver=0.1.3.0 +pkgver=0.1.5.0 pkgrel=0 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc $pkgname-openrc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd" @@ -47,7 +47,7 @@ openrc() { ln -s ../../init.d/mdevd "$rldir/mdevd" } -sha512sums="8f7b922f6ce8b4dad2dd0e395034f068d950501fe166609da31b5fd7110e938e91e537f6c5e5271043cb24864955aff21f708b80aeea83c9502cce280376c17c mdevd-0.1.3.0.tar.gz -b237443837c3d76f8964e2b1a48c2278af7b4a4e7f735da6fc861b7598cbf50017e961e5a4fd1f20dd9cb7dd46f4cdf68144539d909b1f245e110b75c2d849db mdev.conf +sha512sums="1c615b136ac5b14f85cadc747a89068e089420bb6b5413ac9c402d3308d7ae46b94b3d3f66f3fc45500de0a3bba4687eaf1fd8a165e6ade3521dc8a5f3184b52 mdevd-0.1.5.0.tar.gz +ebc44034663423acfa403856e591b224c3aac180407fa679182f8b42ab2730592be677446ef109c15c3aedb821345f5f9fb0e38ea21a42871a46dcc1e1c37706 mdev.conf 31231b28d0b980dda634e8b043a2ee31960493d60c2c9aac8a4f3f68ca1d130342569af2acd0bc04d9d8008b8e234ba949b64d9ec3ff1bded64b4e4f0ce3786b mdevd.run -f6f9eebf49c2de6abde9cfb7a9d7b3a6b3afdd3e01ba4155f1b95dfa27e522363059b69cec19305881773d776ffeccf6c1106d537d01780468bd3b9846edb2cc mdevd.initd" +3b22077f867a07493284bf1d0c0f1ec5c4359d6f6e7313ce917e354b275286833136defd3eddde967257e3dd255c7581f096bcf2f345553ce6db088296abb41f mdevd.initd" diff --git a/system/mdevd/mdev.conf b/system/mdevd/mdev.conf index 49f040ca2..17b0280a7 100644 --- a/system/mdevd/mdev.conf +++ b/system/mdevd/mdev.conf @@ -34,7 +34,7 @@ md[0-9]* root:disk 0660 # */opt/mdev/helpers/storage-device dm-[0-9]* root:disk 0660 # */opt/mdev/helpers/storage-device bcache[0-9]* root:disk 0660 # */opt/mdev/helpers/storage-device mmcblk[0-9].* root:disk 0660 # */opt/mdev/helpers/storage-device -sr[0-9]* root:cdrom 0660 @ln -sf $MDEV cdrom +sr[0-9]* root:cdrom 0660 +ln -sf $MDEV cdrom # Run settle-nics every time new NIC appear. # If you don't want to auto-populate /etc/mactab with NICs, run 'settle-nics' without '--write-mactab' param. @@ -60,7 +60,7 @@ rd!(.*) root:disk 0660 =rd/%1 agpgart root:root 0660 # >misc/ psaux root:root 0660 # >misc/ -rtc[0-9]* root:root 0600 @ln -sf $MDEV rtc +rtc[0-9]* root:root 0600 +ln -sf $MDEV rtc # input stuff SUBSYSTEM=input;.* root:input 0660 diff --git a/system/mdevd/mdevd.initd b/system/mdevd/mdevd.initd index 3f6bccf86..28c34b796 100644 --- a/system/mdevd/mdevd.initd +++ b/system/mdevd/mdevd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2019 Adélie Linux +# Copyright 2019-2021 Adélie Linux description="mdevd manages device permissions and symbolic links in /dev" extra_started_commands="reload" diff --git a/system/net-tools/APKBUILD b/system/net-tools/APKBUILD index cb33d5c48..2b95aecc0 100644 --- a/system/net-tools/APKBUILD +++ b/system/net-tools/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=net-tools -pkgver=1.60_git20140218 -_ver=${pkgver%_git*} -pkgrel=3 +pkgver=2.10 +pkgrel=0 pkgdesc="Linux networking base tools" url="https://sourceforge.net/projects/net-tools/" arch="all" @@ -13,11 +12,7 @@ depends="mii-tool" depends_dev="" makedepends="$depends_dev bash linux-headers" subpackages="$pkgname-doc $pkgname-lang $pkgname-dbg mii-tool:mii_tool" -source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$_ver.tar.bz2 - git.patch - musl-fixes.patch - " -builddir="$srcdir"/$pkgname-$_ver +source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.xz" prepare() { default_prepare @@ -79,6 +74,4 @@ mii_tool() { mv "$pkgdir"/sbin/mii-tool "$subpkgdir"/sbin/ } -sha512sums="8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae net-tools-1.60.tar.bz2 -5edc92e8cf46da11898ac1999cfccb5b7ae3407f649c75c2da43c4264e1271b010eafbc84283e4c41219870bf89722e09666b25d28c84cb4ac60ceebee9adb2d git.patch -08c9e7681e069a42f4da714faf0b93ad1c569cf942a94a1b41103e86850235b507c0291e2f3839c84dd02aba0b1a16d79580fbfc55dd2af8d09b0ff71d714e9f musl-fixes.patch" +sha512sums="aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf net-tools-2.10.tar.xz" diff --git a/system/net-tools/git.patch b/system/net-tools/git.patch deleted file mode 100644 index eb35885e8..000000000 --- a/system/net-tools/git.patch +++ /dev/null @@ -1,26170 +0,0 @@ -diff --git a/.cvsignore b/.cvsignore -index 1d4a063..ff65062 100644 ---- a/.cvsignore -+++ b/.cvsignore -@@ -1,2 +1,3 @@ - arp hostname ifconfig ipmaddr iptunnel netstat plipconfig rarp route slattach - version.h config.make config.status config.h nameif mii-tool -+.git -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..9184162 ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,36 @@ -+*.o -+ -+*.diff -+*.patch -+*.rej -+*.orig -+ -+.gdb_history -+.gdbinit -+core -+*.gdb -+ -+/config.h -+/config.make -+/config.status -+ -+/net-tools-*.tar* -+ -+/lib/libnet-tools.a -+ -+/po/*.mo -+ -+/version.h -+ -+/arp -+/hostname -+/ifconfig -+/ipmaddr -+/iptunnel -+/mii-tool -+/nameif -+/netstat -+/plipconfig -+/rarp -+/route -+/slattach -diff --git a/COPYING b/COPYING -index a43ea21..d159169 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 675 Mass Ave, Cambridge, MA 02139, USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. -- -- GNU GENERAL PUBLIC LICENSE -+ -+ GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -- -+ - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. -- -+ - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ impose that choice. - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. -- -+ - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- Appendix: How to Apply These Terms to Your New Programs -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it -@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least - the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> -- Copyright (C) 19yy <name of author> -+ Copyright (C) <year> <name of author> - - 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 -@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. - 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, write to the Free Software -- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) 19yy name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -@@ -335,5 +335,5 @@ necessary. Here is a sample; alter the names: - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the --library. If this is what you want to do, use the GNU Library General -+library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. -diff --git a/INSTALLING b/INSTALLING -index c49f21f..f6180c8 100644 ---- a/INSTALLING -+++ b/INSTALLING -@@ -27,7 +27,7 @@ of the other options should work as well. - - - COMPILE --------- -+------- - To compile simply use "make". - - There should be no warnings or errors. -diff --git a/Makefile b/Makefile -index 8fcc55c..edf80ec 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,14 +5,10 @@ - # NET-3 Networking Distribution for the LINUX operating - # system. - # --# Version: 2001-02-13 --# - # Author: Bernd Eckenfels <net-tools@lina.inka.de> - # Copyright 1995-1996 Bernd Eckenfels, Germany - # --# URLs: ftp://ftp.inka.de/pub/comp/Linux/networking/NetTools/ --# ftp://ftp.linux.org.uk/pub/linux/Networking/PROGRAMS/NetTools/ --# http://www.inka.de/sites/lina/linux/NetTools/index_en.html -+# URLs: http://net-tools.sourceforge.net/ - # - # Based on: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - # Copyright 1988-1993 MicroWalt Corporation -@@ -22,55 +18,16 @@ - # Alan Cox <A.Cox@swansea.ac.uk> - # Copyright 1993-1994 Swansea University Computer Society - # --# Be careful! -+# Be careful! - # This Makefile doesn't describe complete dependencies for all include files. --# If you change include files you might need to do make clean. --# --# {1.20} Bernd Eckenfels: Even more modifications for the new --# package layout --# {1.21} Bernd Eckenfels: Check if config.in is newer than --# config.status --# {1.22} Bernd Eckenfels: Include ypdomainname and nisdomainame --# --# 1.3.50-BETA6 private Release --# --#960125 {1.23} Bernd Eckenfels: Peter Tobias' rewrite for --# makefile-based installation --# 1.3.50-BETA6a private Release --# --#960201 {1.24} Bernd Eckenfels: net-features.h added --# --#960201 1.3.50-BETA6b private Release --# --#960203 1.3.50-BETA6c private Release --# --#960204 1.3.50-BETA6d private Release --# --#960204 {1.25} Bernd Eckenfels: DISTRIBUTION added --# --#960205 1.3.50-BETA6e private Release --# --#960206 {1.26} Bernd Eckenfels: afrt.o removed (cleaner solution) --# --#960215 1.3.50-BETA6f Release --# --#960216 {1.30} Bernd Eckenfels: net-lib support --#960322 {1.31} Bernd Eckenfels: moveable netlib, TOPDIR --#960424 {1.32} Bernd Eckenfels: included the URLs in the Comment --# --#960514 1.31-alpha release --# --#960518 {1.33} Bernd Eckenfels: -I/usr/src/linux/include comment added --# --# 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 2 of the License, or (at --# your option) any later version. -+# If you change include files you might need to do make clean. - # - --# set the base of the Installation -+# set the base of the Installation - # BASEDIR = /mnt -+BASEDIR ?= $(DESTDIR) -+BINDIR ?= /bin -+SBINDIR ?= /sbin - - # path to the net-lib support library. Default: lib - NET_LIB_PATH = lib -@@ -88,20 +45,26 @@ endif - - # Compiler and Linker Options - # You may need to uncomment and edit these if you are using libc5 and IPv6. --COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include --ifeq ($(origin LOPTS), undefined) --LOPTS = --endif -+CFLAGS ?= -O2 -g -+CFLAGS += -Wall -+CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe -+CPPFLAGS += -D_GNU_SOURCE - RESLIB = # -L/usr/inet6/lib -linet6 - - ifeq ($(HAVE_AFDECnet),1) - DNLIB = -ldnet - endif - -+ifeq ($(origin CC), undefined) -+CC = gcc -+endif -+LD = $(CC) -+PKG_CONFIG ?= pkg-config -+ - # -------- end of user definitions -------- - --MAINTAINER = Philip.Blundell@pobox.com --RELEASE = 1.60 -+MAINTAINER = net-tools-devel@lists.sourceforge.net -+RELEASE = 2.10-alpha - - .EXPORT_ALL_VARIABLES: - -@@ -113,22 +76,22 @@ endif - - NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a - --CFLAGS = $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) --LDFLAGS = $(LOPTS) -L$(NET_LIB_PATH) -+ifeq ($(HAVE_SELINUX),1) -+SE_PC_CFLAGS := $(shell $(PKG_CONFIG) --cflags libselinux) -+SE_PC_LIBS := $(shell $(PKG_CONFIG) --libs libselinux || echo -lselinux) -+SELIB = $(SE_PC_LIBS) -+CPPFLAGS += $(SE_PC_CFLAGS) -+endif - --SUBDIRS = man/ $(NET_LIB_PATH)/ -+CPPFLAGS += -I. -I$(TOPDIR)/include -I$(NET_LIB_PATH) -+LDFLAGS += -L$(NET_LIB_PATH) - --ifeq ($(origin CC), undefined) --CC = gcc --endif --LD = $(CC) -+SUBDIRS = man/ $(NET_LIB_PATH)/ - - NLIB = -l$(NET_LIB_NAME) - --MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)' -- --%.o: %.c config.h version.h intl.h net-features.h $< -- $(CC) $(CFLAGS) -c $< -+%.o: %.c config.h version.h intl.h lib/net-features.h $< -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - - all: config.h version.h subdirs $(PROGS) - -@@ -154,12 +117,21 @@ clobber: clean - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) clobber) ; done - - --dist: clobber -- @echo Creating net-tools-$(RELEASE) in .. -- @tar -cvz -f ../net-tools-$(RELEASE).tar.gz -C .. net-tools -+dist: -+ rm -rf net-tools-$(RELEASE) -+ git archive --prefix=net-tools-$(RELEASE)/ HEAD | tar xf - -+ $(MAKE) -C net-tools-$(RELEASE)/po $@ -+ tar cf - net-tools-$(RELEASE)/ | xz > net-tools-$(RELEASE).tar.xz -+ rm -rf net-tools-$(RELEASE) - -+distcheck: dist -+ tar xf net-tools-$(RELEASE).tar.xz -+ yes "" | $(MAKE) -C net-tools-$(RELEASE) config -+ $(MAKE) -C net-tools-$(RELEASE) -+ rm -rf net-tools-$(RELEASE) -+ @printf "\nThe tarball is ready to go:\n%s\n" "`du -b net-tools-$(RELEASE).tar.xz`" - --config.h: config.in Makefile -+config.h: config.in Makefile - @echo "Configuring the Linux net-tools (NET-3 Base Utilities)..." ; echo - @if [ config.status -nt config.in ]; \ - then ./configure.sh config.status; \ -@@ -175,85 +147,91 @@ $(NET_LIB): config.h version.h intl.h libdir - - i18n.h: i18ndir - --libdir: -- @$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES) -+libdir: version.h -+ @$(MAKE) -C $(NET_LIB_PATH) - - i18ndir: - @$(MAKE) -C po - --subdirs: -- @for i in $(SUBDIRS); do $(MAKE) -C $$i $(MDEFINES) ; done -+# use libdir target for lib/ to avoid parallel build issues -+subdirs: libdir -+ @for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done - - ifconfig: $(NET_LIB) ifconfig.o -- $(CC) $(LDFLAGS) -o ifconfig ifconfig.o $(NLIB) $(RESLIB) -- --nameif: nameif.o -- $(CC) $(LDFLAGS) -o nameif nameif.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB) $(RESLIB) -+ -+nameif: $(NET_LIB) nameif.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(RESLIB) - - hostname: hostname.o -- $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) - - route: $(NET_LIB) route.o -- $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(RESLIB) - - arp: $(NET_LIB) arp.o -- $(CC) $(LDFLAGS) -o arp arp.o $(NLIB) $(RESLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB) $(RESLIB) - - rarp: $(NET_LIB) rarp.o -- $(CC) $(LDFLAGS) -o rarp rarp.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB) - - slattach: $(NET_LIB) slattach.o -- $(CC) $(LDFLAGS) -o slattach slattach.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(NLIB) - - plipconfig: $(NET_LIB) plipconfig.o -- $(CC) $(LDFLAGS) -o plipconfig plipconfig.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB) - - netstat: $(NET_LIB) netstat.o statistics.o -- $(CC) $(LDFLAGS) -o netstat netstat.o statistics.o $(NLIB) $(RESLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(RESLIB) $(SELIB) - - iptunnel: $(NET_LIB) iptunnel.o -- $(CC) $(LDFLAGS) -o iptunnel iptunnel.o $(NLIB) $(RESLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB) $(RESLIB) - - ipmaddr: $(NET_LIB) ipmaddr.o -- $(CC) $(LDFLAGS) -o ipmaddr ipmaddr.o $(NLIB) $(RESLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB) $(RESLIB) - --mii-tool: mii-tool.o -- $(CC) $(LDFLAGS) -o mii-tool mii-tool.o -+mii-tool: $(NET_LIB) mii-tool.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(RESLIB) - - installbin: -- install -m 0755 -d ${BASEDIR}/sbin -- install -m 0755 -d ${BASEDIR}/bin -- install -m 0755 arp ${BASEDIR}/sbin -- install -m 0755 hostname ${BASEDIR}/bin -- install -m 0755 ifconfig ${BASEDIR}/sbin -- install -m 0755 nameif ${BASEDIR}/sbin -- install -m 0755 netstat ${BASEDIR}/bin -- install -m 0755 plipconfig $(BASEDIR)/sbin -- install -m 0755 rarp ${BASEDIR}/sbin -- install -m 0755 route ${BASEDIR}/sbin -- install -m 0755 slattach $(BASEDIR)/sbin -+ @echo -+ @echo "######################################################" -+ @echo "Notice: ifconfig and route are now installed into /bin" -+ @echo "######################################################" -+ @echo -+ install -m 0755 -d ${BASEDIR}${SBINDIR} -+ install -m 0755 -d ${BASEDIR}${BINDIR} -+ install -m 0755 arp ${BASEDIR}${SBINDIR} -+ install -m 0755 hostname ${BASEDIR}${BINDIR} -+ install -m 0755 ifconfig ${BASEDIR}${BINDIR} -+ install -m 0755 nameif ${BASEDIR}${SBINDIR} -+ install -m 0755 netstat ${BASEDIR}${BINDIR} -+ install -m 0755 plipconfig $(BASEDIR)${SBINDIR} -+ install -m 0755 rarp ${BASEDIR}${SBINDIR} -+ install -m 0755 route ${BASEDIR}${BINDIR} -+ install -m 0755 slattach $(BASEDIR)${SBINDIR} - ifeq ($(HAVE_IP_TOOLS),1) -- install -m 0755 ipmaddr $(BASEDIR)/sbin -- install -m 0755 iptunnel $(BASEDIR)/sbin -+ install -m 0755 ipmaddr $(BASEDIR)${SBINDIR} -+ install -m 0755 iptunnel $(BASEDIR)${SBINDIR} - endif - ifeq ($(HAVE_MII),1) -- install -m 0755 mii-tool $(BASEDIR)/sbin -+ install -m 0755 mii-tool $(BASEDIR)${SBINDIR} - endif -- ln -fs hostname $(BASEDIR)/bin/dnsdomainname -- ln -fs hostname $(BASEDIR)/bin/ypdomainname -- ln -fs hostname $(BASEDIR)/bin/nisdomainname -- ln -fs hostname $(BASEDIR)/bin/domainname -+ ln -fs hostname $(BASEDIR)${BINDIR}/dnsdomainname -+ ln -fs hostname $(BASEDIR)${BINDIR}/ypdomainname -+ ln -fs hostname $(BASEDIR)${BINDIR}/nisdomainname -+ ln -fs hostname $(BASEDIR)${BINDIR}/domainname - ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename -+ ln -fs hostname $(BASEDIR)${BINDIR}/nodename - endif - - savebin: -- @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ -- ${BASEDIR}/bin/netstat \ -- ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ -- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ -- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ -- ${BASEDIR}/bin/domainname ; do \ -+ @for i in ${BASEDIR}${SBINDIR}/arp ${BASEDIR}${SBINDIR}/ifconfig \ -+ ${BASEDIR}${BINDIR}/netstat \ -+ ${BASEDIR}${SBINDIR}/rarp ${BASEDIR}${SBINDIR}/route \ -+ ${BASEDIR}${BINDIR}/hostname ${BASEDIR}${BINDIR}/ypdomainname \ -+ ${BASEDIR}${BINDIR}/dnsdomainname ${BASEDIR}${BINDIR}/nisdomainname \ -+ ${BASEDIR}${BINDIR}/domainname ; do \ - [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. - - installdata: -diff --git a/README b/README -index 4e35868..aa6cc9a 100644 ---- a/README -+++ b/README -@@ -10,29 +10,35 @@ This package includes the important tools for controlling the network - subsystem of the Linux kernel. This includes arp, hostname, ifconfig, - netstat, rarp and route. Additionally, this package contains - utilities relating to particular network hardware types (plipconfig, --slattach) and advanced aspects of IP configuration (iptunnel, -+slattach, mii-tool) and advanced aspects of IP configuration (iptunnel, - ipmaddr). - - Please include the output of "program --version" when reporting bugs. - - - Contents: -- -+ - README This file. - - README.ipv6 Notes for people hacking IPv6. - - INSTALLING Installation instructions. - -- COPYING Your free copy of the GNU Public License. -+ COPYING Your free copy of the GNU General Public License. - - TODO Some things that need to be done. - -+The Homepage (including Git repository, release downloads, bug tracker and -+mailing list) is hosted by SourceForge.net. Please consider to -+join the project if you want to contribute: -+ -+ https://sourceforge.net/projects/net-tools/ -+ - - Notes - ----- - --This is net-tools 1.60. -+This is net-tools 1.6x. - - You need kernel 2.0 or later to use these programs. These programs - should compile cleanly with both glibc (version 2.0 or 2.1) and libc5, -@@ -59,6 +65,8 @@ all common environments but some of the more esoteric hardware and - protocol families may be more touchy. Feel free to send patches if - you have problems. - -+For this release, the localized man pages are installed with UTF-8 encoding. -+ - Phil Blundell - philb@gnu.org - -diff --git a/RPM/net-tools.spec b/RPM/net-tools.spec -index 86b45db..b12f785 100644 ---- a/RPM/net-tools.spec -+++ b/RPM/net-tools.spec -@@ -34,7 +34,7 @@ make BASEDIR=$RPM_BUILD_ROOT install - strip arp ifconfig rarp route slattach plipconfig ipmaddr iptunnel - cd ../bin - strip hostname netstat --) -+) - - %clean - rm -rf $RPM_BUILD_ROOT -@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT - * Fri Feb 27 1998 Jason Spangler <jasons@usemail.com> - - changed to net-tools 1.432 - - removed old glibc 2.1 patch -- -+ - * Wed Oct 22 1997 Erik Troan <ewt@redhat.com> - - added extra patches for glibc 2.1 - -diff --git a/TODO b/TODO -index ec6aae8..c8a10dc 100644 ---- a/TODO -+++ b/TODO -@@ -23,7 +23,7 @@ TODO for net-tools - [ ] supply some informations about new features to HOWTOs - [ ] Config file only works with bash not ash. - [ ] Token ring is almost totally untested. --[ ] additional tools for IPX, AX.25 etc be bundled [ipxripd004, ipx_* tools -+[ ] additional tools for IPX, AX.25 etc be bundled [ipxripd004, ipx_* tools - from caldera, axattach] into existing bins - [ ] "SIOCAX25OPTRT" [Joerg (DL1BKE)]. 1.3.75 - [ ] dummy NOARP?! (2. default route for preveting hostunreachables on linedrop) -diff --git a/arp.c b/arp.c -index 509a804..5db71a7 100644 ---- a/arp.c -+++ b/arp.c -@@ -8,7 +8,7 @@ - * NET-3 Networking Distribution for the LINUX operating - * system. - * -- * Version: $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $ -+ * Version: $Id: arp.c,v 1.27 2009/09/06 22:50:11 vapier Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -20,14 +20,14 @@ - * Andrew Tridgell : proxy arp netmasks - * Bernd Eckenfels : -n option - * Bernd Eckenfels : Use only /proc for display -- * {1.60} Bernd Eckenfels : new arpcode (-i) for 1.3.42 but works -+ * {1.60} Bernd Eckenfels : new arpcode (-i) for 1.3.42 but works - * with 1.2.x, too - * {1.61} Bernd Eckenfels : more verbose messages - * {1.62} Bernd Eckenfels : check -t for hw adresses and try to - * explain EINVAL (jeff) - *970125 {1.63} Bernd Eckenfels : -a print hardwarename instead of tiltle - *970201 {1.64} Bernd Eckenfels : net-features.h support -- *970203 {1.65} Bernd Eckenfels : "#define" in "#if", -+ *970203 {1.65} Bernd Eckenfels : "#define" in "#if", - * -H|-A additional to -t|-p - *970214 {1.66} Bernd Eckenfels : Fix optarg required for -H and -A - *970412 {1.67} Bernd Eckenfels : device=""; is default -@@ -35,7 +35,7 @@ - *970517 {1.69} Bernd Eckenfels : usage() fixed - *970622 {1.70} Bernd Eckenfels : arp -d priv - *970106 {1.80} Bernd Eckenfels : new syntax without -D and with "dev <If>", -- * ATF_MAGIC, ATF_DONTPUB support. -+ * ATF_MAGIC, ATF_DONTPUB support. - * Typo fix (Debian Bug#5728 Giuliano Procida) - *970803 {1.81} Bernd Eckenfels : removed junk comment line 1 - *970925 {1.82} Bernd Eckenfels : include fix for libc6 -@@ -80,7 +80,7 @@ - #define FEATURE_ARP - #include "lib/net-features.h" - --char *Release = RELEASE, *Version = "arp 1.88 (2001-04-04)"; -+static char *Release = RELEASE; - - int opt_n = 0; /* do not resolve addresses */ - int opt_N = 0; /* use symbolic names */ -@@ -100,9 +100,10 @@ static int arp_del(char **args) - { - char host[128]; - struct arpreq req; -- struct sockaddr sa; -+ struct sockaddr_storage ss; -+ struct sockaddr *sa; - int flags = 0; -- int err; -+ int deleted = 0; - - memset((char *) &req, 0, sizeof(req)); - -@@ -112,12 +113,13 @@ static int arp_del(char **args) - return (-1); - } - safe_strncpy(host, *args, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -+ sa = (struct sockaddr *)&ss; -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } - /* If a host has more than one address, use the correct one! */ -- memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr)); -+ memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr)); - - if (hw_set) - req.arp_ha.sa_family = hw->type; -@@ -148,7 +150,7 @@ static int arp_del(char **args) - continue; - } - if (!strcmp(*args, "dontpub")) { --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - req.arp_flags |= ATF_DONTPUB; - #else - ENOSUPP("arp", "ATF_DONTPUB"); -@@ -157,7 +159,7 @@ static int arp_del(char **args) - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - req.arp_flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -176,12 +178,12 @@ static int arp_del(char **args) - if (*++args == NULL) - usage(); - if (strcmp(*args, "255.255.255.255") != 0) { -- strcpy(host, *args); -- if (ap->input(0, host, &sa) < 0) { -+ safe_strncpy(host, *args, (sizeof host)); -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } -- memcpy((char *) &req.arp_netmask, (char *) &sa, -+ memcpy((char *) &req.arp_netmask, (char *) sa, - sizeof(struct sockaddr)); - req.arp_flags |= ATF_NETMASK; - } -@@ -190,35 +192,41 @@ static int arp_del(char **args) - } - usage(); - } -+ -+ // if neighter priv nor pub is given, work on both - if (flags == 0) - flags = 3; - -- strcpy(req.arp_dev, device); -+ safe_strncpy(req.arp_dev, device, sizeof(req.arp_dev)); - -- err = -1; -+ /* unfortuatelly the kernel interface does not allow us to -+ delete private entries anlone, so we need this hack -+ to avoid "not found" errors if we try both. */ -+ deleted = 0; - - /* Call the kernel. */ - if (flags & 2) { - if (opt_v) -- fprintf(stderr, "arp: SIOCDARP(nopub)\n"); -- if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) { -- if (errno == ENXIO) { -+ fprintf(stderr, "arp: SIOCDARP(dontpub)\n"); -+ if (ioctl(sockfd, SIOCDARP, &req) < 0) { -+ if ((errno == ENXIO) || (errno == ENOENT)) { - if (flags & 1) -- goto nopub; -+ goto dontpub; - printf(_("No ARP entry for %s\n"), host); - return (-1); - } -- perror("SIOCDARP(priv)"); -+ perror("SIOCDARP(dontpub)"); - return (-1); -- } -+ } else -+ deleted = 1; - } -- if ((flags & 1) && (err)) { -- nopub: -+ if (!deleted && (flags & 1)) { -+ dontpub: - req.arp_flags |= ATF_PUBL; - if (opt_v) - fprintf(stderr, "arp: SIOCDARP(pub)\n"); - if (ioctl(sockfd, SIOCDARP, &req) < 0) { -- if (errno == ENXIO) { -+ if ((errno == ENXIO) || (errno == ENOENT)) { - printf(_("No ARP entry for %s\n"), host); - return (-1); - } -@@ -235,7 +243,7 @@ static int arp_getdevhw(char *ifname, struct sockaddr *sa, struct hwtype *hw) - struct ifreq ifr; - struct hwtype *xhw; - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) < 0) { - fprintf(stderr, _("arp: cant get HW-Address for `%s': %s.\n"), ifname, strerror(errno)); - return (-1); -@@ -260,7 +268,8 @@ static int arp_set(char **args) - { - char host[128]; - struct arpreq req; -- struct sockaddr sa; -+ struct sockaddr_storage ss; -+ struct sockaddr *sa; - int flags; - - memset((char *) &req, 0, sizeof(req)); -@@ -271,12 +280,13 @@ static int arp_set(char **args) - return (-1); - } - safe_strncpy(host, *args++, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -+ sa = (struct sockaddr *)&ss; -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } - /* If a host has more than one address, use the correct one! */ -- memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr)); -+ memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr)); - - /* Fetch the hardware address. */ - if (*args == NULL) { -@@ -317,7 +327,7 @@ static int arp_set(char **args) - continue; - } - if (!strcmp(*args, "dontpub")) { --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - flags |= ATF_DONTPUB; - #else - ENOSUPP("arp", "ATF_DONTPUB"); -@@ -326,7 +336,7 @@ static int arp_set(char **args) - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -345,12 +355,12 @@ static int arp_set(char **args) - if (*++args == NULL) - usage(); - if (strcmp(*args, "255.255.255.255") != 0) { -- strcpy(host, *args); -- if (ap->input(0, host, &sa) < 0) { -+ safe_strncpy(host, *args, (sizeof host)); -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } -- memcpy((char *) &req.arp_netmask, (char *) &sa, -+ memcpy((char *) &req.arp_netmask, (char *) sa, - sizeof(struct sockaddr)); - flags |= ATF_NETMASK; - } -@@ -363,7 +373,7 @@ static int arp_set(char **args) - /* Fill in the remainder of the request. */ - req.arp_flags = flags; - -- strcpy(req.arp_dev, device); -+ safe_strncpy(req.arp_dev, device, sizeof(req.arp_dev)); - - /* Call the kernel. */ - if (opt_v) -@@ -424,7 +434,7 @@ static int arp_file(char *name) - - - /* Print the contents of an ARP request block. */ --static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mask, char *dev) -+static void arp_disp_2(const char *name, int type, int arp_flags, const char *hwa, const char *mask, const char *dev) - { - static int title = 0; - struct hwtype *xhw; -@@ -445,11 +455,11 @@ static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mas - strcat(flags, "M"); - if (arp_flags & ATF_PUBL) - strcat(flags, "P"); --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - if (arp_flags & ATF_MAGIC) - strcat(flags, "A"); - #endif --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - if (arp_flags & ATF_DONTPUB) - strcat(flags, "!"); - #endif -@@ -463,7 +473,7 @@ static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mas - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("%-8.8s%-20.20s", "*", "*"); -+ printf("%-8.8s%-20.20s", "*", _("<from_interface>")); - else - printf("%-8.8s%-20.20s", "", _("(incomplete)")); - } else { -@@ -474,7 +484,7 @@ static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mas - } - - /* Print the contents of an ARP request block. */ --static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, char *mask, char *dev) -+static void arp_disp(const char *name, const char *ip, int type, int arp_flags, const char *hwa, const char *mask, const char *dev) - { - struct hwtype *xhw; - -@@ -486,7 +496,7 @@ static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, c - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("* "); -+ printf("<from_interface> "); - else - printf(_("<incomplete> ")); - } else { -@@ -499,12 +509,12 @@ static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, c - if (arp_flags & ATF_PERM) - printf("PERM "); - if (arp_flags & ATF_PUBL) -- printf("PUP "); --#ifdef HAVE_ATF_MAGIC -+ printf("PUB "); -+#ifdef ATF_MAGIC - if (arp_flags & ATF_MAGIC) - printf("AUTO "); - #endif --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - if (arp_flags & ATF_DONTPUB) - printf("DONTPUB "); - #endif -@@ -519,7 +529,8 @@ static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, c - static int arp_show(char *name) - { - char host[100]; -- struct sockaddr sa; -+ struct sockaddr_storage ss; -+ struct sockaddr *sa; - char ip[100]; - char hwa[100]; - char mask[100]; -@@ -527,19 +538,20 @@ static int arp_show(char *name) - char dev[100]; - int type, flags; - FILE *fp; -- char *hostname; -+ const char *hostname; - int num, entries = 0, showed = 0; - - host[0] = '\0'; - -+ sa = (struct sockaddr *)&ss; - if (name != NULL) { - /* Resolve the host name. */ - safe_strncpy(host, name, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } -- safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host)); -+ safe_strncpy(host, ap->sprint(sa, 1), sizeof(host)); - } - /* Open the PROCps kernel table. */ - if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) { -@@ -548,11 +560,11 @@ static int arp_show(char *name) - } - /* Bypass header -- read until newline */ - if (fgets(line, sizeof(line), fp) != (char *) NULL) { -- strcpy(mask, "-"); -- strcpy(dev, "-"); -+ safe_strncpy(mask, "-", sizeof(mask)); -+ safe_strncpy(dev, "-", sizeof(dev)); - /* Read the ARP cache entries. */ - for (; fgets(line, sizeof(line), fp);) { -- num = sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n", -+ num = sscanf(line, "%s 0x%x 0x%x %99s %99s %99s\n", - ip, &type, &flags, hwa, mask, dev); - if (num < 4) - break; -@@ -575,10 +587,10 @@ static int arp_show(char *name) - if (opt_n) - hostname = "?"; - else { -- if (ap->input(0, ip, &sa) < 0) -+ if (ap->input(0, ip, sa) < 0) - hostname = ip; - else -- hostname = ap->sprint(&sa, opt_n | 0x8000); -+ hostname = ap->sprint(sa, opt_n | 0x8000); - if (strcmp(hostname, ip) == 0) - hostname = "?"; - } -@@ -605,20 +617,20 @@ static int arp_show(char *name) - - static void version(void) - { -- fprintf(stderr, "%s\n%s\n%s\n", Release, Version, Features); -+ fprintf(stderr, "%s\n%s\n", Release, Features); - exit(E_VERSION); - } - - static void usage(void) - { - fprintf(stderr, _("Usage:\n arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP cache\n")); -- fprintf(stderr, _(" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP entry\n")); -- fprintf(stderr, _(" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from file\n")); -- fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add entry\n")); -- fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub <-''-\n")); -- fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub <-''-\n\n")); -- -+ fprintf(stderr, _(" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP entry\n")); -+ fprintf(stderr, _(" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from file\n")); -+ fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add entry\n")); -+ fprintf(stderr, _(" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub <-''-\n\n")); -+ - fprintf(stderr, _(" -a display (all) hosts in alternative (BSD) style\n")); -+ fprintf(stderr, _(" -e display (all) hosts in default (Linux) style\n")); - fprintf(stderr, _(" -s, --set set a new ARP entry\n")); - fprintf(stderr, _(" -d, --delete delete a specified entry\n")); - fprintf(stderr, _(" -v, --verbose be verbose\n")); -diff --git a/config.in b/config.in -index f3310d6..e080937 100644 ---- a/config.in -+++ b/config.in -@@ -1,5 +1,5 @@ - # --# config.in Configure.sh source for the net-tools. -+# config.in configure.sh source for the net-tools. - # This file contains the definition of what the support - # library contains. Most of all, it defines which types - # of address families and hardware we know of. -@@ -46,19 +46,20 @@ bool 'Does your system support GNU gettext?' I18N n - * - * - * Protocol Families. --* -+* - bool 'UNIX protocol family' HAVE_AFUNIX y - bool 'INET (TCP/IP) protocol family' HAVE_AFINET y --bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n -+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y - bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y - bool 'Appletalk DDP protocol family' HAVE_AFATALK y - bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y - bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y --bool 'Rose (packet radio) protocol family' HAVE_AFROSE n -+bool 'Rose (packet radio) protocol family' HAVE_AFROSE y - bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y --bool 'Econet protocol family' HAVE_AFECONET n -+bool 'Econet protocol family' HAVE_AFECONET y - bool 'DECnet protocol family' HAVE_AFDECnet n --bool 'Ash protocol family' HAVE_AFASH n -+bool 'Ash protocol family' HAVE_AFASH y -+bool 'Bluetooth protocol family' HAVE_AFBLUETOOTH n - * - * - * Device Hardware types. -@@ -68,24 +69,27 @@ bool 'ARCnet support' HAVE_HWARC y - bool 'SLIP (serial line) support' HAVE_HWSLIP y - bool 'PPP (serial line) support' HAVE_HWPPP y - bool 'IPIP Tunnel support' HAVE_HWTUNNEL y --bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y --bool 'Token ring (generic) support' HAVE_HWTR y -+bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP n -+bool 'Token ring (generic) support' HAVE_HWTR n - bool 'AX25 (packet radio) support' HAVE_HWAX25 y --bool 'Rose (packet radio) support' HAVE_HWROSE n -+bool 'Rose (packet radio) support' HAVE_HWROSE y - bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y - bool 'X.25 (generic) support' HAVE_HWX25 y - bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y --bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n --bool 'FDDI (generic) support' HAVE_HWFDDI n --bool 'HIPPI (generic) support' HAVE_HWHIPPI n --bool 'Ash hardware support' HAVE_HWASH n --bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n -+bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y -+bool 'FDDI (generic) support' HAVE_HWFDDI y -+bool 'HIPPI (generic) support' HAVE_HWHIPPI y -+bool 'Ash hardware support' HAVE_HWASH y -+bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y - bool 'IrDA support' HAVE_HWIRDA y --bool 'Econet hardware support' HAVE_HWEC n -+bool 'Econet hardware support' HAVE_HWEC y -+bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y -+bool 'InfiniBand hardware support' HAVE_HWIB y - * - * - * Other Features. - * --bool 'IP Masquerading support' HAVE_FW_MASQUERADE n --bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n --bool 'Build mii-tool' HAVE_MII n -+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y -+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y -+bool 'Build mii-tool' HAVE_MII y -+bool 'SELinux support' HAVE_SELINUX n -diff --git a/configure.sh b/configure.sh -index 9859b59..64b594f 100755 ---- a/configure.sh -+++ b/configure.sh -@@ -1,6 +1,6 @@ - #!/usr/bin/env bash - # --# Configure.sh Generates interactively a config.h from config.in -+# configure.sh Generates interactively a config.h from config.in - # - # net-tools A collection of programs that form the base set of the - # NET-3 Networking Distribution for the LINUX operating -@@ -37,7 +37,15 @@ CONFIG=config.h - MAKECONFIG=config.make - - --[ -z "$BASH" ] && { echo "Configure requires bash" 1>&2; exit 1; } -+[ -z "$BASH" ] && { echo "configure.sh requires bash" 1>&2; exit 1; } -+ -+cat <<EOF -+ -+###################################################### -+Notice: ifconfig and route are now installed into /bin -+###################################################### -+ -+EOF - - # Disable filename globbing once and for all. - # Enable function cacheing. -@@ -106,7 +114,7 @@ function int() - } - - # -- # Make sure we start out with a clean slate. -+ # Make sure we start out with a clean state. - # - > config.new - > ${CONFIG} -diff --git a/hostname.c b/hostname.c -index 8793fb9..ae98ca6 100644 ---- a/hostname.c -+++ b/hostname.c -@@ -6,23 +6,22 @@ - * Usage: hostname [-d|-f|-s|-a|-i|-y|-n] - * hostname [-h|-V] - * hostname {name|-F file} -- * dnsdmoainname -+ * dnsdmoainname - * nisdomainname {name|-F file} - * -- * Version: hostname 1.96 (1996-02-18) -+ * Version: hostname 1.101 (2003-10-11) - * - * Author: Peter Tobias <tobias@et-inf.fho-emden.de> - * - * Changes: -- * {1.90} Peter Tobias : Added -a and -i options. -- * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts -- * (major rewrite), usage. -- *960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/ -- * setdomainname added -- *960218 {1.96} Bernd Eckenfels : netinet/in.h added -- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n -- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings -+ * {1.90} Peter Tobias : Added -a and -i options. -+ * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage. -+ *19960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added -+ *19960218 {1.96} Bernd Eckenfels : netinet/in.h added -+ *19980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n -+ *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings - *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale -+ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break) - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -31,7 +30,9 @@ - * your option) any later version. - */ - #include <stdio.h> -+#include <stdlib.h> - #include <unistd.h> -+#include <stdlib.h> - #include <getopt.h> - #include <string.h> - #include <netdb.h> -@@ -41,13 +42,19 @@ - #include <arpa/inet.h> - #include "config.h" - #include "version.h" -+#include "net-support.h" - #include "../intl.h" - -+#if HAVE_AFINET6 -+#include <sys/socket.h> /* for PF_INET6 */ -+#include <sys/types.h> /* for inet_ntop */ -+#endif -+ - #if HAVE_AFDECnet - #include <netdnet/dn.h> - #endif - --char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)"; -+static char *Release = RELEASE; - - static char *program_name; - static int opt_v; -@@ -72,12 +79,13 @@ static void setnname(char *nname) - if (setnodename(nname, strlen(nname))) { - switch(errno) { - case EPERM: -- fprintf(stderr, _("%s: you must be root to change the node name\n"), program_name); -+ fprintf(stderr, _("%s: you don't have permission to set the node name\n"), program_name); - break; - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ break; - } - exit(1); - } -@@ -92,12 +100,11 @@ static void sethname(char *hname) - if (sethostname(hname, strlen(hname))) { - switch (errno) { - case EPERM: -- fprintf(stderr, _("%s: you must be root to change the host name\n"), program_name); -+ fprintf(stderr, _("%s: you don't have permission to set the host name\n"), program_name); - break; - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -111,12 +118,11 @@ static void setdname(char *dname) - if (setdomainname(dname, strlen(dname))) { - switch (errno) { - case EPERM: -- fprintf(stderr, _("%s: you must be root to change the domain name\n"), program_name); -+ fprintf(stderr, _("%s: you don't have permission to set the domain name\n"), program_name); - break; - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -125,15 +131,23 @@ static void setdname(char *dname) - static void showhname(char *hname, int c) - { - struct hostent *hp; -+#if HAVE_AFINET6 -+ struct in6_addr **ip6; -+#endif - register char *p, **alias; - struct in_addr **ip; - - if (opt_v) - fprintf(stderr, _("Resolving `%s' ...\n"), hname); -- if (!(hp = gethostbyname(hname))) { -+ if ( -+#if HAVE_AFINET6 -+ !(hp = gethostbyname2(hname, PF_INET6)) && -+#endif -+ !(hp = gethostbyname(hname))) { - herror(program_name); - exit(1); - } -+ - if (opt_v) { - fprintf(stderr, _("Result: h_name=`%s'\n"), - hp->h_name); -@@ -142,11 +156,28 @@ static void showhname(char *hname, int c) - while (alias[0]) - fprintf(stderr, _("Result: h_aliases=`%s'\n"), - *alias++); -- -- ip = (struct in_addr **) hp->h_addr_list; -- while (ip[0]) -- fprintf(stderr, _("Result: h_addr_list=`%s'\n"), -- inet_ntoa(**ip++)); -+#if HAVE_AFINET6 -+ if (hp->h_addrtype == PF_INET6) { -+ char addr[INET6_ADDRSTRLEN + 1]; -+ addr[INET6_ADDRSTRLEN] = '\0'; -+ ip6 = (struct in6_addr **) hp->h_addr_list; -+ while (ip6[0]) { -+ if (inet_ntop(PF_INET6, *ip6++, addr, INET6_ADDRSTRLEN)) -+ fprintf(stderr, _("Result: h_addr_list=`%s'\n"), addr); -+ else if (errno == EAFNOSUPPORT) -+ fprintf(stderr, _("%s: protocol family not supported\n"), -+ program_name); -+ else if (errno == ENOSPC) -+ fprintf(stderr, _("%s: name too long\n"), program_name); -+ } -+ } else -+#endif -+ { -+ ip = (struct in_addr **) hp->h_addr_list; -+ while (ip[0]) -+ fprintf(stderr, _("Result: h_addr_list=`%s'\n"), -+ inet_ntoa(**ip++)); -+ } - } - if (!(p = strchr(hp->h_name, '.')) && (c == 'd')) - return; -@@ -158,8 +189,29 @@ static void showhname(char *hname, int c) - printf("\n"); - break; - case 'i': -- while (hp->h_addr_list[0]) -- printf("%s ", inet_ntoa(*(struct in_addr *) *hp->h_addr_list++)); -+#if HAVE_AFINET6 -+ if (hp->h_addrtype == PF_INET6) { -+ char addr[INET6_ADDRSTRLEN + 1]; -+ addr[INET6_ADDRSTRLEN] = '\0'; -+ while (hp->h_addr_list[0]) { -+ if (inet_ntop(PF_INET6, (struct in6_addr *)*hp->h_addr_list++, -+ addr, INET6_ADDRSTRLEN)) { -+ printf("%s ", addr); -+ } else if (errno == EAFNOSUPPORT) { -+ fprintf(stderr, _("\n%s: protocol family not supported\n"), -+ program_name); -+ exit(1); -+ } else if (errno == ENOSPC) { -+ fprintf(stderr, _("\n%s: name too long\n"), program_name); -+ exit(1); -+ } -+ } -+ } else -+#endif -+ { -+ while (hp->h_addr_list[0]) -+ printf("%s ", inet_ntoa(*(struct in_addr *)*hp->h_addr_list++)); -+ } - printf("\n"); - break; - case 'd': -@@ -173,7 +225,6 @@ static void showhname(char *hname, int c) - *p = '\0'; - printf("%s\n", hp->h_name); - break; -- default: - } - } - -@@ -215,8 +266,8 @@ static void setfilename(char *name, int what) - - static void version(void) - { -- fprintf(stderr, "%s\n%s\n", Release, Version); -- exit(5); /* E_VERSION */ -+ fprintf(stderr, "%s\n", Release); -+ exit(E_VERSION); - } - - static void usage(void) -@@ -247,7 +298,7 @@ static void usage(void) - " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" - " part of the FQDN) in the /etc/hosts file.\n")); - -- exit(4); /* E_USAGE */ -+ exit(E_USAGE); - } - - -@@ -326,11 +377,12 @@ int main(int argc, char **argv) - break; - case 'V': - version(); -+ break; // not reached - case '?': - case 'h': - default: - usage(); -- -+ break; // not reached - }; - - -@@ -371,7 +423,10 @@ int main(int argc, char **argv) - setdname(argv[optind]); - break; - } -- getdomainname(myname, sizeof(myname)); -+ if (getdomainname(myname, sizeof(myname)) < 0) { -+ perror("getdomainname()"); -+ exit(1); -+ } - if (opt_v) - fprintf(stderr, _("getdomainname()=`%s'\n"), myname); - printf("%s\n", myname); -diff --git a/ifconfig.c b/ifconfig.c -index 73a4e9b..df9793a 100644 ---- a/ifconfig.c -+++ b/ifconfig.c -@@ -3,7 +3,7 @@ - * that either displays or sets the characteristics of - * one or more of the system's networking interfaces. - * -- * Version: $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $ -+ * Version: $Id: ifconfig.c,v 1.59 2011-01-01 03:22:31 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * and others. Copyright 1993 MicroWalt Corporation -@@ -19,8 +19,8 @@ - * - * {1.34} - 19980630 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - * - gettext instead of catgets for i18n -- * 10/1998 - Andi Kleen. Use interface list primitives. -- * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu -+ * 10/1998 - Andi Kleen. Use interface list primitives. -+ * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu - * (default AF was wrong) - * 20010404 - Arnaldo Carvalho de Melo, use setlocale - */ -@@ -49,7 +49,7 @@ - #include <asm/types.h> - - --#ifdef HAVE_HWSLIP -+#if HAVE_HWSLIP - #include <linux/if_slip.h> - #endif - -@@ -85,19 +85,16 @@ struct in6_ifreq { - #include "sockets.h" - #include "util.h" - --char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)"; -+static char *Release = RELEASE; - - int opt_a = 0; /* show all interfaces */ --int opt_i = 0; /* show the statistics */ - int opt_v = 0; /* debugging output flag */ - - int addr_family = 0; /* currently selected AF */ - - /* for ipv4 add/del modes */ --static int get_nmbc_parent(char *parent, unsigned long *nm, -- unsigned long *bc); --static int set_ifstate(char *parent, unsigned long ip, -- unsigned long nm, unsigned long bc, -+static int get_nmbc_parent(char *parent, in_addr_t *nm, in_addr_t *bc); -+static int set_ifstate(char *parent, in_addr_t ip, in_addr_t nm, in_addr_t bc, - int flag); - - static int if_print(char *ifname) -@@ -105,7 +102,7 @@ static int if_print(char *ifname) - int res; - - if (ife_short) -- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); -+ printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); - - if (!ifname) { - res = for_all_interfaces(do_if_print, &opt_a); -@@ -113,11 +110,14 @@ static int if_print(char *ifname) - struct interface *ife; - - ife = lookup_interface(ifname); -- res = do_if_fetch(ife); -- if (res >= 0) -+ if (!ife) { -+ return -1; -+ } -+ res = do_if_fetch(ife); -+ if (res >= 0) - ife_print(ife); - } -- return res; -+ return res; - } - - /* Set a certain interface flag. */ -@@ -127,7 +127,7 @@ static int set_flag(char *ifname, short flag) - - safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { -- fprintf(stderr, _("%s: unknown interface: %s\n"), -+ fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), - ifname, strerror(errno)); - return (-1); - } -@@ -159,7 +159,7 @@ static int clr_flag(char *ifname, short flag) - - safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { -- fprintf(stderr, _("%s: unknown interface: %s\n"), -+ fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), - ifname, strerror(errno)); - return -1; - } -@@ -172,9 +172,35 @@ static int clr_flag(char *ifname, short flag) - return (0); - } - -+/** test is a specified flag is set */ -+static int test_flag(char *ifname, short flags) -+{ -+ struct ifreq ifr; -+ int fd; -+ -+ if (strchr(ifname, ':')) { -+ /* This is a v4 alias interface. Downing it via a socket for -+ another AF may have bad consequences. */ -+ fd = get_socket_for_af(AF_INET); -+ if (fd < 0) { -+ fprintf(stderr, _("No support for INET on this system.\n")); -+ return -1; -+ } -+ } else -+ fd = skfd; -+ -+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { -+ fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), -+ ifname, strerror(errno)); -+ return -1; -+ } -+ return (ifr.ifr_flags & flags); -+} -+ - static void usage(void) - { -- fprintf(stderr, _("Usage:\n ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n")); -+ fprintf(stderr, _("Usage:\n ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n")); - #if HAVE_AFINET - fprintf(stderr, _(" [add <address>[/<prefixlen>]]\n")); - fprintf(stderr, _(" [del <address>[/<prefixlen>]]\n")); -@@ -184,7 +210,7 @@ static void usage(void) - #ifdef SIOCSKEEPALIVE - fprintf(stderr, _(" [outfill <NN>] [keepalive <NN>]\n")); - #endif -- fprintf(stderr, _(" [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n")); -+ fprintf(stderr, _(" [hw <HW> <address>] [mtu <NN>]\n")); - fprintf(stderr, _(" [[-]trailers] [[-]arp] [[-]allmulti]\n")); - fprintf(stderr, _(" [multicast] [[-]promisc]\n")); - fprintf(stderr, _(" [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n")); -@@ -207,38 +233,39 @@ static void usage(void) - - static void version(void) - { -- fprintf(stderr, "%s\n%s\n", Release, Version); -- exit(0); -+ fprintf(stderr, "%s\n", Release); -+ exit(E_VERSION); - } - - static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa) - { - int err = 0; - -- memcpy((char *) &ifr->ifr_netmask, (char *) sa, -- sizeof(struct sockaddr)); -+ memcpy(&ifr->ifr_netmask, sa, sizeof(struct sockaddr)); - if (ioctl(skfd, SIOCSIFNETMASK, ifr) < 0) { - fprintf(stderr, "SIOCSIFNETMASK: %s\n", - strerror(errno)); - err = 1; - } -- return 0; -+ return err; - } - - int main(int argc, char **argv) - { -- struct sockaddr sa; -- struct sockaddr_in sin; -+ struct sockaddr_storage _sa, _samask; -+ struct sockaddr *sa = (struct sockaddr *)&_sa; -+ struct sockaddr *samask = (struct sockaddr *)&_samask; -+ struct sockaddr_in *sin = (struct sockaddr_in *)sa; - char host[128]; - struct aftype *ap; - struct hwtype *hw; - struct ifreq ifr; -- int goterr = 0, didnetmask = 0; -+ int goterr = 0, didnetmask = 0, neednetmask=0; - char **spp; - int fd; - #if HAVE_AFINET6 - extern struct aftype inet6_aftype; -- struct sockaddr_in6 sa6; -+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; - struct in6_ifreq ifr6; - unsigned long prefix_len; - char *cp; -@@ -248,7 +275,7 @@ int main(int argc, char **argv) - #endif - - #if I18N -- setlocale (LC_ALL, ""); -+ setlocale(LC_ALL, ""); - bindtextdomain("net-tools", "/usr/share/locale"); - textdomain("net-tools"); - #endif -@@ -265,7 +292,7 @@ int main(int argc, char **argv) - - else if (!strcmp(*argv, "-v")) - opt_v = 1; -- -+ - else if (!strcmp(*argv, "-V") || !strcmp(*argv, "-version") || - !strcmp(*argv, "--version")) - version(); -@@ -275,7 +302,7 @@ int main(int argc, char **argv) - usage(); - - else { -- fprintf(stderr, _("ifconfig: option `%s' not recognised.\n"), -+ fprintf(stderr, _("ifconfig: option `%s' not recognised.\n"), - argv[0]); - fprintf(stderr, _("ifconfig: `--help' gives usage information.\n")); - exit(1); -@@ -309,9 +336,9 @@ int main(int argc, char **argv) - /* The next argument is either an address family name, or an option. */ - if ((ap = get_aftype(*spp)) != NULL) - spp++; /* it was a AF name */ -- else -+ else - ap = get_aftype(DFLT_AF); -- -+ - if (ap) { - addr_family = ap->af; - skfd = ap->fd; -@@ -356,7 +383,7 @@ int main(int argc, char **argv) - goterr = 1; - } else { - if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) { -- perror("port: SIOCGIFMAP"); -+ perror("port: SIOCGIFMAP"); - goterr = 1; - continue; - } -@@ -388,6 +415,8 @@ int main(int argc, char **argv) - } - if (!strcmp(*spp, "-promisc")) { - goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC); -+ if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -398,6 +427,8 @@ int main(int argc, char **argv) - } - if (!strcmp(*spp, "-multicast")) { - goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST); -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -408,6 +439,8 @@ int main(int argc, char **argv) - } - if (!strcmp(*spp, "-allmulti")) { - goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI); -+ if (test_flag(ifr.ifr_name, IFF_ALLMULTI) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -430,21 +463,12 @@ int main(int argc, char **argv) - if (!strcmp(*spp, "-dynamic")) { - goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC); - spp++; -+ if (test_flag(ifr.ifr_name, IFF_DYNAMIC) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name); - continue; - } - #endif - -- if (!strcmp(*spp, "metric")) { -- if (*++spp == NULL) -- usage(); -- ifr.ifr_metric = atoi(*spp); -- if (ioctl(skfd, SIOCSIFMETRIC, &ifr) < 0) { -- fprintf(stderr, "SIOCSIFMETRIC: %s\n", strerror(errno)); -- goterr = 1; -- } -- spp++; -- continue; -- } - if (!strcmp(*spp, "mtu")) { - if (*++spp == NULL) - usage(); -@@ -460,7 +484,7 @@ int main(int argc, char **argv) - if (!strcmp(*spp, "keepalive")) { - if (*++spp == NULL) - usage(); -- ifr.ifr_data = (caddr_t) atoi(*spp); -+ ifr.ifr_data = (caddr_t) (uintptr_t) atoi(*spp); - if (ioctl(skfd, SIOCSKEEPALIVE, &ifr) < 0) { - fprintf(stderr, "SIOCSKEEPALIVE: %s\n", strerror(errno)); - goterr = 1; -@@ -474,7 +498,7 @@ int main(int argc, char **argv) - if (!strcmp(*spp, "outfill")) { - if (*++spp == NULL) - usage(); -- ifr.ifr_data = (caddr_t) atoi(*spp); -+ ifr.ifr_data = (caddr_t) (uintptr_t) atoi(*spp); - if (ioctl(skfd, SIOCSOUTFILL, &ifr) < 0) { - fprintf(stderr, "SIOCSOUTFILL: %s\n", strerror(errno)); - goterr = 1; -@@ -486,20 +510,24 @@ int main(int argc, char **argv) - - if (!strcmp(*spp, "-broadcast")) { - goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST); -+ if (test_flag(ifr.ifr_name, IFF_BROADCAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name); - spp++; - continue; - } - if (!strcmp(*spp, "broadcast")) { - if (*++spp != NULL) { - safe_strncpy(host, *spp, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->input(0, host, sa) < 0) { -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr.ifr_broadaddr, (char *) &sa, -- sizeof(struct sockaddr)); -+ memcpy(&ifr.ifr_broadaddr, sa, sizeof(struct sockaddr)); - if (ioctl(ap->fd, SIOCSIFBRDADDR, &ifr) < 0) { - fprintf(stderr, "SIOCSIFBRDADDR: %s\n", - strerror(errno)); -@@ -514,14 +542,16 @@ int main(int argc, char **argv) - if (*++spp == NULL) - usage(); - safe_strncpy(host, *spp, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->input(0, host, sa) < 0) { -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa, -- sizeof(struct sockaddr)); -+ memcpy(&ifr.ifr_dstaddr, sa, sizeof(struct sockaddr)); - if (ioctl(ap->fd, SIOCSIFDSTADDR, &ifr) < 0) { - fprintf(stderr, "SIOCSIFDSTADDR: %s\n", - strerror(errno)); -@@ -534,14 +564,17 @@ int main(int argc, char **argv) - if (*++spp == NULL || didnetmask) - usage(); - safe_strncpy(host, *spp, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->input(0, host, sa) < 0) { -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host); - goterr = 1; - spp++; - continue; - } - didnetmask++; -- goterr = set_netmask(ap->fd, &ifr, &sa); -+ goterr |= set_netmask(ap->fd, &ifr, sa); - spp++; - continue; - } -@@ -563,8 +596,8 @@ int main(int argc, char **argv) - if (*++spp == NULL) - usage(); - if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) { -- fprintf(stderr, "mem_start: SIOCGIFMAP: %s\n", strerror(errno)); -- spp++; -+ fprintf(stderr, "mem_start: SIOCGIFMAP: %s\n", strerror(errno)); -+ spp++; - goterr = 1; - continue; - } -@@ -580,8 +613,8 @@ int main(int argc, char **argv) - if (*++spp == NULL) - usage(); - if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) { -- fprintf(stderr, "io_addr: SIOCGIFMAP: %s\n", strerror(errno)); -- spp++; -+ fprintf(stderr, "io_addr: SIOCGIFMAP: %s\n", strerror(errno)); -+ spp++; - goterr = 1; - continue; - } -@@ -597,9 +630,9 @@ int main(int argc, char **argv) - if (*++spp == NULL) - usage(); - if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) { -- fprintf(stderr, "irq: SIOCGIFMAP: %s\n", strerror(errno)); -+ fprintf(stderr, "irq: SIOCGIFMAP: %s\n", strerror(errno)); - goterr = 1; -- spp++; -+ spp++; - continue; - } - ifr.ifr_map.irq = atoi(*spp); -@@ -613,20 +646,24 @@ int main(int argc, char **argv) - if (!strcmp(*spp, "-pointopoint")) { - goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); - spp++; -+ if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); - continue; - } - if (!strcmp(*spp, "pointopoint")) { - if (*(spp + 1) != NULL) { - spp++; - safe_strncpy(host, *spp, (sizeof host)); -- if (ap->input(0, host, &sa)) { -- ap->herror(host); -+ if (ap->input(0, host, sa)) { -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa, -- sizeof(struct sockaddr)); -+ memcpy(&ifr.ifr_dstaddr, sa, sizeof(struct sockaddr)); - if (ioctl(ap->fd, SIOCSIFDSTADDR, &ifr) < 0) { - fprintf(stderr, "SIOCSIFDSTADDR: %s\n", - strerror(errno)); -@@ -652,17 +689,20 @@ int main(int argc, char **argv) - if (*++spp == NULL) - usage(); - safe_strncpy(host, *spp, (sizeof host)); -- if (hw->input(host, &sa) < 0) { -+ if (hw->input(host, sa) < 0) { - fprintf(stderr, _("%s: invalid %s address.\n"), host, hw->name); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa, -- sizeof(struct sockaddr)); -+ memcpy(&ifr.ifr_hwaddr, sa, sizeof(struct sockaddr)); - if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) { -- fprintf(stderr, "SIOCSIFHWADDR: %s\n", -- strerror(errno)); -+ if (errno == EBUSY) -+ fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n", -+ strerror(errno)); -+ else -+ fprintf(stderr, "SIOCSIFHWADDR: %s\n", -+ strerror(errno)); - goterr = 1; - } - spp++; -@@ -681,22 +721,23 @@ int main(int argc, char **argv) - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); -- if (inet6_aftype.input(1, host, -- (struct sockaddr *) &sa6) < 0) { -- inet6_aftype.herror(host); -+ if (inet6_aftype.input(1, host, sa) < 0) { -+ if (inet6_aftype.herror) -+ inet6_aftype.herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr6.ifr6_addr, (char *) &sa6.sin6_addr, -- sizeof(struct in6_addr)); -+ memcpy(&ifr6.ifr6_addr, &sin6->sin6_addr, sizeof(struct in6_addr)); - - fd = get_socket_for_af(AF_INET6); - if (fd < 0) { -- fprintf(stderr, -+ fprintf(stderr, - _("No support for INET6 on this system.\n")); - goterr = 1; - spp++; -@@ -718,11 +759,11 @@ int main(int argc, char **argv) - continue; - } - #endif --#ifdef HAVE_AFINET -+#if HAVE_AFINET - { /* ipv4 address a.b.c.d */ -- unsigned long ip, nm, bc; -+ in_addr_t ip, nm, bc; - safe_strncpy(host, *spp, (sizeof host)); -- if (inet_aftype.input(0, host, (struct sockaddr *)&sin) < 0) { -+ if (inet_aftype.input(0, host, sa) < 0) { - ap->herror(host); - goterr = 1; - spp++; -@@ -730,15 +771,15 @@ int main(int argc, char **argv) - } - fd = get_socket_for_af(AF_INET); - if (fd < 0) { -- fprintf(stderr, -+ fprintf(stderr, - _("No support for INET on this system.\n")); - goterr = 1; - spp++; - continue; - } - -- memcpy(&ip, &sin.sin_addr.s_addr, sizeof(unsigned long)); -- -+ memcpy(&ip, &sin->sin_addr.s_addr, sizeof(ip)); -+ - if (get_nmbc_parent(ifr.ifr_name, &nm, &bc) < 0) { - fprintf(stderr, _("Interface %s not initialized\n"), - ifr.ifr_name); -@@ -747,7 +788,7 @@ int main(int argc, char **argv) - continue; - } - set_ifstate(ifr.ifr_name, ip, nm, bc, 1); -- -+ - } - spp++; - continue; -@@ -771,22 +812,21 @@ int main(int argc, char **argv) - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); -- if (inet6_aftype.input(1, host, -- (struct sockaddr *) &sa6) < 0) { -+ if (inet6_aftype.input(1, host, sa) < 0) { - inet6_aftype.herror(host); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr6.ifr6_addr, (char *) &sa6.sin6_addr, -+ memcpy(&ifr6.ifr6_addr, &sin6->sin6_addr, - sizeof(struct in6_addr)); -- -+ - fd = get_socket_for_af(AF_INET6); - if (fd < 0) { -- fprintf(stderr, -+ fprintf(stderr, - _("No support for INET6 on this system.\n")); - goterr = 1; - spp++; -@@ -800,6 +840,8 @@ int main(int argc, char **argv) - } - ifr6.ifr6_ifindex = ifr.ifr_ifindex; - ifr6.ifr6_prefixlen = prefix_len; -+ if (opt_v) -+ fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len); - if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) { - fprintf(stderr, "SIOCDIFADDR: %s\n", - strerror(errno)); -@@ -809,12 +851,12 @@ int main(int argc, char **argv) - continue; - } - #endif --#ifdef HAVE_AFINET -+#if HAVE_AFINET - { - /* ipv4 address a.b.c.d */ -- unsigned long ip, nm, bc; -+ in_addr_t ip, nm, bc; - safe_strncpy(host, *spp, (sizeof host)); -- if (inet_aftype.input(0, host, (struct sockaddr *)&sin) < 0) { -+ if (inet_aftype.input(0, host, sa) < 0) { - ap->herror(host); - goterr = 1; - spp++; -@@ -827,9 +869,11 @@ int main(int argc, char **argv) - spp++; - continue; - } -- -- memcpy(&ip, &sin.sin_addr.s_addr, sizeof(unsigned long)); -- -+ -+ /* Clear "ip" in case sizeof(unsigned long) > sizeof(sin.sin_addr.s_addr) */ -+ ip = 0; -+ memcpy(&ip, &sin->sin_addr.s_addr, sizeof(ip)); -+ - if (get_nmbc_parent(ifr.ifr_name, &nm, &bc) < 0) { - fprintf(stderr, _("Interface %s not initialized\n"), - ifr.ifr_name); -@@ -859,17 +903,16 @@ int main(int argc, char **argv) - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); -- if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) { -+ if (inet6_aftype.input(1, host, sa) < 0) { - inet6_aftype.herror(host); - goterr = 1; - spp++; - continue; - } -- memcpy((char *) &ifr6.ifr6_addr, (char *) &sa6.sin6_addr, -- sizeof(struct in6_addr)); -+ memcpy(&ifr6.ifr6_addr, &sin6->sin6_addr, sizeof(struct in6_addr)); - - fd = get_socket_for_af(AF_INET6); - if (fd < 0) { -@@ -900,10 +943,10 @@ int main(int argc, char **argv) - /* If the next argument is a valid hostname, assume OK. */ - safe_strncpy(host, *spp, (sizeof host)); - -- /* FIXME: sa is too small for INET6 addresses, inet6 should use that too, -+ /* FIXME: sa is too small for INET6 addresses, inet6 should use that too, - broadcast is unexpected */ - if (ap->getmask) { -- switch (ap->getmask(host, &sa, NULL)) { -+ switch (ap->getmask(host, samask, NULL)) { - case -1: - usage(); - break; -@@ -911,8 +954,8 @@ int main(int argc, char **argv) - if (didnetmask) - usage(); - -- goterr = set_netmask(skfd, &ifr, &sa); -- didnetmask++; -+ // remeber to set the netmask from samask later -+ neednetmask = 1; - break; - } - } -@@ -920,12 +963,14 @@ int main(int argc, char **argv) - fprintf(stderr, _("ifconfig: Cannot set address for this protocol family.\n")); - exit(1); - } -- if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -- fprintf(stderr, _("ifconfig: `--help' gives usage information.\n")); -- exit(1); -+ if (ap->input(0, host, sa) < 0) { -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr, -+ _("ifconfig: `--help' gives usage information.\n")); exit(1); - } -- memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr)); -+ memcpy(&ifr.ifr_addr, sa, sizeof(struct sockaddr)); - { - int r = 0; /* to shut gcc up */ - switch (ap->af) { -@@ -965,14 +1010,14 @@ int main(int argc, char **argv) - * end, since it's deleted already! - Roman - * - * Should really use regex.h here, not sure though how well it'll go -- * with the cross-platform support etc. -+ * with the cross-platform support etc. - */ - { - char *ptr; - short int found_colon = 0; - for (ptr = ifr.ifr_name; *ptr; ptr++ ) - if (*ptr == ':') found_colon++; -- -+ - if (!(found_colon && *(ptr - 1) == '-')) - goterr |= set_flag(ifr.ifr_name, (IFF_UP | IFF_RUNNING)); - } -@@ -980,6 +1025,14 @@ int main(int argc, char **argv) - spp++; - } - -+ if (neednetmask) { -+ goterr |= set_netmask(skfd, &ifr, samask); -+ didnetmask++; -+ } -+ -+ if (opt_v && goterr) -+ fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr); -+ - return (goterr); - } - -@@ -1012,7 +1065,7 @@ static int do_ifcmd(struct interface *x, struct ifcmd *ptr) - char *z, *e; - struct sockaddr_in *sin; - int i; -- -+ - if (do_if_fetch(x) < 0) - return 0; - if (strncmp(x->name, ptr->base, ptr->baselen) != 0) -@@ -1028,13 +1081,13 @@ static int do_ifcmd(struct interface *x, struct ifcmd *ptr) - if (i < 0 || i > 255) - abort(); - searcher[i] = 1; -- -+ - /* copy */ - sin = (struct sockaddr_in *)&x->dstaddr; - if (sin->sin_addr.s_addr != ptr->addr) { - return 0; - } -- -+ - if (ptr->flag) { - /* turn UP */ - if (set_flag(x->name, IFF_UP | IFF_RUNNING) == -1) -@@ -1044,49 +1097,48 @@ static int do_ifcmd(struct interface *x, struct ifcmd *ptr) - if (clr_flag(x->name, IFF_UP) == -1) - return -1; - } -- -+ - return 1; /* all done! */ - } - - - static int get_nmbc_parent(char *parent, -- unsigned long *nm, unsigned long *bc) -+ in_addr_t *nm, in_addr_t *bc) - { - struct interface *i; - struct sockaddr_in *sin; -- -+ - i = lookup_interface(parent); - if (!i) - return -1; - if (do_if_fetch(i) < 0) - return 0; - sin = (struct sockaddr_in *)&i->netmask; -- memcpy(nm, &sin->sin_addr.s_addr, sizeof(unsigned long)); -+ memcpy(nm, &sin->sin_addr.s_addr, sizeof(*nm)); - sin = (struct sockaddr_in *)&i->broadaddr; -- memcpy(bc, &sin->sin_addr.s_addr, sizeof(unsigned long)); -+ memcpy(bc, &sin->sin_addr.s_addr, sizeof(*bc)); - return 0; - } - --static int set_ifstate(char *parent, unsigned long ip, -- unsigned long nm, unsigned long bc, -+static int set_ifstate(char *parent, in_addr_t ip, in_addr_t nm, in_addr_t bc, - int flag) - { - char buf[IFNAMSIZ]; - struct ifcmd pt; - int i; -- -+ - pt.base = parent; - pt.baselen = strlen(parent); - pt.addr = ip; - pt.flag = flag; - memset(searcher, 0, sizeof(searcher)); -- i = for_all_interfaces((int (*)(struct interface *,void *))do_ifcmd, -+ i = for_all_interfaces((int (*)(struct interface *,void *))do_ifcmd, - &pt); - if (i == -1) - return -1; - if (i == 1) - return 0; -- -+ - /* add a new interface */ - for (i = 0; i < 256; i++) - if (searcher[i] == 0) -@@ -1094,7 +1146,7 @@ static int set_ifstate(char *parent, unsigned long ip, - - if (i == 256) - return -1; /* FAILURE!!! out of ip addresses */ -- -+ - if (snprintf(buf, IFNAMSIZ, "%s:%d", parent, i) > IFNAMSIZ) - return -1; - if (set_ip_using(buf, SIOCSIFADDR, ip) == -1) -diff --git a/include/interface.h b/include/interface.h -index f95555c..1b58599 100644 ---- a/include/interface.h -+++ b/include/interface.h -@@ -28,11 +28,10 @@ struct user_net_device_stats { - }; - - struct interface { -- struct interface *next, *prev; -+ struct interface *next, *prev; - char name[IFNAMSIZ]; /* interface name */ - short type; /* if type */ - short flags; /* various flags */ -- int metric; /* routing metric */ - int mtu; /* MTU value */ - int tx_queue_len; /* transmit queue length */ - struct ifmap map; /* hardware setup */ -@@ -64,13 +63,17 @@ struct interface { - extern int if_fetch(struct interface *ife); - - extern int for_all_interfaces(int (*)(struct interface *, void *), void *); --extern int free_interface_list(void); -+extern int if_cache_free(void); - extern struct interface *lookup_interface(char *name); - extern int if_readlist(void); - - extern int do_if_fetch(struct interface *ife); - extern int do_if_print(struct interface *ife, void *cookie); - -+extern int procnetdev_version(char *buf); -+extern int get_dev_fields(char *bp, struct interface *ife); -+extern char * get_name(char *name, char *p); -+ - extern void ife_print(struct interface *ptr); - - extern int ife_short; -@@ -84,7 +87,7 @@ extern const char *if_port_text[][4]; - #endif - - #if !defined(ifr_qlen) --/* Actually it is ifru_ivalue, but that is not present in 2.0 kernel headers */ -+/* Actually it is ifru_ivalue, but that is not present in 2.0 kernel headers */ - #define ifr_qlen ifr_ifru.ifru_mtu - #endif - -diff --git a/include/mii.h b/include/mii.h -deleted file mode 100644 -index 1ef7ccc..0000000 ---- a/include/mii.h -+++ /dev/null -@@ -1,86 +0,0 @@ --/* -- * mii.h 1.4 2000/04/25 22:06:15 -- * -- * Media Independent Interface support: register layout and ioctl's -- * -- * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org -- */ -- --#ifndef _LINUX_MII_H --#define _LINUX_MII_H -- --/* network interface ioctl's for MII commands */ --#ifndef SIOCGMIIPHY --#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ --#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ --#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ --#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ --#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ --#endif -- --#include <linux/types.h> -- --/* This data structure is used for all the MII ioctl's */ --struct mii_data { -- __u16 phy_id; -- __u16 reg_num; -- __u16 val_in; -- __u16 val_out; --}; -- --/* Basic Mode Control Register */ --#define MII_BMCR 0x00 --#define MII_BMCR_RESET 0x8000 --#define MII_BMCR_LOOPBACK 0x4000 --#define MII_BMCR_100MBIT 0x2000 --#define MII_BMCR_AN_ENA 0x1000 --#define MII_BMCR_ISOLATE 0x0400 --#define MII_BMCR_RESTART 0x0200 --#define MII_BMCR_DUPLEX 0x0100 --#define MII_BMCR_COLTEST 0x0080 -- --/* Basic Mode Status Register */ --#define MII_BMSR 0x01 --#define MII_BMSR_CAP_MASK 0xf800 --#define MII_BMSR_100BASET4 0x8000 --#define MII_BMSR_100BASETX_FD 0x4000 --#define MII_BMSR_100BASETX_HD 0x2000 --#define MII_BMSR_10BASET_FD 0x1000 --#define MII_BMSR_10BASET_HD 0x0800 --#define MII_BMSR_NO_PREAMBLE 0x0040 --#define MII_BMSR_AN_COMPLETE 0x0020 --#define MII_BMSR_REMOTE_FAULT 0x0010 --#define MII_BMSR_AN_ABLE 0x0008 --#define MII_BMSR_LINK_VALID 0x0004 --#define MII_BMSR_JABBER 0x0002 --#define MII_BMSR_EXT_CAP 0x0001 -- --#define MII_PHY_ID1 0x02 --#define MII_PHY_ID2 0x03 -- --/* Auto-Negotiation Advertisement Register */ --#define MII_ANAR 0x04 --/* Auto-Negotiation Link Partner Ability Register */ --#define MII_ANLPAR 0x05 --#define MII_AN_NEXT_PAGE 0x8000 --#define MII_AN_ACK 0x4000 --#define MII_AN_REMOTE_FAULT 0x2000 --#define MII_AN_ABILITY_MASK 0x07e0 --#define MII_AN_FLOW_CONTROL 0x0400 --#define MII_AN_100BASET4 0x0200 --#define MII_AN_100BASETX_FD 0x0100 --#define MII_AN_100BASETX_HD 0x0080 --#define MII_AN_10BASET_FD 0x0040 --#define MII_AN_10BASET_HD 0x0020 --#define MII_AN_PROT_MASK 0x001f --#define MII_AN_PROT_802_3 0x0001 -- --/* Auto-Negotiation Expansion Register */ --#define MII_ANER 0x06 --#define MII_ANER_MULT_FAULT 0x0010 --#define MII_ANER_LP_NP_ABLE 0x0008 --#define MII_ANER_NP_ABLE 0x0004 --#define MII_ANER_PAGE_RX 0x0002 --#define MII_ANER_LP_AN_ABLE 0x0001 -- --#endif /* _LINUX_MII_H */ -diff --git a/include/util-ank.h b/include/util-ank.h -index 04ab16c..c8fcd08 100644 ---- a/include/util-ank.h -+++ b/include/util-ank.h -@@ -75,6 +75,6 @@ extern int do_qdisc(int argc, char **argv); - extern int do_class(int argc, char **argv); - extern int do_filter(int argc, char **argv); - --extern const char *format_host(int af, void *addr, __u8 *abuf, int alen); -+extern const char *format_host(int af, void *addr, char *abuf, int alen); - - #endif /* __UTILS_H__ */ -diff --git a/ipmaddr.c b/ipmaddr.c -index 2134e81..e4ed41d 100644 ---- a/ipmaddr.c -+++ b/ipmaddr.c -@@ -32,6 +32,7 @@ - - #include "config.h" - #include "intl.h" -+#include "util.h" - #include "util-ank.h" - #include "net-support.h" - #include "version.h" -@@ -44,13 +45,11 @@ int filter_family; - #define NEWADDR 1 - #define DELADDR 2 - --char *Release = RELEASE, -- *Version = "ipmaddr 1.1", -- *Signature = "Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>"; -+static char *Release = RELEASE, *Signature = "Alexey Kuznetsov"; - - static void version(void) - { -- printf("%s\n%s\n%s\n", Release, Version, Signature); -+ printf("%s\n%s\n", Release, Signature); - exit(E_VERSION); - } - -@@ -61,7 +60,7 @@ static void usage(void) - fprintf(stderr, _("Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n")); - fprintf(stderr, _(" ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n")); - fprintf(stderr, _(" ipmaddr -V | -version\n")); -- exit(-1); -+ exit(E_USAGE); - } - - static void print_lla(FILE *fp, int len, unsigned char *addr) -@@ -75,7 +74,7 @@ static void print_lla(FILE *fp, int len, unsigned char *addr) - } - } - --static int parse_lla(char *str, unsigned char *addr) -+static int parse_lla(char *str, char *addr) - { - int len=0; - -@@ -159,8 +158,7 @@ void read_dev_mcast(struct ma_info **result_p) - - len = parse_hex(hexa, (unsigned char*)&m.addr.data); - if (len >= 0) { -- struct ma_info *ma = malloc(sizeof(m)); -- -+ struct ma_info *ma = xmalloc(sizeof(m)); - memcpy(ma, &m, sizeof(m)); - ma->addr.bytelen = len; - ma->addr.bitlen = len<<3; -@@ -174,22 +172,21 @@ void read_dev_mcast(struct ma_info **result_p) - - void read_igmp(struct ma_info **result_p) - { -- struct ma_info m; -+ struct ma_info m, *ma = NULL; - char buf[256]; - FILE *fp = fopen(_PATH_PROCNET_IGMP, "r"); - - if (!fp) - return; - memset(&m, 0, sizeof(m)); -- fgets(buf, sizeof(buf), fp); -+ if (fgets(buf, sizeof(buf), fp)) -+ /* eat line */; - - m.addr.family = AF_INET; - m.addr.bitlen = 32; - m.addr.bytelen = 4; - - while (fgets(buf, sizeof(buf), fp)) { -- struct ma_info *ma = malloc(sizeof(m)); -- - if (buf[0] != '\t') { - sscanf(buf, "%d%s", &m.index, m.name); - continue; -@@ -200,7 +197,7 @@ void read_igmp(struct ma_info **result_p) - - sscanf(buf, "%08x%d", (__u32*)&m.addr.data, &m.users); - -- ma = malloc(sizeof(m)); -+ ma = xmalloc(sizeof(m)); - memcpy(ma, &m, sizeof(m)); - maddr_ins(result_p, ma); - } -@@ -231,8 +228,7 @@ void read_igmp6(struct ma_info **result_p) - - len = parse_hex(hexa, (unsigned char*)&m.addr.data); - if (len >= 0) { -- struct ma_info *ma = malloc(sizeof(m)); -- -+ struct ma_info *ma = xmalloc(sizeof(m)); - memcpy(ma, &m, sizeof(m)); - - ma->addr.bytelen = len; -@@ -291,13 +287,15 @@ static void print_mlist(FILE *fp, struct ma_info *list) - static int multiaddr_list(int argc, char **argv) - { - struct ma_info *list = NULL; -+ size_t l; - - while (argc > 0) { - if (strcmp(*argv, "dev") == 0) { - NEXT_ARG(); -- if (filter_dev[0]) -+ l = strlen(*argv); -+ if (l <= 0 || l >= sizeof(filter_dev)) - usage(); -- strcpy(filter_dev, *argv); -+ strncpy(filter_dev, *argv, sizeof (filter_dev)); - } else if (strcmp(*argv, "all") == 0) { - filter_family = AF_UNSPEC; - } else if (strcmp(*argv, "ipv4") == 0) { -@@ -307,9 +305,10 @@ static int multiaddr_list(int argc, char **argv) - } else if (strcmp(*argv, "link") == 0) { - filter_family = AF_PACKET; - } else { -- if (filter_dev[0]) -+ l = strlen(*argv); -+ if (l <= 0 || l >= sizeof(filter_dev)) - usage(); -- strcpy(filter_dev, *argv); -+ strncpy(filter_dev, *argv, sizeof (filter_dev)); - } - argv++; argc--; - } -@@ -401,7 +400,7 @@ int main(int argc, char **argv) - basename = argv[0]; - else - basename++; -- -+ - while (argc > 1) { - if (argv[1][0] != '-') - break; -diff --git a/iptunnel.c b/iptunnel.c -index 4943d83..ddf43b2 100644 ---- a/iptunnel.c -+++ b/iptunnel.c -@@ -68,13 +68,11 @@ - - #include "util-ank.h" - --char *Release = RELEASE, -- *Version = "iptunnel 1.01", -- *Signature = "Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>"; -+static char *Release = RELEASE, *Signature = "Alexey Kuznetsov"; - - static void version(void) - { -- printf("%s\n%s\n%s\n", Release, Version, Signature); -+ printf("%s\n%s\n", Release, Signature); - exit(E_VERSION); - } - -@@ -92,7 +90,7 @@ static void usage(void) - fprintf(stderr, _(" TOS := { NUMBER | inherit }\n")); - fprintf(stderr, _(" TTL := { 1..255 | inherit }\n")); - fprintf(stderr, _(" KEY := { DOTTED_QUAD | NUMBER }\n")); -- exit(-1); -+ exit(E_USAGE); - } - - static int do_ioctl_get_ifindex(char *dev) -@@ -101,11 +99,12 @@ static int do_ioctl_get_ifindex(char *dev) - int fd; - int err; - -- strcpy(ifr.ifr_name, dev); -+ safe_strncpy(ifr.ifr_name, dev, IFNAMSIZ); - fd = socket(AF_INET, SOCK_DGRAM, 0); - err = ioctl(fd, SIOCGIFINDEX, &ifr); - if (err) { - perror("ioctl"); -+ close(fd); - return 0; - } - close(fd); -@@ -118,11 +117,12 @@ static int do_ioctl_get_iftype(char *dev) - int fd; - int err; - -- strcpy(ifr.ifr_name, dev); -+ safe_strncpy(ifr.ifr_name, dev, IFNAMSIZ); - fd = socket(AF_INET, SOCK_DGRAM, 0); - err = ioctl(fd, SIOCGIFHWADDR, &ifr); - if (err) { - perror("ioctl"); -+ close(fd); - return -1; - } - close(fd); -@@ -141,6 +141,7 @@ static char * do_ioctl_get_ifname(int idx) - err = ioctl(fd, SIOCGIFNAME, &ifr); - if (err) { - perror("ioctl"); -+ close(fd); - return NULL; - } - close(fd); -@@ -155,7 +156,7 @@ static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p) - int fd; - int err; - -- strcpy(ifr.ifr_name, basedev); -+ safe_strncpy(ifr.ifr_name, basedev, IFNAMSIZ); - ifr.ifr_ifru.ifru_data = (void*)p; - fd = socket(AF_INET, SOCK_DGRAM, 0); - err = ioctl(fd, SIOCGETTUNNEL, &ifr); -@@ -171,7 +172,7 @@ static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p) - int fd; - int err; - -- strcpy(ifr.ifr_name, basedev); -+ safe_strncpy(ifr.ifr_name, basedev, IFNAMSIZ); - ifr.ifr_ifru.ifru_data = (void*)p; - fd = socket(AF_INET, SOCK_DGRAM, 0); - err = ioctl(fd, cmd, &ifr); -@@ -187,7 +188,7 @@ static int do_del_ioctl(char *basedev, struct ip_tunnel_parm *p) - int fd; - int err; - -- strcpy(ifr.ifr_name, basedev); -+ safe_strncpy(ifr.ifr_name, basedev, IFNAMSIZ); - ifr.ifr_ifru.ifru_data = (void*)p; - fd = socket(AF_INET, SOCK_DGRAM, 0); - err = ioctl(fd, SIOCDELTUNNEL, &ifr); -@@ -375,7 +376,7 @@ static int do_add(int cmd, int argc, char **argv) - return do_add_ioctl(cmd, "gre0", &p); - case IPPROTO_IPV6: - return do_add_ioctl(cmd, "sit0", &p); -- default: -+ default: - fprintf(stderr, _("cannot determine tunnel mode (ipip, gre or sit)\n")); - return -1; - } -@@ -390,13 +391,13 @@ int do_del(int argc, char **argv) - return -1; - - switch (p.iph.protocol) { -- case IPPROTO_IPIP: -+ case IPPROTO_IPIP: - return do_del_ioctl(p.name[0] ? p.name : "tunl0", &p); -- case IPPROTO_GRE: -+ case IPPROTO_GRE: - return do_del_ioctl(p.name[0] ? p.name : "gre0", &p); -- case IPPROTO_IPV6: -+ case IPPROTO_IPV6: - return do_del_ioctl(p.name[0] ? p.name : "sit0", &p); -- default: -+ default: - return do_del_ioctl(p.name, &p); - } - return -1; -@@ -476,8 +477,10 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) - return -1; - } - -- fgets(buf, sizeof(buf), fp); -- fgets(buf, sizeof(buf), fp); -+ if (fgets(buf, sizeof(buf), fp)) -+ /* eat line */; -+ if (fgets(buf, sizeof(buf), fp)) -+ /* eat line */; - - while (fgets(buf, sizeof(buf), fp) != NULL) { - char *ptr; -@@ -485,9 +488,10 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) - if ((ptr = strchr(buf, ':')) == NULL || - (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) { - fprintf(stderr, _("Wrong format of /proc/net/dev. Sorry.\n")); -+ fclose(fp); - return -1; - } -- if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld", -+ if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*u%lu%lu%lu%lu%lu%lu%lu", - &rx_bytes, &rx_packets, &rx_errs, &rx_drops, - &rx_fifo, &rx_frame, &rx_multi, - &tx_bytes, &tx_packets, &tx_errs, &tx_drops, -@@ -521,6 +525,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p) - tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops); - } - } -+ fclose(fp); - return 0; - } - -@@ -533,7 +538,7 @@ static int do_show(int argc, char **argv) - return -1; - - switch (p.iph.protocol) { -- case IPPROTO_IPIP: -+ case IPPROTO_IPIP: - err = do_get_ioctl(p.name[0] ? p.name : "tunl0", &p); - break; - case IPPROTO_GRE: -@@ -592,7 +597,7 @@ int main(int argc, char **argv) - basename = argv[0]; - else - basename++; -- -+ - while (argc > 1) { - if (argv[1][0] != '-') - break; -diff --git a/lib/Makefile b/lib/Makefile -index d714b2e..431f258 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -16,7 +16,7 @@ - # - - --HWOBJS = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o -+HWOBJS = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o ib.o - AFOBJS = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o - AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o - AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o -@@ -36,7 +36,7 @@ OBJS = $(sort $(VARIA) $(AFOBJS) $(HWOBJS) \ - - # This can be overwritten by the TOPLEVEL Makefile - TOPDIR=.. --CFLAGS += -I$(TOPDIR) -idirafter $(TOPDIR)/include # -fPIC -+CFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include # -fPIC - SONAME=libnet-tools.so.0 - - .SUFFIXES: .a .so -diff --git a/lib/af.c b/lib/af.c -index 4f002c4..0500a0a 100644 ---- a/lib/af.c -+++ b/lib/af.c -@@ -2,7 +2,7 @@ - * lib/af.c This file contains the top-level part of the protocol - * support functions module for the NET-2 base distribution. - * -- * Version: $Id: af.c,v 1.13 2000/05/20 13:38:10 pb Exp $ -+ * Version: $Id: af.c,v 1.14 2007/12/01 17:49:35 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -35,8 +35,10 @@ int flag_netrom; - int flag_inet; - int flag_inet6; - int flag_econet; -+int flag_rose; - int flag_x25 = 0; - int flag_ash; -+int flag_bluetooth; - - - struct aftrans_t { -@@ -58,6 +60,9 @@ struct aftrans_t { - "ipx", "ipx", &flag_ipx - }, - { -+ "rose", "rose", &flag_rose -+ }, -+ { - "appletalk", "ddp", &flag_ddp - }, - { -@@ -88,6 +93,9 @@ struct aftrans_t { - "ash", "ash", &flag_ash - }, - { -+ "bluetooth", "bluetooth", &flag_bluetooth -+ }, -+ { - 0, 0, 0 - } - }; -@@ -193,15 +201,14 @@ void aftrans_def(char *tool, char *argv0, char *dflt) - char *tmp; - char *buf; - -- strcpy(afname, dflt); -+ safe_strncpy(afname, dflt, sizeof(afname)); - - if (!(tmp = strrchr(argv0, '/'))) - tmp = argv0; /* no slash?! */ - else - tmp++; - -- if (!(buf = strdup(tmp))) -- return; -+ buf = xstrdup(tmp); - - if (strlen(tool) >= strlen(tmp)) { - free(buf); -@@ -219,7 +226,7 @@ void aftrans_def(char *tool, char *argv0, char *dflt) - - afname[0] = '\0'; - if (aftrans_opt(buf)) -- strcpy(afname, buf); -+ safe_strncpy(afname, buf, sizeof(afname)); - - free(buf); - } -@@ -296,7 +303,6 @@ int aftrans_opt(const char *arg) - if (tmp2) - *(tmp2++) = '\0'; - -- paft = aftrans; - for (paft = aftrans; paft->alias; paft++) { - if (strcmp(tmp1, paft->alias)) - continue; -@@ -335,7 +341,7 @@ void print_aflist(int type) { - if ((type == 1 && ((*afp)->rprint == NULL)) || ((*afp)->af == 0)) { - afp++; continue; - } -- if ((count % 3) == 0) fprintf(stderr,count?"\n ":" "); -+ if ((count % 3) == 0) fprintf(stderr,count?"\n ":" "); - txt = (*afp)->name; if (!txt) txt = ".."; - fprintf(stderr,"%s (%s) ",txt,(*afp)->title); - count++; -diff --git a/lib/arcnet.c b/lib/arcnet.c -index eb0f46e..9bc3267 100644 ---- a/lib/arcnet.c -+++ b/lib/arcnet.c -@@ -35,7 +35,7 @@ extern struct hwtype arcnet_hwtype; - - - /* Display an ARCnet address in readable format. */ --static char *pr_arcnet(unsigned char *ptr) -+static const char *pr_arcnet(const char *ptr) - { - static char buff[64]; - -@@ -43,11 +43,16 @@ static char *pr_arcnet(unsigned char *ptr) - return (buff); - } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - /* Input an ARCnet address and convert to binary. */ - static int in_arcnet(char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char c, *orig; - int i, val; - -@@ -66,9 +71,8 @@ static int in_arcnet(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val = c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -81,9 +85,8 @@ static int in_arcnet(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val |= c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -92,28 +95,21 @@ static int in_arcnet(char *bufp, struct sockaddr *sap) - - /* We might get a semicolon here - not required. */ - if (*bufp == ':') { -- if (i == ETH_ALEN) { --#ifdef DEBUG -+ if (_DEBUG && i == ETH_ALEN) - fprintf(stderr, _("in_arcnet(%s): trailing : ignored!\n"), -- orig) --#endif -- ; /* nothing */ -- } -+ orig); - bufp++; - } - } - - /* That's it. Any trailing junk? */ -- if ((i == ETH_ALEN) && (*bufp != '\0')) { --#ifdef DEBUG -+ if (_DEBUG && (i == ETH_ALEN) && (*bufp != '\0')) { - fprintf(stderr, _("in_arcnet(%s): trailing junk!\n"), orig); - errno = EINVAL; - return (-1); --#endif - } --#ifdef DEBUG -- fprintf(stderr, "in_arcnet(%s): %s\n", orig, pr_arcnet(sap->sa_data)); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "in_arcnet(%s): %s\n", orig, pr_arcnet(sap->sa_data)); - - return (0); - } -diff --git a/lib/ash.c b/lib/ash.c -index c64667c..6cfc154 100644 ---- a/lib/ash.c -+++ b/lib/ash.c -@@ -31,8 +31,8 @@ static unsigned char hamming[16] = - }; - - /* Display an Ash address in readable format. */ --static char * --pr_ash(unsigned char *ptr) -+static const char * -+pr_ash(const char *ptr) - { - static char buff[128]; - char *p = buff; -@@ -57,10 +57,10 @@ pr_ash(unsigned char *ptr) - - struct hwtype ash_hwtype; - --static int -+static int - in_ash(char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - unsigned int i = 0; - - sap->sa_family = ash_hwtype.type; -@@ -102,7 +102,7 @@ struct hwtype ash_hwtype = - #if HAVE_AFASH - - /* Display an Ash socket address. */ --static char * -+static const char * - pr_sash(struct sockaddr *sap, int numeric) - { - static char buf[64]; -diff --git a/lib/ax25.c b/lib/ax25.c -index 11521d2..d57abe7 100644 ---- a/lib/ax25.c -+++ b/lib/ax25.c -@@ -47,7 +47,7 @@ static char AX25_errmsg[128]; - - extern struct aftype ax25_aftype; - --static char *AX25_print(unsigned char *ptr) -+static const char *AX25_print(const char *ptr) - { - static char buff[8]; - int i; -@@ -66,7 +66,7 @@ static char *AX25_print(unsigned char *ptr) - - - /* Display an AX.25 socket address. */ --static char * -+static const char * - AX25_sprint(struct sockaddr *sap, int numeric) - { - static char buf[64]; -@@ -76,10 +76,15 @@ static char * - return (AX25_print(((struct sockaddr_ax25 *) sap)->sax25_call.ax25_call)); - } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - static int AX25_input(int type, char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char *orig, c; - int i; - -@@ -95,9 +100,8 @@ static int AX25_input(int type, char *bufp, struct sockaddr *sap) - c = toupper(c); - if (!(isupper(c) || isdigit(c))) { - safe_strncpy(AX25_errmsg, _("Invalid callsign"), sizeof(AX25_errmsg)); --#ifdef DEBUG -- fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig); - errno = EINVAL; - return (-1); - } -@@ -107,10 +111,9 @@ static int AX25_input(int type, char *bufp, struct sockaddr *sap) - - /* Callsign too long? */ - if ((i == 6) && (*bufp != '-') && (*bufp != '\0')) { -- strcpy(AX25_errmsg, _("Callsign too long")); --#ifdef DEBUG -- fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig); --#endif -+ safe_strncpy(AX25_errmsg, _("Callsign too long"), sizeof(AX25_errmsg)); -+ if (_DEBUG) -+ fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig); - errno = E2BIG; - return (-1); - } -@@ -128,12 +131,12 @@ static int AX25_input(int type, char *bufp, struct sockaddr *sap) - } - - /* All done. */ --#ifdef DEBUG -- fprintf(stderr, "ax25_input(%s): ", orig); -- for (i = 0; i < sizeof(ax25_address); i++) -- fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); -- fprintf(stderr, "\n"); --#endif -+ if (_DEBUG) { -+ fprintf(stderr, "ax25_input(%s): ", orig); -+ for (i = 0; i < sizeof(ax25_address); i++) -+ fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); -+ fprintf(stderr, "\n"); -+ } - - return (0); - } -diff --git a/lib/ax25_gr.c b/lib/ax25_gr.c -index 4dce92d..46a67ee 100644 ---- a/lib/ax25_gr.c -+++ b/lib/ax25_gr.c -@@ -49,7 +49,8 @@ int AX25_rprint(int options) - } - printf(_("Kernel AX.25 routing table\n")); /* xxx */ - printf(_("Destination Iface Use\n")); /* xxx */ -- fgets(buffer, 256, f); -+ if (fgets(buffer, 256, f)) -+ /* eat line */; - while (fgets(buffer, 256, f)) { - buffer[9] = 0; - buffer[14] = 0; -diff --git a/lib/ddp.c b/lib/ddp.c -index 9b5e829..0a08fd2 100644 ---- a/lib/ddp.c -+++ b/lib/ddp.c -@@ -32,7 +32,7 @@ - #include "util.h" - - /* Display a ddp domain address. */ --static char *ddp_print(unsigned char *ptr) -+static const char *ddp_print(const char *ptr) - { - static char buff[64]; - struct sockaddr_at *sat = (struct sockaddr_at *) (ptr - 2); -@@ -42,7 +42,7 @@ static char *ddp_print(unsigned char *ptr) - - - /* Display a ddp domain address. */ --static char *ddp_sprint(struct sockaddr *sap, int numeric) -+static const char *ddp_sprint(struct sockaddr *sap, int numeric) - { - static char buf[64]; - -diff --git a/lib/ddp_gr.c b/lib/ddp_gr.c -index 94169f0..d05c431 100644 ---- a/lib/ddp_gr.c -+++ b/lib/ddp_gr.c -@@ -1,3 +1,20 @@ -+/* -+ * lib/ddp_gr.c Prinbting of DDP (AppleTalk) routing table -+ * used by the NET-LIB. -+ * -+ * NET-LIB -+ * -+ * Version: $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $ -+ * -+ * Author: Ajax <ajax@firest0rm.org> -+ * -+ * Modification: -+ * 2002-06-02 integrated into main source by Bernd Eckenfels -+ * -+ */ -+ -+/* TODO: name lookups (/etc/atalk.names? NBP?) */ -+ - #include "config.h" - - #if HAVE_AFATALK -@@ -16,9 +33,62 @@ - #include "pathnames.h" - #include "intl.h" - -+/* stolen from inet_gr.c */ -+#define flags_decode(i,o) do { \ -+ o[0] = '\0'; \ -+ if (i & RTF_UP) strcat(o, "U"); \ -+ if (i & RTF_GATEWAY) strcat(o, "G"); \ -+ if (i & RTF_REJECT) strcat(o, "!"); \ -+ if (i & RTF_HOST) strcat(o, "H"); \ -+ if (i & RTF_REINSTATE) strcat(o, "R"); \ -+ if (i & RTF_DYNAMIC) strcat(o, "D"); \ -+ if (i & RTF_MODIFIED) strcat(o, "M"); \ -+ if (i & RTF_DEFAULT) strcat(o, "d"); \ -+ if (i & RTF_ALLONLINK) strcat(o, "a"); \ -+ if (i & RTF_ADDRCONF) strcat(o, "c"); \ -+ if (i & RTF_NONEXTHOP) strcat(o, "o"); \ -+ if (i & RTF_EXPIRES) strcat(o, "e"); \ -+ if (i & RTF_CACHE) strcat(o, "c"); \ -+ if (i & RTF_FLOW) strcat(o, "f"); \ -+ if (i & RTF_POLICY) strcat(o, "p"); \ -+ if (i & RTF_LOCAL) strcat(o, "l"); \ -+ if (i & RTF_MTU) strcat(o, "u"); \ -+ if (i & RTF_WINDOW) strcat(o, "w"); \ -+ if (i & RTF_IRTT) strcat(o, "i"); \ -+ if (i & RTF_NOTCACHED) strcat(o, "n"); \ -+ } while (0) -+ - int DDP_rprint(int options) - { -- fprintf(stderr, _("Routing table for `ddp' not yet supported.\n")); -- return (1); -+ FILE *fp; -+ char *dest, *gw, *dev, *flags; -+ char oflags[32]; -+ char *hdr = "Destination Gateway Device Flags"; -+ -+ fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r"); -+ -+ if (!fp) { -+ perror("Error opening " _PATH_PROCNET_ATALK_ROUTE); -+ fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n"); -+ return 1; -+ } -+ -+ if (fscanf(fp, "%ms %ms %ms %ms\n", &dest, &gw, &flags, &dev)) -+ /* eat line */; -+ free(dest); free(gw); free(flags); free(dev); -+ -+ printf("%s\n", hdr); -+ -+ while (fscanf(fp, "%ms %ms %ms %ms\n", &dest, &gw, &flags, &dev) == 4) { -+ int iflags = atoi(flags); -+ flags_decode(iflags, oflags); -+ printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags); -+ free(dest); free(gw); free(flags); free(dev); -+ } -+ -+ fclose(fp); -+ -+ return 0; -+ - } - #endif -diff --git a/lib/ec_hw.c b/lib/ec_hw.c -index 825e501..088d125 100644 ---- a/lib/ec_hw.c -+++ b/lib/ec_hw.c -@@ -2,7 +2,7 @@ - * lib/ec_hw.c This file contains an implementation of the Econet - * hardware support functions. - * -- * Version: $Id: ec_hw.c,v 1.2 1999/09/27 11:00:46 philip Exp $ -+ * Version: $Id: ec_hw.c,v 1.3 2009/09/06 22:39:20 ecki Exp $ - * - * Author: Philip Blundell <philb@gnu.org> - * -@@ -16,6 +16,7 @@ - - #if HAVE_HWEC - -+#include <stdlib.h> - #include <net/if_arp.h> - #include "net-support.h" - -diff --git a/lib/econet.c b/lib/econet.c -index 1229a28..6cf8a9a 100644 ---- a/lib/econet.c -+++ b/lib/econet.c -@@ -32,8 +32,8 @@ - - - /* Display an Econet address */ --static char * --ec_print(unsigned char *ptr) -+static const char * -+ec_print(const char *ptr) - { - static char buff[64]; - struct ec_addr *ec = (struct ec_addr *) ptr; -@@ -43,7 +43,7 @@ ec_print(unsigned char *ptr) - - - /* Display an Econet socket address */ --static char * -+static const char * - ec_sprint(struct sockaddr *sap, int numeric) - { - struct sockaddr_ec *sec = (struct sockaddr_ec *) sap; -@@ -51,10 +51,10 @@ ec_sprint(struct sockaddr *sap, int numeric) - if (sap->sa_family != AF_ECONET) - return _("[NONE SET]"); - -- return ec_print((unsigned char *) &sec->addr); -+ return ec_print((const char *) &sec->addr); - } - --static int -+static int - ec_input(int type, char *bufp, struct sockaddr *sap) - { - struct sockaddr_ec *sec = (struct sockaddr_ec *) sap; -diff --git a/lib/ether.c b/lib/ether.c -index a71aed7..dee9c73 100644 ---- a/lib/ether.c -+++ b/lib/ether.c -@@ -2,7 +2,7 @@ - * lib/ether.c This file contains an implementation of the "Ethernet" - * support functions. - * -- * Version: $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $ -+ * Version: $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -35,22 +35,27 @@ extern struct hwtype ether_hwtype; - - - /* Display an Ethernet address in readable format. */ --static char *pr_ether(unsigned char *ptr) -+static const char *pr_ether(const char *ptr) - { - static char buff[64]; - -- snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X", -+ snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x", - (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), - (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) - ); - return (buff); - } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - /* Input an Ethernet address and convert to binary. */ - static int in_ether(char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char c, *orig; - int i; - unsigned val; -@@ -70,9 +75,8 @@ static int in_ether(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val = c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -87,9 +91,8 @@ static int in_ether(char *bufp, struct sockaddr *sap) - else if (c == ':' || c == 0) - val >>= 4; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -100,28 +103,21 @@ static int in_ether(char *bufp, struct sockaddr *sap) - - /* We might get a semicolon here - not required. */ - if (*bufp == ':') { -- if (i == ETH_ALEN) { --#ifdef DEBUG -+ if (_DEBUG && i == ETH_ALEN) - fprintf(stderr, _("in_ether(%s): trailing : ignored!\n"), -- orig) --#endif -- ; /* nothing */ -- } -+ orig); - bufp++; - } - } - - /* That's it. Any trailing junk? */ -- if ((i == ETH_ALEN) && (*bufp != '\0')) { --#ifdef DEBUG -+ if (_DEBUG && (i == ETH_ALEN) && (*bufp != '\0')) { - fprintf(stderr, _("in_ether(%s): trailing junk!\n"), orig); - errno = EINVAL; - return (-1); --#endif - } --#ifdef DEBUG -- fprintf(stderr, "in_ether(%s): %s\n", orig, pr_ether(sap->sa_data)); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "in_ether(%s): %s\n", orig, pr_ether(sap->sa_data)); - - return (0); - } -diff --git a/lib/eui64.c b/lib/eui64.c -new file mode 100644 -index 0000000..94831c0 ---- /dev/null -+++ b/lib/eui64.c -@@ -0,0 +1,152 @@ -+/* -+ * lib/eui64.c This file contains support for generic EUI-64 hw addressing -+ * -+ * Version: $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $ -+ * -+ * Author: Daniel Stodden <stodden@in.tum.de> -+ * Copyright 2001 Daniel Stodden -+ * -+ * blueprinted from ether.c -+ * Copyright 1993 MicroWalt Corporation -+ * -+ * 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 2 of the License, or (at -+ * your option) any later version. -+ */ -+#include "config.h" -+ -+#if HAVE_HWEUI64 -+ -+#include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/socket.h> -+#include <net/if_arp.h> -+#include <stdlib.h> -+#include <stdio.h> -+#include <ctype.h> -+#include <errno.h> -+#include <fcntl.h> -+#include <string.h> -+#include <termios.h> -+#include <unistd.h> -+#include "net-support.h" -+#include "pathnames.h" -+#include "intl.h" -+ -+/* -+ * EUI-64 constants -+ */ -+ -+#define EUI64_ALEN 8 -+ -+#ifndef ARPHRD_EUI64 -+#define ARPHRD_EUI64 27 -+#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27" -+#endif -+ -+struct hwtype eui64_hwtype; -+ -+/* Display an EUI-64 address in readable format. */ -+static const char *pr_eui64(const char *ptr) -+{ -+ static char buff[64]; -+ -+ snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", -+ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), -+ (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377) -+ ); -+ return (buff); -+} -+ -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif -+ -+/* Start the PPP encapsulation on the file descriptor. */ -+static int in_eui64( char *bufp, struct sockaddr *sap ) -+{ -+ char *ptr; -+ char c, *orig; -+ int i; -+ unsigned val; -+ -+ sap->sa_family = eui64_hwtype.type; -+ ptr = sap->sa_data; -+ -+ i = 0; -+ orig = bufp; -+ -+ while ((*bufp != '\0') && (i < EUI64_ALEN)) { -+ val = 0; -+ c = *bufp++; -+ if (isdigit(c)) -+ val = c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val = c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val = c - 'A' + 10; -+ else { -+ if (_DEBUG) -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ val <<= 4; -+ c = *bufp; -+ if (isdigit(c)) -+ val |= c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val |= c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val |= c - 'A' + 10; -+ else if (c == ':' || c == 0) -+ val >>= 4; -+ else { -+ if (_DEBUG) -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ if (c != 0) -+ bufp++; -+ -+ *ptr++ = (unsigned char) (val & 0377); -+ i++; -+ -+ /* We might get a semicolon here - not required. */ -+ if (*bufp == ':') { -+ if (_DEBUG && i == EUI64_ALEN) -+ fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"), -+ orig); -+ bufp++; -+ } -+ } -+ -+ /* That's it. Any trailing junk? */ -+ if (_DEBUG && (i == EUI64_ALEN) && (*bufp != '\0')) { -+ fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig); -+ errno = EINVAL; -+ return (-1); -+ } -+ if (_DEBUG) -+ fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data)); -+ -+ return (0); -+} -+ -+struct hwtype eui64_hwtype = -+{ -+ "eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN, -+ pr_eui64, in_eui64, NULL, 0 -+}; -+ -+ -+#endif /* HAVE_EUI64 */ -diff --git a/lib/fddi.c b/lib/fddi.c -index f6bf5ca..c18696e 100644 ---- a/lib/fddi.c -+++ b/lib/fddi.c -@@ -46,7 +46,7 @@ extern struct hwtype fddi_hwtype; - - - /* Display an FDDI address in readable format. */ --static char *pr_fddi(unsigned char *ptr) -+static const char *pr_fddi(const char *ptr) - { - static char buff[64]; - -@@ -57,11 +57,16 @@ static char *pr_fddi(unsigned char *ptr) - return (buff); - } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - /* Input an FDDI address and convert to binary. */ - static int in_fddi(char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char c, *orig; - int i, val; - -@@ -80,9 +85,8 @@ static int in_fddi(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val = c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -95,9 +99,8 @@ static int in_fddi(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val |= c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -106,28 +109,21 @@ static int in_fddi(char *bufp, struct sockaddr *sap) - - /* We might get a semicolon here - not required. */ - if (*bufp == ':') { -- if (i == FDDI_K_ALEN) { --#ifdef DEBUG -+ if (_DEBUG && i == FDDI_K_ALEN) - fprintf(stderr, _("in_fddi(%s): trailing : ignored!\n"), -- orig) --#endif -- ; /* nothing */ -- } -+ orig); - bufp++; - } - } - - /* That's it. Any trailing junk? */ -- if ((i == FDDI_K_ALEN) && (*bufp != '\0')) { --#ifdef DEBUG -+ if (_DEBUG && (i == FDDI_K_ALEN) && (*bufp != '\0')) { - fprintf(stderr, _("in_fddi(%s): trailing junk!\n"), orig); - errno = EINVAL; - return (-1); --#endif - } --#ifdef DEBUG -- fprintf(stderr, "in_fddi(%s): %s\n", orig, pr_fddi(sap->sa_data)); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "in_fddi(%s): %s\n", orig, pr_fddi(sap->sa_data)); - - return (0); - } -diff --git a/lib/frame.c b/lib/frame.c -index 58d1ad4..ad265d6 100644 ---- a/lib/frame.c -+++ b/lib/frame.c -@@ -37,7 +37,7 @@ - #include "net-support.h" - #include "pathnames.h" - --char *pr_dlci(unsigned char *ptr) -+static const char *pr_dlci(const char *ptr) - { - static char buf[12]; - -diff --git a/lib/getargs.c b/lib/getargs.c -index 4170097..6952777 100644 ---- a/lib/getargs.c -+++ b/lib/getargs.c -@@ -24,12 +24,13 @@ - #include <unistd.h> - #include "net-support.h" - #include "pathnames.h" -+#include "util.h" - - - /* Split the input string into multiple fields. */ - int getargs(char *string, char *arguments[]) - { -- int len = strlen(string); -+ int len = strlen(string); - char temp[len+1]; - char *sp, *ptr; - int i, argc; -@@ -41,7 +42,7 @@ int getargs(char *string, char *arguments[]) - */ - sp = string; - i = 0; -- strcpy(temp, string); -+ safe_strncpy(temp, string, sizeof(temp)); - ptr = temp; - - /* -diff --git a/lib/hdlclapb.c b/lib/hdlclapb.c -index c4ed074..b7d563e 100644 ---- a/lib/hdlclapb.c -+++ b/lib/hdlclapb.c -@@ -1,11 +1,11 @@ - /* -- * lib/hdlclapb.c -+ * lib/hdlclapb.c - * This file contains the HDLC/LAPB support for the NET-2 base - * distribution. - * - * Version: $Id: hdlclapb.c,v 1.5 2000/03/05 11:26:02 philip Exp $ - * -- * Original Author: -+ * Original Author: - * Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation - * -diff --git a/lib/hippi.c b/lib/hippi.c -index 308db00..43e7a79 100644 ---- a/lib/hippi.c -+++ b/lib/hippi.c -@@ -46,7 +46,7 @@ extern struct hwtype hippi_hwtype; - - - /* Display an HIPPI address in readable format. */ --static char *pr_hippi(unsigned char *ptr) -+static const char *pr_hippi(const char *ptr) - { - static char buff[64]; - -@@ -57,11 +57,16 @@ static char *pr_hippi(unsigned char *ptr) - return (buff); - } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - /* Input an HIPPI address and convert to binary. */ - static int in_hippi(char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char c, *orig; - int i, val; - -@@ -80,9 +85,8 @@ static int in_hippi(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val = c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -95,9 +99,8 @@ static int in_hippi(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val |= c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -106,27 +109,20 @@ static int in_hippi(char *bufp, struct sockaddr *sap) - - /* We might get a semicolon here - not required. */ - if (*bufp == ':') { -- if (i == HIPPI_ALEN) { --#ifdef DEBUG -- fprintf(stderr, _("in_hippi(%s): trailing : ignored!\n"), orig) --#endif -- ; /* nothing */ -- } -+ if (_DEBUG && i == HIPPI_ALEN) -+ fprintf(stderr, _("in_hippi(%s): trailing : ignored!\n"), orig); - bufp++; - } - } - - /* That's it. Any trailing junk? */ -- if ((i == HIPPI_ALEN) && (*bufp != '\0')) { --#ifdef DEBUG -+ if (_DEBUG && (i == HIPPI_ALEN) && (*bufp != '\0')) { - fprintf(stderr, _("in_hippi(%s): trailing junk!\n"), orig); - errno = EINVAL; - return (-1); --#endif - } --#ifdef DEBUG -- fprintf(stderr, "in_hippi(%s): %s\n", orig, pr_hippi(sap->sa_data)); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "in_hippi(%s): %s\n", orig, pr_hippi(sap->sa_data)); - - return (0); - } -diff --git a/lib/hw.c b/lib/hw.c -index 4989748..71dfcf9 100644 ---- a/lib/hw.c -+++ b/lib/hw.c -@@ -2,7 +2,7 @@ - * lib/hw.c This file contains the top-level part of the hardware - * support functions module. - * -- * Version: $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $ -+ * Version: $Id: hw.c,v 1.19 2008/10/03 01:52:04 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -73,6 +73,10 @@ extern struct hwtype irda_hwtype; - - extern struct hwtype ec_hwtype; - -+extern struct hwtype ib_hwtype; -+ -+extern struct hwtype eui64_hwtype; -+ - static struct hwtype *hwtypes[] = - { - -@@ -97,7 +101,7 @@ static struct hwtype *hwtypes[] = - #if HAVE_HWTR - &tr_hwtype, - #ifdef ARPHRD_IEEE802_TR -- &tr_hwtype1, -+ &tr_hwtype1, - #endif - #endif - #if HAVE_HWAX25 -@@ -144,6 +148,12 @@ static struct hwtype *hwtypes[] = - #if HAVE_HWX25 - &x25_hwtype, - #endif -+#if HAVE_HWIB -+ &ib_hwtype, -+#endif -+#if HAVE_HWEUI64 -+ &eui64_hwtype, -+#endif - &unspec_hwtype, - NULL - }; -@@ -211,12 +221,18 @@ void hwinit() - #if HAVE_HWTR - tr_hwtype.title = _("16/4 Mbps Token Ring"); - #ifdef ARPHRD_IEEE802_TR -- tr_hwtype1.title = _("16/4 Mbps Token Ring (New)") ; -+ tr_hwtype1.title = _("16/4 Mbps Token Ring (New)") ; - #endif - #endif - #if HAVE_HWEC - ec_hwtype.title = _("Econet"); - #endif -+#if HAVE_HWIB -+ ib_hwtype.title = _("InfiniBand"); -+#endif -+#if HAVE_HWEUI64 -+ eui64_hwtype.title = _("Generic EUI-64"); -+#endif - sVhwinit = 1; - } - -@@ -269,7 +285,7 @@ void print_hwlist(int type) { - if (((type == 1) && ((*hwp)->alen == 0)) || ((*hwp)->type == -1)) { - hwp++; continue; - } -- if ((count % 3) == 0) fprintf(stderr,count?"\n ":" "); -+ if ((count % 3) == 0) fprintf(stderr,count?"\n ":" "); - txt = (*hwp)->name; if (!txt) txt = ".."; - fprintf(stderr,"%s (%s) ",txt,(*hwp)->title); - count++; -diff --git a/lib/ib.c b/lib/ib.c -new file mode 100644 -index 0000000..1eeb7f0 ---- /dev/null -+++ b/lib/ib.c -@@ -0,0 +1,151 @@ -+/* -+ * lib/ib.c This file contains an implementation of the "Infiniband" -+ * support functions. -+ * -+ * Version: $Id: ib.c,v 1.1 2008/10/03 01:52:03 ecki Exp $ -+ * -+ * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> -+ * Copyright 1993 MicroWalt Corporation -+ * Tom Duffy <tduffy@sun.com> -+ * -+ * 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 2 of the License, or (at -+ * your option) any later version. -+ */ -+#include "config.h" -+ -+#if HAVE_HWIB -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <net/if_arp.h> -+#include <linux/if_infiniband.h> -+#include <stdlib.h> -+#include <stdio.h> -+#include <errno.h> -+#include <ctype.h> -+#include <string.h> -+#include <unistd.h> -+#include "net-support.h" -+#include "pathnames.h" -+#include "intl.h" -+#include "util.h" -+ -+extern struct hwtype ib_hwtype; -+ -+ -+/* Display an InfiniBand address in readable format. */ -+static const char *pr_ib(const char *ptr) -+{ -+ static char buff[128]; -+ char *pos; -+ unsigned int i; -+ -+ pos = buff; -+ for (i = 0; i < INFINIBAND_ALEN; i++) { -+ pos += sprintf(pos, "%02X:", (*ptr++ & 0377)); -+ } -+ buff[strlen(buff) - 1] = '\0'; -+ fprintf(stderr, _("Infiniband hardware address can be incorrect! Please read BUGS section in ifconfig(8).\n")); -+ /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X", -+ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), -+ (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) -+ ); -+ */ -+ return (buff); -+} -+ -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif -+ -+/* Input an Infiniband address and convert to binary. */ -+static int in_ib(char *bufp, struct sockaddr *sap) -+{ -+ char *ptr; -+ char c, *orig; -+ int i; -+ unsigned val; -+ -+ sap->sa_family = ib_hwtype.type; -+ ptr = sap->sa_data; -+ -+ i = 0; -+ orig = bufp; -+ while ((*bufp != '\0') && (i < INFINIBAND_ALEN)) { -+ val = 0; -+ c = *bufp++; -+ if (isdigit(c)) -+ val = c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val = c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val = c - 'A' + 10; -+ else { -+ if (_DEBUG) -+ fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig); -+ errno = EINVAL; -+ return (-1); -+ } -+ val <<= 4; -+ c = *bufp; -+ if (isdigit(c)) -+ val |= c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val |= c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val |= c - 'A' + 10; -+ else if (c == ':' || c == 0) -+ val >>= 4; -+ else { -+#ifdef DEBUG -+ fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig); -+#endif -+ errno = EINVAL; -+ return (-1); -+ } -+ if (c != 0) -+ bufp++; -+ *ptr++ = (unsigned char) (val & 0377); -+ i++; -+ -+ /* We might get a semicolon here - not required. */ -+ if (*bufp == ':') { -+ if (i == INFINIBAND_ALEN) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_ib(%s): trailing : ignored!\n"), -+ orig) -+#endif -+ ; /* nothing */ -+ } -+ bufp++; -+ } -+ } -+ -+ /* That's it. Any trailing junk? */ -+ if ((i == INFINIBAND_ALEN) && (*bufp != '\0')) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_ib(%s): trailing junk!\n"), orig); -+ errno = EINVAL; -+ return (-1); -+#endif -+ } -+#ifdef DEBUG -+ fprintf(stderr, "in_ib(%s): %s\n", orig, pr_ib(sap->sa_data)); -+#endif -+ -+ return (0); -+} -+ -+ -+struct hwtype ib_hwtype = -+{ -+ "infiniband", NULL, ARPHRD_INFINIBAND, INFINIBAND_ALEN, -+ pr_ib, in_ib, NULL -+}; -+ -+ -+#endif /* HAVE_HWIB */ -diff --git a/lib/inet.c b/lib/inet.c -index ae90664..fc23b17 100644 ---- a/lib/inet.c -+++ b/lib/inet.c -@@ -3,7 +3,7 @@ - * support functions for the net-tools. - * (NET-3 base distribution). - * -- * Version: $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $ -+ * Version: $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -14,11 +14,11 @@ - *960203 {1.23} Bernd Eckenfels : net-features support - *960217 {1.24} Bernd Eckenfels : get_sname - *960219 {1.25} Bernd Eckenfels : extern int h_errno -- *960329 {1.26} Bernd Eckenfels : resolve 255.255.255.255 -+ *960329 {1.26} Bernd Eckenfels : resolve 255.255.255.255 - *980101 {1.27} Bernd Eckenfels : resolve raw sockets in /etc/protocols - *990302 {1.28} Phil Blundell : add netmask to INET_rresolve - *991007 Kurt Garloff : rresolve, resolve: may be hosts -- * <garloff@suse.de> store type (host?) in cache -+ * <garloff@suse.de> store type (host?) in cache - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -96,9 +96,9 @@ static int INET_resolve(char *name, struct sockaddr_in *sin, int hostfirst) - #ifdef DEBUG - if (hostfirst) fprintf (stderr, "gethostbyname (%s)\n", name); - #endif -- if (hostfirst && -+ if (hostfirst && - (hp = gethostbyname(name)) != (struct hostent *) NULL) { -- memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], -+ memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], - sizeof(struct in_addr)); - return 0; - } -@@ -127,24 +127,24 @@ static int INET_resolve(char *name, struct sockaddr_in *sin, int hostfirst) - errno = h_errno; - return -1; - } -- memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], -+ memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], - sizeof(struct in_addr)); - - return 0; - } - - --/* numeric: & 0x8000: default instead of *, -- * & 0x4000: host instead of net, -+/* numeric: & 0x8000: default instead of *, -+ * & 0x4000: host instead of net, - * & 0x0fff: don't resolve - */ --static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, -+static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, - int numeric, unsigned int netmask) - { - struct hostent *ent; - struct netent *np; - struct addr *pn; -- unsigned long ad, host_ad; -+ u_int32_t ad, host_ad; - int host = 0; - - /* Grmpf. -FvK */ -@@ -155,24 +155,34 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, - errno = EAFNOSUPPORT; - return (-1); - } -- ad = (unsigned long) sin->sin_addr.s_addr; -+ ad = sin->sin_addr.s_addr; - #ifdef DEBUG -- fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric); -+ fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x, len %d\n", ad, netmask, numeric, len); - #endif -+ -+ // if no symbolic names are requested we shortcut with ntoa -+ if (numeric & 0x0FFF) { -+ safe_strncpy(name, inet_ntoa(sin->sin_addr), len); -+ return (0); -+ } -+ -+ // we skip getnetbyaddr for 0.0.0.0/0 and 0.0.0.0/~0 - if (ad == INADDR_ANY) { -- if ((numeric & 0x0FFF) == 0) { -+ if (netmask == INADDR_ANY) { -+ // for 0.0.0.0/0 we hardcode symbolic name - if (numeric & 0x8000) - safe_strncpy(name, "default", len); - else - safe_strncpy(name, "*", len); - return (0); -+ } else { -+ // for 0.0.0.0/1 we skip getnetbyname() -+ safe_strncpy(name, "0.0.0.0", len); -+ return (0); - } - } -- if (numeric & 0x0FFF) { -- safe_strncpy(name, inet_ntoa(sin->sin_addr), len); -- return (0); -- } - -+ // it is a host address if flagged or any host bits set - if ((ad & (~netmask)) != 0 || (numeric & 0x4000)) - host = 1; - #if 0 -@@ -183,7 +193,7 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, - if (pn->addr.sin_addr.s_addr == ad && pn->host == host) { - safe_strncpy(name, pn->name, len); - #ifdef DEBUG -- fprintf (stderr, "rresolve: found %s %08lx in cache\n", (host? "host": "net"), ad); -+ fprintf (stderr, "rresolve: found %s %08lx in cache (name=%s, len=%d)\n", (host? "host": "net"), ad, name, len); - #endif - return (0); - } -@@ -210,12 +220,11 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, - } - if ((ent == NULL) && (np == NULL)) - safe_strncpy(name, inet_ntoa(sin->sin_addr), len); -- pn = (struct addr *) malloc(sizeof(struct addr)); -+ pn = (struct addr *) xmalloc(sizeof(struct addr)); - pn->addr = *sin; - pn->next = INET_nn; - pn->host = host; -- pn->name = (char *) malloc(strlen(name) + 1); -- strcpy(pn->name, name); -+ pn->name = xstrdup(name); - INET_nn = pn; - - return (0); -@@ -229,35 +238,35 @@ static void INET_reserror(char *text) - - - /* Display an Internet socket address. */ --static char *INET_print(unsigned char *ptr) -+static const char *INET_print(const char *ptr) - { - return (inet_ntoa((*(struct in_addr *) ptr))); - } - - - /* Display an Internet socket address. */ --static char *INET_sprint(struct sockaddr *sap, int numeric) -+static const char *INET_sprint(struct sockaddr *sap, int numeric) - { - static char buff[128]; - - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); - -- if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, -+ if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, - numeric, 0xffffff00) != 0) - return (NULL); - - return (buff); - } - --char *INET_sprintmask(struct sockaddr *sap, int numeric, -+char *INET_sprintmask(struct sockaddr *sap, int numeric, - unsigned int netmask) - { - static char buff[128]; - - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); -- if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, -+ if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, - numeric, netmask) != 0) - return (NULL); - return (buff); -@@ -385,10 +394,8 @@ static int read_services(void) - setservent(1); - while ((se = getservent())) { - /* Allocate a service entry. */ -- item = (struct service *) malloc(sizeof(struct service)); -- if (item == NULL) -- perror("netstat"); -- item->name = strdup(se->s_name); -+ item = (struct service *) xmalloc(sizeof(struct service)); -+ item->name = xstrdup(se->s_name); - item->number = se->s_port; - - /* Fill it in. */ -@@ -398,16 +405,17 @@ static int read_services(void) - add2list(&udp_name, item); - } else if (!strcmp(se->s_proto, "raw")) { - add2list(&raw_name, item); -+ } else { /* sctp, ddp, dccp */ -+ free(item->name); -+ free(item); - } - } - endservent(); - setprotoent(1); - while ((pe = getprotoent())) { - /* Allocate a service entry. */ -- item = (struct service *) malloc(sizeof(struct service)); -- if (item == NULL) -- perror("netstat"); -- item->name = strdup(pe->p_name); -+ item = (struct service *) xmalloc(sizeof(struct service)); -+ item->name = xstrdup(pe->p_name); - item->number = htons(pe->p_proto); - add2list(&raw_name, item); - } -@@ -416,35 +424,38 @@ static int read_services(void) - } - - --char *get_sname(int socknumber, char *proto, int numeric) -+const char *get_sname(int socknumber, const char *proto, int numeric) - { - static char buffer[64], init = 0; - struct service *item; - - if (socknumber == 0) - return ("*"); -- if (numeric) { -- sprintf(buffer, "%d", ntohs(socknumber)); -- return (buffer); -- } -+ if (numeric) -+ goto do_ntohs; -+ - if (!init) { - (void) read_services(); - init = 1; - } - buffer[0] = '\0'; -- if (!strcmp(proto, "tcp")) { -- if ((item = searchlist(tcp_name, socknumber)) != NULL) -- sprintf(buffer, "%s", item->name); -- } else if (!strcmp(proto, "udp")) { -- if ((item = searchlist(udp_name, socknumber)) != NULL) -- sprintf(buffer, "%s", item->name); -- } else if (!strcmp(proto, "raw")) { -- if ((item = searchlist(raw_name, socknumber)) != NULL) -- sprintf(buffer, "%s", item->name); -- -+ if (!strcmp(proto, "tcp")) -+ item = searchlist(tcp_name, socknumber); -+ else if (!strcmp(proto, "udp")) -+ item = searchlist(udp_name, socknumber); -+ else if (!strcmp(proto, "raw")) -+ item = searchlist(raw_name, socknumber); -+ else -+ item = NULL; -+ if (item) { -+ strncpy(buffer, item->name, sizeof(buffer)); -+ buffer[sizeof(buffer) - 1] = '\0'; - } -- if (!buffer[0]) -+ -+ if (!buffer[0]) { -+ do_ntohs: - sprintf(buffer, "%d", ntohs(socknumber)); -+ } - return (buffer); - } - -diff --git a/lib/inet6.c b/lib/inet6.c -index 1f936b3..b428d07 100644 ---- a/lib/inet6.c -+++ b/lib/inet6.c -@@ -3,7 +3,7 @@ - * support functions for the net-tools. - * (most of it copied from lib/inet.c 1.26). - * -- * Version: $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $ -+ * Version: $Id: inet6.c,v 1.13 2010-07-05 22:52:00 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -44,6 +44,21 @@ - - extern int h_errno; /* some netdb.h versions don't export this */ - -+char * fix_v4_address(char *buf, struct in6_addr *in6) -+{ -+ if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { -+ char *s =strchr(buf, '.'); -+ if (s) { -+ while (s > buf && *s != ':') -+ --s; -+ if (*s == ':') ++s; -+ else s = NULL; -+ } -+ if (s) return s; -+ } -+ return buf; -+} -+ - static int INET6_resolve(char *name, struct sockaddr_in6 *sin6) - { - struct addrinfo req, *ai; -@@ -69,10 +84,9 @@ static int INET6_resolve(char *name, struct sockaddr_in6 *sin6) - #endif - - --static int INET6_rresolve(char *name, struct sockaddr_in6 *sin6, int numeric) -+static int INET6_rresolve(char *name, size_t namelen, -+ struct sockaddr_in6 *sin6, int numeric) - { -- int s; -- - /* Grmpf. -FvK */ - if (sin6->sin6_family != AF_INET6) { - #ifdef DEBUG -@@ -83,21 +97,20 @@ static int INET6_rresolve(char *name, struct sockaddr_in6 *sin6, int numeric) - return (-1); - } - if (numeric & 0x7FFF) { -- inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80); -+ inet_ntop( AF_INET6, &sin6->sin6_addr, name, namelen); - return (0); - } - if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - if (numeric & 0x8000) -- strcpy(name, "default"); -+ safe_strncpy(name, "default", namelen); - else -- strcpy(name, "*"); -+ safe_strncpy(name, "[::]", namelen); - return (0); - } - -- if ((s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), -- name, 255 /* !! */ , NULL, 0, 0))) { -- fputs("getnameinfo failed\n", stderr); -- return -1; -+ if (getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), -+ name, namelen , NULL, 0, 0)) { -+ inet_ntop( AF_INET6, &sin6->sin6_addr, name, namelen); - } - return (0); - } -@@ -109,41 +122,48 @@ static void INET6_reserror(char *text) - } - - -+ - /* Display an Internet socket address. */ --static char *INET6_print(unsigned char *ptr) -+static const char *INET6_print(const char *ptr) - { - static char name[80]; - - inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80); -- return name; -+ return fix_v4_address(name, (struct in6_addr *)ptr); - } - - - /* Display an Internet socket address. */ - /* dirty! struct sockaddr usually doesn't suffer for inet6 addresses, fst. */ --static char *INET6_sprint(struct sockaddr *sap, int numeric) -+static const char *INET6_sprint(struct sockaddr *sap, int numeric) - { - static char buff[128]; - - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); -- if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0) -+ if (INET6_rresolve(buff, sizeof(buff), -+ (struct sockaddr_in6 *) sap, numeric) != 0) - return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); -- return (buff); -+ return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr)); - } - - - static int INET6_getsock(char *bufp, struct sockaddr *sap) - { - struct sockaddr_in6 *sin6; -+ char *p; - - sin6 = (struct sockaddr_in6 *) sap; - sin6->sin6_family = AF_INET6; - sin6->sin6_port = 0; -+ sin6->sin6_scope_id = 0; -+ sin6->sin6_flowinfo = 0; - - if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0) - return (-1); -- -+ p = fix_v4_address(bufp, &sin6->sin6_addr); -+ if (p != bufp) -+ memcpy(bufp, p, strlen(p)+1); - return 16; /* ?;) */ - } - -diff --git a/lib/inet6_gr.c b/lib/inet6_gr.c -index 14f32eb..72b4a66 100644 ---- a/lib/inet6_gr.c -+++ b/lib/inet6_gr.c -@@ -1,4 +1,4 @@ --/* -+ /* - Modifications: - 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets, - snprintf instead of sprintf -@@ -31,6 +31,7 @@ - #include "pathnames.h" - #include "intl.h" - #include "net-features.h" -+#include "util.h" - - /* neighbour discovery from linux-2.4.0/include/net/neighbour.h */ - -@@ -63,7 +64,7 @@ int rprint_fib6(int ext, int numeric) - struct sockaddr_in6 saddr6, snaddr6; - int num, iflags, metric, refcnt, use, prefix_len, slen; - FILE *fp = fopen(_PATH_PROCNET_ROUTE6, "r"); -- -+ - char addr6p[8][5], saddr6p[8][5], naddr6p[8][5]; - - if (!fp) { -@@ -71,14 +72,18 @@ int rprint_fib6(int ext, int numeric) - printf(_("INET6 (IPv6) not configured in this system.\n")); - return 1; - } -- printf(_("Kernel IPv6 routing table\n")); - -- printf(_("Destination " -- "Next Hop " -- "Flags Metric Ref Use Iface\n")); -+ if (numeric & RTF_CACHE) -+ printf(_("Kernel IPv6 routing cache\n")); -+ else -+ printf(_("Kernel IPv6 routing table\n")); -+ -+ printf(_("Destination " -+ "Next Hop " -+ "Flag Met Ref Use If\n")); - - while (fgets(buff, 1023, fp)) { -- num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n", -+ num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %15s\n", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7], - &prefix_len, -@@ -87,20 +92,24 @@ int rprint_fib6(int ext, int numeric) - &slen, - naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3], - naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7], -- &metric, &use, &refcnt, &iflags, iface); --#if 0 -- if (num < 23) -- continue; --#endif -- if (!(iflags & RTF_UP)) -+ &metric, &refcnt, &use, &iflags, iface); -+ if (0 && num < 23) - continue; -+ if (iflags & RTF_CACHE) { -+ if (!(numeric & RTF_CACHE)) -+ continue; -+ } else { -+ if (numeric & RTF_CACHE) -+ continue; -+ } -+ - /* Fetch and resolve the target address. */ - snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7]); - inet6_aftype.input(1, addr6, (struct sockaddr *) &saddr6); - snprintf(addr6, sizeof(addr6), "%s/%d", -- inet6_aftype.sprint((struct sockaddr *) &saddr6, 1), -+ inet6_aftype.sprint((struct sockaddr *) &saddr6, numeric), - prefix_len); - - /* Fetch and resolve the nexthop address. */ -@@ -109,10 +118,15 @@ int rprint_fib6(int ext, int numeric) - naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7]); - inet6_aftype.input(1, naddr6, (struct sockaddr *) &snaddr6); - snprintf(naddr6, sizeof(naddr6), "%s", -- inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1)); -+ inet6_aftype.sprint((struct sockaddr *) &snaddr6, numeric)); - - /* Decode the flags. */ -- strcpy(flags, "U"); -+ -+ flags[0]=0; -+ if (iflags & RTF_UP) -+ strcat(flags, "U"); -+ if (iflags & RTF_REJECT) -+ strcat(flags, "!"); - if (iflags & RTF_GATEWAY) - strcat(flags, "G"); - if (iflags & RTF_HOST) -@@ -123,9 +137,19 @@ int rprint_fib6(int ext, int numeric) - strcat(flags, "A"); - if (iflags & RTF_CACHE) - strcat(flags, "C"); -+ if (iflags & RTF_ALLONLINK) -+ strcat(flags, "a"); -+ if (iflags & RTF_EXPIRES) -+ strcat(flags, "e"); -+ if (iflags & RTF_MODIFIED) -+ strcat(flags, "m"); -+ if (iflags & RTF_NONEXTHOP) -+ strcat(flags, "n"); -+ if (iflags & RTF_FLOW) -+ strcat(flags, "f"); - - /* Print the info. */ -- printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n", -+ printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n", - addr6, naddr6, flags, metric, refcnt, use, iface); - } - -@@ -138,14 +162,13 @@ int rprint_cache6(int ext, int numeric) - char buff[4096], iface[16], flags[16]; - char addr6[128], haddr[20], statestr[20]; - struct sockaddr_in6 saddr6; -- int type, num, refcnt, prefix_len, location, state, gc; -+ int type, refcnt, prefix_len, location, state, gc; - long tstamp, expire, ndflags, reachable, stale, delete; - FILE *fp = fopen(_PATH_PROCNET_NDISC, "r"); - char addr6p[8][5], haddrp[6][3]; - - if (!fp) { -- ESYSNOT("nd_print", "ND Table"); -- return 1; -+ return rprint_fib6(ext, numeric | RTF_CACHE); - } - printf(_("Kernel IPv6 Neighbour Cache\n")); - -@@ -160,7 +183,7 @@ int rprint_cache6(int ext, int numeric) - - - while (fgets(buff, 1023, fp)) { -- num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %08lx %08lx %08lx %04x %04x %04lx %8s %2s%2s%2s%2s%2s%2s\n", -+ sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %08lx %08lx %08lx %04x %04x %04lx %8s %2s%2s%2s%2s%2s%2s\n", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7], - &location, &prefix_len, &type, &state, &expire, &tstamp, &reachable, &gc, &refcnt, -@@ -194,31 +217,31 @@ int rprint_cache6(int ext, int numeric) - /* Decode the state */ - switch (state) { - case NUD_NONE: -- strcpy(statestr, "NONE"); -+ safe_strncpy(statestr, "NONE", sizeof(statestr)); - break; - case NUD_INCOMPLETE: -- strcpy(statestr, "INCOMPLETE"); -+ safe_strncpy(statestr, "INCOMPLETE", sizeof(statestr)); - break; - case NUD_REACHABLE: -- strcpy(statestr, "REACHABLE"); -+ safe_strncpy(statestr, "REACHABLE", sizeof(statestr)); - break; - case NUD_STALE: -- strcpy(statestr, "STALE"); -+ safe_strncpy(statestr, "STALE", sizeof(statestr)); - break; - case NUD_DELAY: -- strcpy(statestr, "DELAY"); -+ safe_strncpy(statestr, "DELAY", sizeof(statestr)); - break; - case NUD_PROBE: -- strcpy(statestr, "PROBE"); -+ safe_strncpy(statestr, "PROBE", sizeof(statestr)); - break; - case NUD_FAILED: -- strcpy(statestr, "FAILED"); -+ safe_strncpy(statestr, "FAILED", sizeof(statestr)); - break; - case NUD_NOARP: -- strcpy(statestr, "NOARP"); -+ safe_strncpy(statestr, "NOARP", sizeof(statestr)); - break; - case NUD_PERMANENT: -- strcpy(statestr, "PERM"); -+ safe_strncpy(statestr, "PERM", sizeof(statestr)); - break; - default: - snprintf(statestr, sizeof(statestr), "UNKNOWN(%02x)", state); -diff --git a/lib/inet6_sr.c b/lib/inet6_sr.c -index fbfe033..1ad9510 100644 ---- a/lib/inet6_sr.c -+++ b/lib/inet6_sr.c -@@ -33,7 +33,7 @@ - #include "pathnames.h" - #include "intl.h" - #include "net-features.h" -- -+#include "util.h" - - - extern struct aftype inet6_aftype; -@@ -63,7 +63,7 @@ static int INET6_setroute(int action, int options, char **args) - if (*args == NULL) - return (usage()); - -- strcpy(target, *args++); -+ safe_strncpy(target, *args++, sizeof(target)); - if (!strcmp(target, "default")) { - prefix_len = 0; - memset(&sa6, 0, sizeof(sa6)); -@@ -112,7 +112,7 @@ static int INET6_setroute(int action, int options, char **args) - return (usage()); - if (rt.rtmsg_flags & RTF_GATEWAY) - return (usage()); -- strcpy(gateway, *args); -+ safe_strncpy(gateway, *args, sizeof(gateway)); - if (inet6_aftype.input(1, gateway, - (struct sockaddr *) &sa6) < 0) { - inet6_aftype.herror(gateway); -@@ -152,7 +152,7 @@ static int INET6_setroute(int action, int options, char **args) - } - if (devname) { - memset(&ifr, 0, sizeof(ifr)); -- strcpy(ifr.ifr_name, devname); -+ safe_strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name)); - - if (ioctl(skfd, SIOGIFINDEX, &ifr) < 0) { - perror("SIOGIFINDEX"); -diff --git a/lib/inet_gr.c b/lib/inet_gr.c -index d1e5efc..f67e89d 100644 ---- a/lib/inet_gr.c -+++ b/lib/inet_gr.c -@@ -1,5 +1,5 @@ - /* -- $Id: inet_gr.c,v 1.13 2000/10/08 01:00:44 ecki Exp $ -+ $Id: inet_gr.c,v 1.14 2009/07/08 00:24:03 ecki Exp $ - - Modifications: - 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets -@@ -31,14 +31,15 @@ - #include "intl.h" - #include "net-features.h" - #include "proc.h" -+#include "util.h" - extern struct aftype inet_aftype; - --extern char *INET_sprintmask(struct sockaddr *sap, int numeric, -+extern char *INET_sprintmask(struct sockaddr *sap, int numeric, - unsigned int netmask); - - int rprint_fib(int ext, int numeric) - { -- char buff[1024], iface[16], flags[64]; -+ char buff[1024], iface[17], flags[64]; - char gate_addr[128], net_addr[128]; - char mask_addr[128]; - int num, iflags, metric, refcnt, use, mss, window, irtt; -@@ -68,19 +69,19 @@ int rprint_fib(int ext, int numeric) - mss = 0; - - fmt = proc_gen_fmt(_PATH_PROCNET_ROUTE, 0, fp, -- "Iface", "%16s", -- "Destination", "%128s", -- "Gateway", "%128s", -+ "Iface", "%15s", -+ "Destination", "%127s", -+ "Gateway", "%127s", - "Flags", "%X", - "RefCnt", "%d", - "Use", "%d", - "Metric", "%d", -- "Mask", "%128s", -+ "Mask", "%127s", - "MTU", "%d", - "Window", "%d", - "IRTT", "%d", - NULL); -- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d\n" */ -+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d\n" */ - - if (!fmt) - return 1; -@@ -104,18 +105,19 @@ int rprint_fib(int ext, int numeric) - - /* Fetch and resolve the genmask. */ - (void) inet_aftype.input(1, mask_addr, &snet_mask); -- -+ - sin_netmask = (struct sockaddr_in *)&snet_mask; -- strcpy(net_addr, INET_sprintmask(&snet_target, -+ safe_strncpy(net_addr, INET_sprintmask(&snet_target, - (numeric | 0x8000 | (iflags & RTF_HOST? 0x4000: 0)), -- sin_netmask->sin_addr.s_addr)); -- net_addr[15] = '\0'; -+ sin_netmask->sin_addr.s_addr), sizeof(net_addr)); -+ net_addr[15] = '\0'; - -- strcpy(gate_addr, inet_aftype.sprint(&snet_gateway, numeric | 0x4000)); -- gate_addr[15] = '\0'; -+ safe_strncpy(gate_addr, inet_aftype.sprint(&snet_gateway, numeric | 0x4000), -+ sizeof(gate_addr)); -+ gate_addr[15] = '\0'; - -- strcpy(mask_addr, inet_aftype.sprint(&snet_mask, 1)); -- mask_addr[15] = '\0'; -+ safe_strncpy(mask_addr, inet_aftype.sprint(&snet_mask, 1), sizeof(mask_addr)); -+ mask_addr[15] = '\0'; - - /* Decode the flags. */ - flags[0] = '\0'; -@@ -125,7 +127,7 @@ int rprint_fib(int ext, int numeric) - strcat(flags, "G"); - #if HAVE_RTF_REJECT - if (iflags & RTF_REJECT) -- strcpy(flags, "!"); -+ safe_strncpy(flags, "!", sizeof(flags)); - #endif - if (iflags & RTF_HOST) - strcat(flags, "H"); -@@ -205,7 +207,7 @@ int rprint_fib(int ext, int numeric) - - int rprint_cache(int ext, int numeric) - { -- char buff[1024], iface[16], flags[64]; -+ char buff[1024], iface[17], flags[64]; - char gate_addr[128], dest_addr[128], specdst[128]; - char src_addr[128]; - struct sockaddr snet; -@@ -221,17 +223,17 @@ int rprint_cache(int ext, int numeric) - return 1; - } - -- /* Okay, first thing we need to know is the format of the rt_cache. -+ /* Okay, first thing we need to know is the format of the rt_cache. - * I am aware of two possible layouts: - * 2.2.0 - * "Iface\tDestination\tGateway \tFlags\t\tRefCnt\tUse\tMetric\tSource\t\tMTU\tWindow\tIRTT\tTOS\tHHRef\tHHUptod\tSpecDst" -- * "%s\t%08lX\t%08lX\t%8X\t%d\t%u\t%d\t%08lX\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X" -+ * "%s\t%08lX\t%08lX\t%8X\t%d\t%u\t%d\t%08lX\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X" - * - * 2.0.36 - * "Iface\tDestination\tGateway \tFlags\tRefCnt\tUse\tMetric\tSource\t\tMTU\tWindow\tIRTT\tHH\tARP" - * "%s\t%08lX\t%08lX\t%02X\t%d\t%u\t%d\t%08lX\t%d\t%lu\t%u\t%d\t%1d" - */ -- -+ - format = proc_guess_fmt(_PATH_PROCNET_RTCACHE, fp, "IRTT",1,"TOS",2,"HHRef",4,"HHUptod",8,"SpecDst",16,"HH",32,"ARP",64,NULL); - - printf(_("Kernel IP routing cache\n")); -@@ -251,7 +253,7 @@ int rprint_cache(int ext, int numeric) - printf("ERROR: proc_guess_fmt(%s,... returned: %d\n",_PATH_PROCNET_RTCACHE, format); - break; - } -- -+ - rewind(fp); - - if (ext == 1) -@@ -268,21 +270,21 @@ int rprint_cache(int ext, int numeric) - "MSS Window irtt HH Arp\n")); - - fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp, -- "Iface", "%16s", -- "Destination", "%128s", -- "Gateway", "%128s", -+ "Iface", "%15s", -+ "Destination", "%127s", -+ "Gateway", "%127s", - "Flags", "%X", - "RefCnt", "%d", - "Use", "%d", - "Metric", "%d", -- "Source", "%128s", -+ "Source", "%127s", - "MTU", "%d", - "Window", "%d", - "IRTT", "%d", - "HH", "%d", - "ARP", "%d", - NULL); -- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d\n" */ -+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d\n" */ - } - - if (format == 2) { -@@ -291,23 +293,23 @@ int rprint_cache(int ext, int numeric) - "Flags Metric Ref Use Iface " - "MSS Window irtt TOS HHRef HHUptod SpecDst\n")); - fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp, -- "Iface", "%16s", -- "Destination", "%128s", -- "Gateway", "%128s", -+ "Iface", "%15s", -+ "Destination", "%127s", -+ "Gateway", "%127s", - "Flags", "%X", - "RefCnt", "%d", - "Use", "%d", - "Metric", "%d", -- "Source", "%128s", -+ "Source", "%127s", - "MTU", "%d", - "Window", "%d", - "IRTT", "%d", - "TOS", "%d", - "HHRef", "%d", - "HHUptod", "%d", -- "SpecDst", "%128s", -+ "SpecDst", "%127s", - NULL); -- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d %128s\n" */ -+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d %127s\n" */ - } - - -@@ -333,27 +335,23 @@ int rprint_cache(int ext, int numeric) - if (num < 12) - continue; - } -- -+ - - /* Fetch and resolve the target address. */ - (void) inet_aftype.input(1, dest_addr, &snet); -- strcpy(dest_addr, inet_aftype.sprint(&snet, numeric)); -- dest_addr[15] = '\0'; -+ safe_strncpy(dest_addr, inet_aftype.sprint(&snet, numeric), sizeof(dest_addr)); - - /* Fetch and resolve the gateway address. */ - (void) inet_aftype.input(1, gate_addr, &snet); -- strcpy(gate_addr, inet_aftype.sprint(&snet, numeric)); -- gate_addr[15] = '\0'; -+ safe_strncpy(gate_addr, inet_aftype.sprint(&snet, numeric), sizeof(gate_addr)); - - /* Fetch and resolve the source. */ - (void) inet_aftype.input(1, src_addr, &snet); -- strcpy(src_addr, inet_aftype.sprint(&snet, numeric)); -- src_addr[15] = '\0'; -+ safe_strncpy(src_addr, inet_aftype.sprint(&snet, numeric), sizeof(src_addr)); - - /* Fetch and resolve the SpecDst addrerss. */ - (void) inet_aftype.input(1, specdst, &snet); -- strcpy(specdst, inet_aftype.sprint(&snet, numeric)); -- specdst[15] = '\0'; -+ safe_strncpy(specdst, inet_aftype.sprint(&snet, numeric), sizeof(specdst)); - - /* Decode the flags. */ - flags[0] = '\0'; -@@ -367,7 +365,7 @@ if (format == 1) { - strcat(flags, "G"); - #if HAVE_RTF_REJECT - if (iflags & RTF_REJECT) -- strcpy(flags, "!"); -+ safe_strncpy(flags, "!", sizeof(flags)); - #endif - if (iflags & RTF_REINSTATE) - strcat(flags, "R"); -diff --git a/lib/inet_sr.c b/lib/inet_sr.c -index 6d010d5..1a876ae 100644 ---- a/lib/inet_sr.c -+++ b/lib/inet_sr.c -@@ -3,6 +3,7 @@ - 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets - 1999-10-07 - Kurt Garloff - for -host and gws: prefer host names - over networks (or even reject) -+ 2003-10-11 - Maik Broemme - gcc 3.x warnign fixes (default: break;) - */ - - #include "config.h" -@@ -104,7 +105,6 @@ static int INET_setroute(int action, int options, char **args) - isnet = 1; break; - case 2: - isnet = 0; break; -- default: - } - - /* Fill in the other fields. */ -diff --git a/lib/interface.c b/lib/interface.c -index f4d2a9a..67f0d8f 100644 ---- a/lib/interface.c -+++ b/lib/interface.c -@@ -1,13 +1,13 @@ - /* Code to manipulate interface information, shared between ifconfig and -- netstat. -+ netstat. - -- 10/1998 partly rewriten by Andi Kleen to support an interface list. -- I don't claim that the list operations are efficient @). -+ 10/1998 partly rewriten by Andi Kleen to support an interface list. -+ I don't claim that the list operations are efficient @). - - 8/2000 Andi Kleen make the list operations a bit more efficient. - People are crazy enough to use thousands of aliases now. - -- $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $ -+ $Id: interface.c,v 1.35 2011-01-01 03:22:31 ecki Exp $ - */ - - #include "config.h" -@@ -23,6 +23,7 @@ - #include <string.h> - #include <unistd.h> - #include <ctype.h> -+#include <string.h> - - #if HAVE_AFIPX - #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) -@@ -36,7 +37,7 @@ - #include <neteconet/ec.h> - #endif - --#ifdef HAVE_HWSLIP -+#if HAVE_HWSLIP - #include <linux/if_slip.h> - #include <net/if_arp.h> - #endif -@@ -87,49 +88,58 @@ int procnetdev_vsn = 1; - - int ife_short; - -+int if_list_all = 0; /* do we have requested the complete proc list, yet? */ -+ - static struct interface *int_list, *int_last; - - static int if_readlist_proc(char *); - --static struct interface *add_interface(char *name) -+static struct interface *if_cache_add(char *name) - { - struct interface *ife, **nextp, *new; - -+ if (!int_list) -+ int_last = NULL; -+ -+ /* the cache is sorted, so if we hit a smaller if, exit */ - for (ife = int_last; ife; ife = ife->prev) { -- int n = nstrcmp(ife->name, name); -- if (n == 0) -- return ife; -- if (n < 0) -- break; -+ int n = nstrcmp(ife->name, name); -+ if (n == 0) -+ return ife; -+ if (n < 0) -+ break; - } -- new(new); -- safe_strncpy(new->name, name, IFNAMSIZ); -- nextp = ife ? &ife->next : &int_list; -+ new(new); -+ safe_strncpy(new->name, name, IFNAMSIZ); -+ nextp = ife ? &ife->next : &int_list; // keep sorting - new->prev = ife; -- new->next = *nextp; -- if (new->next) -- new->next->prev = new; -+ new->next = *nextp; -+ if (new->next) -+ new->next->prev = new; - else -- int_last = new; -- *nextp = new; -- return new; -+ int_last = new; -+ *nextp = new; -+ return new; - } - - struct interface *lookup_interface(char *name) - { -- struct interface *ife = NULL; -+ /* if we have read all, use it */ -+ if (if_list_all) -+ return if_cache_add(name); - -- if (if_readlist_proc(name) < 0) -- return NULL; -- ife = add_interface(name); -- return ife; -+ /* otherwise we read a limited list */ -+ if (if_readlist_proc(name) < 0) -+ return NULL; -+ -+ return if_cache_add(name); - } - - int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie) - { - struct interface *ife; - -- if (!int_list && (if_readlist() < 0)) -+ if (!if_list_all && (if_readlist() < 0)) - return -1; - for (ife = int_list; ife; ife = ife->next) { - int err = doit(ife, cookie); -@@ -139,13 +149,15 @@ int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie) - return 0; - } - --int free_interface_list(void) -+int if_cache_free(void) - { - struct interface *ife; - while ((ife = int_list) != NULL) { - int_list = ife->next; - free(ife); - } -+ int_last = NULL; -+ if_list_all = 0; - return 0; - } - -@@ -158,7 +170,7 @@ static int if_readconf(void) - int skfd; - - /* SIOCGIFCONF currently seems to only work properly on AF_INET sockets -- (as of 2.1.128) */ -+ (as of 2.1.128) */ - skfd = get_socket_for_af(AF_INET); - if (skfd < 0) { - fprintf(stderr, _("warning: no inet socket available: %s\n"), -@@ -180,7 +192,7 @@ static int if_readconf(void) - } - if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) { - /* assume it overflowed and try again */ -- numreqs += 10; -+ numreqs *= 2; - continue; - } - break; -@@ -188,7 +200,7 @@ static int if_readconf(void) - - ifr = ifc.ifc_req; - for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) { -- add_interface(ifr->ifr_name); -+ if_cache_add(ifr->ifr_name); - ifr++; - } - err = 0; -@@ -198,7 +210,7 @@ out: - return err; - } - --static char *get_name(char *name, char *p) -+char *get_name(char *name, char *p) - { - while (isspace(*p)) - p++; -@@ -206,16 +218,19 @@ static char *get_name(char *name, char *p) - if (isspace(*p)) - break; - if (*p == ':') { /* could be an alias */ -- char *dot = p, *dotname = name; -- *name++ = *p++; -- while (isdigit(*p)) -- *name++ = *p++; -- if (*p != ':') { /* it wasn't, backup */ -- p = dot; -- name = dotname; -+ char *dot = p++; -+ while (*p && isdigit(*p)) p++; -+ if (*p == ':') { -+ /* Yes it is, backup and copy it. */ -+ p = dot; -+ *name++ = *p++; -+ while (*p && isdigit(*p)) { -+ *name++ = *p++; -+ } -+ } else { -+ /* No, it isn't */ -+ p = dot; - } -- if (*p == '\0') -- return NULL; - p++; - break; - } -@@ -225,7 +240,7 @@ static char *get_name(char *name, char *p) - return p; - } - --static int procnetdev_version(char *buf) -+int procnetdev_version(char *buf) - { - if (strstr(buf, "compressed")) - return 3; -@@ -234,12 +249,12 @@ static int procnetdev_version(char *buf) - return 1; - } - --static int get_dev_fields(char *bp, struct interface *ife) -+int get_dev_fields(char *bp, struct interface *ife) - { - switch (procnetdev_vsn) { - case 3: - sscanf(bp, -- "%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu", -+ "%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu", - &ife->stats.rx_bytes, - &ife->stats.rx_packets, - &ife->stats.rx_errors, -@@ -259,7 +274,7 @@ static int get_dev_fields(char *bp, struct interface *ife) - &ife->stats.tx_compressed); - break; - case 2: -- sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu", -+ sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu", - &ife->stats.rx_bytes, - &ife->stats.rx_packets, - &ife->stats.rx_errors, -@@ -277,7 +292,7 @@ static int get_dev_fields(char *bp, struct interface *ife) - ife->stats.rx_multicast = 0; - break; - case 1: -- sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu", -+ sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu", - &ife->stats.rx_packets, - &ife->stats.rx_errors, - &ife->stats.rx_dropped, -@@ -300,25 +315,21 @@ static int get_dev_fields(char *bp, struct interface *ife) - - static int if_readlist_proc(char *target) - { -- static int proc_read; - FILE *fh; - char buf[512]; - struct interface *ife; - int err; - -- if (proc_read) -- return 0; -- if (!target) -- proc_read = 1; -- - fh = fopen(_PATH_PROCNET_DEV, "r"); - if (!fh) { - fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"), -- _PATH_PROCNET_DEV, strerror(errno)); -- return if_readconf(); -- } -- fgets(buf, sizeof buf, fh); /* eat line */ -- fgets(buf, sizeof buf, fh); -+ _PATH_PROCNET_DEV, strerror(errno)); -+ return -2; -+ } -+ if (fgets(buf, sizeof buf, fh)) -+ /* eat line */; -+ if (fgets(buf, sizeof buf, fh)) -+ /* eat line */; - - #if 0 /* pretty, but can't cope with missing fields */ - fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh, -@@ -349,8 +360,8 @@ static int if_readlist_proc(char *target) - err = 0; - while (fgets(buf, sizeof buf, fh)) { - char *s, name[IFNAMSIZ]; -- s = get_name(name, buf); -- ife = add_interface(name); -+ s = get_name(name, buf); -+ ife = if_cache_add(name); - get_dev_fields(s, ife); - ife->statistics_valid = 1; - if (target && !strcmp(target,name)) -@@ -359,7 +370,6 @@ static int if_readlist_proc(char *target) - if (ferror(fh)) { - perror(_PATH_PROCNET_DEV); - err = -1; -- proc_read = 0; - } - - #if 0 -@@ -369,13 +379,23 @@ static int if_readlist_proc(char *target) - return err; - } - --int if_readlist(void) --{ -- int err = if_readlist_proc(NULL); -- if (!err) -- err = if_readconf(); -- return err; --} -+int if_readlist(void) -+{ -+ /* caller will/should check not to call this too often -+ * (i.e. only if if_list_all == 0 -+ */ -+ int proc_err, conf_err; -+ -+ proc_err = if_readlist_proc(NULL); -+ conf_err = if_readconf(); -+ -+ if_list_all = 1; -+ -+ if (proc_err < 0 && conf_err < 0) -+ return -1; -+ else -+ return 0; -+} - - /* Support for fetching an IPX address */ - -@@ -392,14 +412,14 @@ int if_fetch(struct interface *ife) - { - struct ifreq ifr; - int fd; -- char *ifname = ife->name; -+ char *ifname = ife->name; - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) - return (-1); - ife->flags = ifr.ifr_flags; - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) - memset(ife->hwaddr, 0, 32); - else -@@ -407,53 +427,47 @@ int if_fetch(struct interface *ife) - - ife->type = ifr.ifr_hwaddr.sa_family; - -- strcpy(ifr.ifr_name, ifname); -- if (ioctl(skfd, SIOCGIFMETRIC, &ifr) < 0) -- ife->metric = 0; -- else -- ife->metric = ifr.ifr_metric; -- -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0) - ife->mtu = 0; - else - ife->mtu = ifr.ifr_mtu; - --#ifdef HAVE_HWSLIP -+#if HAVE_HWSLIP - if (ife->type == ARPHRD_SLIP || ife->type == ARPHRD_CSLIP || - ife->type == ARPHRD_SLIP6 || ife->type == ARPHRD_CSLIP6 || - ife->type == ARPHRD_ADAPT) { - #ifdef SIOCGOUTFILL -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGOUTFILL, &ifr) < 0) - ife->outfill = 0; - else -- ife->outfill = (unsigned int) ifr.ifr_data; -+ ife->outfill = (unsigned long) ifr.ifr_data; - #endif - #ifdef SIOCGKEEPALIVE -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGKEEPALIVE, &ifr) < 0) - ife->keepalive = 0; - else -- ife->keepalive = (unsigned int) ifr.ifr_data; -+ ife->keepalive = (unsigned long) ifr.ifr_data; - #endif - } - #endif - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) - memset(&ife->map, 0, sizeof(struct ifmap)); - else - memcpy(&ife->map, &ifr.ifr_map, sizeof(struct ifmap)); - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) - memset(&ife->map, 0, sizeof(struct ifmap)); - else - ife->map = ifr.ifr_map; - - #ifdef HAVE_TXQUEUELEN -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) < 0) - ife->tx_queue_len = -1; /* unknown value */ - else -@@ -466,24 +480,24 @@ int if_fetch(struct interface *ife) - /* IPv4 address? */ - fd = get_socket_for_af(AF_INET); - if (fd >= 0) { -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - ifr.ifr_addr.sa_family = AF_INET; - if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { - ife->has_ip = 1; - ife->addr = ifr.ifr_addr; -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFDSTADDR, &ifr) < 0) - memset(&ife->dstaddr, 0, sizeof(struct sockaddr)); - else - ife->dstaddr = ifr.ifr_dstaddr; - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFBRDADDR, &ifr) < 0) - memset(&ife->broadaddr, 0, sizeof(struct sockaddr)); - else - ife->broadaddr = ifr.ifr_broadaddr; - -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFNETMASK, &ifr) < 0) - memset(&ife->netmask, 0, sizeof(struct sockaddr)); - else -@@ -497,7 +511,7 @@ int if_fetch(struct interface *ife) - /* DDP address maybe ? */ - fd = get_socket_for_af(AF_APPLETALK); - if (fd >= 0) { -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { - ife->ddpaddr = ifr.ifr_addr; - ife->has_ddp = 1; -@@ -509,22 +523,22 @@ int if_fetch(struct interface *ife) - /* Look for IPX addresses with all framing types */ - fd = get_socket_for_af(AF_IPX); - if (fd >= 0) { -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (!ipx_getaddr(fd, IPX_FRAME_ETHERII, &ifr)) { - ife->has_ipx_bb = 1; - ife->ipxaddr_bb = ifr.ifr_addr; - } -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (!ipx_getaddr(fd, IPX_FRAME_SNAP, &ifr)) { - ife->has_ipx_sn = 1; - ife->ipxaddr_sn = ifr.ifr_addr; - } -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (!ipx_getaddr(fd, IPX_FRAME_8023, &ifr)) { - ife->has_ipx_e3 = 1; - ife->ipxaddr_e3 = ifr.ifr_addr; - } -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (!ipx_getaddr(fd, IPX_FRAME_8022, &ifr)) { - ife->has_ipx_e2 = 1; - ife->ipxaddr_e2 = ifr.ifr_addr; -@@ -536,7 +550,7 @@ int if_fetch(struct interface *ife) - /* Econet address maybe? */ - fd = get_socket_for_af(AF_ECONET); - if (fd >= 0) { -- strcpy(ifr.ifr_name, ifname); -+ safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { - ife->ecaddr = ifr.ifr_addr; - ife->has_econet = 1; -@@ -548,29 +562,29 @@ int if_fetch(struct interface *ife) - } - - int do_if_fetch(struct interface *ife) --{ -+{ - if (if_fetch(ife) < 0) { -- char *errmsg; -- if (errno == ENODEV) { -- /* Give better error message for this case. */ -- errmsg = _("Device not found"); -- } else { -- errmsg = strerror(errno); -+ char *errmsg; -+ if (errno == ENODEV) { -+ /* Give better error message for this case. */ -+ errmsg = _("Device not found"); -+ } else { -+ errmsg = strerror(errno); - } - fprintf(stderr, _("%s: error fetching interface information: %s\n"), - ife->name, errmsg); - return -1; - } -- return 0; -+ return 0; - } - - int do_if_print(struct interface *ife, void *cookie) - { - int *opt_a = (int *) cookie; -- int res; -+ int res; - -- res = do_if_fetch(ife); -- if (res >= 0) { -+ res = do_if_fetch(ife); -+ if (res >= 0) { - if ((ife->flags & IFF_UP) || *opt_a) - ife_print(ife); - } -@@ -579,11 +593,11 @@ int do_if_print(struct interface *ife, void *cookie) - - void ife_print_short(struct interface *ptr) - { -- printf("%-5.5s ", ptr->name); -- printf("%5d %3d", ptr->mtu, ptr->metric); -+ printf("%-8.8s ", ptr->name); -+ printf("%5d ", ptr->mtu); - /* If needed, display the interface statistics. */ - if (ptr->statistics_valid) { -- printf("%8llu %6lu %6lu %6lu", -+ printf("%8llu %6lu %6lu %-6lu ", - ptr->stats.rx_packets, ptr->stats.rx_errors, - ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors); - printf("%8llu %6lu %6lu %6lu ", -@@ -636,8 +650,9 @@ void ife_print_long(struct interface *ptr) - int hf; - int can_compress = 0; - unsigned long long rx, tx, short_rx, short_tx; -- char Rext[5]="b"; -- char Text[5]="b"; -+ const char *Rext = "B"; -+ const char *Text = "B"; -+ static char flags[200]; - - #if HAVE_AFIPX - static struct aftype *ipxtype = NULL; -@@ -650,7 +665,7 @@ void ife_print_long(struct interface *ptr) - #endif - #if HAVE_AFINET6 - FILE *f; -- char addr6[40], devname[20]; -+ char addr6[40], devname[21]; - struct sockaddr_in6 sap; - int plen, scope, dad_status, if_idx; - extern struct aftype inet6_aftype; -@@ -663,39 +678,79 @@ void ife_print_long(struct interface *ptr) - - hf = ptr->type; - -+#if HAVE_HWSLIP - if (hf == ARPHRD_CSLIP || hf == ARPHRD_CSLIP6) - can_compress = 1; -+#endif - - hw = get_hwntype(hf); - if (hw == NULL) - hw = get_hwntype(-1); - -- printf(_("%-9.9s Link encap:%s "), ptr->name, hw->title); -- /* For some hardware types (eg Ash, ATM) we don't print the -- hardware address if it's null. */ -- if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && -- hw->suppress_null_addr))) -- printf(_("HWaddr %s "), hw->print(ptr->hwaddr)); --#ifdef IFF_PORTSEL -- if (ptr->flags & IFF_PORTSEL) { -- printf(_("Media:%s"), if_port_text[ptr->map.port][0]); -- if (ptr->flags & IFF_AUTOMEDIA) -- printf(_("(auto)")); -- } -+ sprintf(flags, "flags=%d<", ptr->flags); -+ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ -+ if (ptr->flags == 0) -+ strcat(flags,">"); -+ if (ptr->flags & IFF_UP) -+ strcat(flags,_("UP,")); -+ if (ptr->flags & IFF_BROADCAST) -+ strcat(flags,_("BROADCAST,")); -+ if (ptr->flags & IFF_DEBUG) -+ strcat(flags,_("DEBUG,")); -+ if (ptr->flags & IFF_LOOPBACK) -+ strcat(flags,_("LOOPBACK,")); -+ if (ptr->flags & IFF_POINTOPOINT) -+ strcat(flags,_("POINTOPOINT,")); -+ if (ptr->flags & IFF_NOTRAILERS) -+ strcat(flags,_("NOTRAILERS,")); -+ if (ptr->flags & IFF_RUNNING) -+ strcat(flags,_("RUNNING,")); -+ if (ptr->flags & IFF_NOARP) -+ strcat(flags,_("NOARP,")); -+ if (ptr->flags & IFF_PROMISC) -+ strcat(flags,_("PROMISC,")); -+ if (ptr->flags & IFF_ALLMULTI) -+ strcat(flags,_("ALLMULTI,")); -+ if (ptr->flags & IFF_SLAVE) -+ strcat(flags,_("SLAVE,")); -+ if (ptr->flags & IFF_MASTER) -+ strcat(flags,_("MASTER,")); -+ if (ptr->flags & IFF_MULTICAST) -+ strcat(flags,_("MULTICAST,")); -+#ifdef HAVE_DYNAMIC -+ if (ptr->flags & IFF_DYNAMIC) -+ strcat(flags,_("DYNAMIC,")); -+#endif -+ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ -+ if (flags[strlen(flags)-1] == ',') -+ flags[strlen(flags)-1] = '>'; -+ else -+ flags[strlen(flags)-1] = 0; -+ -+ -+ printf(_("%s: %s mtu %d"), -+ ptr->name, flags, ptr->mtu); -+#ifdef SIOCSKEEPALIVE -+ if (ptr->outfill || ptr->keepalive) -+ printf(_(" outfill %d keepalive %d"), -+ ptr->outfill, ptr->keepalive); - #endif - printf("\n"); - -+ -+ - #if HAVE_AFINET - if (ptr->has_ip) { -- printf(_(" %s addr:%s "), ap->name, -+ printf(_(" %s %s"), ap->name, - ap->sprint(&ptr->addr, 1)); -- if (ptr->flags & IFF_POINTOPOINT) { -- printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); -- } -+ printf(_(" netmask %s"), ap->sprint(&ptr->netmask, 1)); - if (ptr->flags & IFF_BROADCAST) { -- printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); -+ printf(_(" broadcast %s"), ap->sprint(&ptr->broadaddr, 1)); - } -- printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); -+ if (ptr->flags & IFF_POINTOPOINT) { -+ printf(_(" destination %s"), ap->sprint(&ptr->dstaddr, 1)); -+ } -+ printf("\n"); - } - #endif - -@@ -703,7 +758,7 @@ void ife_print_long(struct interface *ptr) - /* FIXME: should be integrated into interface.c. */ - - if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) { -- while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n", -+ while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7], - &if_idx, &plen, &scope, &dad_status, devname) != EOF) { -@@ -712,29 +767,30 @@ void ife_print_long(struct interface *ptr) - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7]); - inet6_aftype.input(1, addr6, (struct sockaddr *) &sap); -- printf(_(" inet6 addr: %s/%d"), -- inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen); -- printf(_(" Scope:")); -- switch (scope) { -- case 0: -- printf(_("Global")); -- break; -- case IPV6_ADDR_LINKLOCAL: -- printf(_("Link")); -- break; -- case IPV6_ADDR_SITELOCAL: -- printf(_("Site")); -- break; -- case IPV6_ADDR_COMPATv4: -- printf(_("Compat")); -- break; -- case IPV6_ADDR_LOOPBACK: -- printf(_("Host")); -- break; -- default: -- printf(_("Unknown")); -+ printf(_(" %s %s prefixlen %d"), -+ inet6_aftype.name, -+ inet6_aftype.sprint((struct sockaddr *) &sap, 1), -+ plen); -+ printf(_(" scopeid 0x%x"), scope); -+ -+ flags[0] = '<'; flags[1] = 0; -+ if (scope & IPV6_ADDR_COMPATv4) { -+ strcat(flags, _("compat,")); -+ scope -= IPV6_ADDR_COMPATv4; - } -- printf("\n"); -+ if (scope == 0) -+ strcat(flags, _("global,")); -+ if (scope & IPV6_ADDR_LINKLOCAL) -+ strcat(flags, _("link,")); -+ if (scope & IPV6_ADDR_SITELOCAL) -+ strcat(flags, _("site,")); -+ if (scope & IPV6_ADDR_LOOPBACK) -+ strcat(flags, _("host,")); -+ if (flags[strlen(flags)-1] == ',') -+ flags[strlen(flags)-1] = '>'; -+ else -+ flags[strlen(flags)-1] = 0; -+ printf("%s\n", flags); - } - } - fclose(f); -@@ -747,17 +803,17 @@ void ife_print_long(struct interface *ptr) - - if (ipxtype != NULL) { - if (ptr->has_ipx_bb) -- printf(_(" IPX/Ethernet II addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_bb, 1)); -+ printf(_(" %s Ethernet-II %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1)); - if (ptr->has_ipx_sn) -- printf(_(" IPX/Ethernet SNAP addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_sn, 1)); -+ printf(_(" %s Ethernet-SNAP %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1)); - if (ptr->has_ipx_e2) -- printf(_(" IPX/Ethernet 802.2 addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_e2, 1)); -+ printf(_(" %s Ethernet802.2 %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1)); - if (ptr->has_ipx_e3) -- printf(_(" IPX/Ethernet 802.3 addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_e3, 1)); -+ printf(_(" %s Ethernet802.3 %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1)); - } - #endif - -@@ -766,7 +822,7 @@ void ife_print_long(struct interface *ptr) - ddptype = get_afntype(AF_APPLETALK); - if (ddptype != NULL) { - if (ptr->has_ddp) -- printf(_(" EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1)); -+ printf(_(" %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1)); - } - #endif - -@@ -775,53 +831,30 @@ void ife_print_long(struct interface *ptr) - ectype = get_afntype(AF_ECONET); - if (ectype != NULL) { - if (ptr->has_econet) -- printf(_(" econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1)); -+ printf(_(" %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1)); - } - #endif - -- printf(" "); -- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ -- if (ptr->flags == 0) -- printf(_("[NO FLAGS] ")); -- if (ptr->flags & IFF_UP) -- printf(_("UP ")); -- if (ptr->flags & IFF_BROADCAST) -- printf(_("BROADCAST ")); -- if (ptr->flags & IFF_DEBUG) -- printf(_("DEBUG ")); -- if (ptr->flags & IFF_LOOPBACK) -- printf(_("LOOPBACK ")); -- if (ptr->flags & IFF_POINTOPOINT) -- printf(_("POINTOPOINT ")); -- if (ptr->flags & IFF_NOTRAILERS) -- printf(_("NOTRAILERS ")); -- if (ptr->flags & IFF_RUNNING) -- printf(_("RUNNING ")); -- if (ptr->flags & IFF_NOARP) -- printf(_("NOARP ")); -- if (ptr->flags & IFF_PROMISC) -- printf(_("PROMISC ")); -- if (ptr->flags & IFF_ALLMULTI) -- printf(_("ALLMULTI ")); -- if (ptr->flags & IFF_SLAVE) -- printf(_("SLAVE ")); -- if (ptr->flags & IFF_MASTER) -- printf(_("MASTER ")); -- if (ptr->flags & IFF_MULTICAST) -- printf(_("MULTICAST ")); --#ifdef HAVE_DYNAMIC -- if (ptr->flags & IFF_DYNAMIC) -- printf(_("DYNAMIC ")); --#endif -- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ -- printf(_(" MTU:%d Metric:%d"), -- ptr->mtu, ptr->metric ? ptr->metric : 1); --#ifdef SIOCSKEEPALIVE -- if (ptr->outfill || ptr->keepalive) -- printf(_(" Outfill:%d Keepalive:%d"), -- ptr->outfill, ptr->keepalive); -+ /* For some hardware types (eg Ash, ATM) we don't print the -+ hardware address if it's null. */ -+ if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && -+ hw->suppress_null_addr))) -+ printf(_(" %s %s"), hw->name, hw->print(ptr->hwaddr)); -+ else -+ printf(_(" %s"), hw->name); -+ if (ptr->tx_queue_len != -1) -+ printf(_(" txqueuelen %d"), ptr->tx_queue_len); -+ printf(" (%s)\n", hw->title); -+ -+#ifdef IFF_PORTSEL -+ if (ptr->flags & IFF_PORTSEL) { -+ printf(_(" media %s"), if_port_text[ptr->map.port][0]); -+ if (ptr->flags & IFF_AUTOMEDIA) -+ printf(_("autoselect")); -+ printf("\n"); -+ } - #endif -- printf("\n"); -+ - - /* If needed, display the interface statistics. */ - -@@ -830,55 +863,87 @@ void ife_print_long(struct interface *ptr) - * not for the aliases, although strictly speaking they're shared - * by all addresses. - */ -- printf(" "); -- -- printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"), -- ptr->stats.rx_packets, ptr->stats.rx_errors, -- ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, -- ptr->stats.rx_frame_errors); -- if (can_compress) -- printf(_(" compressed:%lu\n"), ptr->stats.rx_compressed); -- -- rx = ptr->stats.rx_bytes; -+ rx = ptr->stats.rx_bytes; -+ short_rx = rx * 10; -+ if (rx > 1125899906842624ull) { -+ short_rx /= 1125899906842624ull; -+ Rext = "PiB"; -+ } else if (rx > 1099511627776ull) { -+ short_rx /= 1099511627776ull; -+ Rext = "TiB"; -+ } else if (rx > 1073741824ull) { -+ short_rx /= 1073741824ull; -+ Rext = "GiB"; -+ } else if (rx > 1048576) { -+ short_rx /= 1048576; -+ Rext = "MiB"; -+ } else if (rx > 1024) { -+ short_rx /= 1024; -+ Rext = "KiB"; -+ } - tx = ptr->stats.tx_bytes; -- short_rx = rx * 10; - short_tx = tx * 10; -- if (rx > 1048576) { short_rx /= 1048576; strcpy(Rext, "Mb"); } -- else if (rx > 1024) { short_rx /= 1024; strcpy(Rext, "Kb"); } -- if (tx > 1048576) { short_tx /= 1048576; strcpy(Text, "Mb"); } -- else if (tx > 1024) { short_tx /= 1024; strcpy(Text, "Kb"); } -+ if (tx > 1125899906842624ull) { -+ short_tx /= 1125899906842624ull; -+ Text = "PiB"; -+ } else if (tx > 1099511627776ull) { -+ short_tx /= 1099511627776ull; -+ Text = "TiB"; -+ } else if (tx > 1073741824ull) { -+ short_tx /= 1073741824ull; -+ Text = "GiB"; -+ } else if (tx > 1048576) { -+ short_tx /= 1048576; -+ Text = "MiB"; -+ } else if (tx > 1024) { -+ short_tx /= 1024; -+ Text = "KiB"; -+ } - -- printf(" "); -- printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), -- ptr->stats.tx_packets, ptr->stats.tx_errors, -+ printf(" "); -+ printf(_("RX packets %llu bytes %llu (%lu.%lu %s)\n"), -+ ptr->stats.rx_packets, -+ rx, (unsigned long)(short_rx / 10), -+ (unsigned long)(short_rx % 10), Rext); -+ if (can_compress) { -+ printf(" "); -+ printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed); -+ } -+ printf(" "); -+ printf(_("RX errors %lu dropped %lu overruns %lu frame %lu\n"), -+ ptr->stats.rx_errors, ptr->stats.rx_dropped, -+ ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors); -+ -+ -+ printf(" "); -+ printf(_("TX packets %llu bytes %llu (%lu.%lu %s)\n"), -+ ptr->stats.tx_packets, -+ tx, (unsigned long)(short_tx / 10), -+ (unsigned long)(short_tx % 10), Text); -+ if (can_compress) { -+ printf(" "); -+ printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed); -+ } -+ printf(" "); -+ printf(_("TX errors %lu dropped %lu overruns %lu carrier %lu collisions %lu\n"), -+ ptr->stats.tx_errors, - ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, -- ptr->stats.tx_carrier_errors); -- printf(_(" collisions:%lu "), ptr->stats.collisions); -- if (can_compress) -- printf(_("compressed:%lu "), ptr->stats.tx_compressed); -- if (ptr->tx_queue_len != -1) -- printf(_("txqueuelen:%d "), ptr->tx_queue_len); -- printf("\n "); -- printf(_("RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n"), -- rx, (unsigned long)(short_rx / 10), -- (unsigned long)(short_rx % 10), Rext, -- tx, (unsigned long)(short_tx / 10), -- (unsigned long)(short_tx % 10), Text); -+ ptr->stats.tx_carrier_errors, ptr->stats.collisions); - } - - if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || -- ptr->map.base_addr)) { -- printf(" "); -+ ptr->map.base_addr >= 0x100)) { -+ printf(" device "); - if (ptr->map.irq) -- printf(_("Interrupt:%d "), ptr->map.irq); -- if (ptr->map.base_addr >= 0x100) /* Only print devices using it for -+ printf(_("interrupt %d "), ptr->map.irq); -+ if (ptr->map.base_addr >= 0x100) /* Only print devices using it for - I/O maps */ -- printf(_("Base address:0x%x "), ptr->map.base_addr); -+ printf(_("base 0x%x "), ptr->map.base_addr); - if (ptr->map.mem_start) { -- printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); -+ printf(_("memory 0x%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); - } - if (ptr->map.dma) -- printf(_("DMA chan:%x "), ptr->map.dma); -+ printf(_(" dma 0x%x"), ptr->map.dma); - printf("\n"); - } - printf("\n"); -diff --git a/lib/ipx.c b/lib/ipx.c -index 0e760a3..837788c 100644 ---- a/lib/ipx.c -+++ b/lib/ipx.c -@@ -42,7 +42,7 @@ - #endif - - /* Display a ipx domain address. */ --static char *IPX_print(unsigned char *ptr) -+static const char *IPX_print(const char *ptr) - { - static char buff[64]; - struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) (ptr - 2); -@@ -73,7 +73,7 @@ static char *IPX_print(unsigned char *ptr) - - - /* Display a ipx domain address. */ --static char *IPX_sprint(struct sockaddr *sap, int numeric) -+static const char *IPX_sprint(struct sockaddr *sap, int numeric) - { - static char buf[64]; - -@@ -87,12 +87,10 @@ static int IPX_getsock(char *bufp, struct sockaddr *sap) - { - char *sp = bufp, *bp; - unsigned int i; -- unsigned char val; - struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) sap; - - sipx->sipx_port = 0; - -- val = 0; - bp = (char *) sipx->sipx_node; - for (i = 0; i < sizeof(sipx->sipx_node); i++) { - *sp = toupper(*sp); -@@ -133,6 +131,9 @@ static int IPX_input(int type, char *bufp, struct sockaddr *sap) - char *ep; - int nbo; - -+ if (!sai) -+ return (-1); -+ - sai->sipx_family = AF_IPX; - sai->sipx_network = htonl(0); - sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] = -diff --git a/lib/ipx_gr.c b/lib/ipx_gr.c -index 3d7ef1d..09c8dcd 100644 ---- a/lib/ipx_gr.c -+++ b/lib/ipx_gr.c -@@ -27,6 +27,7 @@ - #include "net-support.h" - #include "pathnames.h" - #include "intl.h" -+#include "util.h" - - /* UGLY */ - -@@ -38,25 +39,32 @@ int IPX_rprint(int options) - char net[128], router_net[128]; - char router_node[128]; - int num; -- FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r"); -+ FILE *fp; - struct aftype *ap; - struct sockaddr sa; - -- if ((ap = get_afntype(AF_IPX)) == NULL) { -- EINTERN("lib/ipx_rt.c", "AF_IPX missing"); -- return (-1); -+ fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r"); -+ -+ if (!fp) { -+ fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r"); - } - - if (!fp) { -- perror(_PATH_PROCNET_IPX_ROUTE); -- printf(_("IPX not configured in this system.\n")); -+ perror(NULL); -+ printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2); - return 1; - } - -+ if ((ap = get_afntype(AF_IPX)) == NULL) { -+ EINTERN("lib/ipx_rt.c", "AF_IPX missing"); -+ return (-1); -+ } -+ - printf(_("Kernel IPX routing table\n")); /* xxx */ - printf(_("Destination Router Net Router Node\n")); - -- fgets(buff, 1023, fp); -+ if (fgets(buff, 1023, fp)) -+ /* eat line */; - - while (fgets(buff, 1023, fp)) { - num = sscanf(buff, "%s %s %s", net, router_net, router_node); -@@ -65,15 +73,15 @@ int IPX_rprint(int options) - - /* Fetch and resolve the Destination */ - (void) ap->input(5, net, &sa); -- strcpy(net, ap->sprint(&sa, numeric)); -+ safe_strncpy(net, ap->sprint(&sa, numeric), sizeof(net)); - - /* Fetch and resolve the Router Net */ - (void) ap->input(5, router_net, &sa); -- strcpy(router_net, ap->sprint(&sa, numeric)); -+ safe_strncpy(router_net, ap->sprint(&sa, numeric), sizeof(router_net)); - - /* Fetch and resolve the Router Node */ - (void) ap->input(2, router_node, &sa); -- strcpy(router_node, ap->sprint(&sa, numeric)); -+ safe_strncpy(router_node, ap->sprint(&sa, numeric), sizeof(router_node)); - - printf("%-25s %-25s %-25s\n", net, router_net, router_node); - } -diff --git a/lib/irda.c b/lib/irda.c -index fa147fe..3658673 100644 ---- a/lib/irda.c -+++ b/lib/irda.c -@@ -1,29 +1,31 @@ - /********************************************************************* -- * -+ * - * Filename: irda.c -- * Version: 0.1 -- * Description: A first attempt to make ifconfig understand IrDA -+ * Version: 0.2 -+ * Description: A second attempt to make ifconfig understand IrDA - * Status: Experimental. - * Author: Dag Brattli <dagb@cs.uit.no> - * Created at: Wed Apr 21 09:03:09 1999 - * Modified at: Wed Apr 21 09:17:05 1999 - * Modified by: Dag Brattli <dagb@cs.uit.no> -- * -- * 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 2 of -+ * Modified at: Wed May 1 11:51:44 CEST 2002 -+ * Modified by: Christoph Bartelmus <christoph@bartelmus.de> -+ * -+ * 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 2 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, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA -- * -+ * - ********************************************************************/ - - #include "config.h" -@@ -57,11 +59,11 @@ - * Print hardware address of interface - * - */ --static char *irda_print(unsigned char *ptr) -+static const char *irda_print(const char *ptr) - { -- static char buff[8]; -+ static char buff[12]; - -- sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], -+ snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], - ptr[1], ptr[0]); - - return (buff); -diff --git a/lib/loopback.c b/lib/loopback.c -index 0f08ac2..1b7e9cc 100644 ---- a/lib/loopback.c -+++ b/lib/loopback.c -@@ -32,7 +32,7 @@ - #include "util.h" - - /* Display an UNSPEC address. */ --static char *pr_unspec(unsigned char *ptr) -+static const char *pr_unspec(const char *ptr) - { - static char buff[64]; - char *pos; -diff --git a/lib/masq_info.c b/lib/masq_info.c -index 45ca689..3a97a98 100644 ---- a/lib/masq_info.c -+++ b/lib/masq_info.c -@@ -6,7 +6,7 @@ - * NET-3 Networking Distribution for the LINUX operating - * system. (net-tools, net-drivers) - * -- * Version: $Id: masq_info.c,v 1.7 2000/10/08 01:00:44 ecki Exp $ -+ * Version: $Id: masq_info.c,v 1.8 2009/09/06 22:52:01 vapier Exp $ - * - * Author: Bernd 'eckes' Eckenfels <net-tools@lina.inka.de> - * Copyright 1999 Bernd Eckenfels, Germany -@@ -119,7 +119,9 @@ static int read_masqinfo(FILE * f, struct masq *mslist, int nmslist) - ms->src.sin_family = AF_INET; - ms->dst.sin_family = AF_INET; - -- if (strcmp("TCP", buf) == 0) -+ if (strcmp("IP", buf) == 0) -+ ms->proto = "ip"; -+ else if (strcmp("TCP", buf) == 0) - ms->proto = "tcp"; - else if (strcmp("UDP", buf) == 0) - ms->proto = "udp"; -@@ -206,10 +208,9 @@ int ip_masq_info(int numeric_host, int numeric_port, int ext) - } - for (i = 0; i < ntotal; i++) - print_masq(&(mslist[i]), numeric_host, numeric_port, ext); -- if (mslist) -- free(mslist); -- - } -+ -+ free(mslist); - return 0; - } - #endif -diff --git a/lib/net-features.h b/lib/net-features.h -index 0de2730..569f4a5 100644 ---- a/lib/net-features.h -+++ b/lib/net-features.h -@@ -20,7 +20,7 @@ - * your option) any later version. - */ - --/* -+/* - * This needs to be included AFTER the KErnel Header Files - * one of the FEATURE_ should be defined to get the Feature Variable - * definition included -@@ -117,6 +117,9 @@ static char *Features = - "-I18N" - #endif /* I18N */ - -+#if HAVE_SELINUX -+" +SELINUX" -+#endif - - "\nAF: " - #ifdef DFLT_AF -@@ -183,6 +186,12 @@ static char *Features = - "-" - #endif - "ROSE " -+#if HAVE_AFBLUETOOTH -+"+" -+#else -+"-" -+#endif -+"BLUETOOTH" - - "\nHW: " - -@@ -295,6 +304,13 @@ static char *Features = - "-" - #endif - "HDLC/LAPB " -+ -+#if HAVE_HWEUI64 -+"+" -+#else -+"-" -+#endif -+"EUI64 " - ; - - -diff --git a/lib/net-support.h b/lib/net-support.h -index 568fe81..0841170 100644 ---- a/lib/net-support.h -+++ b/lib/net-support.h -@@ -38,15 +38,15 @@ struct aftype { - char *title; - int af; - int alen; -- char *(*print) (unsigned char *); -- char *(*sprint) (struct sockaddr *, int numeric); -+ const char *(*print) (const char *); -+ const char *(*sprint) (struct sockaddr *, int numeric); - int (*input) (int type, char *bufp, struct sockaddr *); - void (*herror) (char *text); - int (*rprint) (int options); - int (*rinput) (int typ, int ext, char **argv); - - /* may modify src */ -- int (*getmask) (char *src, struct sockaddr * mask, char *name); -+ int (*getmask) (char *src, struct sockaddr *mask, char *name); - - int fd; - char *flag_file; -@@ -60,7 +60,7 @@ struct hwtype { - char *title; - int type; - int alen; -- char *(*print) (unsigned char *); -+ const char *(*print) (const char *); - int (*input) (char *, struct sockaddr *); - int (*activate) (int fd); - int suppress_null_addr; -@@ -119,11 +119,12 @@ extern int IPX_rinput(int action, int flags, char **argv); - extern int NETROM_rinput(int action, int flags, char **argv); - extern int AX25_rinput(int action, int flags, char **argv); - extern int X25_rinput(int action, int flags, char **argv); -+extern int ROSE_rinput(int action, int flags, char **argv); - - extern int aftrans_opt(const char *arg); - extern void aftrans_def(char *tool, char *argv0, char *dflt); - --extern char *get_sname(int socknumber, char *proto, int numeric); -+extern const char *get_sname(int socknumber, const char *proto, int numeric); - - extern int flag_unx; - extern int flag_ipx; -@@ -131,14 +132,16 @@ extern int flag_ax25; - extern int flag_ddp; - extern int flag_netrom; - extern int flag_x25; -+extern int flag_rose; - extern int flag_inet; - extern int flag_inet6; -+extern int flag_bluetooth; - --extern char afname[]; -+extern char afname[256]; - - #define AFTRANS_OPTS \ - {"ax25", 0, 0, 1}, \ -- {"x25", 0, 0, 1}, \ -+ {"x25", 0, 0, 1}, \ - {"ip", 0, 0, 1}, \ - {"ipx", 0, 0, 1}, \ - {"appletalk", 0, 0, 1}, \ -@@ -146,9 +149,11 @@ extern char afname[]; - {"inet", 0, 0, 1}, \ - {"inet6", 0, 0, 1}, \ - {"ddp", 0, 0, 1}, \ -+ {"rose", 0, 0, 1}, \ - {"unix", 0, 0, 1}, \ -+ {"bluetooth", 0, 0, 1}, \ - {"tcpip", 0, 0, 1} --#define AFTRANS_CNT 11 -+#define AFTRANS_CNT 12 - - #define EINTERN(file, text) fprintf(stderr, \ - _("%s: Internal Error `%s'.\n"),file,text); -@@ -163,8 +168,8 @@ extern char afname[]; - #define E_NOTFOUND 8 - #define E_SOCK 7 - #define E_LOOKUP 6 --#define E_VERSION 5 --#define E_USAGE 4 -+#define E_VERSION EXIT_SUCCESS -+#define E_USAGE EXIT_SUCCESS - #define E_OPTERR 3 - #define E_INTERN 2 - #define E_NOSUPP 1 -@@ -234,7 +239,7 @@ extern char afname[]; - /* this is a 2.0.36 flag from /usr/src/linux/include/linux/route.h */ - #define RTF_NOTCACHED 0x0400 /* this route isn't cached */ - --#ifdef HAVE_AFECONET -+#if HAVE_AFECONET - #ifndef AF_ECONET - #define AF_ECONET 19 /* Acorn Econet */ - #endif -diff --git a/lib/netrom.c b/lib/netrom.c -index 1de9dc3..dfe1ae3 100644 ---- a/lib/netrom.c -+++ b/lib/netrom.c -@@ -11,7 +11,7 @@ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -- * -+ * - * Changes: - * 980701 {1.21} Arnaldo Carvalho de Melo - GNU gettext instead of catgets, - * strncpy instead of strcpy for -@@ -52,7 +52,7 @@ static char netrom_errmsg[128]; - - extern struct aftype netrom_aftype; - --static char *NETROM_print(unsigned char *ptr) -+static const char *NETROM_print(const char *ptr) - { - static char buff[8]; - int i; -@@ -71,7 +71,7 @@ static char *NETROM_print(unsigned char *ptr) - - - /* Display an AX.25 socket address. */ --static char *NETROM_sprint(struct sockaddr *sap, int numeric) -+static const char *NETROM_sprint(struct sockaddr *sap, int numeric) - { - char buf[64]; - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) -@@ -79,10 +79,15 @@ static char *NETROM_sprint(struct sockaddr *sap, int numeric) - return (NETROM_print(((struct sockaddr_ax25 *) sap)->sax25_call.ax25_call)); - } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - static int NETROM_input(int type, char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char *orig, c; - unsigned int i; - -@@ -98,9 +103,8 @@ static int NETROM_input(int type, char *bufp, struct sockaddr *sap) - c = toupper(c); - if (!(isupper(c) || isdigit(c))) { - safe_strncpy(netrom_errmsg, _("Invalid callsign"), sizeof(netrom_errmsg)); --#ifdef DEBUG -- fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig); - errno = EINVAL; - return (-1); - } -@@ -111,9 +115,8 @@ static int NETROM_input(int type, char *bufp, struct sockaddr *sap) - /* Callsign too long? */ - if ((i == 6) && (*bufp != '-') && (*bufp != '\0')) { - safe_strncpy(netrom_errmsg, _("Callsign too long"), sizeof(netrom_errmsg)); --#ifdef DEBUG -- fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig); - errno = E2BIG; - return (-1); - } -@@ -131,12 +134,12 @@ static int NETROM_input(int type, char *bufp, struct sockaddr *sap) - } - - /* All done. */ --#ifdef DEBUG -- fprintf(stderr, "netrom_input(%s): ", orig); -- for (i = 0; i < sizeof(ax25_address); i++) -- fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); -- fprintf(stderr, "\n"); --#endif -+ if (_DEBUG) { -+ fprintf(stderr, "netrom_input(%s): ", orig); -+ for (i = 0; i < sizeof(ax25_address); i++) -+ fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); -+ fprintf(stderr, "\n"); -+ } - - return (0); - } -diff --git a/lib/netrom_gr.c b/lib/netrom_gr.c -index adf54b2..ec82fe8 100644 ---- a/lib/netrom_gr.c -+++ b/lib/netrom_gr.c -@@ -10,7 +10,7 @@ - * - * Changes: - * 980701 {0.02} Arnaldo Carvalho de Melo GNU gettext instead of catgets -- * -+ * - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -39,9 +39,7 @@ int NETROM_rprint(int options) - /*int ext = options & FLAG_EXT; - int numeric = options & FLAG_NUM_HOST; */ - -- f1 = fopen(_PATH_PROCNET_NR_NODES, "r"); - if (!f1) perror(_PATH_PROCNET_NR_NODES); -- f2 = fopen(_PATH_PROCNET_NR_NEIGH, "r"); - if (!f2) perror(_PATH_PROCNET_NR_NEIGH); - - if (f1 == NULL || f2 == NULL) { -@@ -50,7 +48,8 @@ int NETROM_rprint(int options) - } - printf(_("Kernel NET/ROM routing table\n")); - printf(_("Destination Mnemonic Quality Neighbour Iface\n")); -- fgets(buffer, 256, f1); -+ if (fgets(buffer, 256, f1)) -+ /* eat line */; - while (fgets(buffer, 256, f1)) { - buffer[9] = 0; - buffer[17] = 0; -@@ -60,7 +59,8 @@ int NETROM_rprint(int options) - qual = atoi(buffer + 24 + 15 * w); - n = atoi(buffer + 32 + 15 * w); - rewind(f2); -- fgets(buffer, 256, f2); -+ if (fgets(buffer, 256, f2)) -+ /* eat line */; - while (fgets(buffer, 256, f2)) { - if (atoi(buffer) == n) { - buffer[15] = 0; -diff --git a/lib/nstrcmp.c b/lib/nstrcmp.c -index 8b1ff30..e05c778 100644 ---- a/lib/nstrcmp.c -+++ b/lib/nstrcmp.c -@@ -1,34 +1,190 @@ - /* Copyright 1998 by Andi Kleen. Subject to the GPL. */ --/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ -+/* rewritten by bernd eckenfels because of complicated alias semantic */ -+/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ - #include <ctype.h> - #include <stdlib.h> -+#include <string.h> - #include "util.h" - --/* like strcmp(), but knows about numbers */ --int nstrcmp(const char *astr, const char *b) -+ -+/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */ -+char* cutalias(char* name) -+{ -+ int digit = 0; -+ int pos; -+ -+ for(pos=strlen(name); pos>0; pos--) -+ { -+ if (name[pos-1]==':' && digit) -+ { -+ name[pos-1]='\0'; -+ return name+pos; -+ } -+ if (!isdigit(name[pos-1])) -+ break; -+ digit = 1; -+ } -+ return NULL; -+} -+ -+ -+/* return index of last non digit or -1 if it does not end with digits */ -+int rindex_nondigit(char *name) -+{ -+ int pos = strlen(name); -+ -+ for(pos=strlen(name); pos>0; pos--) -+ { -+ if (!isdigit(name[pos-1])) -+ return pos; -+ } -+ return 0; -+} -+ -+ -+/* like strcmp(), but knows about numbers and ':' alias suffix */ -+int nstrcmp(const char *ap, const char *bp) -+{ -+ char *a = xstrdup(ap); -+ char *b = xstrdup(bp); -+ char *an, *bn; -+ int av = 0, bv = 0; -+ char *aalias=cutalias(a); -+ char *balias=cutalias(b); -+ int aindex=rindex_nondigit(a); -+ int bindex=rindex_nondigit(b); -+ int complen=(aindex<bindex)?aindex:bindex; -+ int res = strncmp(a, b, complen); -+ -+ if (res != 0) { -+ goto out; -+ } -+ -+ if (aindex > bindex) { -+ res = 1; -+ goto out; -+ } -+ -+ if (aindex < bindex) { -+ res = -1; -+ goto out; -+ } -+ -+ an = a+aindex; -+ bn = b+bindex; -+ -+ av = atoi(an); -+ bv = atoi(bn); -+ -+ if (av < bv) { -+ res = -1; -+ goto out; -+ } -+ -+ if (av > bv) { -+ res = 1; -+ goto out; -+ } -+ -+ res = strcmp(a, b); -+ if (res != 0) { -+ goto out; -+ } -+ -+ av = -1; -+ if (aalias != NULL) -+ av = atoi(aalias); -+ -+ bv = -1; -+ if (balias != NULL) -+ bv = atoi(balias); -+ -+ if (av < bv) { -+ res = -1; -+ goto out; -+ } -+ -+ if (av > bv) { -+ res = 1; -+ goto out; -+ } -+ -+ if (aalias && balias) { -+ res = strcmp(aalias, balias); -+ } -+ -+out: -+ -+ free(a); free(b); -+ -+ return res; -+} -+ -+ -+#ifdef NSTRCMP_TEST -+ -+int cs(int s) -+{ -+ if (s < 0) return -1; -+ if (s > 0) return 1; -+ return 0; -+} -+ -+ -+int dotest(char* a, char* b, int exp) -+{ -+ int res = nstrcmp(a, b); -+ int err = (cs(res) != cs(exp)); -+ printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK"); -+ return err; -+} -+ -+int main() - { -- const char *a = astr; -- -- while (*a == *b) { -- if (*a == '\0') -- return 0; -- a++; -- b++; -- } -- if (isdigit(*a)) { -- if (!isdigit(*b)) -- return -1; -- while (a > astr) { -- a--; -- if (!isdigit(*a)) { -- a++; -- break; -- } -- if (!isdigit(*b)) -- return -1; -- b--; -- } -- return atoi(a) > atoi(b) ? 1 : -1; -- } -- return *a - *b; -+ int err = 0; -+ -+ err |= dotest("eth1", "eth1", 0); -+ err |= dotest("eth0:1", "eth0:1", 0); -+ err |= dotest("lan", "lan", 0); -+ err |= dotest("100", "100", 0); -+ err |= dotest("", "", 0); -+ err |= dotest(":", ":", 0); -+ err |= dotest("a:b:c", "a:b:c", 0); -+ err |= dotest("a:", "a:", 0); -+ err |= dotest(":a", ":a", 0); -+ -+ err |= dotest("a", "aa", -1); -+ err |= dotest("eth0", "eth1", -1); -+ err |= dotest("eth1", "eth20", -1); -+ err |= dotest("eth20", "eth100", -1); -+ err |= dotest("eth1", "eth13", -1); -+ err |= dotest("eth", "eth2", -1); -+ err |= dotest("eth0:1", "eth0:2", -1); -+ err |= dotest("eth1:10", "eth13:10", -1); -+ err |= dotest("eth1:1", "eth1:13", -1); -+ err |= dotest("a", "a:", -1); -+ -+ err |= dotest("aa", "a", 1); -+ err |= dotest("eth2", "eth1", 1); -+ err |= dotest("eth13", "eth1", 1); -+ err |= dotest("eth2", "eth", 1); -+ err |= dotest("eth2:10", "eth2:1", 1); -+ err |= dotest("eth2:5", "eth2:4", 1); -+ err |= dotest("eth3:2", "eth2:3", 1); -+ err |= dotest("eth13:1", "eth1:0", 1); -+ err |= dotest("a:", "a", 1); -+ err |= dotest("a1b12", "a1b2", 1); -+ -+ err |= dotest("eth1", "eth01", 1); -+ err |= dotest("eth01", "eth1", -1); -+ err |= dotest("eth1:1", "eth01:1", 1); -+ err |= dotest("eth01:1", "eth1:1", -1); -+ err |= dotest("eth1:1", "eth01:01", 1); -+ err |= dotest("eth1:01", "eth01:1", 1); -+ err |= dotest("eth01:1", "eth1:01", -1); -+ err |= dotest("eth01:01", "eth1:1", -1); -+ -+ return err; - } -+ -+#endif -diff --git a/lib/pathnames.h b/lib/pathnames.h -index 1f7fefb..14b051c 100644 ---- a/lib/pathnames.h -+++ b/lib/pathnames.h -@@ -1,9 +1,8 @@ -- - /* -- * lib/pathnames.h This file contains the definitions of the path -+ * lib/pathnames.h This file contains the definitions of the path - * names used by the NET-LIB. - * -- * NET-LIB -+ * NET-LIB - * - * Version: lib/pathnames.h 1.37 (1997-08-23) - * -@@ -17,6 +16,12 @@ - #define _PATH_PROCNET_TCP6 "/proc/net/tcp6" - #define _PATH_PROCNET_UDP "/proc/net/udp" - #define _PATH_PROCNET_UDP6 "/proc/net/udp6" -+#define _PATH_PROCNET_UDPLITE "/proc/net/udplite" -+#define _PATH_PROCNET_UDPLITE6 "/proc/net/udplite6" -+#define _PATH_PROCNET_SCTPEPTS "/proc/net/sctp/eps" -+#define _PATH_PROCNET_SCTP6EPTS "/proc/net/sctp6/eps" -+#define _PATH_PROCNET_SCTPASSOCS "/proc/net/sctp/assocs" -+#define _PATH_PROCNET_SCTP6ASSOCS "/proc/net/sctp6/assocs" - #define _PATH_PROCNET_RAW "/proc/net/raw" - #define _PATH_PROCNET_RAW6 "/proc/net/raw6" - #define _PATH_PROCNET_UNIX "/proc/net/unix" -@@ -29,8 +34,10 @@ - #define _PATH_PROCNET_NR_NODES "/proc/net/nr_nodes" - #define _PATH_PROCNET_ARP "/proc/net/arp" - #define _PATH_PROCNET_AX25 "/proc/net/ax25" --#define _PATH_PROCNET_IPX "/proc/net/ipx" --#define _PATH_PROCNET_IPX_ROUTE "/proc/net/ipx_route" -+#define _PATH_PROCNET_IPX_SOCKET1 "/proc/net/ipx/socket" -+#define _PATH_PROCNET_IPX_SOCKET2 "/proc/net/ipx" -+#define _PATH_PROCNET_IPX_ROUTE1 "/proc/net/ipx/route" -+#define _PATH_PROCNET_IPX_ROUTE2 "/proc/net/ipx_route" - #define _PATH_PROCNET_ATALK "/proc/net/appletalk" - #define _PATH_PROCNET_IP_BLK "/proc/net/ip_block" - #define _PATH_PROCNET_IP_FWD "/proc/net/ip_forward" -@@ -42,9 +49,12 @@ - #define _PATH_PROCNET_RARP "/proc/net/rarp" - #define _PATH_ETHERS "/etc/ethers" - #define _PATH_PROCNET_ROSE_ROUTE "/proc/net/rose_routes" --#define _PATH_PROCNET_X25 "/proc/net/x25" --#define _PATH_PROCNET_X25_ROUTE "/proc/net/x25_routes" -+#define _PATH_PROCNET_X25 "/proc/net/x25" -+#define _PATH_PROCNET_X25_ROUTE "/proc/net/x25/route" - #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" -+#define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route" -+#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/class/bluetooth/l2cap" -+#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/class/bluetooth/rfcomm" - - /* pathname for the netlink device */ - #define _PATH_DEV_ROUTE "/dev/route" -diff --git a/lib/ppp.c b/lib/ppp.c -index 8bf1499..27d660c 100644 ---- a/lib/ppp.c -+++ b/lib/ppp.c -@@ -8,7 +8,7 @@ - * Copyright 1993 MicroWalt Corporation - * - * Modified by Alan Cox, May 94 to cover NET-3 -- * -+ * - * Changes: - * 980701 {1.12} Arnaldo Carvalho de Melo - GNU gettext instead of catgets - * -diff --git a/lib/proc.c b/lib/proc.c -index bf34dbe..8e4711d 100644 ---- a/lib/proc.c -+++ b/lib/proc.c -@@ -1,11 +1,14 @@ - /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */ --/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ --/* Fixme: cannot currently cope with removed fields */ -+/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ -+/* Fixme: cannot currently cope with removed fields */ - - #include <string.h> - #include <stdarg.h> - #include <stdio.h> -+#include <stdlib.h> - #include <ctype.h> -+#include <unistd.h> -+#include "util.h" - - /* Caller must free return string. */ - -@@ -46,10 +49,10 @@ char *proc_gen_fmt(char *name, int more, FILE * fh,...) - name, title); - return NULL; - } -- return strdup(format); -+ return xstrdup(format); - } - --/* -+/* - * this will generate a bitmask of present/missing fields in the header of - * a /proc file. - */ -@@ -72,3 +75,22 @@ int proc_guess_fmt(char *name, FILE *fh, ...) - va_end(ap); - return flag; - } -+ -+ -+FILE *proc_fopen(const char *name) -+{ -+ static char *buffer; -+ static size_t pagesz; -+ FILE *fd = fopen(name, "r"); -+ -+ if (fd == NULL) -+ return NULL; -+ -+ if (!buffer) { -+ pagesz = getpagesize(); -+ buffer = malloc(pagesz); -+ } -+ -+ setvbuf(fd, buffer, _IOFBF, pagesz); -+ return fd; -+} -diff --git a/lib/proc.h b/lib/proc.h -index 91f803c..379de23 100644 ---- a/lib/proc.h -+++ b/lib/proc.h -@@ -1,5 +1,7 @@ -- -- --/* Generate a suitable scanf format for a column title line */ -+/* -+ * prototypes for proc.c -+ */ - char *proc_gen_fmt(char *name, int more, FILE * fh,...); - int proc_guess_fmt(char *name, FILE* fh,...); -+FILE *proc_fopen(const char *name); -+ -diff --git a/lib/rose.c b/lib/rose.c -index 381226b..6286cb1 100644 ---- a/lib/rose.c -+++ b/lib/rose.c -@@ -34,6 +34,7 @@ - #include "net-support.h" - #include "pathnames.h" - #include "intl.h" -+#include "util.h" - - #ifndef _NETROSE_ROSE_H - #include <linux/ax25.h> -@@ -53,8 +54,8 @@ static char ROSE_errmsg[128]; - - extern struct aftype rose_aftype; - --static char * -- ROSE_print(unsigned char *ptr) -+static const char * -+ ROSE_print(const char *ptr) - { - static char buff[12]; - -@@ -64,7 +65,7 @@ static char * - } - - /* Display a ROSE socket address. */ --static char * -+static const char * - ROSE_sprint(struct sockaddr *sap, int numeric) - { - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) -@@ -73,7 +74,6 @@ static char * - return (ROSE_print(((struct sockaddr_rose *) sap)->srose_addr.rose_addr)); - } - -- - static int ROSE_input(int type, char *bufp, struct sockaddr *sap) - { - char *ptr; -@@ -84,10 +84,7 @@ static int ROSE_input(int type, char *bufp, struct sockaddr *sap) - - /* Node address the correct length ? */ - if (strlen(bufp) != 10) { -- strcpy(ROSE_errmsg, _("Node address must be ten digits")); --#ifdef DEBUG -- fprintf(stderr, "rose_input(%s): %s !\n", ROSE_errmsg, orig); --#endif -+ safe_strncpy(ROSE_errmsg, _("Node address must be ten digits"), sizeof(ROSE_errmsg)); - errno = EINVAL; - return (-1); - } -@@ -98,13 +95,6 @@ static int ROSE_input(int type, char *bufp, struct sockaddr *sap) - } - - /* All done. */ --#ifdef DEBUG -- fprintf(stderr, "rose_input(%s): ", orig); -- for (i = 0; i < sizeof(rose_address); i++) -- fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); -- fprintf(stderr, "\n"); --#endif -- - return (0); - } - -diff --git a/lib/rose_gr.c b/lib/rose_gr.c -index cf0a60a..a0858fd 100644 ---- a/lib/rose_gr.c -+++ b/lib/rose_gr.c -@@ -53,7 +53,8 @@ int ROSE_rprint(int options) - } - printf(_("Kernel ROSE routing table\n")); - printf(_("Destination Iface Use\n")); -- fgets(buffer, 256, f); -+ if (fgets(buffer, 256, f)) -+ /* eat line */; - while (fgets(buffer, 256, f)) { - buffer[9] = 0; - buffer[14] = 0; -diff --git a/lib/strip.c b/lib/strip.c -index fd396ba..ced2325 100644 ---- a/lib/strip.c -+++ b/lib/strip.c -@@ -38,8 +38,8 @@ - - extern struct hwtype strip_hwtype; - --static char * --pr_strip(unsigned char *ptr) -+static const char * -+pr_strip(const char *ptr) - { - static char buff[64]; - if(ptr[1]) -diff --git a/lib/tr.c b/lib/tr.c -index 8d86aa7..c5314da 100644 ---- a/lib/tr.c -+++ b/lib/tr.c -@@ -2,7 +2,7 @@ - * lib/tr.c This file contains an implementation of the "Tokenring" - * support functions. - * -- * Version: $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $ -+ * Version: $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * Copyright 1993 MicroWalt Corporation -@@ -30,10 +30,16 @@ - #include "net-support.h" - #include "pathnames.h" - #include "intl.h" -+#include "util.h" - -+ -+/* actual definition at the end of file */ - extern struct hwtype tr_hwtype; -+#ifdef ARPHRD_IEEE802_TR -+extern struct hwtype tr_hwtype1; -+#endif - --static char *pr_tr(unsigned char *ptr) -+static const char *pr_tr(const char *ptr) - { - static char buff[64]; - -@@ -42,16 +48,31 @@ static char *pr_tr(unsigned char *ptr) - (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) - ); - return (buff); --} -+ } - -+#ifdef DEBUG -+#define _DEBUG 1 -+#else -+#define _DEBUG 0 -+#endif - - static int in_tr(char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char c, *orig; - int i, val; - -+#ifdef ARPHRD_IEEE802_TR -+ if (kernel_version() < KRELEASE(2,3,30)) { -+ sap->sa_family = tr_hwtype.type; -+ } else { -+ sap->sa_family = tr_hwtype1.type; -+ } -+#else - sap->sa_family = tr_hwtype.type; -+ #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)" -+#endif -+ - ptr = sap->sa_data; - - i = 0; -@@ -66,9 +87,8 @@ static int in_tr(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val = c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -81,9 +101,8 @@ static int in_tr(char *bufp, struct sockaddr *sap) - else if (c >= 'A' && c <= 'F') - val |= c - 'A' + 10; - else { --#ifdef DEBUG -- fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig); --#endif -+ if (_DEBUG) -+ fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig); - errno = EINVAL; - return (-1); - } -@@ -92,28 +111,21 @@ static int in_tr(char *bufp, struct sockaddr *sap) - - /* We might get a semicolon here - not required. */ - if (*bufp == ':') { -- if (i == TR_ALEN) { --#ifdef DEBUG -+ if (_DEBUG && i == TR_ALEN) - fprintf(stderr, _("in_tr(%s): trailing : ignored!\n"), -- orig) --#endif -- ; /* nothing */ -- } -+ orig); - bufp++; - } - } - - /* That's it. Any trailing junk? */ -- if ((i == TR_ALEN) && (*bufp != '\0')) { --#ifdef DEBUG -+ if (_DEBUG && (i == TR_ALEN) && (*bufp != '\0')) { - fprintf(stderr, _("in_tr(%s): trailing junk!\n"), orig); - errno = EINVAL; - return (-1); --#endif - } --#ifdef DEBUG -- fprintf(stderr, "in_tr(%s): %s\n", orig, pr_tr(sap->sa_data)); --#endif -+ if (_DEBUG) -+ fprintf(stderr, "in_tr(%s): %s\n", orig, pr_tr(sap->sa_data)); - - return (0); - } -diff --git a/lib/tunnel.c b/lib/tunnel.c -index 19606c1..8a160bf 100644 ---- a/lib/tunnel.c -+++ b/lib/tunnel.c -@@ -21,7 +21,7 @@ - - extern struct hwtype ether_hwtype; - --static char *pr_tunnel(unsigned char *ptr) -+static const char *pr_tunnel(const char *ptr) - { - return (""); - } -diff --git a/lib/unix.c b/lib/unix.c -index fb4dcce..936cd48 100644 ---- a/lib/unix.c -+++ b/lib/unix.c -@@ -32,7 +32,7 @@ - - - /* Display an UNSPEC address. */ --static char *UNSPEC_print(unsigned char *ptr) -+static const char *UNSPEC_print(const char *ptr) - { - static char buff[64]; - char *pos; -@@ -48,7 +48,7 @@ static char *UNSPEC_print(unsigned char *ptr) - - - /* Display an UNSPEC socket address. */ --static char *UNSPEC_sprint(struct sockaddr *sap, int numeric) -+static const char *UNSPEC_sprint(struct sockaddr *sap, int numeric) - { - static char buf[64]; - -@@ -61,14 +61,14 @@ static char *UNSPEC_sprint(struct sockaddr *sap, int numeric) - #if HAVE_AFUNIX - - /* Display a UNIX domain address. */ --static char *UNIX_print(unsigned char *ptr) -+static const char *UNIX_print(const char *ptr) - { - return (ptr); - } - - - /* Display a UNIX domain address. */ --static char *UNIX_sprint(struct sockaddr *sap, int numeric) -+static const char *UNIX_sprint(struct sockaddr *sap, int numeric) - { - static char buf[64]; - -diff --git a/lib/util-ank.c b/lib/util-ank.c -index 43a7f1c..b077f35 100644 ---- a/lib/util-ank.c -+++ b/lib/util-ank.c -@@ -293,7 +293,7 @@ int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits) - return 0; - } - --const char *format_host(int af, void *addr, __u8 *abuf, int alen) -+const char *format_host(int af, void *addr, char *abuf, int alen) - { - #ifdef RESOLVE_HOSTNAMES - if (resolve_hosts) { -diff --git a/lib/util.c b/lib/util.c -index ac932f4..0397f1e 100644 ---- a/lib/util.c -+++ b/lib/util.c -@@ -1,4 +1,4 @@ --/* Copyright 1998 by Andi Kleen. Subject to the GPL. */ -+/* Copyright 1998 by Andi Kleen. Subject to the GPL. */ - /* $Id: util.c,v 1.4 1998/11/17 15:17:02 freitag Exp $ */ - #include <stdio.h> - #include <stdlib.h> -@@ -22,6 +22,15 @@ void *xmalloc(size_t sz) - return p; - } - -+/* Like strdup, but oom() instead of NULL */ -+char *xstrdup(const char *s) -+{ -+ char *d = strdup(s); -+ if (!d) -+ oom(); -+ return d; -+} -+ - void *xrealloc(void *oldp, size_t sz) - { - void *p = realloc(oldp, sz); -@@ -33,19 +42,19 @@ void *xrealloc(void *oldp, size_t sz) - int kernel_version(void) - { - struct utsname uts; -- int major, minor, patch; -+ int major, minor, patch=0; - - if (uname(&uts) < 0) - return -1; -- if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) -+ if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) < 2) - return -1; - return KRELEASE(major, minor, patch); - } - - --/* Like strncpy but make sure the resulting string is always 0 terminated. */ -+/* Like strncpy but make sure the resulting string is always 0 terminated. */ - char *safe_strncpy(char *dst, const char *src, size_t size) --{ -+{ - dst[size-1] = '\0'; -- return strncpy(dst,src,size-1); -+ return strncpy(dst,src,size-1); - } -diff --git a/lib/util.h b/lib/util.h -index 6acb158..b7598e8 100644 ---- a/lib/util.h -+++ b/lib/util.h -@@ -2,6 +2,7 @@ - - void *xmalloc(size_t sz); - void *xrealloc(void *p, size_t sz); -+char *xstrdup(const char *src); - - #define new(p) ((p) = xmalloc(sizeof(*(p)))) - -@@ -12,5 +13,8 @@ int kernel_version(void); - - int nstrcmp(const char *, const char *); - --char *safe_strncpy(char *dst, const char *src, size_t size); -+char *safe_strncpy(char *dst, const char *src, size_t size); - -+ -+#define netmin(a,b) ((a)<(b) ? (a) : (b)) -+#define netmax(a,b) ((a)>(b) ? (a) : (b)) -diff --git a/lib/x25.c b/lib/x25.c -index 1ffb569..45de5af 100644 ---- a/lib/x25.c -+++ b/lib/x25.c -@@ -38,6 +38,7 @@ - #include "net-locale.h" - #endif - #include "intl.h" -+#include "util.h" - - static char X25_errmsg[128]; - -@@ -50,8 +51,8 @@ extern struct aftype x25_aftype; - #endif - - --static char * --X25_print(unsigned char *ptr) -+static const char * -+X25_print(const char *ptr) - { - static char buff[X25_ADDR_LEN+1]; - -@@ -63,7 +64,7 @@ X25_print(unsigned char *ptr) - - - /* Display an X.25 socket address. */ --static char * -+static const char * - X25_sprint(struct sockaddr *sap, int numeric) - { - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) -@@ -78,7 +79,7 @@ X25_sprint(struct sockaddr *sap, int numeric) - static int - X25_input(int type, char *bufp, struct sockaddr *sap) - { -- unsigned char *ptr; -+ char *ptr; - char *p; - unsigned int sigdigits; - -@@ -88,9 +89,11 @@ X25_input(int type, char *bufp, struct sockaddr *sap) - - /* Address the correct length ? */ - if (strlen(bufp)>18) { -- strcpy(X25_errmsg, _("Address can't exceed eighteen digits with sigdigits")); -+ safe_strncpy(X25_errmsg, -+ _("Address can't exceed eighteen digits with sigdigits"), -+ sizeof(X25_errmsg)); - #ifdef DEBUG -- fprintf(stderr, "x25_input(%s): %s !\n", X25_errmsg, orig); -+ fprintf(stderr, "x25_input(%s): %s !\n", bufp, X25_errmsg); - #endif - errno = EINVAL; - return(-1); -@@ -105,10 +108,11 @@ X25_input(int type, char *bufp, struct sockaddr *sap) - } - - if (strlen(bufp) < 1 || strlen(bufp) > 15 || sigdigits > strlen(bufp)) { -- *p = '/'; -- strcpy(X25_errmsg, _("Invalid address")); -+ if (p != NULL) -+ *p = '/'; -+ safe_strncpy(X25_errmsg, _("Invalid address"), sizeof(X25_errmsg)); - #ifdef DEBUG -- fprintf(stderr, "x25_input(%s): %s !\n", X25_errmsg, orig); -+ fprintf(stderr, "x25_input(%s): %s !\n", bufp, X25_errmsg); - #endif - errno = EINVAL; - return(-1); -@@ -118,10 +122,7 @@ X25_input(int type, char *bufp, struct sockaddr *sap) - - /* All done. */ - #ifdef DEBUG -- fprintf(stderr, "x25_input(%s): ", orig); -- for (i = 0; i < sizeof(x25_address); i++) -- fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); -- fprintf(stderr, "\n"); -+ fprintf(stderr, "x25_input(%s)\n", bufp); - #endif - - return sigdigits; -@@ -152,7 +153,7 @@ struct hwtype x25_hwtype = { - }; - - struct aftype x25_aftype = --{ -+{ - "x25", NULL, /*"CCITT X.25", */ AF_X25, X25_ADDR_LEN, - X25_print, X25_sprint, X25_input, X25_herror, - X25_rprint, X25_rinput, NULL /* getmask */, -diff --git a/lib/x25_gr.c b/lib/x25_gr.c -index 187fc05..79682e0 100644 ---- a/lib/x25_gr.c -+++ b/lib/x25_gr.c -@@ -37,6 +37,7 @@ - #include <string.h> - #include "net-support.h" - #include "pathnames.h" -+#include "proc.h" - #define EXTERN - #if 0 - #include "net-locale.h" -@@ -48,9 +49,18 @@ - #define X25_ADDR_LEN 16 - #endif - -+static FILE *proc_fopen_x25_route(void) -+{ -+ FILE *ret = proc_fopen(_PATH_PROCNET_X25_ROUTE); -+ if (ret) -+ return ret; -+ /* try old linux-2.4 name */ -+ return proc_fopen("/proc/net/x25_routes"); -+} -+ - int X25_rprint(int options) - { -- FILE *f=fopen(_PATH_PROCNET_X25_ROUTE, "r"); -+ FILE *f=proc_fopen_x25_route(); - char buffer[256]; - char *p; - int digits; -@@ -62,7 +72,8 @@ int X25_rprint(int options) - } - printf( _("Kernel X.25 routing table\n")); /* xxx */ - printf( _("Destination Iface\n")); /* xxx */ -- fgets(buffer,256,f); -+ if (fgets(buffer,256,f)) -+ /* eat line */; - while(fgets(buffer,256,f)) - { - p = strchr(buffer,'\n'); -diff --git a/lib/x25_sr.c b/lib/x25_sr.c -index 8637c98..fde79dc 100644 ---- a/lib/x25_sr.c -+++ b/lib/x25_sr.c -@@ -38,6 +38,7 @@ - #include "net-locale.h" - #endif - #include "intl.h" -+#include "util.h" - - #include "net-features.h" - -@@ -64,10 +65,10 @@ static int X25_setroute(int action, int options, char **args) - if (*args == NULL) - return(usage()); - -- strcpy(target, *args++); -+ safe_strncpy(target, *args++, sizeof(target)); - - /* Clean out the x25_route_struct structure. */ -- memset((char *) &rt, 0, sizeof(struct x25_route_struct)); -+ memset((char *) &rt, 0, sizeof(rt)); - - - if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) { -@@ -76,8 +77,8 @@ static int X25_setroute(int action, int options, char **args) - } - rt.sigdigits=sigdigits; - -- /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ -- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); -+ /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */ -+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr)); - - while (*args) { - if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { -@@ -89,7 +90,7 @@ static int X25_setroute(int action, int options, char **args) - return(usage()); - if (rt.device[0]) - return(usage()); -- strcpy(rt.device, *args); -+ safe_strncpy(rt.device, *args, sizeof(rt.device)); - args++; - } - if (rt.device[0]=='\0') -@@ -111,7 +112,7 @@ static int X25_setroute(int action, int options, char **args) - perror("socket"); - return(E_SOCK); - } -- -+ - /* Tell the kernel to accept this route. */ - if (action==RTACTION_DEL) { - if (ioctl(skfd, SIOCDELRT, &rt) < 0) { -@@ -137,14 +138,14 @@ int X25_rinput(int action, int options, char **args) - if (action == RTACTION_FLUSH) { - fprintf(stderr,"Flushing `x25' routing table not supported\n"); - return(usage()); -- } -+ } - if (options & FLAG_CACHE) { - fprintf(stderr,"Modifying `x25' routing cache not supported\n"); - return(usage()); -- } -+ } - if ((*args == NULL) || (action == RTACTION_HELP)) - return(usage()); -- -+ - return(X25_setroute(action, options, args)); - } - #endif /* HAVE_AFX25 */ -diff --git a/man/Makefile b/man/Makefile -index 4ef1af8..23f5468 100644 ---- a/man/Makefile -+++ b/man/Makefile -@@ -29,9 +29,14 @@ mandir=/usr/share/man - - -include ../config.make - ifeq ($(I18N),1) --LANGS=`ls -d * | grep -v Makefile` -+ALL_LANGS = $(filter-out Makefile,$(wildcard *)) -+ifeq ($(LINGUAS),) -+LANGS = $(ALL_LANGS) - else --LANGS=en_US -+LANGS = $(sort $(filter $(LINGUAS),$(ALL_LANGS)) en_US) -+endif -+else -+LANGS = en_US - endif - - all: -@@ -43,7 +48,7 @@ clean: - clobber: clean - - install: -- LANGS=$(LANGS) ; \ -+ LANGS='$(LANGS)' ; \ - for LANG in $$LANGS; do \ - cd $$LANG; \ - for SECTION in 1 5 8; do \ -diff --git a/man/de_DE/arp.8 b/man/de_DE/arp.8 -index debd879..79abfc7 100644 ---- a/man/de_DE/arp.8 -+++ b/man/de_DE/arp.8 -@@ -1,149 +1,145 @@ --.TH ARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH ARP 8 "17. Oktober 2012" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - .SH NAME - arp \- Manipulation des ARP-Caches - .SH SYNOPSIS --.B arp --.RB [ \-vn ] --.RB [ "\-H Typ" ] --.RB [ "-i Schnittstelle" ] --.B -a -+.B arp -+.RB [ \-vn ] -+.RB [ "\-H Typ" ] -+.RB [ "-i Schnittstelle" ] -+.B -a - .RB [ Rechnername ] - .PP --.B arp -+.B arp - .RB [ \-v ] --.RB [ "\-i if" ] -+.RB [ "\-i Schnittstelle" ] - .B "\-d Rechnername" - .RB [ pub ] - .PP --.B arp --.RB [ \-v ] --.RB [ "\-H Typ" ] --.RB [ "\-i Schnittstelle" ] -+.B arp -+.RB [ \-v ] -+.RB [ "\-H Typ" ] -+.RB [ "\-i Schnittstelle" ] - .B -s Rechnername hw_adr --.RB [ temp ] -+.RB [ temp ] - .PP --.B arp --.RB [ \-v ] --.RB [ "\-H Typ" ] --.RB [ "\-i Interface" ] -+.B arp -+.RB [ \-v ] -+.RB [ "\-H Typ" ] -+.RB [ "\-i Interface" ] - .B -s Rechnername hw_adr --.RB [ "netmask nm" ] -+.RB [ "netmask Maske" ] - .B pub - .PP --.B arp --.RB [ \-v ] --.RB [ "\-H Typ" ] --.RB [ "\-i Schnittstelle" ] --.B -Ds Rechnername ifa --.RB [ "netmask nm" ] -+.B arp -+.RB [ \-v ] -+.RB [ "\-H Typ" ] -+.RB [ "\-i Schnittstelle" ] -+.B -Ds Rechnername Schnittstelle2 -+.RB [ "netmask Maske" ] - .B pub - .PP --.B arp -+.B arp - .RB [ \-vnD ] --.RB [ "\-H Typ" ] -+.RB [ "\-H Typ" ] - .RB [ "-i Schnittstelle" ] - .B -f [Dateiname] - - .SH BESCHREIBUNG - .B Arp - kann den ARP-Cache des Kernels auf verschiedene Arten manipulieren. Die --haupts\(:achliche Verwendung ist es Adresszuordnungseintr\(:age zu -+haupts\(:achliche Verwendung ist es, Adresszuordnungseintr\(:age zu - l\(:oschen und von Hand neue zu erzeugen. Zum Zweck der Fehlersuche ist --moeglich mit dem --.B arp --Programm den Inhalt des ARP-Caches vollst\(:andig auszugeben. -+es m\(:oglich, mit dem -+.BR arp -Programm -+den Inhalt des ARP-Caches vollst\(:andig auszugeben. -+ -+.B ARP -+steht f\(:ur Address Resolution Protocol, welches dazu verwendet wird, \(:uber -+die IPv4-Adresse die MAC-Adresse von Nachbarn im Netzwerk zu finden. - .SH OPTIONEN - .TP - .B "\-v, \-\-verbose" - Ausf\(:uhrlichere Ausgaben. - .TP - .B "\-n, \-\-numeric" --macht numerische Adressausgaben anstatt zu versuche, den symbolischen Rechner-, -+Numerische Adressausgaben anstatt zu versuchen, den symbolischen Rechner-, - Port- oder Benutzernamen zu ermitteln. - .TP --.B "\-H type, \-\-hw-type type" -+.B "\-H Typ, \-\-hw-type Typ" - Beim Setzen oder Auslesen des ARP-Caches schr\(:ankt diese Option --ein, auf welcher Klasse von Eintr\(:agen -+ein, auf welcher Klasse von Eintr\(:agen - .B arp - operieren soll. Der Standardwert dieses Arguments ist - .B ether - (d.h. Hardwarecode 0x01 f\(:ur IEEE 802.3 10Mbps Ethernet). - Andere m\(:ogliche Werte sind Netzwerkstechnologien so wie z.B. --.RB "ARCnet (" arcnet ")" --, --.RB "PROnet (" pronet ")" --, --.RB "AX.25 (" ax25 ")" --and --.RB "NET/ROM (" netrom ")." -+.RB "ARCnet (" arcnet "), PROnet (" pronet "), AX.25 (" ax25 ") und NET/ROM (" netrom ")." - .TP - .B "\-a [Rechnername], \-\-display [Rechnername]" - Zeigt die Eintr\(:age der angegebenen Rechner an. Wird kein --.B hostname --Argument verwendet, so werden alle Eintr\(:age aufgelistet. -+.BR hostname -Argument -+verwendet, so werden alle Eintr\(:age aufgelistet. - .TP - .B "\-d Rechnername, \-\-delete Rechnername" --Alle Eintr\(:age f\(:ur den angegebenen Host entfernen. Dies kann z.B. --benutzt werden, wenn ein System angehalten wird. -+Alle Eintr\(:age f\(:ur den angegebenen Host entfernen. Dies kann z.B. benutzt -+werden, wenn ein System angehalten wird. - .TP - .B "\-D, \-\-use-device" - Die Hardwareadresse der Netzwerksschnittstelle --.B ifa -+.B Schnittstelle2 - verwenden. - .TP --.B "\-i If, \-\-device Schnittstelle" -+.B "\-i Schnittstelle, \-\-device Schnittstelle" - Eine Netzwerksschnittstelle ausw\(:ahlen. Es werden nur Eintr\(:age --f\(:ur die angegebene Schnittstelle ausgedruckt. Beim Setzen von von -+f\(:ur die angegebene Schnittstelle ausgegeben. Beim Setzen von - permanenten oder tempor\(:aren Eintr\(:agen wird diese Schnittstelle mit - dem Eintrag assoziiert. Wird diese Option nicht verwendet, so versucht der --Kernel auf Basis der Routentabelle eine Schnittstelle auszuw\(:ahlen. F\(:ur --.B pub --Eintr\(:age ist die angegebene Schnittstelle diejenige, auf der ARP-Anfragen -+Kernel, auf Basis der Routentabelle eine Schnittstelle auszuw\(:ahlen. F\(:ur -+.BR pub -Eintr\(:age -+ist die angegebene Schnittstelle diejenige, auf der ARP-Anfragen - beantwortet werden. - .br - .B ANMERKUNG: --Diese Schnittstelle mu\(ss eine andere sein als die, auf die die IP-Datagramme -+Diese Schnittstelle mu\(ss eine andere sein als die, auf welche die IP-Datagramme - weitergeleitet werden. - .TP --.B "\-s Rechnername hw_addr, \-\-set Rechnername" --Erzeugt manuel einen ARP Adresseintrag f\(:ur den Rechner --.B Rechnername -+.B "\-s Rechnername hw_addr, \-\-set Rechnername hw_addr" -+Erzeugt manuell einen ARP-Adresseintrag f\(:ur den Rechner -+.BR Rechnername , - in dem die Hardwareadresse auf - .B hw_addr - gesetzt ist. Das genaue Format der Hardwareadresse ist abh\(:angig von der --Hardwareklasse aber f\(:ur die meisten Klassen kann man davon ausgehen, da\(ss -+Hardwareklasse, aber f\(:ur die meisten Klassen kann man davon ausgehen, da\(ss - die \(:ubliche Darstellung verwendet wird. F\(:ur die Ethernetklasse sind --dies sechs hexadezimale, von Doppelpunkten getrennte Bytes. Beim Zuf\(:ugen --von Proxy-ARP-Entr\(:agen (das sind die mit der gesetzten --.BR pub lizieren --Flagge) kann --.B Netmaske -+dies sechs hexadezimale, durch Doppelpunkte getrennte Bytes. Beim Zuf\(:ugen -+von Proxy-ARP-Entr\(:agen (das sind die mit dem gesetzten -+.BR pub lished-Flag) -+kann die -+.B Maske - f\(:ur ARP-Eintr\(:age f\(:ur ganze Subnetze angegeben werde. Von dieser - Praxis wird abgeraten. Sie wird von \(:alteren Kerneln unterst\(:utzt, da --sie gelegentlich n\(:utzlich ist. Wird die --If the --.B temp --Flagge nicht angegeben, so werden die erzeugten Eintr\(:age nicht dauerhaft --in den ARP-Cache eingetragen. -+sie gelegentlich n\(:utzlich ist. -+Der Eintrag wird permanent im ARP-Cache gespeichert, -+wenn das \fBtemp\fR-Flag nicht angegeben wird. - .br - .B ANMERKUNG: --Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich ARP-Eintr\(:age f\(:ur --ganze Teilnetze zu erzeugen. Statt dessen wird automatisches Proxy ARP -+Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich, ARP-Eintr\(:age f\(:ur -+ganze Teilnetze zu erzeugen. Stattdessen wird automatisches Proxy ARP - durchgef\(:uhrt, d.h. wenn eine Route existiert und Forwarding eingeschaltet --ist wird automatisch ein tempor\(:arer Proxyarpeintrag erzeugt. -+ist, wird automatisch ein tempor\(:arer Proxyarpeintrag erzeugt. - Siehe auch - .BR arp (7) - f\(:ur mehr Details. - .TP --.B "\-f Dateiname, \-\-file Dateiname" -+.B "\-f [Dateiname], \-\-file [Dateiname]" - \(:Ahnlich der - .B \-s - Option, au\(sser, da\(ss diesmal die Adressinformation aus der Datei - .B Dateiname - verwendet wird. Dies kann verwendet werden, wenn ARP-Eintr\(:age f\(:ur - etliche Rechner erzeugt werden m\(:ussen. Der Name dieser Datei ist oft --.IR /etc/ethers , --aber dies ist nicht offizieil standardisiert. Wenn kein Dateinamen -+.IR /etc/ethers , -+aber dies ist nicht offizieil standardisiert. Wenn kein Dateinamen - angeben ist wird /etc/ethers benutzt. - .sp 1 - Das Format der Datei ist einfach; es enth\(:alt nur ASCII-Textzeilen, die -@@ -158,16 +154,28 @@ erwartet wird, kann auch eine - .B "IP-Adresse" - in Form eines durch Punkte getrennten Dezimalquadrupels angegeben werden. - .P --Aus Kompatiblit\(:atsgr\(:unden k\(:onnen Rechnername und die -+Aus Kompatiblit\(:atsgr\(:unden k\(:onnen Rechnername und die - Hardwareadresse auch vertauscht werden. --.LP --Jeder vollst\(:andige Eintrag wird im ARP-Cache mit der --.B C --Flagge markiert. Permanente Eintr\(:age werden mit -+.LP -+Jeder vollst\(:andige Eintrag wird im ARP-Cache mit dem -+.BR C -Flag -+markiert. Permanente Eintr\(:age werden mit - .B M --und zu publizierende Eintr\(:age mit der -+und zu publizierende Eintr\(:age mit - .B P --Flagge. -+markiert. -+.SH BEISPIELE -+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub -+ -+Beantwortet ARP-Anfragen f\(:ur 10.0.0.2 die auf der Schnittstelle eth0 -+empfangen werden mit der MAC-Adresse f\(:ur eth1. -+ -+.B /usr/sbin/arp -i eth1 -d 10.0.0.1 -+ -+Entfernt den ARP-Eintrag f\(:ur 10.0.0.1 auf der Schnittstelle -+.BR eth1 . -+Dies betrifft sowohl publizierte Proxy-ARP-Einträge als auch auf permanente ARP-Eintr\(:age. -+ - .SH DATEIEN - .I /proc/net/arp, - .br -@@ -176,10 +184,12 @@ Flagge. - .I /etc/hosts - .br - .I /etc/ethers -+ - .SH SIEHE AUCH - ethers(5), rarp(8), route(8), ifconfig(8), netstat(8) -+ - .SH AUTOREN --Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> mit vielen Verbesserungen vom --Verwalter der Net-Tools Bernd Eckenfels <net-tools@lina.inka.de>. -+Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net-tools@lina.inka.de>. -+ - .SH \(:Ubersetzung --Ralf B\(:achle <ralf@gnu.org> -+Ralf B\(:achle <ralf@gnu.org>, Simon A. Eugster <simon.eu@gmail.com> -diff --git a/man/de_DE/ifconfig.8 b/man/de_DE/ifconfig.8 -index aa2a4a0..9713965 100644 ---- a/man/de_DE/ifconfig.8 -+++ b/man/de_DE/ifconfig.8 -@@ -73,9 +73,6 @@ Modus. Ist er eingeschaltet, so werden alle Multicastpakete vom Netzwerk - empfangen unabh\(:angig davon, ob sie an die Schnittstelle adressiert sind - oder nicht. - .TP --.B "metric N" --Dieses Argument setzt den Metrik-Wert f\(:ur die Schnittstelle auf N. --.TP - .B "mtu N" - Dieses Argument setzt die Maximum Transfer Unit (MTU) der Schnittstelle, - das ist das gr\(:o\(sste Paket, dass gesendet werden kann. -@@ -98,7 +95,7 @@ F\(:ugt der Schnittstelle eine IPv6-Adresse zu. - .B "del addr/prefixlen" - Entfernt eine IPv6-Adresse von der Schnittstelle. - .TP --.B "tunnel aa.bb.cc.dd" -+.B "tunnel ::aa.bb.cc.dd" - Erzeugt ein neues SIT (IPv6-in-IPv4) Ger\(:at, das Pakete zum angegebenen - Ziel tunnelt. - .TP -@@ -180,12 +177,10 @@ Seit Kernel Version 2.2 gibt es keine expliziten Statistiken f\(:ur - Schnittstellenaliase mehr. Die Statistiken f\(:ur die Originaladresse werden - mit allen Aliasen auf das gleiche Ger\(:at geteilt. Um Statistiken per - Adresse zu erhalten sollte explizite EIntr\(:age f\(:ur die Adresse mit dem --.BR ipchains(8) -+.BR iptables(8) - Kommando gemacht werden. - - .SH DATEIEN --.I /proc/net/socket --.br - .I /proc/net/dev - .br - .I /proc/net/if_inet6 -@@ -193,7 +188,7 @@ Kommando gemacht werden. - W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit - diesem Kommando nicht ge\(:andert werden. - .SH SIEHE AUCH --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), iptables(8) - .SH AUTOREN - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br -diff --git a/man/de_DE/netstat.8 b/man/de_DE/netstat.8 -index f59aec0..fdb76c9 100644 ---- a/man/de_DE/netstat.8 -+++ b/man/de_DE/netstat.8 -@@ -9,7 +9,7 @@ - .\" Modified: Tuan Hoang tuan@optimus.mitre.org - .\" - .\" --.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - - .SH NAME - netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen -@@ -20,6 +20,8 @@ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstat - .RB [ \-venaoc ] - .RB [ \-\-tcp | \-t ] - .RB [ \-\-udp | \-u ] -+.RB [ \-\-udplite | \-U ] -+.RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] - .RB [ \-\-groups | \-g ] - .RB [ \-\-unix | \-x ] -@@ -44,7 +46,6 @@ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstat - .B netstat - .RB [ \-veenpac ] - .RB { \-\-interfaces | \-i } --.RI [ Schnittstelle ] - - .PP - -@@ -68,6 +69,8 @@ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstat - .SH BESCHREIBUNG - .B Netstat - zeigt Informationen des Linux Netzwerkssystems an. -+.PP -+.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment. - - .SS "(no option)" - Ohne Optionen zeigt -@@ -103,18 +106,17 @@ benutzt das Ausgabeformat von - Wegen Details siehe - .BR route (8). - --.SS "\-i, \-\-interface \fISchnittstelle\fI" -+.SS "\-i, \-\-interfaces" - Wird die - .BR -i ", " --interfaces --Option verwendet, so wird eine Tabelle aller (oder der angegebenen --.IR Schnittstellen ) -+Option verwendet, so wird eine Tabelle aller Schnittstellen - ausgedruckt. Die Ausgabe ist im Format von - .B "ifconfig -e" - und wird in - .BR ifconfig (8) - beschrieben. - .B "netstat -ei" --druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie -+druckt eine Tabelle f\(:ur Interfaces wie - .BR ifconfig . - Die - .B -a -@@ -182,7 +184,7 @@ Dies hat den gleichen Effekt wie die Langoptionen - und - .BR \-\-ddp. - --.SS "\-c, \-\-continous" -+.SS "\-c, \-\-continuous" - Mit dieser Option wiederholt - .B netstat - im Sekundenabstand die Ausgabe, bis es abgebrochen wird. -@@ -414,7 +416,7 @@ werden.) - Seit der Kern Version 2.2 zeigt netstat -i keine Schnittstellenstatistiken - von Schnittstellenaliasen mehr an. Um Statistiken per Schnittstelle zur - erhalten, m\(:ussen jetzt mit dem --.BR ipchains(8) -+.BR iptables(8) - Befehl explizite Regeln zugef\(:ugt werden. - - .SH DATEIEN -@@ -477,10 +479,7 @@ Befehl explizite Regeln zugef\(:ugt werden. - .SH SIEHE AUCH - .BR route (8), - .BR ifconfig (8), --.BR ipfw (4), --.BR ipfw (8), --.BR ipfwadm (8) --.BR ipchains (8) -+.BR iptables (8) - - .PP - .SH PROBLEME -diff --git a/man/de_DE/route.8 b/man/de_DE/route.8 -index a28c9d1..1a32712 100644 ---- a/man/de_DE/route.8 -+++ b/man/de_DE/route.8 -@@ -55,7 +55,7 @@ Schnittstelle] - .SH BESCHREIBUNG - .B Route - wird zum \(:Andern der IP-Routing-Tabelle der Kernels verwendet. Seine --prim\(:are Verwendung ist statische Routen f\*:ur bestimmte Rechner oder -+prim\(:are Verwendung ist statische Routen f\(:ur bestimmte Rechner oder - Netzwerke \(:uber eine Schnittstelle einzutragen, nachdem diese mit dem - Programm - .BR ifconfig (8) -diff --git a/man/en_US/arp.8 b/man/en_US/arp.8 -index d859b46..c065e22 100644 ---- a/man/en_US/arp.8 -+++ b/man/en_US/arp.8 -@@ -1,56 +1,111 @@ --.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" -+.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - arp \- manipulate the system ARP cache - .SH SYNOPSIS --.B arp --.RB [ \-vn ] --.RB [ "\-H type" ] --.RB [ "-i if" ] --.B -a --.RB [ hostname ] -+.B arp -+.RB [ \-vn ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.RB [ \-ae ] -+.RI [ hostname ] - .PP --.B arp -+.B arp - .RB [ \-v ] --.RB [ "\-i if" ] --.B "\-d hostname" -+.RB [ \-i -+.IR if ] -+.B \-d -+.I hostname - .RB [ pub ] - .PP --.B arp --.RB [ \-v ] --.RB [ "\-H type" ] --.RB [ "\-i if" ] --.B -s hostname hw_addr --.RB [ temp ] -+.B arp -+.RB [ \-v ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-s -+.I hostname hw_addr -+.RB [ temp ] - .PP --.B arp --.RB [ \-v ] --.RB [ "\-H type" ] --.RB [ "\-i if" ] --.B -s hostname hw_addr --.RB [ "netmask nm" ] -+.B arp -+.RB [ \-v ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-s -+.I hostname hw_addr -+.RB [ netmask -+.IR nm ] - .B pub - .PP --.B arp --.RB [ \-v ] --.RB [ "\-H type" ] --.RB [ "\-i if" ] --.B -Ds hostname ifa --.RB [ "netmask nm" ] -+.B arp -+.RB [ \-v ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-Ds -+.I hostname -+.I ifname -+.RB [ netmask -+.IR nm ] - .B pub - .PP --.B arp -+.B arp - .RB [ \-vnD ] --.RB [ "\-H type" ] --.RB [ "-i if" ] --.B -f [filename] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-f -+.RI [ filename ] - - .SH DESCRIPTION - .B Arp --manipulates the kernel's ARP cache in various ways. The primary options --are clearing an address mapping entry and manually setting up one. For --debugging purposes, the -+manipulates or displays the kernel's IPv4 network neighbour cache. It can add -+entries to the table, delete one or display the current content. -+ -+.B ARP -+stands for Address Resolution Protocol, which is used to find the media -+access control address of a network neighbour for a given IPv4 Address. -+.SH MODES - .B arp --program also allows a complete dump of the ARP cache. -+with no mode specifier will print the current content of the table. It is -+possible to limit the number of entries printed, by specifying an hardware -+address type, interface name or host address. -+ -+.B arp -d -+.I address -+will delete a ARP table entry. Root or netadmin privilege is required to do -+this. The entry is found by IP address. If a hostname is given, it will be -+resolved before looking up the entry in the ARP table. -+ -+.B arp -s -+.I address hw_addr -+is used to set up a new table entry. The format of the -+.I hw_addr -+parameter is dependent on the hardware class, but for most classes one can -+assume that the usual presentation can be used. For the Ethernet class, -+this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp -+entries (that is those with the -+.BR pub lish -+flag set) a -+.B netmask -+may be specified to proxy arp for entire subnets. This is not good -+practice, but is supported by older kernels because it can be -+useful. If the -+.B temp -+flag is not supplied entries will be permanent stored into the ARP -+cache. To simplify setting up entries for one of your own network interfaces, you can use the -+.B "arp \-Ds" -+.I address ifname -+form. In that case the hardware address is taken from the interface with the -+specified name. -+ -+.br - .SH OPTIONS - .TP - .B "\-v, \-\-verbose" -@@ -60,7 +115,7 @@ Tell the user what is going on by being verbose. - shows numerical addresses instead of trying to determine symbolic host, port - or user names. - .TP --.B "\-H type, \-\-hw-type type" -+\fB\-H\fI type\fR, \fB\-\-hw\-type\fI type\fR, \fB\-t\fI type\fR - When setting or reading the ARP cache, this optional parameter tells - .B arp - which class of entries it should check for. The default value of -@@ -76,23 +131,18 @@ Other values might include network technologies such as - and - .RB "NET/ROM (" netrom ")." - .TP --.B "\-a [hostname], \-\-display [hostname]" --Shows the entries of the specified hosts. If the --.B hostname --parameter is not used, --.B all --entries will be displayed. -+.B \-a -+Use alternate BSD style output format (with no fixed columns). - .TP --.B "\-d hostname, \-\-delete hostname" --Remove any entry for the specified host. This can be used if the --indicated host is brought down, for example. -+.B \-e -+Use default Linux style output format (with fixed columns). - .TP - .B "\-D, \-\-use-device" --Use the interface --.BR ifa "'s" --hardware address. -+Instead of a hw_addr, the given argument is the name of an interface. -+.B arp -+will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself. - .TP --.B "\-i If, \-\-device If" -+\fB\-i\fI If\fR, \fB\-\-device\fI If\fR - Select an interface. When dumping the ARP cache only entries matching - the specified interface will be printed. When setting a permanent or - .B temp -@@ -101,53 +151,36 @@ option is not used, the kernel will guess based on the routing - table. For - .B pub - entries the specified interface is the interface on which ARP requests will --be answered. -+be answered. - .br - .B NOTE: - This has to be different from the interface to which the IP - datagrams will be routed. --.TP --.B "\-s hostname hw_addr, \-\-set hostname" --Manually create an ARP address mapping entry for host --.B hostname --with hardware address set to --.B hw_addr --. The format of the hardware address is dependent on the hardware --class, but for most classes one can assume that the usual presentation --can be used. For the Ethernet class, this is 6 bytes in hexadecimal, --separated by colons. When adding proxy arp entries (that is those with --the --.BR pub lish --flag set a --.B netmask --may be specified to proxy arp for entire subnets. This is not good --practice, but is supported by older kernels because it can be --useful. If the --.B temp --flag is not supplied entries will be permanent stored into the ARP --cache. --.br - .B NOTE: --As of kernel 2.2.0 it is no longer possible to set an ARP entry for an -+As of kernel 2.2.0 it is no longer possible to set an ARP entry for an - entire subnet. Linux instead does automagic proxy arp when a route --exists and it is forwarding. See -+exists and it is forwarding. See - .BR arp (7) --for details. -+for details. Also the -+.B dontpub -+option which is available for delete and set operations cannot be -+used with 2.4 and newer kernels. - .TP --.B "\-f filename, \-\-file filename" -+\fB\-f\fI filename\fR, \fB\-\-file\fI filename\fR - Similar to the - .B \-s - option, only this time the address info is taken from file --.B filename --. This can be used if ARP entries for a lot of hosts have to be -+.IR filename . -+This can be used if ARP entries for a lot of hosts have to be - set up. The name of the data file is very often --.IR /etc/ethers , --but this is not official. If no filename is specified /etc/ethers -+.IR /etc/ethers , -+but this is not official. If no filename is specified -+.I /etc/ethers - is used as default. - .sp 1 - The format of the file is simple; it - only contains ASCII text lines with a hostname, and a hardware --address separated by whitespace. Additionally the -+address separated by whitespace. Additionally the - .BR "pub" , " temp" " and" " netmask" - flags can be used. - .LP -@@ -157,9 +190,9 @@ is expected, one can also enter an - .B "IP address" - in dotted-decimal notation. - .P --As a special case for compatibility the order of the hostname and -+As a special case for compatibility the order of the hostname and - the hardware address can be exchanged. --.LP -+.LP - Each complete entry in the ARP cache will be marked with the - .B C - flag. Permanent entries are marked with -@@ -167,8 +200,18 @@ flag. Permanent entries are marked with - and published entries have the - .B P - flag. -+.SH EXAMPLES -+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub -+ -+This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for -+eth1. -+ -+.B /usr/sbin/arp -i eth1 -d 10.0.0.1 -+ -+Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match -+published proxy ARP entries and permanent entries. - .SH FILES --.I /proc/net/arp, -+.I /proc/net/arp - .br - .I /etc/networks - .br -@@ -178,5 +221,4 @@ flag. - .SH SEE ALSO - rarp(8), route(8), ifconfig(8), netstat(8) - .SH AUTHORS --Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements --from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>. -+Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>. -diff --git a/man/en_US/ethers.5 b/man/en_US/ethers.5 -index f3ba116..5a02892 100644 ---- a/man/en_US/ethers.5 -+++ b/man/en_US/ethers.5 -@@ -1,4 +1,4 @@ --.TH ETHERS 5 "April 26th, 1996" "" "File formats" -+.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" - .SH NAME \"{{{roff}}}\"{{{ - ethers \- Ethernet address to IP number database - .\"}}} -@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number database - IP numbers, one line for each IP number: - .sp - .RS --\fIEthernet-address\fP \fIIP-number\fP -+\fIEthernet\-address\fP \fIIP\-number\fP - .RE - .sp --The two items are separated by any number of SPACE and/or TAB char --acters. A \fB#\fP at the beginning of a line starts a comment --which extends to the end of the line. The \fIEthernet-address\fP is -+The two items are separated by any number of SPACE and/or TAB characters. -+A \fB#\fP at the beginning of a line starts a comment -+which extends to the end of the line. The \fIEthernet\-address\fP is - written as - .IR x : x : x : x : x : x , - where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP - which represents one byte of the address, which is in network byte --order (big-endian). The \fIIP-number\fP may be a hostname which -+order (big-endian). The \fIIP\-number\fP may be a hostname which - can be resolved by DNS or a dot separated number. - .\"}}} - .SH EXAMPLES \"{{{ -diff --git a/man/en_US/hostname.1 b/man/en_US/hostname.1 -index cea3f6e..c45b7b6 100644 ---- a/man/en_US/hostname.1 -+++ b/man/en_US/hostname.1 -@@ -1,66 +1,60 @@ --.TH HOSTNAME 1 "28 Jan 1996" "net-tools" "Linux Programmer's Manual" -+.TH HOSTNAME 1 "2013\-08\-29" "net\-tools" "Linux System Administrator's Manual" - - .SH NAME - hostname \- show or set the system's host name - .br --domainname \- show or set the system's NIS/YP domain name --.br - dnsdomainname \- show the system's DNS domain name - .br --nisdomainname \- show or set system's NIS/YP domain name -+domainname \- show or set the system's NIS/YP domain name - .br --ypdomainname \- show or set the system's NIS/YP domain name -+nisdomainname \- show or set system's NIS/YP domain name - .br - nodename \- show or set the system's DECnet node name -+.br -+ypdomainname \- show or set the system's NIS/YP domain name - - .SH SYNOPSIS - .B hostname - .RB [ \-v ] --.RB [ \-a ] --.RB [ \-\-alias ] --.RB [ \-d ] --.RB [ \-\-domain ] --.RB [ \-f ] --.RB [ \-\-fqdn ] --.RB [ \-i ] --.RB [ \-\-ip-address ] --.RB [ \-\-long ] --.RB [ \-s ] --.RB [ \-\-short ] --.RB [ \-y ] --.RB [ \-\-yp ] --.RB [ \-\-nis ] --.RB [ \-n ] --.RB [ \-\-node ] -+.RB [ \-s | \-\-short ] -+ -+.PP -+.B hostname -+.RB [ \-v ] -+.RB [ \-a | \-\-alias ] -+.RB [ \-d | \-\-domain ] -+.RB [ \-f | \-\-fqdn | \-\-long ] -+.RB [ \-i | \-\-ip\-address ] -+ -+.PP -+.B hostname -+.RB [ \-v ] -+.RB [ \-y | \-\-yp | \-\-nis ] -+.RB [ \-n | \-\-node ] - - .PP - .B hostname - .RB [ \-v ] --.RB [ \-F\ filename ] --.RB [ \-\-file\ filename ] --.RB [ hostname ] -+.RB [ \-F\ filename | \-\-file\ filename ] -+.RI [ newname ] - - .PP - .B domainname - .RB [ \-v ] --.RB [ \-F\ filename ] --.RB [ \-\-file\ filename ] --.RB [ name ] -+.RB [ \-F\ filename | \-\-file\ filename ] -+.RI [ newname ] - - .PP - .B nodename - .RB [ \-v ] --.RB [ \-F\ filename ] --.RB [ \-\-file\ filename ] --.RB [ name ] -+.RB [ \-F\ filename | \-\-file\ filename ] -+.RI [ newname ] - - .PP - .B hostname --.RB [ \-v ] --.RB [ \-h ] --.RB [ \-\-help ] --.RB [ \-V ] --.RB [ \-\-version ] -+.RB [ \-v | \-\-verbose ] -+.RB [ \-h | \-\-help ] -+.RB [ \-V | \-\-version ] - - .PP - .B dnsdomainname -@@ -124,12 +118,8 @@ command (see - below). - - .LP --The host name is usually set once at system startup in --.I /etc/rc.d/rc.inet1 --or --.I /etc/init.d/boot --(normally by reading the contents of a file which contains --the host name, e.g. -+The host name is usually set once at system startup by reading the -+contents of a file which contains the host name, e.g. - .IR /etc/hostname ). - - .SS THE FQDN -@@ -142,16 +132,17 @@ with this command. The FQDN of the system is the name that the - returns for the host name. - - .LP --Technically: The FQDN is the name --.BR gethostbyname (2) --returns for the host name returned by --.BR gethostname (2). --The DNS domain name is the part after the first dot. -+Technically: The FQDN is the canonical name returned by -+.BR gethostbyname2 (2) -+when resolving the result of the -+.BR gethostname (2) -+name. The DNS domain name is the part after the first dot. - .LP - Therefore it depends on the configuration (usually in - .IR /etc/host.conf ) --how you can change it. Usually (if the hosts file is parsed before DNS or --NIS) you can change it in -+how you can change it. If -+.B hosts -+is the first lookup method, you can change the FQDN in - .IR /etc/hosts . - - -@@ -161,27 +152,23 @@ NIS) you can change it in - Display the alias name of the host (if used). - .TP - .I "\-d, \-\-domain" --Display the name of the DNS domain. Don't use the command --.B domainname --to get the DNS domain name because it will show the NIS domain name and --not the DNS domain name. Use -+Display the name of the DNS domain (this is the FQDN without the segment up -+to the first dot). This is equivalent to using the - .B dnsdomainname --instead. -+command. - .TP - .I "\-F, \-\-file filename" --Read the host name from the specified file. Comments (lines starting with -+Read the new host name from the specified file. Comments (lines starting with - a `#') are ignored. - .TP - .I "\-f, \-\-fqdn, \-\-long" --Display the FQDN (Fully Qualified Domain Name). A FQDN consists of a --short host name and the DNS domain name. Unless you are using bind or NIS --for host lookups you can change the FQDN and the DNS domain name (which is --part of the FQDN) in the \fI/etc/hosts\fR file. -+Display the FQDN (Fully Qualified Domain Name). A FQDN consists of name -+including the DNS domain. - .TP - .I "\-h, \-\-help" - Print a usage message and exit. - .TP --.I "\-i, \-\-ip-address" -+.I "\-i, \-\-ip\-address" - Display the IP address(es) of the host. - .TP - .I "\-n, \-\-node" -@@ -203,11 +190,13 @@ Display the NIS domain name. If a parameter is given (or - .B \-\-file name - ) then root can also set a new NIS domain. - .SH FILES -+.B /etc/hostname - .B /etc/hosts -+.B /etc/host.conf -+ - .SH AUTHOR --Peter Tobias, <tobias@et-inf.fho-emden.de> -+Peter Tobias, <tobias@et\-inf.fho\-emden.de> - .br --Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage). -+Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage). - .br - Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage). -- -diff --git a/man/en_US/ifconfig.8 b/man/en_US/ifconfig.8 -index e75cf59..0243be3 100644 ---- a/man/en_US/ifconfig.8 -+++ b/man/en_US/ifconfig.8 -@@ -1,10 +1,10 @@ --.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - ifconfig \- configure a network interface - .SH SYNOPSIS --.B "ifconfig [interface]" -+.B "ifconfig [-v] [-a] [-s] [interface]" - .br --.B "ifconfig interface [aftype] options | address ..." -+.B "ifconfig [-v] interface [aftype] options | address ..." - .SH DESCRIPTION - .B Ifconfig - is used to configure the kernel-resident network interfaces. It is -@@ -18,7 +18,7 @@ a single - .B interface - argument is given, it displays the status of the given interface - only; if a single --.B -a -+.B \-a - argument is given, it displays the status of all interfaces, even - those that are down. Otherwise, it configures an interface. - -@@ -39,13 +39,34 @@ supported address families include - (Novell IPX) and - .B netrom - (AMPR Packet radio). -+All numbers supplied as parts in IPv4 dotted decimal notation may be decimal, -+octal, or hexadecimal, as specified in the ISO C standard (that is, a leading 0x -+or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise, -+the number is interpreted as decimal). Use of hexadecimal and octal numbers -+is not RFC-compliant and therefore its use is discouraged. - .SH OPTIONS - .TP -+.B -a -+display all interfaces which are currently available, even if down -+.TP -+.B -s -+display a short list (like netstat -i) -+.TP -+.B -v -+be more verbose for some error conditions -+.TP - .B interface - The name of the interface. This is usually a driver name followed by - a unit number, for example - .B eth0 --for the first Ethernet interface. -+for the first Ethernet interface. If your kernel supports alias interfaces, -+you can specify them with -+.B eth0:0 -+for the first alias of eth0. You can use them to assign a second address. To -+delete an alias interface use -+.BR "ifconfig eth0:0 down" . -+Note: for every scope (i.e. same net with address/netmask combination) all -+aliases are deleted, if you delete the first (primary). - .TP - .B up - This flag causes the interface to be activated. It is implicitly -@@ -69,9 +90,6 @@ Enable or disable - mode. If selected, all multicast packets on the network will be - received by the interface. - .TP --.B "metric N" --This parameter sets the interface metric. --.TP - .B "mtu N" - This parameter sets the Maximum Transfer Unit (MTU) of an interface. - .TP -@@ -92,7 +110,7 @@ Add an IPv6 address to an interface. - .B "del addr/prefixlen" - Remove an IPv6 address from an interface. - .TP --.B "tunnel aa.bb.cc.dd" -+.B "tunnel ::aa.bb.cc.dd" - Create a new SIT (IPv6-in-IPv4) device, tunnelling to the given destination. - .TP - .B "irq addr" -@@ -122,13 +140,13 @@ are - can be used to tell the driver to auto-sense the media. Again, not - all drivers can do this. - .TP --.B "[-]broadcast [addr]" -+.B "[\-]broadcast [addr]" - If the address argument is given, set the protocol broadcast - address for this interface. Otherwise, set (or clear) the - .B IFF_BROADCAST - flag for the interface. - .TP --.B "[-]pointopoint [addr]" -+.B "[\-]pointopoint [addr]" - This keyword enables the - .B point-to-point - mode of an interface, meaning that it is a direct link between two -@@ -173,23 +191,40 @@ alias interfaces anymore. The statistics printed for the original address - are shared with all alias addresses on the same device. If you want per-address - statistics you should add explicit accounting - rules for the address using the --.BR ipchains(8) -+.BR iptables (8) - command. - .LP --Interrupt problems with Ethernet device drivers fail with EAGAIN. See --.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html -+Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable -+counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers -+are truncated to one decimal (which can by quite a large error if you -+consider 0.1 PiB is 112.589.990.684.262 bytes :) -+.LP -+Interrupt problems with Ethernet device drivers fail with EAGAIN -+.I (SIOCSIIFLAGS: Resource temporarily unavailable) -+it is most likely a interrupt conflict. See -+.I http://www.scyld.com/expert/irq\-conflict.html - for more information. - .SH FILES --.I /proc/net/socket --.br - .I /proc/net/dev - .br - .I /proc/net/if_inet6 - .SH BUGS -+Ifconfig uses the ioctl access method to get the full address information, -+which limits hardware addresses to 8 bytes. -+Because Infiniband hardware address has 20 bytes, -+only the first 8 bytes are displayed correctly. -+Please use -+.B ip link -+command from -+.B iproute2 -+package to display link layer informations including the hardware address. -+.LP - While appletalk DDP and IPX addresses will be displayed they cannot be - altered by this command. - .SH SEE ALSO --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), iptables(8), ifup(8), interfaces(5). -+.br -+http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples - .SH AUTHORS - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br -@@ -198,3 +233,5 @@ Alan Cox, <Alan.Cox@linux.org> - Phil Blundell, <Philip.Blundell@pobox.com> - .br - Andi Kleen -+.br -+Bernd Eckenfels, <net\-tools@lina.inka.de> -diff --git a/man/en_US/mii-tool.8 b/man/en_US/mii-tool.8 -index 6b773ec..7decaac 100644 ---- a/man/en_US/mii-tool.8 -+++ b/man/en_US/mii-tool.8 -@@ -1,13 +1,12 @@ - .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org --.\" mii-tool.8 1.5 2000/04/25 22:58:19 - .\" --.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools" -+.TH MII\-TOOL 8 "2013\-02\-15" "net\-tools" "Linux System Administrator's Manual" - - .SH NAME --mii-tool \- view, manipulate media-independent interface status -+mii\-tool \- view, manipulate media-independent interface status - - .SH SYNOPSIS --.B mii-tool -+.B mii\-tool - [\fB\-v\fR, \fB\-\-verbose\fR] - [\fB\-V\fR, \fB\-\-version\fR] - [\fB\-R\fR, \fB\-\-reset\fR] -@@ -16,7 +15,8 @@ mii-tool \- view, manipulate media-independent interface status - [\fB\-l\fR, \fB\-\-log\fR] - [\fB\-A\fR, \fB\-\-advertise=\fImedia,...\fR] - [\fB\-F\fR, \fB\-\-force=\fImedia\fR] --.RI [ "interface\ ..." ] -+[\fB\-p\fR, \fB\-\-phy=\fIaddr\fR] -+.RI "interface\ ..." - - .SH DESCRIPTION - This utility checks or sets the status of a network interface's Media -@@ -32,18 +32,21 @@ single-speed hubs, are unable to autonegotiate. To handle such - devices, the MII protocol also allows for establishing a link by - simply detecting either a 10baseT or 100baseT link beat. The \fB\-F\fR - or \fB\-\-force\fR options can be used to force the MII to operate in --one mode, instead of autonegotiating. The \fB\-A\fR and \fB-F\fR -+one mode, instead of autonegotiating. The \fB\-A\fR and \fB\-F\fR - options are mutually exclusive. - .PP - The default short output reports the negotiated link speed and link --status for each interface. If an interface or interfaces are not --specified on the command line, then \fBmii-tool\fR will check any --available interfaces from \fBeth0\fR through \fBeth7\fR. -+status for each interface. - .SH OPTIONS - .TP - \fB\-v\fR, \fB\-\-verbose\fR - Display more detailed MII status information. If used twice, also - display raw MII register contents. -+.br -+\fBAlert:\fR If used three times, will force reading all MII -+registers, including non standard ones. It's not guaranteed any -+valid answer from PHY while PHY communication can even hang. -+With driver e1000e will fail while reading register 0x07. - .TP - \fB\-V\fR, \fB\-\-version\fR - Display program version information. -@@ -59,7 +62,7 @@ Watch interface(s) and report changes in link status. The MII - interfaces are polled at one second intervals. - .TP - \fB\-l\fR, \fB\-\-log\fR --Used with \fB-w\fR, records link status changes in the system log -+Used with \fB\-w\fR, records link status changes in the system log - instead of printing on standard output. - .TP - \fB\-F\fI media\fR, \fB\-\-force=\fImedia\fR -@@ -71,8 +74,31 @@ Enable and restart autonegotiation, and advertise only the specified - media technologies. Multiple technologies should be separated by - commas. Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR, - \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR. -+.TP -+\fB\-p\fI addr\fR, \fB\-\-phy=\fIaddr\fR -+Override the MII address provided by kernel with value \fBaddr\fR. -+ -+.SH DIAGNOSTICS -+.TP -+SIOCGMIIPHY on 'eth?' failed: Invalid argument -+If the interface is not running (up), kernel will refuse to report its link state. -+.TP -+SIOCGMIIPHY on 'eth?' failed: Operation not permitted -+Most kernels restrict access to root. -+.TP -+SIOCGMIIPHY on 'eth?' failed: No such device -+This error is shown, if the kernel does not know about the named device. -+.TP -+SIOCGMIIPHY on 'eth?' failed: Operation not supported -+The interface in question does not support MII queries. Most likely, it does not have -+MII transceivers, at all. - - .SH AUTHORS - David Hinds \- dhinds@pcmcia.sourceforge.org - .br - Donald Becker \- becker@scyld.com -+.br -+Bernd Eckenfels \- net-tools@lina.inka.de -+ -+.SH SEE ALSO -+http://net-tools.sourceforge.net \- Homepage of the net-tools project -diff --git a/man/en_US/nameif.8 b/man/en_US/nameif.8 -index ff2430f..195304d 100644 ---- a/man/en_US/nameif.8 -+++ b/man/en_US/nameif.8 -@@ -1,10 +1,10 @@ --.TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual" -+.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - nameif \- name network interfaces based on MAC addresses - .SH SYNOPSIS --.B "nameif [-c configfile] [-s]" -+.B "nameif [\-c configfile] [\-s]" - .br --.B "nameif [-c configfile] [-s] {interface macaddress}" -+.B "nameif [\-c configfile] [\-s] {interface macaddress}" - .SH DESCRIPTION - .B nameif - renames network interfaces based on mac addresses. When no arguments are -@@ -18,11 +18,11 @@ looks for the interface with the given MAC address and renames it to the - name given. - - When the --.I -s -+.I \-s - argument is given all error messages go to the syslog. - - When the --.I -c -+.I \-c - argument is given with a file name that file is read instead of /etc/mactab. - - .SH NOTES -diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8 -index b33996a..3157dc4 100644 ---- a/man/en_US/netstat.8 -+++ b/man/en_US/netstat.8 -@@ -6,9 +6,10 @@ - .\" Modified: Bernd.Eckenfels@inka.de - .\" Modified: Andi Kleen ak@muc.de - .\" Modified: Tuan Hoang tqhoang@bigfoot.com -+.\" Modified: Brian Micek bmicek@gmail.com - .\" - .\" --.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2012\-09\-15" "net\-tools" "Linux System Administrator's Manual" - - .SH NAME - netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships -@@ -19,17 +20,20 @@ netstat \- Print network connections, routing tables, interface statistics, masq - .RI [ address_family_options ] - .RB [ \-\-tcp | \-t ] - .RB [ \-\-udp | \-u ] -+.RB [ \-\-udplite | \-U ] -+.RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] - .RB [ \-\-listening | \-l ] - .RB [ \-\-all | \-a ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-symbolic | \-N ] - .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] - .RB [ \-\-timers | \-o ] - .RB [ \-\-program | \-p ] - .RB [ \-\-verbose | \-v ] - .RB [ \-\-continuous | \-c] -+.RB [ \-\-wide | \-W] - .P - .B netstat - .RB { \-\-route | \-r } -@@ -37,37 +41,38 @@ netstat \- Print network connections, routing tables, interface statistics, masq - .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] - .RB [ \-\-verbose | \-v ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-interfaces | \-i } --.RI [ iface ] - .RB [ \-\-all | \-a ] - .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] - .RB [ \-\-verbose | \-v ] - .RB [ \-\-program | \-p ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-groups | \-g } - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-masquerade | \-M } - .RB [ \-\-extend | \-e ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-statistics | -s } - .RB [ \-\-tcp | \-t ] - .RB [ \-\-udp | \-u ] -+.RB [ \-\-udplite | \-U ] -+.RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] - .P - .B netstat -@@ -78,13 +83,26 @@ netstat \- Print network connections, routing tables, interface statistics, masq - .P - .IR address_family_options : - .PP --.RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ] -+.RB [ -4 | \-\-inet ] -+.RB [ -6 | \-\-inet6 ] -+.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp ", ... } ]" - .RB [ \-\-unix | \-x ] --.RB [ \-\-inet | \-\-ip ] -+.RB [ \-\-inet | \-\-ip | \-\-tcpip ] - .RB [ \-\-ax25 ] -+.RB [ \-\-x25 ] -+.RB [ \-\-rose ] -+.RB [ \-\-ash ] - .RB [ \-\-ipx ] - .RB [ \-\-netrom ] --.RB [ \-\-ddp ] -+.RB [ \-\-ddp | \-\-appletalk ] -+.RB [ \-\-econet | \-\-ec ] -+ -+.SH NOTES -+This program is obsolete. -+Replacement for \fBnetstat\fR is \fBss\fR. -+Replacement for \fBnetstat -r\fR is \fBip route\fR. -+Replacement for \fBnetstat -i\fR is \fBip -s link\fR. -+Replacement for \fBnetstat -g\fR is \fBip maddr\fR. - - .SH DESCRIPTION - .B Netstat -@@ -98,12 +116,17 @@ displays a list of open sockets. If you don't specify any - address families, then the active sockets of all configured address - families will be printed. - .SS "\-\-route , \-r" --Display the kernel routing tables. -+Display the kernel routing tables. See the description in -+.BR route (8) -+for details. -+.B netstat -r -+and -+.B route -e -+produce the same output. - .SS "\-\-groups , \-g" - Display multicast group membership information for IPv4 and IPv6. --.SS "\-\-interface=\fIiface \fR, \fB\-i" --Display a table of all network interfaces, or the specified --.IR iface ) . -+.SS "\-\-interfaces, \-i" -+Display a table of all network interfaces. - .SS "\-\-masquerade , \-M" - Display a list of masqueraded connections. - .SS "\-\-statistics , \-s" -@@ -112,16 +135,19 @@ Display summary statistics for each protocol. - .SS "\-\-verbose , \-v" - Tell the user what is going on by being verbose. Especially print some - useful information about unconfigured address families. -+.SS "\-\-wide , \-W" -+Do not truncate IP addresses by using output as wide as needed. This is -+optional for now to not break existing scripts. - .SS "\-\-numeric , \-n" - Show numerical addresses instead of trying to determine symbolic host, port - or user names. --.SS "\-\-numeric-hosts" -+.SS "\-\-numeric\-hosts" - shows numerical host addresses but does not affect the resolution of - port or user names. --.SS "\-\-numeric-ports" -+.SS "\-\-numeric\-ports" - shows numerical port numbers but does not affect the resolution of - host or user names. --.SS "\-\-numeric-users" -+.SS "\-\-numeric\-users" - shows numerical user IDs but does not affect the resolution of host or - port names. - -@@ -131,15 +157,18 @@ protocols) for which connections are to be shown. - .I family - is a comma (',') separated list of address family keywords like - .BR inet , -+.BR inet6 , - .BR unix , - .BR ipx , - .BR ax25 , - .BR netrom , -+.BR econet , - and - .BR ddp . - This has the same effect as using the --.BR \-\-inet , --.BR \-\-unix " (" \-x ), -+.BR \-\-inet | -4 , -+.BR \-\-inet6 | -6 , -+.BR \-\-unix | -x , - .BR \-\-ipx , - .BR \-\-ax25 , - .BR \-\-netrom , -@@ -149,7 +178,7 @@ options. - .P - The address family - .B inet --includes raw, udp and tcp protocol sockets. -+(Iv4) includes raw, udp, udplite and tcp protocol sockets. - .SS "\-c, \-\-continuous" - This will cause - .B netstat -@@ -164,23 +193,24 @@ Show the PID and name of the program to which each socket belongs. - Show only listening sockets. (These are omitted by default.) - .SS "\-a, \-\-all" - Show both listening and non-listening sockets. With the --.B --interfaces --option, show interfaces that are not marked -+.B \-\-interfaces -+option, show interfaces that are not up - .SS "\-F" - Print routing information from the FIB. (This is the default.) - .SS "\-C" - Print routing information from the route cache. --.IR UP . - .P - .SH OUTPUT - .P --.SS Active Internet connections \fR(TCP, UDP, raw)\fR -+.SS Active Internet connections \fR(TCP, UDP, UDPLite, raw)\fR - .SS "Proto" --The protocol (tcp, udp, raw) used by the socket. --.SS "Recv-Q" --The count of bytes not copied by the user program connected to this socket. --.SS "Send-Q" --The count of bytes not acknowledged by the remote host. -+The protocol (tcp, udp, udpl, raw) used by the socket. -+.SS "Recv\-Q" -+Established: The count of bytes not copied by the user program connected to this socket. -+Listening: Since Kernel 2.6.18 this column contains the current syn backlog. -+.SS "Send\-Q" -+Established: The count of bytes not acknowledged by the remote host. -+Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog. - .SS "Local Address" - Address and port number of the local end of the socket. Unless the - .BR \-\-numeric " (" \-n ) -@@ -192,7 +222,7 @@ Address and port number of the remote end of the socket. - Analogous to "Local Address." - .SS "State" - The state of the socket. Since there are no states in raw mode and usually no --states used in UDP, this column may be left blank. Normally this can be one -+states used in UDP and UDPLite, this column may be left blank. Normally this can be one - of several values: - .TP - .I -@@ -221,7 +251,7 @@ TIME_WAIT - The socket is waiting after close to handle packets still in the network. - .TP - .I --CLOSED -+CLOSE - The socket is not being used. - .TP - .I -@@ -255,7 +285,7 @@ The username or the user id (UID) of the owner of the socket. - .SS "PID/Program name" - Slash-separated pair of the process id (PID) and process name of the - process that owns the socket. --.B --program -+.B \-\-program - causes this column to be included. You will also need - .I superuser - privileges to see this information on sockets you don't own. This -@@ -356,13 +386,6 @@ to the socket. - .SS Active AX.25 sockets - (this needs to be done by somebody who knows it) - .PP --.SH NOTES --Starting with Linux release 2.2 --.B netstat -i --does not show interface statistics for alias interfaces. To get per --alias interface counters you need to setup explicit rules using the --.BR ipchains(8) --command. - - .SH FILES - .ta -@@ -385,6 +408,9 @@ status information via the following files. - .I /proc/net/udp - -- UDP socket information - -+.I /proc/net/udplite -+-- UDPLite socket information -+ - .I /proc/net/igmp - -- IGMP multicast information - -@@ -428,9 +454,10 @@ status information via the following files. - .SH SEE ALSO - .BR route (8), - .BR ifconfig (8), --.BR ipchains (8), - .BR iptables (8), - .BR proc (5) -+.BR ss (8) -+.BR ip (8) - .P - .SH BUGS - Occasionally strange information may appear if a socket changes -@@ -438,12 +465,10 @@ as it is viewed. This is unlikely to occur. - .P - .SH AUTHORS - The netstat user interface was written by Fred Baumgarten --<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically -+<dc6iq@insu1.etec.uni\-karlsruhe.de>, the man page basically - by Matt Welsh <mdw@tc.cornell.edu>. It was updated by --Alan Cox <Alan.Cox@linux.org> but could do with a bit more --work. It was updated again by Tuan Hoang --<tqhoang@bigfoot.com>. --.br --The man page and the command included in the net-tools --package is totally rewritten by Bernd Eckenfels --<ecki@linux.de>. -+Alan Cox <Alan.Cox@linux.org>, updated again by Tuan Hoang -+<tqhoang@bigfoot.com>. The man page and the command included -+in the net\-tools package is totally rewritten by Bernd Eckenfels -+<ecki@linux.de>. UDPLite options were added by Brian Micek -+<bmicek@gmail.com> -diff --git a/man/en_US/plipconfig.8 b/man/en_US/plipconfig.8 -index c6d2567..d42a0bc 100644 ---- a/man/en_US/plipconfig.8 -+++ b/man/en_US/plipconfig.8 -@@ -1,10 +1,18 @@ --.TH PLIPCONFIG 8 "17 February 1995" "" "" -+.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - plipconfig \- fine tune PLIP device parameters - .SH SYNOPSIS --.B "plipconfig interface" -+.B plipconfig interface -+.RB [ nibble -+.IR NN ] -+.RB [ trigger -+.IR NN ] - .br --.B "plipconfig interface [nibble NN] [trigger NN] [unit NN]" -+.B plipconfig -+.RB [ \-V ] -+.RB [ \-\-version ] -+.RB [ \-h ] -+.RB [ \-\-help ] - .SH DESCRIPTION - .B Plipconfig - is used to (hopefully) improve PLIP performance by changing the default -diff --git a/man/en_US/rarp.8 b/man/en_US/rarp.8 -index e462799..d9d31f9 100644 ---- a/man/en_US/rarp.8 -+++ b/man/en_US/rarp.8 -@@ -1,20 +1,20 @@ --.TH RARP 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" -+.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - rarp \- manipulate the system RARP table - .SH SYNOPSIS --.B "rarp [-V] [--version] [-h] [--help]" -+.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]" - .br --.B "rarp -a" -+.B "rarp \-a" - .br --.B "rarp [-v] -d hostname ..." -+.B "rarp [\-v] \-d hostname ..." - .br --.B "rarp [-v] [-t type] -s hostname hw_addr" -+.B "rarp [\-v] [\-t type] \-s hostname hw_addr" - .SH NOTE - .P - This program is obsolete. From version 2.3, the Linux kernel - no longer contains RARP support. For a replacement RARP daemon, see - .I --ftp://ftp.dementia.org/pub/net-tools -+ftp://ftp.dementia.org/pub/net\-tools - .SH DESCRIPTION - .B Rarp - manipulates the kernel's RARP table in various ways. The primary options -@@ -61,8 +61,8 @@ Remove all RARP entries for the specified host. - Create a RARP address mapping entry for host - .B hostname - with hardware address set to --.B hw_addr --. The format of the hardware address is dependent on the hardware -+.BR hw_addr . -+The format of the hardware address is dependent on the hardware - class, but for most classes one can assume that the usual presentation - can be used. For the Ethernet class, this is 6 bytes in hexadecimal, - separated by colons. -diff --git a/man/en_US/route.8 b/man/en_US/route.8 -index f59c074..19895e9 100644 ---- a/man/en_US/route.8 -+++ b/man/en_US/route.8 -@@ -1,57 +1,62 @@ --.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "2014\-02\-17" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - route \- show / manipulate the IP routing table - .SH SYNOPSIS - .B route --.RB [ \-CFvnee ] -+.RB [ \-CFvnNee ] -+.RB [ \-A -+family -+.RB | \-4 | \-6 ] - .TP - .B route - .RB [ \-v ] - .RB [ \-A --family] -+family -+.RB | \-4 | \-6 ] - .B add - .RB [ \-net | \-host ] --target -+.I target - .RB [ netmask --Nm] -+.IR Nm ] - .RB [ gw --Gw] -+.IR Gw ] - .RB [ metric --N] -+.IR N ] - .RB [ mss --M] -+.IR M ] - .RB [ window --W] -+.IR W ] - .RB [ irtt --I] -+.IR I ] - .RB [ reject ] - .RB [ mod ] - .RB [ dyn ] - .RB [ reinstate ] - .RB [[ dev ] --If] -+.IR If ] - .TP - .B route - .RB [ \-v ] - .RB [ \-A --family] -+.I family -+.RB | \-4 | \-6 ] - .B del - .RB [ \-net | \-host ] --target -+.I target - .RB [ gw --Gw] -+.IR Gw ] - .RB [ netmask --Nm] -+.IR Nm ] - .RB [ metric --N] -+.IR M ] - .RB [[ dev ] --If] -+.IR If ] - .TP - .B route - .RB [ \-V ] - .RB [ \-\-version ] - .RB [ \-h ] --.RB [ \--help ] -+.RB [ \-\-help ] - .SH DESCRIPTION - .B Route - manipulates the kernel's IP routing tables. Its primary use is to set -@@ -72,19 +77,27 @@ displays the current contents of the routing tables. - - .SH OPTIONS - .TP --.B \-A family --use the specified address family (eg `inet'; use `route --help' for a full --list). -+\fB\-A \fIfamily\fR -+use the specified address family (eg `inet'). Use -+.B route \-\-help -+for a full list. You can use -+.B \-6 -+as an alias for -+.B \-\-inet6 -+and -+.B \-4 -+as an alias for -+.B \-A inet -+. - - .TP --.B -F -+.B \-F - operate on the kernel's FIB (Forwarding Information Base) routing - table. - This is the default. - .TP --.B -C -+.B \-C - operate on the kernel's routing cache. -- - .TP - .B \-v - select verbose operation. -@@ -96,11 +109,10 @@ nameserver has vanished. - .TP - .B \-e - use --.BR netstat (8)-format -+.BR netstat (8)\-format - for displaying the routing table. - .B \-ee - will generate a very long line with all parameters from the routing table. -- - .TP - .B del - delete a route. -@@ -108,25 +120,27 @@ delete a route. - .B add - add a new route. - .TP --.B target --the destination network or host. You can provide IP addresses in dotted --decimal or host/network names. -+.I target -+the destination network or host. You can provide an addresses or symbolic -+network or host name. Optionally you can use \fB/\fIprefixlen\fR notation -+instead of using the \fBnetmask\fR option. - .TP - .B \-net - the --.B target -+.I target - is a network. - .TP --.B -host -+.B \-host - the --.B target -+.I target - is a host. - .TP --.B netmask NM -+\fBnetmask \fINM\fR - when adding a network route, the netmask to be used. - .TP --.B gw GW -+\fBgw \fIGW\fR - route packets via a gateway. -+.br - .B NOTE: - The specified gateway must be reachable first. This usually means that - you have to set up a static route to the gateway beforehand. If you specify -@@ -134,91 +148,94 @@ the address of one of your local interfaces, it will be used to decide about - the interface to which the packets should be routed to. This is a BSDism - compatibility hack. - .TP --.B metric M --set the metric field in the routing table (used by routing daemons) to M. -+\fBmetric \fIM\fR -+set the metric field in the routing table (used by routing daemons) to \fIM\fR. If this option is not specified the metric for inet6 (IPv6) address family defaults to '1', for inet (IPv4) it defaults to '0'. You should always specify an explicit metric value to not rely on those defaults - they also differ from iproute2. - .TP --.B mss M --set the TCP Maximum Segment Size (MSS) for connections over this route --to M bytes. --The default is the device MTU minus headers, or a lower MTU when path mtu --discovery occured. This setting can be used to force smaller TCP packets on the --other end when path mtu discovery does not work (usually because of --misconfigured firewalls that block ICMP Fragmentation Needed) -+\fBmss \fIM\fR -+sets MTU (Maximum Transmission Unit) of the route to \fIM\fR bytes. -+Note that the current implementation of the route command does not allow -+the option to set the Maximum Segment Size (MSS). - .TP --.B window W --set the TCP window size for connections over this route to W -+\fBwindow \fIW\fR -+set the TCP window size for connections over this route to \fIW\fR - bytes. This is typically only used on AX.25 networks and with drivers - unable to handle back to back frames. - .TP --.B irtt I -+\fBirtt \fII\fR - set the initial round trip time (irtt) for TCP connections over this --route to I milliseconds (1-12000). This is typically only used on -+route to \fII\fR milliseconds (1-12000). This is typically only used on - AX.25 networks. If omitted the RFC 1122 default of 300ms is used. - .TP - .B reject - install a blocking route, which will force a route lookup to fail. - This is for example used to mask out networks before using the default --route. This is NOT for firewalling. -+route. This is NOT for firewalling. - .TP - .B mod, dyn, reinstate - install a dynamic or modified route. These flags are for diagnostic - purposes, and are generally only set by routing daemons. - .TP --.B dev If -+\fBdev \fIIf\fR - force the route to be associated with the specified device, as the - kernel will otherwise try to determine the device on its own (by - checking already existing routes and device specifications, and where - the route is added to). In most normal networks you won't need this. - --If --.B dev If -+If \fBdev \fIIf\fR - is the last option on the command line, the word - .B dev - may be omitted, as it's the default. Otherwise the order of the route --modifiers (metric - netmask - gw - dev) doesn't matter. -+modifiers (\fBmetric netmask gw dev\fR) doesn't matter. - - .SH EXAMPLES - .TP --.B route add -net 127.0.0.0 --adds the normal loopback entry, using netmask 255.0.0.0 (class A net, --determined from the destination address) and associated with the --"lo" device (assuming this device was prviously set up correctly with -+.B route add \-net 127.0.0.0 netmask 255.0.0.0 metric 1024 dev lo -+adds the normal loopback entry, using netmask 255.0.0.0 and associated with the -+"lo" device (assuming this device was previously set up correctly with - .BR ifconfig (8)). - - .TP --.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 --adds a route to the network 192.56.76.x via --"eth0". The Class C netmask modifier is not really necessary here because --192.* is a Class C IP address. The word "dev" can be omitted here. -+.B route add \-net 192.56.76.0 netmask 255.255.255.0 metric 1024 dev eth0 -+adds a route to the local network 192.56.76.x via -+"eth0". The word "dev" can be omitted here. - - .TP --.B route add default gw mango-gw -+.B route del default -+deletes the current default route, which is labeled "default" or 0.0.0.0 -+in the destination field of the current routing table. -+ -+.TP -+.B route add default gw mango - adds a default route (which will be used if no other route matches). --All packets using this route will be gatewayed through "mango-gw". The -+All packets using this route will be gatewayed through the address of a node -+named "mango". The - device which will actually be used for that route depends on how we --can reach "mango-gw" - the static route to "mango-gw" will have to be --set up before. -+can reach "mango" - "mango" must be on directly reachable route. - - .TP --.B route add ipx4 sl0 --Adds the route to the "ipx4" host via the SLIP interface (assuming that --"ipx4" is the SLIP host). -+.B route add mango sl0 -+Adds the route to the host named "mango" via the SLIP interface (assuming that -+"mango" is the SLIP host). - - .TP --.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 -+.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw mango - This command adds the net "192.57.66.x" to be gatewayed through the former - route to the SLIP interface. - - .TP --.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0 -+.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0 - This is an obscure one documented so people know how to do it. This sets - all of the class D (multicast) IP routes to go via "eth0". This is the - correct normal configuration line with a multicasting kernel. - - .TP --.B route add -net 10.0.0.0 netmask 255.0.0.0 reject -+.B route add \-net 10.0.0.0 netmask 255.0.0.0 metric 1024 reject - This installs a rejecting route for the private network "10.x.x.x." - -+.TP -+.B route -6 add 2001:0002::/48 metric 1 dev eth0 -+This adds a IPv6 route with the specified metric to be directly reachable via eth0. -+ - .LP - .SH OUTPUT - The output of the kernel routing table is organized in the following columns -@@ -275,21 +292,20 @@ entry) - route) - .TP - .B Metric --The 'distance' to the target (usually counted in hops). It is not used by --recent kernels, but may be needed by routing daemons. -+The 'distance' to the target (usually counted in hops). - .TP - .B Ref - Number of references to this route. (Not used in the Linux kernel.) - .TP - .B Use --Count of lookups for the route. Depending on the use of -F and -C this will --be either route cache misses (-F) or hits (-C). -+Count of lookups for the route. Depending on the use of \-F and \-C this will -+be either route cache misses (\-F) or hits (\-C). - .TP - .B Iface - Interface to which packets for this route will be sent. - .TP - .B MSS --Default maximum segement size for TCP connections over this route. -+Default maximum segment size for TCP connections over this route. - .TP - .B Window - Default window size for TCP connections over this route. -@@ -313,8 +329,12 @@ Whether or not the hardware address for the cached route is up to date. - .br - .I /proc/net/rt_cache - .LP --.SH SEE ALSO --.I ifconfig(8), netstat(8), arp(8), rarp(8) -+.SH "SEE ALSO" -+.IR ifconfig (8), -+.IR netstat (8), -+.IR arp (8), -+.IR rarp (8), -+.IR ip (8) - .LP - .SH HISTORY - .B Route -@@ -323,4 +343,4 @@ for Linux was originally written by Fred N. van Kempen, - Linus Torvalds for pl15. Alan Cox added the mss and window options for - Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels. - .SH AUTHOR --Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>. -+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>. -diff --git a/man/en_US/slattach.8 b/man/en_US/slattach.8 -index 0c4c863..0e2cfcc 100644 ---- a/man/en_US/slattach.8 -+++ b/man/en_US/slattach.8 -@@ -1,8 +1,8 @@ --.TH SLATTACH 8 "12 Feb 1994" "" "" -+.TH SLATTACH 8 "2011\-12\-31" "net\-tools" "Linux System Administrator's Manual" - .SH NAME - slattach \- attach a network interface to a serial line - .SH SYNOPSIS --.B "slattach [-dehlLmnqv] [-c command] [-p proto] [-s speed] [tty]" -+.B "slattach [\-dehlLmnqv] [\-c command] [\-p proto] [\-s speed] [tty]" - .br - .SH DESCRIPTION - .B Slattach -@@ -11,47 +11,53 @@ is a tiny little program that can be used to put a normal terminal - you to use it for point-to-point links to other computers. - .SH OPTIONS - .TP --.B "[-c command]" -+.B tty -+Path to a serial device like -+.IR /dev/ttyS* ", " /dev/cua* " or " /dev/ptmx -+to spawn a new pseudo tty. -+.TP -+.B "[\-c command]" - Execute - .B command - when the line is hung up. This can be used to run scripts or re-establish - connections when a link goes down. - .TP --.B "[-d]" -+.B "[\-d]" - Enable debugging output. Useful when determining why a given - setup doesn't work. - .TP --.B "[-h]" -+.B "[\-h]" - Exit when the carrier is lost. This works on both /dev/tty and /dev/cua - devices by directly monitoring the carrier status every 15 seconds. --.B "[-v]" -+.TP -+.B "[\-v]" - Enable verbose output. Useful in shell scripts. - .TP --.B "[-q]" -+.B "[\-q]" - Operate in quiet mode - no messages at all. - .TP --.B "[-l]" -+.B "[\-l]" - Create an UUCP-style lockfile for the device in /var/lock. - .TP --.B "[-n]" -+.B "[\-n]" - Equivalent to the "mesg n" command. - .TP --.B "[-m]" -+.B "[\-m]" - Do \fBnot\fP initialize the line into 8 bits raw mode. - .TP --.B "[-e]" -+.B "[\-e]" - Exit right after initializing device, instead of waiting for the --line to hangup. -+line to hang up. - .TP --.B "[-L]" -+.B "[\-L]" - Enable 3 wire operation. The terminal is moved into CLOCAL mode, - carrier watching is disabled. - .TP --.B "[-p proto]" -+.B "[\-p proto]" - Set a specific kind of protocol to use on the line. The default - is set to --.B "cslip" --, i.e. compressed SLIP. Other possible values are -+.BR "cslip" , -+i.e. compressed SLIP. Other possible values are - .B "slip" - (normal SLIP), - .B "adaptive" -@@ -70,14 +76,14 @@ to be active on the line. For kiss connections the - .B axattach - program should be used. - .TP --.B "[-s speed]" -+.B "[\-s speed]" - Set a specific line speed, other than the default. - .PP - If no arguments are given, the current terminal line (usually: the - login device) is used. Otherwise, an attempt is made to claim the - indicated terminal port, lock it, and open it. - .SH FILES --.I /dev/cua* /var/lock/LCK.* -+.I /dev/cua* /var/lock/LCK.* /dev/ttyS* /dev/ptmx - .SH BUGS - None known. - .SH SEE ALSO -diff --git a/man/fr_FR/arp.8 b/man/fr_FR/arp.8 -index df37e8b..a669469 100644 ---- a/man/fr_FR/arp.8 -+++ b/man/fr_FR/arp.8 -@@ -1,32 +1,32 @@ --.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" -+.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Administrator's Manual" - .SH NOM --arp \- manipule la table ARP du systme -+arp \- manipule la table ARP du système - .SH SYNOPSIS - .B arp - .RB [ \-vn ] - .RB [ "\-H type" ] - .RB [ "-i if" ] - .B -a --.RB [ nom_hte ] -+.RB [ nom_hôte ] - .PP - .B arp - .RB [ \-v ] - .RB [ "\-i if" ] --.B "\-d nom_hte" -+.B "\-d nom_hôte" - .RB [ pub ] - .PP - .B arp - .RB [ \-v ] - .RB [ "\-H type" ] - .RB [ "\-i if" ] --.B -s nom_hte hw_addr -+.B -s nom_hôte hw_addr - .RB [ temp ] - .PP - .B arp - .RB [ \-v ] - .RB [ "\-H type" ] - .RB [ "\-i if" ] --.B -s nom_hte hw_addr -+.B -s nom_hôte hw_addr - .RB [ "netmask nm" ] - .B pub - .PP -@@ -34,7 +34,7 @@ arp \- manipule la table ARP du syst - .RB [ \-v ] - .RB [ "\-H type" ] - .RB [ "\-i if" ] --.B -Ds nom_hte ifa -+.B -Ds nom_hôte ifa - .RB [ "netmask nm" ] - .B pub - .PP -@@ -46,33 +46,33 @@ arp \- manipule la table ARP du syst - - .SH DESCRIPTION - .B Arp --manipule la table ARP du noyau de diffrentes faons. Les options principales --permettent d'effacer une correspondance d'adresses et d'en dfinir -+manipule la table ARP du noyau de différentes façons. Les options principales -+permettent d'effacer une correspondance d'adresses et d'en définir - une manuellement. --Pour les besoins de dbogage, le programme -+Pour les besoins de débogage, le programme - .B arp - permet aussi d'effectuer un dump complet de la table ARP. - .SH OPTIONS - .TP - .B "\-v, \-\-verbose" --Dit l'utilisateur ce qui se passe en tant verbeux. -+Dit à l'utilisateur ce qui se passe en étant verbeux. - .TP - .B "\-n, \-\-numeric" --Affiche les adresses numriques au lieu d'essayer de dterminer les nom --d'htes symboliques. -+Affiche les adresses numériques au lieu d'essayer de déterminer les nom -+d'hôtes symboliques. - .TP - .B "\-H type, \-\-hw-type type" --En positionnant ou lisant les entres ARP, ce paramtre optionnel indique -- -+En positionnant ou lisant les entrées ARP, ce paramètre optionnel indique -+à - .B arp --les classes d'entres qu'il doit contrler. La valeur par dfaut de --ce paramtre est -+les classes d'entrées qu'il doit contrôler. La valeur par défaut de -+ce paramètre est - .B ether --(i.e. code de matriel -+(i.e. code de matériel - .B 0x01 - pour - .B "IEEE 802.3 10Mbps Ethernet". --D'autres valeurs doivent correspondre des technologies rseaux telles que -+D'autres valeurs doivent correspondre à des technologies réseaux telles que - .RB "ARCnet (" arcnet ")" - , - .RB "PROnet (" pronet ")" -@@ -81,89 +81,89 @@ D'autres valeurs doivent correspondre - and - .RB "NET/ROM (" netrom ")." - .TP --.B "\-a [nom_d_hte], \-\-display [nom_d_hte]" --Affiche les entres concernant l'hte spcifi. Si le paramtre --.B nom_d_hte --n'est pas utilis, -+.B "\-a [nom_d_hôte], \-\-display [nom_d_hôte]" -+Affiche les entrées concernant l'hôte spécifié. Si le paramètre -+.B nom_d_hôte -+n'est pas utilisé, - .B toutes --les entres seront affiches. -+les entrées seront affichées. - .TP --.B "\-d nom_d_hte, \-\-delete nom_d_hte" --Enlve une entre pour l'hte spcifi. Ceci peut tre --utilis si l'hte concern ne fonctionne plus, par exemple. -+.B "\-d nom_d_hôte, \-\-delete nom_d_hôte" -+Enlève une entrée pour l'hôte spécifié. Ceci peut être -+utilisé si l'hôte concerné ne fonctionne plus, par exemple. - .TP - .B "\-D, \-\-use-device" --Utilise l'adresse matrielle de l'interface -+Utilise l'adresse matérielle de l'interface - .BR ifa - . - .TP - .B "\-i If, \-\-device If" --Slectionne une interface. Lors du dump du cache ARP, seules les entres --correspondant l'interface spcifie seront affiches. Lorsque l'on dfinit --une entre permanente ou une entre -+Sélectionne une interface. Lors du dump du cache ARP, seules les entrées -+correspondant à l'interface spécifiée seront affichées. Lorsque l'on définit -+une entrée permanente ou une entrée - .B temp --, cette interface lui sera associe; si cette option n'est pas utilise, --le noyau fera des tentatives de rsolution selon la table de routage. Pour --les entres -+, cette interface lui sera associée; si cette option n'est pas utilisée, -+le noyau fera des tentatives de résolution selon la table de routage. Pour -+les entrées - .B pub --l'interface spcifie est celle pour laquelle les requtes ARP auront trouv --une rponse. -+l'interface spécifiée est celle pour laquelle les requêtes ARP auront trouvé -+une réponse. - .br - .B NOTE: --Ceci est diffrent de l'interface vers laquelle les datagrammes IP seront routs. -+Ceci est différent de l'interface vers laquelle les datagrammes IP seront routés. - .TP --.B "\-s nom_d_hte hw_addr, \-\-set hostname hw_addr" --Cre manuellement une correspondance d'adresses ARP pour l'hte --.B nom_d_hte --avec l'adresse matrielle positionne -+.B "\-s nom_d_hôte hw_addr, \-\-set hostname hw_addr" -+Crée manuellement une correspondance d'adresses ARP pour l'hôte -+.B nom_d_hôte -+avec l'adresse matérielle positionnée à - .B hw_addr. --Le format de l'adresse matrielle est dpendant de la classe du matriel, --mais pour la plupart on peut considrer que la prsentation classique --peut tre utilise. Pour la classe Ethernet, c'est 6 octets en hexadcimal, --spars par des double-points. Pour ajouter des entres proxy-arp -+Le format de l'adresse matérielle est dépendant de la classe du matériel, -+mais pour la plupart on peut considérer que la présentation classique -+peut être utilisée. Pour la classe Ethernet, c'est 6 octets en hexadécimal, -+séparés par des double-points. Pour ajouter des entrées proxy-arp - (Ce sont celles avec l'indicateur - .BR pub lish --positionn) --un masque rseau ( -+positionné) -+un masque réseau ( - .B netmask --) peut tre spcifi au proxy-arp pour le --sous-rseau entier. Ceci n'est pas trs recommand, mais est support par -+) peut être spécifié au proxy-arp pour le -+sous-réseau entier. Ceci n'est pas très recommandé, mais est supporté par - les anciens noyaux, car c'est utile dans certains cas. Si l'indicateur - .B temp --n'est pas fourni, les entres ARP seront permanentes. -+n'est pas fourni, les entrées ARP seront permanentes. - .br - .B NOTE: --A partir du noyau 2.2.0 il n'est plus possible de dfinir des entres ARP --pour un sous rseau entier. -+A partir du noyau 2.2.0 il n'est plus possible de définir des entrées ARP -+pour un sous réseau entier. - .TP - .B "\-f nom_de_fichier, \-\-file nom_de_fichier" --Similaire l'option -+Similaire à l'option - .B \-s - , mais cette fois les informations d'adresses sont prises dans le fichier --.B nom_de_fichier --. Ceci peut tre utilis si les entres ARP configurer sont --nombreuses. Le nom du fichier de donnes est trs souvent nomm -+.BR nom_de_fichier . -+Ceci peut être utilisé si les entrées ARP à configurer sont -+nombreuses. Le nom du fichier de données est très souvent nommé - .B /etc/ethers - , mais ce n'est pas officiel. - .sp 1 - Le format du fichier est simple; Il contient --seulement des lignes de texte ASCII avec sur chaque ligne un nom d'hte et --une adresse matrielle, spars par des espaces. Les indicateurs -+seulement des lignes de texte ASCII avec sur chaque ligne un nom d'hôte et -+une adresse matérielle, séparés par des espaces. Les indicateurs - .BR "pub" , " temp" " et" " netmask" --peuvent galement tre utiliss. -+peuvent également être utilisés. - .LP --A tous les endroits o un --.B nom d'hte -+A tous les endroits où un -+.B nom d'hôte - est attendu, on peut aussi entrer une - .B "addresse IP" --en notation dcimale pointe. -+en notation décimale pointée. - .LP --Chaque entre complte se trouvant dans le cache ARP est marque de -+Chaque entrée complète se trouvant dans le cache ARP est marquée de - l'indicateur --.B C --. Les entres permanentes sont marques de l'indicateur -+.BR C . -+Les entrées permanentes sont marquées de l'indicateur - .B M --et les entres 'pub' ont l'indicateur -+et les entrées 'pub' ont l'indicateur - .B P - . - .SH FICHIERS -@@ -177,8 +177,8 @@ et les entr - .SH VOIR AUSSI - rarp(8), route(8), ifconfig(8), netstat(8) - .SH AUTEUR --Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les amliorations --apportes par le mainteneur des net-tools Bernd Eckenfels -+Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les améliorations -+apportées par le mainteneur des net-tools Bernd Eckenfels - <net-tools@lina.inka.de>. - .SH TRADUCTION - Jean Michel VANSTEENE (vanstee@worldnet.fr) -diff --git a/man/fr_FR/ethers.5 b/man/fr_FR/ethers.5 -index 5e70929..030fdf6 100644 ---- a/man/fr_FR/ethers.5 -+++ b/man/fr_FR/ethers.5 -@@ -5,7 +5,7 @@ - .\" - .TH ETHERS 5 "26 Avril 1996" "" "Formats de fichiers" - .SH NOM \"{{{roff}}}\"{{{ --ethers \- Base de donnes adresses Ethernet - adresses IP -+ethers \- Base de données adresses Ethernet - adresses IP - .\"}}} - .SH DESCRIPTION \"{{{ - \fB/etc/ethers\fP contient des adresses Ethernet sur 48 bits et leur -@@ -15,14 +15,14 @@ adresse IP correspondante, une ligne par adresses IP: - \fIAdresse-Ethernet\fP \fIAdresse-IP\fP - .RE - .sp --Les deux items sont spars par un ou plusieurs espaces et/ou tabulations. --Un \fB#\fP en dbut de ligne est un commentaire pour tout le reste de la ligne. --L'\fIadresse-Ethernet\fP est crite sous la forme -+Les deux items sont séparés par un ou plusieurs espaces et/ou tabulations. -+Un \fB#\fP en début de ligne est un commentaire pour tout le reste de la ligne. -+L'\fIadresse-Ethernet\fP est écrite sous la forme - .IR x : x : x : x : x : x , --o \fIx\fP est une valeur hxadecimale comprise entre \fB0\fP et \fBff\fP --reprsentant un octet de l'adresse, dans l'ordre du rseau (big-endian). --L'\fIAdresse-IP\fP peut tre soit un nom d'hte rsolu par DNS ou une adresse --en notation dcimale pointe. -+où \fIx\fP est une valeur héxadecimale comprise entre \fB0\fP et \fBff\fP -+représentant un octet de l'adresse, dans l'ordre du réseau (big-endian). -+L'\fIAdresse-IP\fP peut être soit un nom d'hôte résolu par DNS ou une adresse -+en notation décimale pointée. - .\"}}} - .SH EXEMPLES \"{{{ - 08:00:20:00:61:CA pal -diff --git a/man/fr_FR/hostname.1 b/man/fr_FR/hostname.1 -index c4cd412..3adaf4b 100644 ---- a/man/fr_FR/hostname.1 -+++ b/man/fr_FR/hostname.1 -@@ -1,16 +1,16 @@ - .TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual" - .SH NOM --hostname \- affiche ou dfinit le nom d'hte du systme -+hostname \- affiche ou définit le nom d'hôte du système - .br --domainname \- affiche le nom de domaine NIS/YP du systme -+domainname \- affiche le nom de domaine NIS/YP du système - .br --dnsdomainname \- affiche le nom de domaine du systme -+dnsdomainname \- affiche le nom de domaine du système - .br --nisdomainname \- affiche ou dfinit le nom de domaine NIS/YP du systme -+nisdomainname \- affiche ou définit le nom de domaine NIS/YP du système - .br --ypdomainname \- affiche ou dfinit le nom de domaine NIS/YP du systme -+ypdomainname \- affiche ou définit le nom de domaine NIS/YP du système - .br --nodename \- affiche ou dfinit le nom de domaine DECnet du systme -+nodename \- affiche ou définit le nom de domaine DECnet du système - - .SH SYNOPSIS - .B hostname -@@ -73,45 +73,45 @@ nodename \- affiche ou d - - .SH DESCRIPTION - .B Hostname --est le programme utilis soit pour dfinir le nom d'hte, soit --pour visualiser le nom d'hte ou de domaine du systme. Ce nom est --utilis par diffrents programmes rseaux pour identifier la machine. Le --nom de domaine est galement utilis par les NIS/YP. -+est le programme utilisé soit pour définir le nom d'hôte, soit -+pour visualiser le nom d'hôte ou de domaine du système. Ce nom est -+utilisé par différents programmes réseaux pour identifier la machine. Le -+nom de domaine est également utilisé par les NIS/YP. - - .SS "OBTENTION DU NOM" --Appel sans argument, le programme affiche les noms courants: -+Appelé sans argument, le programme affiche les noms courants: - - .LP - .B hostname --fournit le nom du systme tel qu'il est retourn par la fonction --.BR getdomainname (2) --. Ceci est connu comme nom de domaine YP/NIS du systme. -+fournit le nom du système tel qu'il est retourné par la fonction -+.BR getdomainname (2). -+Ceci est connu comme nom de domaine YP/NIS du système. - - - .LP - .B nodename --fournit le nom de noeud DECnet du systme tel qu'il est retourn par la -+fournit le nom de noeud DECnet du système tel qu'il est retourné par la - fonction - .BR getnodename (2) - . - - .LP - .B dnsdomainname --fournit la partie domaine du nom compltement qualifi - FQDN (Fully --Qualified Domain Name). Le nom FQDN du systme est retourn par la commande -+fournit la partie domaine du nom complètement qualifié - FQDN (Fully -+Qualified Domain Name). Le nom FQDN du système est retourné par la commande - .BR "hostname \-\-fqdn" . - - .SS "SET NAME" --Appel avec un argument ou avec l'option -+Appelé avec un argument ou avec l'option - .B \-\-file --, la commande dfinit le nom d'hte, le nom de domaine NIS/YP ou -+, la commande définit le nom d'hôte, le nom de domaine NIS/YP ou - le nom de noeud. - - .LP - Notez que seul le super-utilisateur peut changer les noms. - - .LP --Il n'est pas possible de dfinir le nom FQDN ou le nom de domaine DNS avec -+Il n'est pas possible de définir le nom FQDN ou le nom de domaine DNS avec - la commande - .B dnsdomainname - (voir -@@ -119,8 +119,8 @@ la commande - ci-dessous). - - .LP --Le nom d'hte est gnrallement dfinit une seule fois, au --dmarrage du systme, par le script de configuration -+Le nom d'hôte est générallement définit une seule fois, au -+démarrage du système, par le script de configuration - .I /etc/rc.d/rc.inet1. - ou - .I /etc/init.d/boot -@@ -132,45 +132,45 @@ Vous pouvez modifier le FQDN (tel que fourni par la commande - .BR "hostname \-\-fqdn" ) - ou le nom de domaine DNS (tel que fourni par la commande - .BR "dnsdomainname" ) --avec cette commande. Le FQDN du systme est le nom que le resolveur ( -+avec cette commande. Le FQDN du système est le nom que le resolveur ( - .BR resolver (3) -- ) retourne comme nom d'hte. -+ ) retourne comme nom d'hôte. - - .LP - Techniquement: Le FQDN est le nom fourni par - .BR gethostbyname (2) -- partir du nom d'hte retourn par -+à partir du nom d'hôte retourné par - .BR gethostname (2). - Le nom de domaine DNS est la partie suivant le premier point. - .LP --La faon dont vous pouvez le changer dpend de la configuration -+La façon dont vous pouvez le changer dépend de la configuration - (habituellement dans --.IR /etc/host.conf ) --. Si le fichier 'hosts' est analys avant d'interroger le DNS ou -+.IR /etc/host.conf ). -+Si le fichier 'hosts' est analysé avant d'interroger le DNS ou - NIS) vous pouvez le changer dans le fichier - .IR /etc/hosts . - - .SH OPTIONS - .TP - .I "\-a, \-\-alias" --Affiche l'alias de l'hte (si utilis). -+Affiche l'alias de l'hôte (si utilisé). - .TP - .I "\-d, \-\-domain" - Affiche le nom du domaine DNS. Ne pas utiliser la commande - .B domainname --pour obtenir le nom de domaine DNS car vous obtiendrez en ralit le --nom de domaine NIS. Utilisez plutt la commande -+pour obtenir le nom de domaine DNS car vous obtiendrez en réalité le -+nom de domaine NIS. Utilisez plutôt la commande - .B dnsdomainname - . - .TP - .I "\-F, \-\-file nom_fichier" --Lit le nom d'hte partir du fichier spcifi. Les commentaires (lignes commenant --par un `#') sont ignors. -+Lit le nom d'hôte à partir du fichier spécifié. Les commentaires (lignes commençant -+par un `#') sont ignorés. - .TP - .I "\-f, \-\-fqdn, \-\-long" --Affiche le nom pleinement qualifi - FQDN (Fully Qualified Domain Name). un --FQDN consiste en un nom d'hte court et un nom de domaine. A moins que vous --utilisiez 'bind' ou les NIS pour la recherche d'htes, vous pouvez changer -+Affiche le nom pleinement qualifié - FQDN (Fully Qualified Domain Name). un -+FQDN consiste en un nom d'hôte court et un nom de domaine. A moins que vous -+utilisiez 'bind' ou les NIS pour la recherche d'hôtes, vous pouvez changer - le nom FQDN et le nom de domaine (qui fait partie du FQDN) dans le fichier - \fI/etc/hosts\fR. - .TP -@@ -178,15 +178,15 @@ le nom FQDN et le nom de domaine (qui fait partie du FQDN) dans le fichier - Affiche un message d'aide et se termine. - .TP - .I "\-i, \-\-ip-address" --Affiche la (les) adresse(s) IP de l'hte. -+Affiche la (les) adresse(s) IP de l'hôte. - .TP - .I "\-n, \-\-node" --Affiche le nom de noeud DECnet. Si un paramtre est fourni (ou -+Affiche le nom de noeud DECnet. Si un paramètre est fourni (ou - .B \-\-file nom_fichier --) le super-utilisateur peut galement dfinir un nouveau nom de neud. -+) le super-utilisateur peut également définir un nouveau nom de neud. - .TP - .I "\-s, \-\-short" --Affiche le nom d'hte en format court. Il s'agit du nom d'hte coup au -+Affiche le nom d'hôte en format court. Il s'agit du nom d'hôte coupé au - premier point. - .TP - .I "\-V, \-\-version" -@@ -197,9 +197,9 @@ termine correctement. - Mode verbeux. - .TP - .I "\-y, \-\-yp, \-\-nis" --Affiche le nom de domaine NIS. Si un paramtre est fourni (ou -+Affiche le nom de domaine NIS. Si un paramètre est fourni (ou - .B \-\-file nom_fichier --) le super-utilisateur peut galement dfinir un nouveau nom de domaine NIS. -+) le super-utilisateur peut également définir un nouveau nom de domaine NIS. - .SH FICHIERS - .B /etc/hosts - .SH AUTEURS -diff --git a/man/fr_FR/ifconfig.8 b/man/fr_FR/ifconfig.8 -index 0c29eb0..821f164 100644 ---- a/man/fr_FR/ifconfig.8 -+++ b/man/fr_FR/ifconfig.8 -@@ -1,160 +1,178 @@ --.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" -+.\" -+.\" Traduction : Jean Michel VANSTEENE <vanstee@worldnet.fr> -+.\" zz/08/1997 -+.\" Màj zz/08/2004 net-tools-1.60 Guillaume Audirac -+.\" Màj 17/08/2006 net-tools-1.65 Alain Portal -+.\" -+.TH IFCONFIG 8 "30 juin 2005" "net-tools" "Manuel de l'administrateur Linux" - .SH NOM --ifconfig \- configure une interface rseau -+ifconfig \- Configurer une interface réseau. - .SH SYNOPSIS --.B "ifconfig [interface]" -+.B "ifconfig [\-v] [\-a] [\-s] [interface]" - .br --.B "ifconfig interface [aftype] options | adresse ..." -+.B "ifconfig [\-v] interface [aftype] options | adresse ..." - .SH DESCRIPTION --.B Ifconfig --est utilis pour configurer (et maintenir ensuite) les interfaces --rseau rsidentes dans le noyau. Il est utilis lors du boot pour --configurer la plupart d'entre-elles et ainsi rendre le systme --oprationnel. Aprs, ce n'est quasiment plus utilis que pour --le dbogage ou pour des rglages si ncessaire. -+.B ifconfig -+permet de configurer les interfaces réseau présentes dans le noyau. -+On peut les configurer lors du démarrage quand c'est nécessaire. Ensuite, -+on l'utilise généralement pour le débogage ou pour d'éventuels réglages. - .LP --Si aucun argument n'est donn, -+Si aucun argument n'est donné, - .B ifconfig --affiche simplement l'tat des interfaces actuellement dfinies. Si --seul le paramtre -+affiche l'état des interfaces actives. Si seul le paramètre - .B interface --est donn, il affiche seulement l'tat de l'interface correspondante; --si seul le paramtre --.B -a --est fourni, il affiche l'tat de toutes les interfaces, mme celles qui --ne sont pas actives. --Autrement, il considre qu'il faut positionner de nouvelles valeurs. -- --.SH Familles d'adresses --Si le premier argument aprs le nom de l'interface est reconnu comme --tant un nom de famille d'adresses support, cette famille d'adresses --est utilise pour dcoder et afficher toutes les adresses --protocolaires. Les familles d'adresses actuellement supportes comprennent -+est donné, il affiche seulement l'état de l'interface correspondante\ ; -+si seul le paramètre -+.B \-a -+est fourni, il affiche l'état de toutes les interfaces, même celles -+qui sont inactives. Autrement, il permet de configurer une interface. -+.SH Familles d'Adresses -+Si le premier argument après le nom d'interface est reconnu comme -+le nom d'une famille d'adresses prise en charge, alors cette famille -+d'adresses est utilisée pour décoder et afficher toutes les adresses -+du protocole. Les familles d'adresses actuellement prises en charge -+comprennent - .B inet --(TCP/IP, default) -+(TCP/IP, par défaut), -+.B inet6 -+(IPv6), - .B ax25 --(AMPR Packet Radio.) -+(AMPR Packet Radio), - .B ddp --(Appletalk Phase 2) and -+(Appletalk Phase 2), - .B ipx --(Novell IPX). -+(Novell IPX) et -+.B netrom -+(AMPR Packet Radio). - .SH OPTIONS - .TP -+.B \-a -+Afficher toutes les interfaces actuellement disponibles, même celles -+qui sont inactives. -+.TP -+.B \-s -+Afficher un résumé (comme netstat \-i). -+.TP -+.B \-v -+Mode volubile pour certains types d'erreurs. -+.TP - .B interface --Le nom de l'interface rseau. C'est gnralement un nom de pilote suivi --d'un numro d'ordre comme -+Correspond au nom de l'interface de réseau. C'est généralement un nom de -+pilote suivi d'un chiffre, comme - .B eth0 --pour la premire interface Ethernet. -+pour la première interface Ethernet. Si votre noyau accepte les alias -+d'interfaces, vous pouvez les spécifier avec -+.B eth0:0 -+pour le premier alias de eth0. On peut les utiliser pour les affecter -+à une seconde adresse. Pour supprimer un alias d'interface, utilisez -+.BR "ifconfig eth0:0 down" . -+Note\ : pour chaque groupe (un même noeud donné par une combinaison -+adresse/masque de réseau), si vous supprimez le premier alias (le -+principal), tous les alias sont supprimés. - .TP - .B up --Cette option active l'interface. Elle est implicitement spcifie --si une nouvelle adresse est affecte l'interface (voir plus loin). -+Activer l'interface donnée. Cette option est implicite si une adresse est -+affectée à l'interface. - .TP - .B down --Cette option arrte le fonctionnement du pilote pour cette interface, et --est utilise lorsque les choses commencent aller mal. -+Désactiver le pilote pour l'interface donnée. - .TP - .B "[\-]arp" --Valide ou invalide l'utilisation du protocole ARP sur cette interface. Si --le signe moins (\-) est prsent, l'option est invalide. -+Activer ou désactiver l'utilisation du protocole ARP sur une interface. - .TP - .B "[\-]promisc" --Valide ou invalide le mode --.B promiscuous --. S'il est valid, tous les paquets circulant sur le rseau --seront reus sur cette interface. -+Activer ou désactiver le mode -+.BR promiscuous . -+S'il est activé, tous les paquets circulant sur le réseau seront reçus -+par l'interface. - .TP - .B "[\-]allmulti" --Valide ou invalide le fonctionnement de l'interface en mode --.B all-multicast --. S'il est valid, tous les paquets multicast circulant sur le rseau --seront reus sur cette interface. -+Activer ou désactiver le mode -+.BR all-multicast . -+S'il est activé, l'interface recevra tous les paquets de multidiffusion -+circulant sur le réseau. - .TP - .B "metric N" --Ce paramtre dfinit la mtrique de l'interface. Il n'est pour --l'instant pas implment, mais le sera prochainement. -+Définir la métrique de l'interface. - .TP - .B "mtu N" --Ce paramtre dfinit le MTU (Maximum Transfer Unit) d'une --interface. -+Définir l'unité de transfert maximum ou MTU («\ Maximum Transfer Unit\ ») -+d'une interface. - .TP --.B "dstaddr adr" --Dfinit l'adresse IP de "l'autre bout" dans le cas d'un lien --point--point, comme PPP. Ce paramtre est obsolte; utilisez plutt --le paramtre --.B pointopoint. -+.B "dstaddr adresse" -+Définir l'adresse IP distante dans le cas d'un lien point-à-point -+(comme PPP). Cette option est obsolète\ ; utilisez à la place l'option -+.BR pointopoint . - .TP --.B "netmask adr" --Dfinit le masque de rseau IP pour cette interface. La valeur par --dfaut de cette valeur correspond au masque rseau usuel pour les --classes A, B ou C (dduite de l'adresse IP), mais toute autre valeur peut --tre dfinie selon les besoins en sous-rseaux. -+.B "netmask adresse" -+Définir le masque de réseau IP pour cette interface. La valeur par -+défaut correspond au masque de réseau usuel pour les classes A, B ou C -+(déduite de l'adresse IP), mais une autre valeur peut être définie. - .TP --.B "add adr/lg_prefix" --Ajoute une adresse IPv6 une interface. -+.B "add adresse/long_préfixe" -+Ajouter une adresse IPv6 à une interface. - .TP --.B "del adr/lg_prefix" --Supprime une adresse IPv6 d'une interface. -+.B "del adresse/long_préfixe" -+Supprimer une adresse IPv6 d'une interface. - .TP - .B "tunnel aa.bb.cc.dd" --Cre un nouveau priphrique SIT (IPv6-dans-IPv4), en mode --tunnel jusqu' la destination. -+Créer un nouveau périphérique SIT (IPv6-dans-IPv4), fonctionnant en mode -+tunnel jusqu'à la destination donnée. - .TP --.B "irq adr" --Dfinit la ligne d'interruption utilise par ce --priphrique. Certains priphriques ne supportent pas le --changement dynamique de l'IRQ. -+.B "irq adresse" -+Définir la ligne d'interruption utilisée par un périphérique. -+Certains périphériques ne sont pas capables de changer -+dynamiquement d'IRQ. - .TP --.B "io_addr adr" --Dfinit pour ce priphrique, l'adresse de dbut dans l'espace --d'entre-sortie I/O. -+.B "io_addr adresse" -+Définir l'adresse de début dans l'espace d'entrée-sortie pour un -+périphérique. - .TP --.B "mem_start adr" --Dfinit l'adresse de dbut de mmoire partage pour ce priphrique. Seuls --quelques priphriques ont besoin de ce paramtre. -+.B "mem_start adresse" -+Définir l'adresse de début de la mémoire partagée utilisée par un -+périphérique. Peu de périphériques ont besoin de ce paramètre. - .TP - .B "media type" --Dfinit le port physique ou le type de medium utilis par ce priphrique. --Tous les priphriques ne peuvent pas changer de configuration et les --valeurs supportes varient de l'un l'autre. Les valeur typiques sont -+Définir le port physique ou le type de médium utilisé par le périphérique. -+Tous les périphériques ne peuvent pas changer cette configuration et les -+types acceptés varient de l'un à l'autre. Les valeurs habituelles du -+.B type -+sont - .B 10base2 - (Ethernet fin), - .B 10baseT --(10Mbps Ethernet paire torsade), --.B AUI --(transceiver externe) etc. Le type -+(Ethernet 10Mbps en paire torsadée), -+.B AUI -+(émetteur-récepteur externe), etc. Le médium spécial de type - .B auto --permet d'indiquer au pilote de dtecter automatiquement le medium --utilis. Une fois de plus, tous les priphriques ne supportent pas cette --option. --.TP --.B "[-]broadcast [adr]" --Si l'adresse est galement donne, dfinit l'adresse broadcast --protocolaire pour cette interface. Autrement, il permet d'armer (ou dsarmer) --l'indicateur -+permet d'indiquer au pilote de détecter automatiquement le médium utilisé. -+Une fois de plus, tous les pilotes n'acceptent pas cette option. -+.TP -+.B "[\-]broadcast [adresse]" -+Si l'adresse est donnée, elle définit l'adresse de diffusion du -+protocole pour cette interface. Autrement, on arme -+(ou désarme) l'indicateur - .B IFF_BROADCAST - de l'interface. - .TP --.B "[-]pointopoint [adr]" --Ce mot cl valide le mode --.B point--point --d'une interface, signifiant qu'il existe un lien direct entre 2 machines, --sans que personne d'autre ne puisse tre l'coute. -+.B "[\-]pointopoint [adresse]" -+Valider le mode -+.B point-à-point -+d'une interface, signifiant qu'il existe un lien direct entre 2\ machines, -+sans que personne d'autre ne puisse être à l'écoute. - .br --Si l'argument d'adresse est galement donn, il dfinit l'adresse --de l'autre machine, de la mme manire que le paramtre obsolte --.B dstaddr --. --Autrement il arme (ou dsarme) l'indicateur -+Si l'adresse est également donnée, cela définit l'adresse de -+protocole de l'autre machine, de la même manière que l'option obsolète -+.BR dstaddr . -+Autrement, il arme (ou désarme) l'indicateur - .B IFF_POINTOPOINT - de l'interface. - .TP - .B hw classe adresse --Dfinit l'adresse matrielle de l'interface, si le pilote du --priphrique supporte cette opration. Le mot cl doit tre --suivi du nom de la classe matrielle et de l'adresse matrielle en --caractres imprimables ASCII. Les classes matrielles actuellement --supportes comprennent -+Définir l'adresse matérielle de l'interface, si le pilote du périphérique -+accepte cette opération. L'option doit être suivie du nom de la classe -+matérielle et de l'adresse matérielle en caractères ASCII affichables. -+Les classes matérielles actuellement prises en charge comprennent - .B ether - (Ethernet), - .B ax25 -@@ -165,45 +183,82 @@ et - (AMPR NET/ROM). - .TP - .B multicast --Positionne l'indicateur multicast sur l'interface. Elle n'est --gnralement pas ncessaire puisque les pilotes positionnent --l'option correcte eux mme. -+Positionner l'indicateur de multidiffusion sur l'interface. Ce n'est -+généralement pas nécessaire puisque les pilotes positionnent correctement -+l'option eux-mêmes. - .TP - .B adresse --L'adresse IP de cette interface. -+Correspond à l'adresse IP affectée à cette interface. - .TP --.B txqueuelen length --Set the length of the transmit queue of the device. It is useful to set this --to small values for slower devices with a high latency (modem links, ISDN) --to prevent fast bulk transfers from disturbing interactive traffic like --telnet too much. -+.B txqueuelen longueur -+Définir la longueur de la file d'attente de transmission du périphérique. -+Il est utile de la fixer à des valeurs faibles pour les périphériques -+lents avec un temps d'attente important (modems, ISDN), pour empêcher -+d'être perturbé par de rapides transferts de masse issus des trafics -+interactifs, comme -+.BR telnet . - .SH NOTES --Depuis le noyau 2.2 il n'y a plus de statistiques d'interface explicite --pour les interfaces en alias. Les statistiques affiches pour la vritable --adresse sont partages avec toutes les adresses alias du mme priphrique. --Si vous voulez des adresses par interface, vous devez ajouter des rgles de --comptabilit particulires pour l'adresse en utilisant la commande --.BR ipchains(8) --. -- -+Depuis la version 2.2 du noyau, il n'y a plus de statistiques d'interface -+explicites pour les alias d'interfaces. Les statistiques affichées pour la -+véritable adresse sont partagées avec toutes les adresses d'alias du même -+périphérique. Pour avoir des statistiques par adresse, il faut ajouter -+des règles de comptabilité particulières pour l'adresse en utilisant -+la commande -+.BR ipchains (8) -+ou -+.BR iptables (8). -+.LP -+Depuis net-tools 1.61, -+.B ifconfig -+affiche les compteurs d'octets et ceux lisibles par un utilisateur en -+unités IEC\ 60027-2. Ainsi, 1\ KiB vaut 2^10 octets. Notez que les nombres -+sont tronqués à la première décimale (ce qui peut être une erreur importante -+si vous considérez que 0,1\ PiB vaut 112.589.990.684.262\ octets\ :) -+.LP -+Des problèmes d'interruption avec les pilotes de périphériques Ethernet -+apparaissent avec EAGAIN -+(\fISIOCSIIFLAGS\ : Ressource temporairement indisponible\fR) -+il s'agit sûrement d'un conflit d'interruptions. Voir -+.I http://www.scyld.com/expert/irq-conflict.html -+pour plus d'informations. - .SH FICHIERS --.I /proc/net/socket -+.I /proc/net/socket - .br - .I /proc/net/dev - .br - .I /proc/net/if_inet6 --.SH BUGS --Mme si les adresses appletalk DDP et IPX peuvent tre affiches, --elles ne peuvent tre modifies avec cette commande. -+.SH BOGUES -+Même si les adresses appletalk DDP et IPX peuvent être affichées, -+elles ne peuvent être modifiées avec cette commande. - .SH VOIR AUSSI --route(8), netstat(8), arp(8), rarp(8), ipchains(8) --.SH AUTHORS -+.BR route (8), -+.BR netstat (8), -+.BR arp (8), -+.BR rarp (8), -+.BR ipchains (8), -+.BR iptables (8) -+.br -+http://physics.nist.gov/cuu/Units/binary.html \- Préfixes -+pour les multiples binaires. -+.SH AUTEURS - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br - Alan Cox, <Alan.Cox@linux.org> - .br - Phil Blundell, <Philip.Blundell@pobox.com> - .br --Andi Kleen, -+Andi Kleen, -+.br -+Bernd Eckenfels, <net-tools@lina.inka.de> - .SH TRADUCTION --Jean-Michel VANSTEENE (vanstee@worldnet.fr) -+.PP -+Ce document est une traduction réalisée par Jean Michel Vansteene -+<vanstee\ AT\ worldnet\ DOT\ fr> en août\ 1997, -+mise à jour par Guillaume Audirac en août 2004 -+et révisée le 17\ août\ 2006. -+.PP -+L'équipe de traduction a fait le maximum pour réaliser une adaptation -+française de qualité. La version anglaise la plus à jour de ce document est -+toujours consultable via la commande\ : «\ \fBLANG=C\ man\ 8\ ifconfig\fR\ ». -+N'hésitez pas à signaler à l'auteur ou au traducteur, selon le cas, toute -+erreur dans cette page de manuel. -diff --git a/man/fr_FR/netstat.8 b/man/fr_FR/netstat.8 -index bf16bc6..c65d0be 100644 ---- a/man/fr_FR/netstat.8 -+++ b/man/fr_FR/netstat.8 -@@ -8,11 +8,11 @@ - .\" Modified: Tuan Hoang tuan@optimus.mitre.org - .\" - .\" --.TH NETSTAT 8 "25 Fv 1999" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Administrator's Manual" - - .SH NAME --netstat \- Affiche les connexions rseau, les tables de routage, les --statistiques des interfaces, les connexions masques, les messages netlink, -+netstat \- Affiche les connexions réseau, les tables de routage, les -+statistiques des interfaces, les connexions masquées, les messages netlink, - et les membres multicast. - - .SH SYNOPSIS -@@ -21,6 +21,8 @@ et les membres multicast. - .RB [ \-venaoc ] - .RB [ \-\-tcp | \-t ] - .RB [ \-\-udp | \-u ] -+.RB [ \-\-udplite | \-U ] -+.RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] - .RB [ \-\-groups | \-g ] - .RB [ \-\-unix | \-x ] -@@ -68,34 +70,34 @@ et les membres multicast. - .PP - .SH DESCRIPTION - .B Netstat --affiche les informations du sous-systme rseau de Linux -+affiche les informations du sous-système réseau de Linux - - .SS "(no option)" --Vous pouvez voir l'tat des connexions rseau en listant les sockets --ouvertes. C'est l'option par dfaut : si vous ne spcifiez aucune famille -+Vous pouvez voir l'état des connexions réseau en listant les sockets -+ouvertes. C'est l'option par défaut : si vous ne spécifiez aucune famille - d'adresses, les sockets actives de toutes les familles d'adresses seront --affiches. --Avec le paramtre -+affichées. -+Avec le paramètre - .B -e --vous obtenez quelques informations supplmentaires (userid). Avec le paramtre -+vous obtenez quelques informations supplémentaires (userid). Avec le paramètre - .B -v --vous pouvez demander netstat de signaler des familles d'adresses connues --non supportes par le noyau. Le paramtre -+vous pouvez demander à netstat de signaler des familles d'adresses connues -+non supportées par le noyau. Le paramètre - .B -o --affiche des informations supplmentaires sur les timers rseau. En donnant --le paramtre -+affiche des informations supplémentaires sur les timers réseau. En donnant -+le paramètre - .B -p --vous verrez le PID et le nom du processus qui appartient la socket. Le paramtre -+vous verrez le PID et le nom du processus à qui appartient la socket. Le paramètre - .B -a --affiche toutes les sockets, y compris les sockets d'coute des serveurs. La famille -+affiche toutes les sockets, y compris les sockets d'écoute des serveurs. La famille - d'adresses - .B inet - affiche les sockets raw, udp et tcp. - - .SS "\-r, \-\-route" --Avec le paramtre -+Avec le paramètre - .BR \-r ", " \-\-route --vous pouvez visualiser les tables de routage dans le mme format qu'avec la -+vous pouvez visualiser les tables de routage dans le même format qu'avec la - commande - .B "route -e" - . -@@ -104,44 +106,44 @@ utilisera le format de la commande - .BR route . - Veuillez consulter - .BR route (8) --pour plus de dtails. -+pour plus de détails. - --.SS "\-i, \-\-interface \fIiface\fI" -+.SS "\-i, \-\-interfaces \fIiface\fI" - Si vous utilisez l'option - .BR -i ", " --interfaces - , une table de toutes (ou de l'interface - .IR iface --spcifie) les interfaces rseau sera affiche. Le format de sortie est le --mme que celui de la commande -+spécifiée) les interfaces réseau sera affichée. Le format de sortie est le -+même que celui de la commande - .B "ifconfig -e" --, et est dcrit dans -+, et est décrit dans - .BR ifconfig (8). - .B "netstat -ei" --affiche une table ou une seule entre d'interface comme la commande --.B ifconfig --. Avec le paramtre -+affiche une table ou une seule entrée d'interface comme la commande -+.BR ifconfig . -+Avec le paramètre - .B -a --, vous pouvez inclure les interfaces qui ne sont pas configures (c.a.d qui -+, vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui - n'ont pas l'indicateur - .BR U = UP --arm). -+armé). - - .SS "\-M, \-\-masquerade" - --Permet de voir les sessions ayant de l'IP-masquerade. Avec le paramtre -+Permet de voir les sessions ayant de l'IP-masquerade. Avec le paramètre - .B -e --vous pouvez inclure quelques informations concernant les numros de --squence et les deltas causs par des rcritures de donnes sur des --sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilis --pour cacher au monde extrieur des htes appartenant un rseau (et ayant --des adresses) non officiel, tel que dcrit dans --.BR ipfw (4), ipfwadm "(8) et " ipfw (8). -+vous pouvez inclure quelques informations concernant les numéros de -+séquence et les deltas causés par des réécritures de données sur des -+sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilisé -+pour cacher au monde extérieur des hôtes appartenant à un réseau (et ayant -+des adresses) non officiel, tel que décrit dans -+.BR iptables (8). - - .SS "\-N, \-\-netlink" - --Les noyaux rcents supportent une communication avec l'utilisateur appele --netlink. Vous pouvez obtenir des messages relatifs la cration, la --suppression d'interfaces ou de routes partir de -+Les noyaux récents supportent une communication avec l'utilisateur appelée -+netlink. Vous pouvez obtenir des messages relatifs à la création, la -+suppression d'interfaces ou de routes à partir de - .I /dev/route - (36,0). - -@@ -149,23 +151,23 @@ suppression d'interfaces ou de routes - .SH OPTIONS - .SS "\-v, \-\-verbose" - active le mode verbeux. Affiche quelques informations utiles concernant les --familles d'adresses non configures. -+familles d'adresses non configurées. - - .SS "\-n, \-\-numeric" --affiche les adresses en format numrique au lieu d'essayer de dterminer le --nom symbolique d'hte, de port ou d'utilisateur. -+affiche les adresses en format numérique au lieu d'essayer de déterminer le -+nom symbolique d'hôte, de port ou d'utilisateur. - - .SS "\-p, \-\-programs" --affiche le nom et le PID des processus propritaires de chaque socket --dcrite. Vous devez tre le propritaire d'un processus pour visualiser les --sockets qui lui appartiennent ou tre l'utilisateur -+affiche le nom et le PID des processus propriétaires de chaque socket -+décrite. Vous devez être le propriétaire d'un processus pour visualiser les -+sockets qui lui appartiennent ou être l'utilisateur - .B root - pour disposer de toutes les informations. - - .SS "\-A, \-\-af \fIfamille\fI" --utilise une mthode diffrente pour affecter les familles d'adresses. -+utilise une méthode différente pour affecter les familles d'adresses. - .I famille --est une liste de familles d'adresses spares par des (',') telles que -+est une liste de familles d'adresses séparées par des (',') telles que - .BR inet , - .BR unix , - .BR ipx , -@@ -173,7 +175,7 @@ est une liste de familles d'adresses s - .B netrom - et - .BR ddp . --L'utilisation des options longues suivantes a le mme effet -+L'utilisation des options longues suivantes a le même effet - .BR \-\-inet , - .BR \-\-unix , - .BR \-\-ipx , -@@ -183,9 +185,9 @@ et - .BR \-\-ddp. - - .SS "\-c, \-\-continous" --Demandera -+Demandera à - .B netstat --d'afficher la table slectionne chaque seconde jusqu' ce que vous -+d'afficher la table sélectionnée chaque seconde jusqu'à ce que vous - l'interrompiez. - - .PP -@@ -195,102 +197,102 @@ l'interrompiez. - .SS Connexions Internet actives \fR(TCP, UDP, RAW)\fR - - .SS "Proto" --Le protocole (TCP, UDP, RAW) utilis par la socket. -+Le protocole (TCP, UDP, RAW) utilisé par la socket. - - .SS "Recv-Q" --Le nombre d'octets non encore lus par le programme utilisateur connect -- cette socket. -+Le nombre d'octets non encore lus par le programme utilisateur connecté -+à cette socket. - - .SS "Send-Q" --Le nombre d'octets non encore acquitts par l'hte distant. -+Le nombre d'octets non encore acquittés par l'hôte distant. - - .SS "Local Address (Adresse locale)" --L'adresse locale (nom d'hte local) et numro de port de la -+L'adresse locale (nom d'hôte local) et numéro de port de la - socket. Sauf si l'option - .B -n --est donne, l'adresse de la prise est traduite en nom d'hte, --et le numro de port est traduit en nom de service correspondant. -+est donnée, l'adresse de la prise est traduite en nom d'hôte, -+et le numéro de port est traduit en nom de service correspondant. - - .SS "Foreign Address (Adresse distante)" --L'adresse distante (nom d'hte distant) et le numro de port de --la prise. Comme pour l'adresse locale et le numro de port, l'option -+L'adresse distante (nom d'hôte distant) et le numéro de port de -+la prise. Comme pour l'adresse locale et le numéro de port, l'option - .B -n --invalide la traduction du nom d'hte et de service. -+invalide la traduction du nom d'hôte et de service. - - .SS "State (Etat)" --L'tat de la socket. Puisqu'il n'y a pas d'tat dans le mode RAW --et gnralement pas d'tat utilis en UDP, cette colonne -+L'état de la socket. Puisqu'il n'y a pas d'état dans le mode RAW -+et généralement pas d'état utilisé en UDP, cette colonne - peut se trouver vierge. Normalement, on trouvera une des valeur suivante: - - .TP - .I - ESTABLISHED --La socket a une connexion tablie. -+La socket a une connexion établie. - .TP - .I - SYN_SENT --La socket attend activement d'tablir une connexion. -+La socket attend activement d'établir une connexion. - .TP - .I - SYN_RECV --Une requte de connexion a t reue du rseau. -+Une requête de connexion a été reçue du réseau. - .TP - .I - FIN_WAIT1 --La socket est ferme, et la connexion est en cours de terminaison. -+La socket est fermée, et la connexion est en cours de terminaison. - .TP - .I - FIN_WAIT2 --La connexion est ferme, et la socket attend une terminaison du distant. -+La connexion est fermée, et la socket attend une terminaison du distant. - .TP - .I - TIME_WAIT --La socket attend le traitement de tous les paquets encore sur le rseau -+La socket attend le traitement de tous les paquets encore sur le réseau - avant d'entreprendre la fermeture. - .TP - .I --CLOSED --La socket n'est pas utilise. -+CLOSE -+La socket n'est pas utilisée. - .TP - .I - CLOSE_WAIT --Le distant a arrt, attendant la fermeture de la socket. -+Le distant a arrêté, attendant la fermeture de la socket. - .TP - .I - LAST_ACK --Le distant termine, et la socket est ferme. Attente d'acquittement. -+Le distant termine, et la socket est fermée. Attente d'acquittement. - .TP - .I - LISTEN --La socket est l'coute de connexions entrantes. Ces sockets ne sont --affiches que si le paramtre -+La socket est à l'écoute de connexions entrantes. Ces sockets ne sont -+affichées que si le paramètre - .BR -a , --listening - est fourni. - .TP - .I - CLOSING --Les deux prises sont arrtes mais toutes les donnes locales n'ont --pas encore t envoyes. -+Les deux prises sont arrêtées mais toutes les données locales n'ont -+pas encore été envoyées. - .TP - .I - UNKNOWN --L'tat de la prise est inconnu. -+L'état de la prise est inconnu. - - .SS "User (Utilisateur)" --Le nom d'utilisateur ou l'UID du propritaire de la socket. -+Le nom d'utilisateur ou l'UID du propriétaire de la socket. - - .SS "PID/Program name (PID/Nom de Programme)" --Le PID et le nom du programme (spars par un slash) propritaire de la --socket. Le paramtre -+Le PID et le nom du programme (séparés par un slash) propriétaire de la -+socket. Le paramètre - .B -p - active l'affichage de cette colonne. Vous devez avoir les droits de - .B root --puisque vous devez avoir les droits d'accs aux processus pour visualiser -+puisque vous devez avoir les droits d'accès aux processus pour visualiser - les sockets qui lui correspondent. Ces informations ne sont pas disponibles - avec les sockets IPX. - - .SS "Timer" --(Ceci doit tre rdig) -+(Ceci doit être rédigé) - - - .PP -@@ -298,28 +300,28 @@ avec les sockets IPX. - - - .SS "Proto" --Le protocole (habituellement UNIX) utilis par la socket. -+Le protocole (habituellement UNIX) utilisé par la socket. - - .SS "RefCnt" --Le nombre de rfrences (i.e. processus attachs via cette socket). -+Le nombre de références (i.e. processus attachés via cette socket). - - .SS "Flags (indicateurs)" --Les indicateurs affiche sont SO_ACCEPTON (affich -+Les indicateurs affichée sont SO_ACCEPTON (affiché - .BR ACC ), - SO_WAITDATA - .RB ( W ) - ou SO_NOSPACE - .RB ( N ). --SO_ACCECPTON est utilis pour les sockets --non-connectes si les processus correspondant sont en attente de --demande de connexion. Les autres indicateurs sont d'un intrt limit. -+SO_ACCECPTON est utilisé pour les sockets -+non-connectées si les processus correspondant sont en attente de -+demande de connexion. Les autres indicateurs sont d'un intérêt limité. - - .SS "Type" --Il y a diffrents types d'accs aux sockets : -+Il y a différents types d'accès aux sockets : - .TP - .I - SOCK_DGRAM --La prise est utilise en mode Datagram (sans connexion). -+La prise est utilisée en mode Datagram (sans connexion). - .TP - .I - SOCK_STREAM -@@ -327,90 +329,89 @@ C'est une socket `stream' (connexion). - .TP - .I - SOCK_RAW --La prise est utilise en mode `raw'. -+La prise est utilisée en mode `raw'. - .TP - .I - SOCK_RDM --Celle-ci est utilise pour les messages dlivre de manire fiable. -+Celle-ci est utilisée pour les messages délivrée de manière fiable. - .TP - .I - SOCK_SEQPACKET --C'est une socket en mode paquets squentiels. -+C'est une socket en mode paquets séquentiels. - .TP - .I - SOCK_PACKET --Prise d'accs l'interface RAW. -+Prise d'accès à l'interface RAW. - .TP - .I - UNKNOWN --Qui sait ce que l'avenir nous rserve - Juste remplir ici :-) -+Qui sait ce que l'avenir nous réserve - Juste à remplir ici :-) - - .PP - .SS "State (Etat)" --Ce champ contient un des mots cls suivants : -+Ce champ contient un des mots clés suivants : - .TP - .I - FREE --La socket n'est pas alloue -+La socket n'est pas allouée - .TP - .I - LISTENING --La socket est l'coute de demandes de connexions. Ces sockets ne sont --affiches que si le paramtre -+La socket est à l'écoute de demandes de connexions. Ces sockets ne sont -+affichées que si le paramètre - .BR -a , --listening - est fourni. - .TP - .I - CONNECTING --La prise est en cours d'tablissement de connexion. -+La prise est en cours d'établissement de connexion. - .TP - .I - CONNECTED --La socket est connecte. -+La socket est connectée. - .TP - .I - DISCONNECTING --La socket est en cours de dconnexion. -+La socket est en cours de déconnexion. - .TP - .I - (empty) --La socket n'est connecte aucune autre. -+La socket n'est connectée à aucune autre. - .TP - .I - UNKNOWN --Cet tat ne devrait pas apparatre. -+Cet état ne devrait pas apparaître. - - .SS "PID/Program name (PID/Nom de programme" --Le PID et le nom du programme propritaire de la socket. Plus -+Le PID et le nom du programme propriétaire de la socket. Plus - d'informations sont disponibles dans la section - .B "Connexions Internet actives" - ci-dessus. - - .SS "Path (chemin)" --Affiche le chemin correspondant l'attachement des processus la socket. -+Affiche le chemin correspondant à l'attachement des processus à la socket. - - .PP - .SS Sockets IPX actives - --( faire par quelqu'un qui connat) -+(à faire par quelqu'un qui connaît) - - .PP - .SS Sockets NET/ROM actives - --( faire par quelqu'un qui connat) -+(à faire par quelqu'un qui connaît) - - .PP - .SS Sockets AX.25 actives - --( faire par quelqu'un qui connat) -+(à faire par quelqu'un qui connaît) - - .PP - .SH NOTES - Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques - des interfaces alias. Pour obtenir les compteurs par interface alias, vous --devez dfinir des rgles spcifiques l'aide de la commande --.BR ipchains(8) --. -+devez définir des règles spécifiques à l'aide de la commande -+.BR iptables(8). - - .SH FICHIERS - .ta -@@ -418,7 +419,7 @@ devez d - -- Le fichier de correspondance des services - - .I /proc/net/dev ---- informations priphriques -+-- informations périphériques - - .I /proc/net/raw - -- informations sockets RAW -@@ -471,31 +472,28 @@ devez d - .SH VOIR AUSSI - .BR route (8), - .BR ifconfig (8), --.BR ipfw (4), --.BR ipfw (8), --.BR ipfwadm (8) --.BR ipchains (8) -+.BR iptables (8) - - .PP - .SH BUGS --Des informations tranges peuvent apparaitre occasionnellement --si une socket change d'tat au moment ou elle est visualise. -+Des informations étranges peuvent apparaitre occasionnellement -+si une socket change d'état au moment ou elle est visualisée. - Ceci est peut probable. - .br --Le paramtre -+Le paramètre - .B netstat -i --est dcrit tel qu'il fonctionnera lorsque le code de la version BETA du --paquetage net-tools aura t nettoy. -+est décrit tel qu'il fonctionnera lorsque le code de la version BETA du -+paquetage net-tools aura été nettoyé. - - .PP - .SH AUTEURS --L'interface utilisateur de netstat a t dveloppe par -+L'interface utilisateur de netstat a été développée par - Fred Baumgarten <dc6iq@insu1.etec.uni-karlsruhe.de>. Les pages du --manuel essentiellement crites par Matt Welsh --<mdw@tc.cornell.edu>. Mis jour par Alan Cox <Alan.Cox@linux.org>. -+manuel essentiellement écrites par Matt Welsh -+<mdw@tc.cornell.edu>. Mis à jour par Alan Cox <Alan.Cox@linux.org>. - .br - La page de manuel et la commande incluse dans le paquetage net-tools --a t totallement rcrite par Bernd Eckenfels -+a été totallement réécrite par Bernd Eckenfels - <ecki@linux.de>. - .SH TRADUCTION - Jean Michel VANSTEENE (vanstee@worldnet.fr) -diff --git a/man/fr_FR/plipconfig.8 b/man/fr_FR/plipconfig.8 -index cd44449..4d17ea2 100644 ---- a/man/fr_FR/plipconfig.8 -+++ b/man/fr_FR/plipconfig.8 -@@ -1,44 +1,44 @@ - .TH PLIPCONFIG 8 "17 February 1995" "" "" - .SH NOM --plipconfig \- rglage fin des paramtres du priphrique PLIP -+plipconfig \- réglage fin des paramètres du périphérique PLIP - .SH SYNOPSIS - .B "plipconfig interface" - .br - .B "plipconfig interface [nibble NN] [trigger NN] [unit NN]" - .SH DESCRIPTION - .B Plipconfig --est utilis pour amliorer (esprons-le) les performances PLIP --en changeant les timings par dfaut utiliss par le protocole PLIP. Les --rsultats dpendent du port parallle --utilis, du cable, et de la vitesse CPU de chaque machine -- chaque bout du lien PLIP. -+est utilisé pour améliorer (espérons-le) les performances PLIP -+en changeant les timings par défaut utilisés par le protocole PLIP. Les -+résultats dépendent du port parallèle -+utilisé, du cable, et de la vitesse CPU de chaque machine -+à chaque bout du lien PLIP. - .LP - Si le seul argument est l' - .B interface - , - .B plipconfig --affiche seulement l'tat de cette interface. Autrement, il essaiera de --positionner les options donnes. -+affiche seulement l'état de cette interface. Autrement, il essaiera de -+positionner les options données. - .SH OPTIONS - .TP - .B "nibble NN" --Dfinit la valeur d'attente des digits en microsecondes. Par dfault : 3000. -+Définit la valeur d'attente des digits en microsecondes. Par défault : 3000. - .TP - .B "trigger NN" --Dfinit le dlai de dclenchement en microsecondes. Par dfault : 500. -+Définit le délai de déclenchement en microsecondes. Par défault : 500. - .LP --La vitesse de PLIP peut, dans certains cas, tre amliore en --diminuant les valeurs par dfaut. -+La vitesse de PLIP peut, dans certains cas, être améliorée en -+diminuant les valeurs par défaut. - Les valeurs trop petites peuvent engendrer une utilisation excessive de CPU, --et un temps de rponse aux interruptions mauvais, dont le rsultat est --la perte de caractres lus sur le port, ou de paquets PLIP. -+et un temps de réponse aux interruptions mauvais, dont le résultat est -+la perte de caractères lus sur le port, ou de paquets PLIP. - La modification du MTU PLIP peut aussi affecter la vitesse PLIP. - .SH NOTE --Si vous n'obtenez aucune rponse, il est fort probable que l'IRQ configure --soit mauvaise, et qu'elle ncessite une configuration avec ifconfig. --Les quelques cas pour lesquels les timings par dfaut sont trop courts, --arrivent lorque l'on utilise de longs cables. Quelque chose ne pas faire, --puisque le port parallle n'est pas fait pour fonctionner avec de longs cables. -+Si vous n'obtenez aucune réponse, il est fort probable que l'IRQ configurée -+soit mauvaise, et qu'elle nécessite une configuration avec ifconfig. -+Les quelques cas pour lesquels les timings par défaut sont trop courts, -+arrivent lorque l'on utilise de longs cables. Quelque chose à ne pas faire, -+puisque le port parallèle n'est pas fait pour fonctionner avec de longs cables. - .SH VOIR AUSSI - .I ifconfig(8) - .SH BUGS -diff --git a/man/fr_FR/rarp.8 b/man/fr_FR/rarp.8 -index 73e9328..e68730f 100644 ---- a/man/fr_FR/rarp.8 -+++ b/man/fr_FR/rarp.8 -@@ -1,6 +1,6 @@ --.TH RARP 8 "4 Aot 1997" "net-tools" "Linux Programmer's Manual" -+.TH RARP 8 "4 Août 1997" "net-tools" "Linux Administrator's Manual" - .SH NOM --rarp \- manipule la table systme RARP -+rarp \- manipule la table système RARP - .SH SYNOPSIS - .B "rarp [-V] [--version] [-h] [--help]" - .br -@@ -11,30 +11,30 @@ rarp \- manipule la table syst - .B "rarp [-v] [-t type] -s nom_d_hote adr_materiel" - .SH DESCRIPTION - .B Rarp --manipule la table RARP du noyau de diffrentes faons. Les options de base --permettent d'effacer une entre de correspondance d'adresses et d'en --redfinir une manuellement. Pour des besoins de dbogage, le programme -+manipule la table RARP du noyau de différentes façons. Les options de base -+permettent d'effacer une entrée de correspondance d'adresses et d'en -+redéfinir une manuellement. Pour des besoins de débogage, le programme - .B rarp --permet aussi de vider compltement la table RARP. -+permet aussi de vider complètement la table RARP. - .SH OPTIONS - .TP - .B \-V --Affiche la version de RARP utilis. -+Affiche la version de RARP utilisé. - .TP - .B \-v --Dit l'utilisateur ce qui se passe, en tant verbeux. -+Dit à l'utilisateur ce qui se passe, en étant verbeux. - .TP - .B "\-t type" --En dfinissant ou lisant la table RARP, ce paramtre optionnel dit -+En définissant ou lisant la table RARP, ce paramètre optionnel dit à - .B rarp --quelles classes d'entres il doit contrler. La valeur par dfaut de --ce paramtre est -+quelles classes d'entrées il doit contrôler. La valeur par défaut de -+ce paramètre est - .B ether --(i.e. code matriel -+(i.e. code matériel - .B 0x01 - pour - .B "IEEE 802.3 10Mbps Ethernet". --D'autres valeurs doivent correspondre des technologies rseaux telles que -+D'autres valeurs doivent correspondre à des technologies réseaux telles que - .B AX.25 (ax25). - et - .B NET/ROM (netrom). -@@ -42,31 +42,31 @@ et - .B "\-a" - .TP - .B "\-\-list" --Liste les entres de la table RARP. -+Liste les entrées de la table RARP. - .TP - .B "\-d nom_d_hote" - .TP - .B "\-\-delete nom_d_hote" --Supprime toutes les entres RARP relatives l'hte spcifi. -+Supprime toutes les entrées RARP relatives à l'hôte spécifié. - .TP - .B "\-s nom_d_hote adr_materielle" - .TP - .B "\-\-set nom_d_hote adr_materielle" --Cre manuellement une correspondance d'adresses RARP pour l'hte --.B nom_d_hte --avec l'adresse matrielle --.B adr_materielle --. Le format de l'adresse matrielle est dpendant du matriel, --mais pour la plupart on peut considrer que la prsentation classique --peut tre utilise. Pour la classe Ethernet, c'est 6 octets en hexadcimal, --spars par des double-points. -+Crée manuellement une correspondance d'adresses RARP pour l'hôte -+.B nom_d_hôte -+avec l'adresse matérielle -+.BR adr_materielle . -+Le format de l'adresse matérielle est dépendant du matériel, -+mais pour la plupart on peut considérer que la présentation classique -+peut être utilisée. Pour la classe Ethernet, c'est 6 octets en hexadécimal, -+séparés par des double-points. - - .SH ATTENTION --Certains systmes (notamment des vieux Sun's) supposent que l'hte --rpondant une requte RARP peut aussi fournir d'autres services --de boot distance. Par consquent n'ajoutez jamais --d'entres RARP la lgre moins que vous souhaitiez affronter la --colre de votre administrateur rseau. -+Certains systèmes (notamment des vieux Sun's) supposent que l'hôte -+répondant à une requête RARP peut aussi fournir d'autres services -+de boot à distance. Par conséquent n'ajoutez jamais -+d'entrées RARP à la légère à moins que vous souhaitiez affronter la -+colère de votre administrateur réseau. - .SH FICHIERS - .I /proc/net/rarp, - .SH VOIR AUSSI -diff --git a/man/fr_FR/route.8 b/man/fr_FR/route.8 -index 9109e8d..986faf9 100644 ---- a/man/fr_FR/route.8 -+++ b/man/fr_FR/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "8 Aot 1997" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Administrator's Manual" - .SH NAME - route \- affiche / manipule la table de routage IP - .SH SYNOPSIS -@@ -54,9 +54,9 @@ If] - .RB [ \--help ] - .SH DESCRIPTION - .B Route --manipule la table de routage IP du noyau. Son utilisation premire --consiste configurer des routes statiques vers des htes ou des rseaux --via une interface, aprs sa configuration par le programme -+manipule la table de routage IP du noyau. Son utilisation première -+consiste à configurer des routes statiques vers des hôtes ou des réseaux -+via une interface, après sa configuration par le programme - .B ifconfig(8). - - .SH OPTIONS -@@ -66,12 +66,12 @@ Active le mode verbeux. - - .TP - .B \-A famille --Utilise la famille d'adresses spcifie (p.ex. `inet', `inet6'). -+Utilise la famille d'adresses spécifiée (p.ex. `inet', `inet6'). - - .TP - .B \-n --Affiche les adresses numriques, au lieu --d'essayer de dterminer les noms d'htes. C'est utile si vous essayer de -+Affiche les adresses numériques, au lieu -+d'essayer de déterminer les noms d'hôtes. C'est utile si vous essayer de - savoir pourquoi la route vers votre serveur de nom a disparu. - - .TP -@@ -80,24 +80,24 @@ utilise - .BR netstat (8)-format - pour l'affichage de la table de routage. - .B \-ee --Gnre une trs longue ligne avec tous les paramtres partir de la table -+Génère une très longue ligne avec tous les paramètres à partir de la table - de routage. - - .TP - .B \-net - la - .B cible --est un rseau. -+est un réseau. - - .TP - .B -host - la - .B cible --est un hte. -+est un hôte. - - .TP - .B -F --affiche la table de routage FIB du noyau. L'organisation peut tre change avec -+affiche la table de routage FIB du noyau. L'organisation peut être changée avec - .B \-e - et - .B \-ee -@@ -117,131 +117,131 @@ ajoute une route. - - .TP - .B cible --L'hte ou le rseau destination. Vous pouvez fournir une adresse IP en --notation dcimale pointe ou un nom d'hte ou de rseau. -+L'hôte ou le réseau destination. Vous pouvez fournir une adresse IP en -+notation décimale pointée ou un nom d'hôte ou de réseau. - - .TP - .B netmask Nm --spcifie le masque rseau de la route ajouter. -+spécifie le masque réseau de la route à ajouter. - - .TP - .B gw Gw --signifie que tout paquet IP envoy cette adresse sera rout par --la passerelle spcifie. -+signifie que tout paquet IP envoyé à cette adresse sera routé par -+la passerelle spécifiée. - .B NOTE: --La passerelle concerne doit pouvoir tre atteinte. Ceci signifie --qu'une route statique vers cette passerelle doit pralablement exister. --Si vous spcifiez l'adresse de l'une de vos interfaces locales, elle sera --utilise pour dcider de l'interface vers laquelle les paquets seront --envoys. Ceci est une bidouille permettant d'tre compatible BSD. -+La passerelle concernée doit pouvoir être atteinte. Ceci signifie -+qu'une route statique vers cette passerelle doit préalablement exister. -+Si vous spécifiez l'adresse de l'une de vos interfaces locales, elle sera -+utilisée pour décider de l'interface vers laquelle les paquets seront -+envoyés. Ceci est une bidouille permettant d'être compatible BSD. - - .TP - .B metric M --Affecte la valeur M au champ mtrique de la table de routage (utilis par --les dmons de routage). -+Affecte la valeur M au champ métrique de la table de routage (utilisé par -+les démons de routage). - - .TP - .B mss M --Spcifie le MSS (Maximum Segment Size, Taille maximum de segment) de TCP, --pour les connexions empreintant cette route. Ce n'est normalement utilis -+Spécifie le MSS (Maximum Segment Size, Taille maximum de segment) de TCP, -+pour les connexions empreintant cette route. Ce n'est normalement utilisé - que pour des optimisations fines des configurations de routage. - - - .TP - .B window W --Dfinit la taille de fentre TCP W octets pour les connexions relatives -- cette route. C'est en gnral uniquement utilis sur les rseaux AX.25 et --avec les pilotes incapables de manipuler les trames dos dos. -+Définit la taille de fenêtre TCP à W octets pour les connexions relatives -+à cette route. C'est en général uniquement utilisé sur les réseaux AX.25 et -+avec les pilotes incapables de manipuler les trames dos à dos. - - .TP - .B irtt I --Dfinit le iRTT initial (round trip time) pour les connexions TCP sur cette --route I millisecondes (1-12000). C'est en gnral uniquement utilis sur --les rseaux AX.25. Si omis, la valeur par dfaut (300 ms selon le RFC 1122) --est utilise. -+Définit le iRTT initial (round trip time) pour les connexions TCP sur cette -+route à I millisecondes (1-12000). C'est en général uniquement utilisé sur -+les réseaux AX.25. Si omis, la valeur par défaut (300 ms selon le RFC 1122) -+est utilisée. - - .TP - .B reject --Installe une route bloquante, qui forcera l'chec d'une recherche. --C'est par exemple utilis pour masquer les rseaux avant d'utiliser la --route par dfaut. Ce n'est pas une fonction de pare-feu. -+Installe une route bloquante, qui forcera l'échec d'une recherche. -+C'est par exemple utilisé pour masquer les réseaux avant d'utiliser la -+route par défaut. Ce n'est pas une fonction de pare-feu. - - .TP - .B mod, dyn, reinstate --Installe une route dynamique ou modifie. Les deux indicateurs ne sont en --gnral positionns que par le dmon de routage. Cela ne sert que pour des -+Installe une route dynamique ou modifiée. Les deux indicateurs ne sont en -+général positionnés que par le démon de routage. Cela ne sert que pour des - besoins de diagnostics. - - .TP - .B dev If --Force la route tre associe au priphrique spcifi, sinon le noyau --tentera de le dterminer par lui-mme (en consultant les routes existantes --et les spcifications de priphriques). Dans la plupart des rseaux -+Force la route à être associée au périphérique spécifié, sinon le noyau -+tentera de le déterminer par lui-même (en consultant les routes existantes -+et les spécifications de périphériques). Dans la plupart des réseaux - normaux, vous n'aurez pas besoin de ceci. - - If - .B dev If --est la dernire option de la ligne de commande, le mot -+est la dernière option de la ligne de commande, le mot - .B dev --peut tre omis, puisque c'est la valeur par dfaut. Autrement l'ordre des -+peut être omis, puisque c'est la valeur par défaut. Autrement l'ordre des - modificateurs de route (metric - netmask - gw - dev) n'a pas d'importance. - - .SH EXEMPLES - .TP - .B route add -net 127.0.0.0 --ajoute l'entre loopback normale, en utilisant le masque 255.0.0.0 (rseau --de classe A, selon l'adresse de destination) et associe avec l'interface --"lo" (en supposant que ce priphrique a t correctement configur avec -+ajoute l'entrée loopback normale, en utilisant le masque 255.0.0.0 (réseau -+de classe A, selon l'adresse de destination) et associée avec l'interface -+"lo" (en supposant que ce périphérique a été correctement configuré avec - .BR ifconfig (8)). - - .TP - .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 --ajoute une route vers le rseau 192.56.76.x via --"eth0". Le masque de classe C n'est pas vraiment ncessaire ici car --192.* est une adresse IP de classe C. Le mot "dev" peut tre omis. -+ajoute une route vers le réseau 192.56.76.x via -+"eth0". Le masque de classe C n'est pas vraiment nécessaire ici car -+192.* est une adresse IP de classe C. Le mot "dev" peut être omis. - - .TP - .B route add default gw mango-gw --ajoute une route par dfaut (qui sera utilise si aucune autre route ne -+ajoute une route par défaut (qui sera utilisée si aucune autre route ne - convient). Tous les paquets empreintant cette route passeront par --"mango-gw". Le priphrique qui sera effectivement utilis pour cette route --dpend de la faon dont on atteint "mango-gw" - la route statique vers --"mango-gw" devra tre pralablement configure. -+"mango-gw". Le périphérique qui sera effectivement utilisé pour cette route -+dépend de la façon dont on atteint "mango-gw" - la route statique vers -+"mango-gw" devra être préalablement configurée. - - .TP - .B route add ipx4 sl0 --ajoute une route vers l'hte "ipx4" via l'interface SLIP (en supposant que --"ipx4" est l'hte SLIP). -+ajoute une route vers l'hôte "ipx4" via l'interface SLIP (en supposant que -+"ipx4" est l'hôte SLIP). - - .TP - .B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 --Cette commande route le rseau "192.57.66.x" par l'ancienne route vers l'interface SLIP. -+Cette commande route le réseau "192.57.66.x" par l'ancienne route vers l'interface SLIP. - - .TP - .B route add 224.0.0.0 netmask 240.0.0.0 dev eth0 --Ceci est une commande mal documente et les gens savent ce qu'il faut --faire? Ceci force toutes les routes IP des classes D (multicast) -+Ceci est une commande mal documentée et les gens savent ce qu'il faut -+faire? Ceci force toutes les routes IP des classes D (multicast) à - passer par "eth0". C'est la configuration correcte, normale pour un noyau - supportant le multicast. - - .TP - .B route add 10.0.0.0 netmask 255.0.0.0 reject --Installe une route 'rejete' pour le rseau priv "10.x.x.x." -+Installe une route 'rejetée' pour le réseau privé "10.x.x.x." - - .LP - .SH RESULTATS --Le contenu des tables de routage du noyaus est affich en colonnes comme -+Le contenu des tables de routage du noyaus est affiché en colonnes comme - suit - .TP - .B Destination --Le rseau ou hte destination. -+Le réseau ou hôte destination. - .TP - .B Gateway --L'adresse de la passerelle ou '*' si indfini. -+L'adresse de la passerelle ou '*' si indéfini. - .TP - .B Genmask --Le masque de rseau pour le rseau destinataire; '255.255.255.255' pour un hte --et '0.0.0.0' pour la route par dfaut ( -+Le masque de réseau pour le réseau destinataire; '255.255.255.255' pour un hôte -+et '0.0.0.0' pour la route par défaut ( - .B default - ). - .TP -@@ -254,63 +254,63 @@ Les indicateurs possibles sont - .br - .B H - (la cible est un --.BR hte ) -+.BR hôte ) - .br - .B G - (utilise comme - .BR passerelle ) - .br - .B R --.RB ( rtablit -+.RB ( rétablit - la route pour le routage dynamique) - .br - .B D - .RB ( dynamiquement --configure par le dmon ou par redirect) -+configurée par le démon ou par redirect) - .br - .B M --.RB ( modifie --par le dmon de routage ou par redirect) -+.RB ( modifiée -+par le démon de routage ou par redirect) - .br - .B ! --.RB ( rejte -+.RB ( rejète - la route) - .TP - .B Metric --La 'distance' la cible (habituellement compte en hops). Ce n'est pas --utilis par les noyaux rcents, mais peut-tre requis par certains dmons -+La 'distance' à la cible (habituellement comptée en hops). Ce n'est pas -+utilisé par les noyaux récents, mais peut-être requis par certains démons - de routage. - .TP - .B Ref --Nombre de rfrences cette route. (Pas utilis dans le noyau Linux.) -+Nombre de références à cette route. (Pas utilisé dans le noyau Linux.) - .TP - .B Use - Count of lookups for the route. Depending on the use of -F and -C this will - be either route cache misses (-F) or hits (-C). - .TP - .B Iface --Interface vers laquelle les paquets empruntant cette route seront envoys. -+Interface vers laquelle les paquets empruntant cette route seront envoyés. - .TP - .B MSS --Taille de segment maximum par dfaut pour les connexions TCP sur cette -+Taille de segment maximum par défaut pour les connexions TCP sur cette - route. - .TP - .B Window --Taille de fentre par dfaut pour les connexions TCP sur cette route. -+Taille de fenêtre par défaut pour les connexions TCP sur cette route. - .TP - .B irtt - RTT Initial (Round Trip Time). Le noyau utilise ceci pour essayer les --meilleurs paramtres protocolaires TCP sans attendre de rponse --(ventuellement tardive). -+meilleurs paramètres protocolaires TCP sans attendre de réponse -+(éventuellement tardive). - .TP --.B HH (seulement cach) --Le nombre d'entres ARP et de routes caches faisant rfrence au cache --d'en-tte matriel pour la route en cache. Ce sera la valeur \-1 si aucune adresse --matrielle n'est ncessaire pour l'interface de la route cache (p.ex. lo). -+.B HH (seulement caché) -+Le nombre d'entrées ARP et de routes cachées faisant référence au cache -+d'en-tête matériel pour la route en cache. Ce sera la valeur \-1 si aucune adresse -+matérielle n'est nécessaire pour l'interface de la route cachée (p.ex. lo). - .TP --.B Arp (seulement cach) --Indique si oui ou non l'adresse matrielle pour la route en cache est encore -- jour. -+.B Arp (seulement caché) -+Indique si oui ou non l'adresse matérielle pour la route en cache est encore -+à jour. - .LP - .SH FICHIERS - .I /proc/net/ipv6_route -@@ -324,11 +324,11 @@ Indique si oui ou non l'adresse mat - .LP - .SH HISTORIQUE - .B Route --pour Linux a t originellement crit par Fred N. van Kempen, --<waltje@uwalt.nl.mugnet.org> puis modifi par Johannes Stille et --Linus Torvalds pour pl15. Alan Cox a ajout les options concernant --la gestion des fentres et MSS pour Linux 1.1.22. Le support de irtt --et la fusion avec netstat ont t raliss par Bernd Eckenfels. -+pour Linux a été originellement écrit par Fred N. van Kempen, -+<waltje@uwalt.nl.mugnet.org> puis modifié par Johannes Stille et -+Linus Torvalds pour pl15. Alan Cox a ajouté les options concernant -+la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt -+et la fusion avec netstat ont été réalisés par Bernd Eckenfels. - .SH AUTEUR - Maintenu par Phil Blundell <Philip.Blundell@pobox.com>. - .SH TRADUCTION -diff --git a/man/fr_FR/slattach.8 b/man/fr_FR/slattach.8 -index 512d514..d21d0d7 100644 ---- a/man/fr_FR/slattach.8 -+++ b/man/fr_FR/slattach.8 -@@ -1,87 +1,87 @@ - .TH SLATTACH 8 "12 Feb 1994" "" "" - .SH NOM --slattach \- attache une interface rseau une ligne srie -+slattach \- attache une interface réseau à une ligne série - .SH SYNOPSIS - .B "slattach [-dehlLmnqv] [-c commande] [-p proto] [-s vitesse] [tty]" - .br - .SH DESCRIPTION - .B Slattach --est un minuscule programme qui peut tre utilis pour attacher --un terminal normal ("srie") dans un des diffrents modes "rseau", --ceci vous permettant de l'utiliser pour des liaisons point--point --vers d'autres systmes. -+est un minuscule programme qui peut être utilisé pour attacher -+un terminal normal ("série") dans un des différents modes "réseau", -+ceci vous permettant de l'utiliser pour des liaisons point-à-point -+vers d'autres systèmes. - .SH OPTIONS - .TP - .B "[-c commande]" --Excute -+Exécute - .B `commande' --lorsque la ligne est suspendue. Ceci peut tre utilis pour lancer --des scripts ou rtablir des connexions quand un lien tombe. -+lorsque la ligne est suspendue. Ceci peut être utilisé pour lancer -+des scripts ou réétablir des connexions quand un lien tombe. - .TP - .B "[-d]" --Valide le dbogage. Utile pour dterminer pourquoi une configuration -+Valide le débogage. Utile pour déterminer pourquoi une configuration - ne fonctionne pas. - .TP - .B "[-h]" --Termine lorsque la porteuse est perdue. Ceci fonctionne la fois sur --les priphriques /dev/tty et /dev/cua en contrlant directement --l'tat de la porteuse toutes les 15 secondes. -+Termine lorsque la porteuse est perdue. Ceci fonctionne à la fois sur -+les périphériques /dev/tty et /dev/cua en contrôlant directement -+l'état de la porteuse toutes les 15 secondes. - .TP - .B "[-v]" - Valide le mode verbeux. Utile pour les shell scripts. - .TP - .B "[-q]" --Opre en mode silencieux - pas de messages du tout. -+Opère en mode silencieux - pas de messages du tout. - .TP - .B "[-l]" --Cre un fichier de vrouillage pour le priphrique comme -+Crée un fichier de vérouillage pour le périphérique comme - pour UUCP dans /var/lock. - .TP - .B "[-n]" --Equivalent la commande "mesg n". -+Equivalent à la commande "mesg n". - .TP - .B "[-m]" - \fBn'\fPinitialise \fBpas\fP la ligne en mode raw 8 bits. - .TP - .B "[-e]" --Termine correctement aprs l'initialisation du priphrique, -+Termine correctement après l'initialisation du périphérique, - au lieu d'attendre que la ligne soit suspendue. - .TP - .B "[-L]" --Valide les oprations 3 lignes. Le terminal est mis en mode CLOCAL, --la surveillance de porteuse est invalide. -+Valide les opérations 3 lignes. Le terminal est mis en mode CLOCAL, -+la surveillance de porteuse est invalidée. - .TP - .B "[-p proto]" --Dfinit le protocole spcifique utiliser sur la ligne. --La valeur par dfaut est -+Définit le protocole spécifique à utiliser sur la ligne. -+La valeur par défaut est - .B "cslip" --, c'est--dire SLIP compress. Les autres valeurs possibles sont : -+, c'est-à-dire SLIP compressé. Les autres valeurs possibles sont : - .B "slip" - (SLIP normal), - .B "adaptive" - (CSLIP/SLIP adaptatifs), - .B "ppp" --(Protocole Point--Point) -+(Protocole Point-à-Point) - et - .B "kiss" --(un protocole utilis pour communiquer avec des controleurs AX.25 paquets radios). --L'argument spcifique -+(un protocole utilisé pour communiquer avec des controleurs AX.25 paquets radios). -+L'argument spécifique - .B "tty" --peut tre utilis pour refaire passer le priphrique en --fonctionnement srie normal. L'utilisation du mode 'ppp' n'est en --principe pas utile puisque ppp ncessite le dmon additionnel -+peut être utilisé pour refaire passer le périphérique en -+fonctionnement série normal. L'utilisation du mode 'ppp' n'est en -+principe pas utile puisque ppp nécessite le démon additionnel - .B pppd --pour tre actif sur la ligne. Pour les connexions `kiss', le programme -+pour être actif sur la ligne. Pour les connexions `kiss', le programme - .B axattach --doit tre utilis. -+doit être utilisé. - .TP - .B "[-s vitesse]" --Dfinit la vitesse de la ligne, diffrente de la valeur par dfaut. -+Définit la vitesse de la ligne, différente de la valeur par défaut. - .PP --Si aucun argument n'est donn, la ligne courante du terminal --(habituellement lie au login) est utilise. Autrement, une tentative --est effectue pour obtenir le port du terminal indiqu, puis il est --vrouill et ouvert. -+Si aucun argument n'est donné, la ligne courante du terminal -+(habituellement liée au login) est utilisée. Autrement, une tentative -+est effectuée pour obtenir le port du terminal indiqué, puis il est -+vérouillé et ouvert. - .SH FICHIERS - .I /dev/cua* /var/lock/LCK.* - .SH BUGS -diff --git a/man/pt_BR/arp.8 b/man/pt_BR/arp.8 -index 41c8fd6..6c1e7f7 100644 ---- a/man/pt_BR/arp.8 -+++ b/man/pt_BR/arp.8 -@@ -7,12 +7,12 @@ arp \- manipula o cache ARP do sistema - .RB [ "\-H tipo" ] - .RB [ "-i if" ] - .B -a --.RB [ mquina ] -+.RB [ máquina ] - .PP - .B arp - .RB [ \-v ] - .RB [ "\-i if" ] --.B "\-d mquina" -+.B "\-d máquina" - .RB [ pub ] - .RB [ nopub ] - .PP -@@ -20,7 +20,7 @@ arp \- manipula o cache ARP do sistema - .RB [ \-v ] - .RB [ "\-H tipo" ] - .RB [ "\-i if" ] --.B -s mquina endereo_hardware -+.B -s máquina endereço_hardware - .RB [ temp ] - .RB [ nopub ] - .PP -@@ -28,7 +28,7 @@ arp \- manipula o cache ARP do sistema - .RB [ \-v ] - .RB [ "\-H tipo" ] - .RB [ "\-i if" ] --.B -s mquina endereo_hardware -+.B -s máquina endereço_hardware - .RB [ "netmask nm" ] - .B pub - .PP -@@ -36,7 +36,7 @@ arp \- manipula o cache ARP do sistema - .RB [ \-v ] - .RB [ "\-H tipo" ] - .RB [ "\-i if" ] --.B -Ds mquina ifa -+.B -Ds máquina ifa - .RB [ "netmask nm" ] - .B pub - .PP -@@ -46,28 +46,28 @@ arp \- manipula o cache ARP do sistema - .RB [ "-i if" ] - .B -f arquivo - --.SH DESCRIO -+.SH DESCRIÇÃO - .B arp --manipula o cache ARP do kernel de vrias maneiras. As principais opes --so remoo de uma entrada de mapeamento de endereo e configurao manual --de um endereo. Para propsitos de depurao, o programa -+manipula o cache ARP do kernel de várias maneiras. As principais opções -+são remoção de uma entrada de mapeamento de endereço e configuração manual -+de um endereço. Para propósitos de depuração, o programa - .B arp --tambm permite um dump completo do cache ARP. --.SH OPES -+também permite um dump completo do cache ARP. -+.SH OPÇÕES - .TP - .B "\-v, \-\-verbose" --Mostra ao usurio o que est acontecendo, de modo detalhado. -+Mostra ao usuário o que está acontecendo, de modo detalhado. - .TP - .B "\-n, \-\-numeric" --mostra endereos numricos, ao invs de tentar determinar os nomes simblicos da --mquina, porta e usurio. -+mostra endereços numéricos, ao invés de tentar determinar os nomes simbólicos da -+máquina, porta e usuário. - .TP - .B "\-H type, \-\-hw-type type" --Quando configurando ou lendo o cache ARP, este parmetro opcional informa ao -+Quando configurando ou lendo o cache ARP, este parâmetro opcional informa ao - .B arp --que classe de entradas devem ser verificadas. O valor padro deste parmetro -+que classe de entradas devem ser verificadas. O valor padrão deste parâmetro é - .B ether --(i.e. cdigo de hardware 0x01 para Ethernet IEEE 802.3 10Mbps). -+(i.e. código de hardware 0x01 para Ethernet IEEE 802.3 10Mbps). - Outros valores podem incluir tecnologias de rede como - .RB "ARCnet (" arcnet ")" - , -@@ -77,86 +77,86 @@ Outros valores podem incluir tecnologias de rede como - e - .RB "NET/ROM (" netrom ")." - .TP --.B "\-a [mquina], \-\-display [mquina]" --Mostra as entradas das mquinas especificadas. Se o parmetro --.B mquina --no for usado, -+.B "\-a [máquina], \-\-display [máquina]" -+Mostra as entradas das máquinas especificadas. Se o parâmetro -+.B máquina -+não for usado, - .B todas --as entradas sero mostradas. -+as entradas serão mostradas. - .TP --.B "\-d mquina, \-\-delete mquina" --Remove quaisquer entradas para a mquina especificada. Isto pode ser --usado se a mquina indicada for desligada, por exemplo. Nos kernels -+.B "\-d máquina, \-\-delete máquina" -+Remove quaisquer entradas para a máquina especificada. Isto pode ser -+usado se a máquina indicada for desligada, por exemplo. Nos kernels - mais recentes o - .BR arp (1) --suporta a especificao de -+suporta a especificação de - .B pub - ou - .B nopub --para decidir se uma entrada pblica ou privada deve ser removida. Se voc --no informar uma destas flags as duas entradas sero removidas. -+para decidir se uma entrada pública ou privada deve ser removida. Se você -+não informar uma destas flags as duas entradas serão removidas. - .TP - .B "\-D, \-\-use-device" --Usa o endereo de hardware da interface -+Usa o endereço de hardware da interface - .BR ifa - .TP - .B "\-i If, \-\-device If" - Seleciona uma interface. Quando mostrando o cache ARP somente entradas iguais -- interface sero mostradas. Configura uma entrada ARP permanente ou --temporria que ser usada no dispositivo especificado. Se nenhum dispositivo for -+à interface serão mostradas. Configura uma entrada ARP permanente ou -+temporária que será usada no dispositivo especificado. Se nenhum dispositivo for - informado, o kernel descobre o dispositivo a partir da tabela de roteamento. - Para entradas - .B pub --a interface especificada a interface na qual as requisies ARP sero -+a interface especificada é a interface na qual as requisições ARP serão - respondidas. - .br - .B NOTA: --Deve ser diferente da interface para a qual os pacotes IP sero roteados. -+Deve ser diferente da interface para a qual os pacotes IP serão roteados. - .TP --.B "\-s mquina endereo_hardware, \-\-set mquina" --Cria manualmente uma entrada de mapeamento de endereo ARP para a mquina --.B mquina --com endereo de hardware configurado para --.B endereo_hardware. --O formato do endereo de hardware depende da classe de hardware, mas --para a maioria das classes pode-se assumir que a apresentao usual pode --ser usada. Para a classe Ethernet, so 6 bytes em hexadecimal, separados --por dois pontos (:). Quando adicionando entradas proxy arp (isto , aquelas -+.B "\-s máquina endereço_hardware, \-\-set máquina" -+Cria manualmente uma entrada de mapeamento de endereço ARP para a máquina -+.B máquina -+com endereço de hardware configurado para -+.B endereço_hardware. -+O formato do endereço de hardware depende da classe de hardware, mas -+para a maioria das classes pode-se assumir que a apresentação usual pode -+ser usada. Para a classe Ethernet, são 6 bytes em hexadecimal, separados -+por dois pontos (:). Quando adicionando entradas proxy arp (isto é, aquelas - com a flag --.BR pb lico -+.BR púb lico - setadas) uma - .B netmask - pode ser especificada para o proxy arp de uma subrede inteira. --Proxy arp para rotear redes inteiras no um bom protocolo, mas algumas --vezes til, ento suportado. Se a flag -+Proxy arp para rotear redes inteiras não é um bom protocolo, mas algumas -+vezes é útil, então é suportado. Se a flag - .B temp --no for fornecida, as entradas sero permanentemente armazenadas no cache ARP. -+não for fornecida, as entradas serão permanentemente armazenadas no cache ARP. - .TP - .B "\-f arquivo, \-\-file arquivo" --Similar opo -+Similar à opção - .B \-s --s que desta vez as informaes de endereos so obtidas a partir do arquivo -+só que desta vez as informações de endereços são obtidas a partir do arquivo - .B arquivo. --Isto pode ser usado se entradas ARP para muitas mquinas tiverem que ser --configuradas. O nome do arquivo de dados freqentemente -+Isto pode ser usado se entradas ARP para muitas máquinas tiverem que ser -+configuradas. O nome do arquivo de dados é freqüentemente - .IR /etc/ethers , --mas isto no oficial. -+mas isto não é oficial. - .sp 1 --O formato deste arquivo simples; ele somente contm linhas de texto ASCII com --um nome de mquina e um endereo de hardware separados por um espao em branco. -+O formato deste arquivo é simples; ele somente contém linhas de texto ASCII com -+um nome de máquina e um endereço de hardware separados por um espaço em branco. - Adicionalmente as flags - .BR "pub" , " nopub" , " temp" " and" " netmask" - podem ser usadas. - .LP - Em todos os lugares onde uma --.B mquina -- esperada, voc tambm pode informar um --.B "endereo IP" --em notao decimal separada por pontos. -+.B máquina -+é esperada, você também pode informar um -+.B "endereço IP" -+em notação decimal separada por pontos. - .LP --Cada entrada completa no cache ARP ser marcada com uma flag -+Cada entrada completa no cache ARP será marcada com uma flag - .BR C . --Entradas permanentes so marcadas com um -+Entradas permanentes são marcadas com um - .B M - e entradas publicadas tem uma flag - .BR P . -@@ -171,7 +171,7 @@ e entradas publicadas tem uma flag - .SH AUTOR - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> com muitas melhorias - feitas pelo mantenedor do net-tools, Bernd Eckenfels <net-tools@lina.inka.de>. --Traduo para a lngua portuguesa feita por -+Tradução para a língua portuguesa feita por - Arnaldo Carvalho de Melo <acme@conectiva.com.br> em 11/abril/1998. - Revisado por - Jorge Luiz Godoy Filho <jorge@bestway.com.br> em 15/abril/1998. -diff --git a/man/pt_BR/hostname.1 b/man/pt_BR/hostname.1 -index fe00879..5880fc8 100644 ---- a/man/pt_BR/hostname.1 -+++ b/man/pt_BR/hostname.1 -@@ -1,15 +1,15 @@ - .TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux" - - .SH NOME --hostname \- mostra ou configura o nome da mquina -+hostname \- mostra ou configura o nome da máquina - .BR --domainname \- mostra ou configura o nome do domnio NIS/YP -+domainname \- mostra ou configura o nome do domínio NIS/YP - .BR --dnsdomainname \- mostra o nome do domnio DNS -+dnsdomainname \- mostra o nome do domínio DNS - .BR --nisdomainname \- mostra ou configura o nome do domnio NIS/YP -+nisdomainname \- mostra ou configura o nome do domínio NIS/YP - .BR --ypdomainname \- mostra ou configura o nome do domnio NIS/YP -+ypdomainname \- mostra ou configura o nome do domínio NIS/YP - - .SH SINOPSE - .B hostname -@@ -34,7 +34,7 @@ ypdomainname \- mostra ou configura o nome do dom - .RB [ \-v ] - .RB [ \-F\ arquivo ] - .RB [ \-\-file\ arquivo ] --.RB [ mquina ] -+.RB [ máquina ] - - .PP - .B domainname -@@ -61,11 +61,11 @@ ypdomainname \- mostra ou configura o nome do dom - .B ypdomainname - .RB [ \-v ] - --.SH DESCRIO -+.SH DESCRIÇÃO - .B hostname -- o programa usado para configurar ou mostrar o nome corrente da mquina --ou o domnio do sistema. Este nome usado por muitos dos programas de --rede para identificar a mquina. O nome do domnio tambm usado pelo -+é o programa usado para configurar ou mostrar o nome corrente da máquina -+ou o domínio do sistema. Este nome é usado por muitos dos programas de -+rede para identificar a máquina. O nome do domínio também é usado pelo - NIS/YP. - - .SS "OBTER NOME" -@@ -73,119 +73,119 @@ Quando chamado sem argumentos o programa mostra os nomes correntes: - - .LP - .B hostname --mostrar o nome do sistema conforme retornado pela funo -+mostrará o nome do sistema conforme retornado pela função - .BR gethostname (2). - - - .LP - .B "domainname, nisdomainname, ypdomainname" --mostrar o nome do sistema conforme retornado pela funo -+mostrará o nome do sistema conforme retornado pela função - .BR getdomainname (2). --Isto tambm conhecido como o nome de domnio YP/NIS do sistema. -+Isto também é conhecido como o nome de domínio YP/NIS do sistema. - - .LP - .B dnsdomainname --mostrara a parte do domnio do FQDN (Nome de domnio completamente qualificado). --O FQDN do sistema retornado pelo comando -+mostrara a parte do domínio do FQDN (Nome de domínio completamente qualificado). -+O FQDN do sistema é retornado pelo comando - .BR "hostname \-\-fqdn" . - - .SS "CONFIGURAR NOME" --Quando chamado com um argumento ou com a opo -+Quando chamado com um argumento ou com a opção - .B \-\-file --, o comando configura o nome da mquina ou do domnio NIS/YP. -+, o comando configura o nome da máquina ou do domínio NIS/YP. - - .LP --Note que somente o super usurio pode mudar os nomes. -+Note que somente o super usuário pode mudar os nomes. - - .LP --Nao possvel configurar o FQDN ou o nome do domnio DNS com o comando -+Nao é possível configurar o FQDN ou o nome do domínio DNS com o comando - .B dnsdomainname - (veja - .B "O FQDN" - abaixo). - - .LP --O nome da mquina normalmente configurado durante a inicializao do sistema, -+O nome da máquina é normalmente configurado durante a inicialização do sistema, - em - .I /etc/rc.d/rc.inet1 - ou - .I /etc/init.d/boot --(normalmente lendo o contedo de um arquivo que contm o nome da mquina, ex.: -+(normalmente lendo o conteúdo de um arquivo que contém o nome da máquina, ex.: - .IR /etc/hostname ). - - .SS O FQDN --Voc no pode mudar o FQDN (conforme retornado por -+Você não pode mudar o FQDN (conforme retornado por - .BR "hostname \-\-fqdn" ) --ou o nome do domnio DNS (conforme retornado por -+ou o nome do domínio DNS (conforme retornado por - .BR "dnsdomainname" ) --com este comando. O FQDN do sistema o nome que o -+com este comando. O FQDN do sistema é o nome que o - .BR resolver (3) --retorna para o nome da mquina. -+retorna para o nome da máquina. - - .LP --Tecnicamente: O FQDN o nome retornado pelo -+Tecnicamente: O FQDN é o nome retornado pelo - .BR gethostbyname (2) - para o nome retornado pelo - .BR gethostname (2). --O nome do domnio DNS a parte aps o primeiro ponto. -+O nome do domínio DNS é a parte após o primeiro ponto. - .LP --Portanto isto depende da configurao (normalmente em -+Portanto isto depende da configuração (normalmente em - .IR /etc/host.conf ) --para que voc possa mud-lo. Normalmente (se o arquivo hosts for lido antes --do DNS ou NIS) voc pode mud-lo em -+para que você possa mudá-lo. Normalmente (se o arquivo hosts for lido antes -+do DNS ou NIS) você pode mudá-lo em - .IR /etc/hosts . - - --.SH OPES -+.SH OPÇÕES - .TP - .I "\-a, \-\-alias" --Mostra o alias da mquina (se usado). -+Mostra o alias da máquina (se usado). - .TP - .I "\-d, \-\-domain" --Mostra o nome do domnio DNS. No use o comando -+Mostra o nome do domínio DNS. Não use o comando - .B domainname --para obter o nome do domnio DNS porque ele mostrar o nome do domnio NIS e --no o nome do domnio DNS. Use -+para obter o nome do domínio DNS porque ele mostrará o nome do domínio NIS e -+não o nome do domínio DNS. Use - .BR dnsdomainname . - .TP - .I "\-F, \-\-file arquivo" --Leia o nome da mquina a partir do arquivo especificado. Comentrios (linhas --comeando com um `#') so ignorados. -+Leia o nome da máquina a partir do arquivo especificado. Comentários (linhas -+começando com um `#') são ignorados. - .TP - .I "\-f, \-\-fqdn, \-\-long" --Mostra o FQDN (Nome de Domnio Completamente Qualificado). Um FQDN consiste de --um nome curto de mquina e do nome do domnio DNS. A menos que voc esteja --usando bind ou NIS para resoluo de nomes voc pode mudar o FQDN e o nome --do domnio DNS (que parte do FQDN) no arquivo \fI/etc/hosts\fR. -+Mostra o FQDN (Nome de Domínio Completamente Qualificado). Um FQDN consiste de -+um nome curto de máquina e do nome do domínio DNS. A menos que você esteja -+usando bind ou NIS para resolução de nomes você pode mudar o FQDN e o nome -+do domínio DNS (que é parte do FQDN) no arquivo \fI/etc/hosts\fR. - .TP - .I "\-h, \-\-help" - Mostra uma mensagem sobre como utilizar o comando e termina. - .TP - .I "\-i, \-\-ip-address" --Mostra o(s) endereo(s) IP da mquina. -+Mostra o(s) endereço(s) IP da máquina. - .TP - .I "\-s, \-\-short" --Mostra o nome curto da mquina. o nome da mquina at o primeiro ponto. -+Mostra o nome curto da máquina. É o nome da máquina até o primeiro ponto. - .TP - .I "\-V, \-\-version" --Mostra informao de verso na sada padro e termina com sucesso. -+Mostra informação de versão na saída padrão e termina com sucesso. - .TP - .I "\-v, \-\-verbose" --Mostra uma sada detalhada do que est acontecendo. -+Mostra uma saída detalhada do que está acontecendo. - .TP - .I "\-y, \-\-yp, \-\-nis" --Mostra o nome do domnio NIS. Se um parmetro for especificado (ou -+Mostra o nome do domínio NIS. Se um parâmetro for especificado (ou - .B \-\-file arquivo --) ento o root tambm pode configurar um novo domnio NIS. -+) então o root também pode configurar um novo domínio NIS. - .SH ARQUIVOS - .B /etc/hosts - .SH AUTOR - Peter Tobias, <tobias@et-inf.fho-emden.de> - .BR --Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e pgina man). -+Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e página man). - .BR --Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Traduo para a lngua -+Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Tradução para a língua - portuguesa. - .BR --Jorge Luiz Godoy Filho, <jorge@bestway.com.br> Reviso. -+Jorge Luiz Godoy Filho, <jorge@bestway.com.br> Revisão. - .BR -diff --git a/man/pt_BR/ifconfig.8 b/man/pt_BR/ifconfig.8 -index 0a97683..1432dc5 100644 ---- a/man/pt_BR/ifconfig.8 -+++ b/man/pt_BR/ifconfig.8 -@@ -4,13 +4,13 @@ ifconfig \- configura uma interface de rede - .SH SINOPSE - .B "ifconfig [interface]" - .br --.B "ifconfig interface [aftype] opes | endereos ..." --.SH DESCRIO -+.B "ifconfig interface [aftype] opções | endereços ..." -+.SH DESCRIÇÃO - .B ifconfig -- usado para configurar (e posteriormente manter) as interfaces de --rede. usado durante o boot para configurar a maioria delas para --um estado usvel. Depois disto, normalmente somente necessrio --durante depuraes ou quando for necessria uma configurao fina -+é usado para configurar (e posteriormente manter) as interfaces de -+rede. É usado durante o boot para configurar a maioria delas para -+um estado usável. Depois disto, é normalmente somente necessário -+durante depurações ou quando for necessária uma configuração fina - do sistema. - .LP - Se nenhum argumento for informado, -@@ -19,12 +19,12 @@ somente mostra o estado das interfaces correntemente definidas. Se - um argumento - .B interface - for informado, ele mostra somente o estado da interface informada. De --outra forma ele assume que os parmetros devem ser configurados. --.SH Famlias de Endereamento --Se o primeiro argumento aps o nome da interface for reconhecido --como um nome de uma famlia de endereamento suportada, esta famlia --de endereamento usada na decodificao e apresentao de todos --os endereos de protocolos. Atualmente as famlias de endereamento -+outra forma ele assume que os parâmetros devem ser configurados. -+.SH Famílias de Endereçamento -+Se o primeiro argumento após o nome da interface for reconhecido -+como um nome de uma família de endereçamento suportada, esta família -+de endereçamento é usada na decodificação e apresentação de todos -+os endereços de protocolos. Atualmente as famílias de endereçamento - suportadas incluem - .B inet - (TCP/IP, default) -@@ -36,95 +36,91 @@ suportadas incluem - (Novell IPX) and - .B netrom - (AMPR Packet radio). --.SH OPES -+.SH OPÇÕES - .TP - .B interface --O nome da interface de rede. Usualmente um nome como -+O nome da interface de rede. Usualmente é um nome como - .B eth0 - , - .B sl3 - ou algo parecido: um nome de driver de dispositivo seguido por um --nmero. -+número. - .TP - .B up --Esta flag causa a ativao da interface. especificada --implicitamente se a interface receber um novo endereo (veja -+Esta flag causa a ativação da interface. É especificada -+implicitamente se a interface receber um novo endereço (veja - abaixo). - .TP - .B down --Esta flag desativa o driver desta interface, til quando alguma --coisa comear a ter problemas. -+Esta flag desativa o driver desta interface, é útil quando alguma -+coisa começar a ter problemas. - .TP - .B "[\-]arp" - Habilita ou desabilita o uso do protocolo ARP para esta interface. Se --o sinal de menos (\-) estiver presente a opo desligada. -+o sinal de menos (\-) estiver presente a opção é desligada. - .TP - .B "[\-]trailers" --Habilita ou desabilita o uso de trailer em frames Ethernet. No --utilizada na implementao atual do pacote net-tools. -+Habilita ou desabilita o uso de trailer em frames Ethernet. Não é -+utilizada na implementação atual do pacote net-tools. - .TP - .B "[\-]allmulti" - Habilita ou desabilita o modo - .B promiscuous --da interface. Isto significa que todos os frames passaro pela camada --de rede do kernel, permitindo monitorao da rede. --.TP --.B "metric N" --Este parmetro configura a mtrica da interface. No usado atualmente, --mas ser implementado no futuro. -+da interface. Isto significa que todos os frames passarão pela camada -+de rede do kernel, permitindo monitoração da rede. - .TP - .B "mtu N" --Este parmetro configura a Unidade Mxima de Transferncia (MTU) de uma --interface. Para Ethernet um nmero entre 1000-2000 (o padro --1500). Para SLIP, use algo entre 200 e 4096. Note que a implementao --atual no manipula fragmentao IP ainda, ento melhor configurar -+Este parâmetro configura a Unidade Máxima de Transferência (MTU) de uma -+interface. Para Ethernet é um número entre 1000-2000 (o padrão é -+1500). Para SLIP, use algo entre 200 e 4096. Note que a implementação -+atual não manipula fragmentação IP ainda, então é melhor configurar - a MTU com um tamanho adequado! - .TP - .B "dstaddr addr" --Configura o endereo IP do "outro lado" no caso de um link Ponto-A-Ponto, -+Configura o endereço IP do "outro lado" no caso de um link Ponto-A-Ponto, - como PPP. Esta palavra-chave tornou-se obsoleta e deve ser usada a nova - palavra-chave - .BR pointopoint . - .TP - .B "netmask addr" --Configura a mscara de rede IP para esta interface. Este valor assume o --padro usual das classes A, B ou C (deduzindo-o a partir do endereo -+Configura a máscara de rede IP para esta interface. Este valor assume o -+padrão usual das classes A, B ou C (deduzindo-o a partir do endereço - IP da interface), mas pode ser configurado para qualquer valor para o - uso de sub-redes. - - .TP - .B "irq addr" --Configura a linha de interrupo (IRQ) usada por este dispositivo. Muitos --dispositivos no suportam configurao dinmica de IRQ. -+Configura a linha de interrupção (IRQ) usada por este dispositivo. Muitos -+dispositivos não suportam configuração dinâmica de IRQ. - .TP --.B "[-]broadcast [endereo]" --Se o argumento endereo for informado, configura o endereo de protocolo -+.B "[-]broadcast [endereço]" -+Se o argumento endereço for informado, configura o endereço de protocolo - broadcast para esta interface. De outra forma ele somente configura a flag - .B IFF_BROADCAST - da interface. Se a palavra-chave for precedida por um sinal de menos - .B (-) --, ento a flag removida. -+, então a flag é removida. - .TP --.B "[-]pointopoint [endereo]" -+.B "[-]pointopoint [endereço]" - Esta palavra-chave habilita o modo - .B ponto-a-ponto --da interface, significando que ela um link direto entre duas mquinas --sem ningum ouvindo (ou, pelo menos ns esperamos que este seja o caso -+da interface, significando que ela é um link direto entre duas máquinas -+sem ninguém ouvindo (ou, pelo menos nós esperamos que este seja o caso - :-) - .BR --Se o argumento endereo for informado, configura o endereo de protocolo -+Se o argumento endereço for informado, configura o endereço de protocolo - do outro lado do link, exatamente como a palavra-chave obsoleta - .B dstaddr - faz. De outra forma, ela somente configura a flag - .B IFF_POINTOPOINT - da interface. Se a palavra-chave for precedida por um sinal de menos - .B (-) --, ento a flag removida. -+, então a flag é removida. - .TP - .B "hw" --Configura o endereo de hardware para esta interface, se o driver do --dispositivo suportar esta operao. A palavra-chave deve ser seguida --pelo nome da classe do hardware e o equivalente em ASCII do endereo -+Configura o endereço de hardware para esta interface, se o driver do -+dispositivo suportar esta operação. A palavra-chave deve ser seguida -+pelo nome da classe do hardware e o equivalente em ASCII do endereço - de hardware. As classes de hardware atualmente suportadas incluem - .B ether - (Ethernet), -@@ -136,45 +132,34 @@ e - (AMPR NET/ROM). - .TP - .B multicast --Inicializa a flag de multicast para a interface. Normalmente, isto no ser --necessrio j que os drivers ajustam as flags corretas por si s. -+Inicializa a flag de multicast para a interface. Normalmente, isto não será -+necessário já que os drivers ajustam as flags corretas por si só. - .TP --.B endereo --O nome ou endereo IP da mquina (um nome de mquina ser traduzido para --um endereo IP) da interface. Este parmetro necessrio, apesar --da sintaxe atualmente no requisit-lo. -+.B endereço -+O nome ou endereço IP da máquina (um nome de máquina será traduzido para -+um endereço IP) da interface. Este parâmetro é necessário, apesar -+da sintaxe atualmente não requisitá-lo. - .SH NOTAS -- --+Since kernel release 2.2 there are no explicit interface statistics for --+alias interfaces anymore. The statistics printed for the original address --+are shared with all alias addresses on the same device. If you want per-address --+statistics you should add explicit accounting --+rules for the address using the --+.BR ipchains(8) --+command. -- --Deste o kernel 2.2 no existem mais estatsticas explcitas para os apelidos (aliases) --de interfaces. As estatsticas mostradas para o endereo original so compartilhadas --como todos os endereos associados ao mesmo dispositivo. Se desejar estatsticas --por endereo voc deve explicitamente adicionar regras de contabilizao para os --endereos usando o comando --.BR ipchains(8) -+Deste o kernel 2.2 não existem mais estatísticas explícitas para os apelidos (aliases) -+de interfaces. As estatísticas mostradas para o endereço original são compartilhadas -+como todos os endereços associados ao mesmo dispositivo. Se desejar estatísticas -+por endereço você deve explicitamente adicionar regras de contabilização para os -+endereços usando o comando -+.BR iptables(8) - . - - .SH ARQUIVOS --.I /proc/net/socket --.br - .I /proc/net/dev - .SH BUGS --Os endereos appletalk DDP e IPX sero mostrados, mas no podem ser alterados -+Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados - com este comando. --.SH VEJA TAMBM --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+.SH VEJA TAMBÉM -+route(8), netstat(8), arp(8), rarp(8), iptables(8) - .SH AUTORES - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - Alan Cox, <Alan.Cox@linux.org> --.SH TRADUO E REVISO PARA A LNGUA PORTUGUESA --Arnaldo Carvalho de Melo <acme@conectiva.com.br> (traduo) -+.SH TRADUÇÃO E REVISÃO PARA A LÍNGUA PORTUGUESA -+Arnaldo Carvalho de Melo <acme@conectiva.com.br> (tradução) - .BR --Jorge Luiz Godoy Filho <jorge@bestway.com.br> (reviso) -+Jorge Luiz Godoy Filho <jorge@bestway.com.br> (revisão) - -diff --git a/man/pt_BR/netstat.8 b/man/pt_BR/netstat.8 -index b9b359a..d2d04ef 100644 ---- a/man/pt_BR/netstat.8 -+++ b/man/pt_BR/netstat.8 -@@ -5,13 +5,13 @@ - .\" - .\" Modificado por: Bernd.Eckenfels@inka.de - .\" Modificado por: Andi Kleen ak@muc.de --.\" Traduzido para portugus por Arnaldo Carvalho de Melo <acme@conectiva.com.br> -+.\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br> - .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br> - .\" --.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - - .SH NOME --netstat \- Mostra conexes de rede, tabelas de roteamento, estatsticas de interface e conexes -+netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões - mascaradas. - .SH SINOPSE - -@@ -19,6 +19,8 @@ mascaradas. - .RB [ \-venaoc ] - .RB [ \-\-tcp | \-t ] - .RB [ \-\-udp | \-u ] -+.RB [ \-\-udplite | \-U ] -+.RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] - .RB [ \-\-unix | \-x ] - .RB [ \-\-inet | \-\-ip ] -@@ -63,90 +65,90 @@ mascaradas. - .RB { \-h | \-\-help } - - .PP --.SH DESCRIO -+.SH DESCRIÇÃO - .B netstat --mostra informaes do subsistema de rede do Linux. -+mostra informações do subsistema de rede do Linux. - --.SS "(sem opes)" --Voc pode ver o estado das conexes de rede atravs da listagem dos sockets --abertos. Esta a operao padro: se voc no especificar nenhuma --famlia de endereos, os sockets ativos de todas as famlias de endereos --configuradas sero mostrados. Com -+.SS "(sem opções)" -+Você pode ver o estado das conexões de rede através da listagem dos sockets -+abertos. Esta é a operação padrão: se você não especificar nenhuma -+família de endereços, os sockets ativos de todas as famílias de endereços -+configuradas serão mostrados. Com - .B -e --voc obter informaes adicionais (userid). Com a chave -+você obterá informações adicionais (userid). Com a chave - .B -v --voc poder fazer com que o netstat reclame sobre famlias de endereos --conhecidas que no sejam suportadas pelo kernel. A opo -+você poderá fazer com que o netstat reclame sobre famílias de endereços -+conhecidas que não sejam suportadas pelo kernel. A opção - .B -o --mostra algumas informaes adicionais sobre temporizadores de rede. -+mostra algumas informações adicionais sobre temporizadores de rede. - .B -a --mostra todos os sockets, incluindo sockets de servidores. A famlia de --endereos -+mostra todos os sockets, incluindo sockets de servidores. A família de -+endereços - .B inet --mostrar sockets raw, udp e tcp. -+mostrará sockets raw, udp e tcp. - - .SS "\-r, \-\-route" --Com a opo -+Com a opção - .BR \-r ", " \-\-route --voc obter as tabelas de roteamento do kernel no mesmo formato usado por -+você obterá as tabelas de roteamento do kernel no mesmo formato usado por - .BR "route -e" . - .B "netstat -er" --usar o formato de apresentao do comando -+usará o formato de apresentação do comando - .BR route . - Por favor veja - .BR route (8) - para maiores detalhes. - --.SS "\-i, \-\-interface \fIiface\fI" --Se voc usar a opo -+.SS "\-i, \-\-interfaces \fIiface\fI" -+Se você usar a opção - .BR -i ", " --interfaces - , uma tabela de todas (ou da - .IR iface --especificada) as interfaces de rede ser mostrada. A sada usa o formato -+especificada) as interfaces de rede será mostrada. A saída usa o formato - .B "ifconfig -e" --, e descrita em -+, e é descrita em - .BR ifconfig (8). - .B "netstat -ei" --mostrar uma tabela ou uma entrada de interface como -+mostrará uma tabela ou uma entrada de interface como - .B ifconfig - mostra. Com a chave - .B -a --, voc pode incluir interfaces que no estejam configuradas (i.e. no tem -+, você pode incluir interfaces que não estejam configuradas (i.e. não tem - a flag - .BR U = UP - configurada). - - .SS "\-M, \-\-masquerade" - --Uma lista de todas as sesses mascaradas tambm pode ser vista. Com a chave -+Uma lista de todas as sessões mascaradas também pode ser vista. Com a chave - .B -e --voc pode incluir mais algumas informaes sobre numerao sequencial e deltas --, causados por reescritas de dados em sesses FTP (comando PORT). --O suporte a mascaramento usado para esconder mquinas em endereos de --rede no oficiais do resto do mundo, como descrito em --.BR ipfw (4), ipfwadm "(8) e ipfw (8). -+você pode incluir mais algumas informações sobre numeração sequencial e deltas -+, causados por reescritas de dados em sessões FTP (comando PORT). -+O suporte a mascaramento é usado para esconder máquinas em endereços de -+rede não oficiais do resto do mundo, como descrito em -+.BR iptables (8). - - .SS "\-s, \-\-statistics" - --Mostra estatsticas sobre o subsistema de rede do kernel do Linux, que --so lidas a partir de -+Mostra estatísticas sobre o subsistema de rede do kernel do Linux, que -+são lidas a partir de - .IR /proc/net/snmp . - - .PP --.SH OPES -+.SH OPÇÕES - .SS "\-v, \-\-verbose" --Informa ao usurio o que est ocorrendo, sendo detalhado. Especialmente --mostra algumas informaes teis sobre famlias de endereos no -+Informa ao usuário o que está ocorrendo, sendo detalhado. Especialmente -+mostra algumas informações úteis sobre famílias de endereços não - configuradas. - - .SS "\-n, \-\-numeric" --Mostra endereos numricos, sem tentar resolver os nomes da mquina, porta ou --usurio. -+Mostra endereços numéricos, sem tentar resolver os nomes da máquina, porta ou -+usuário. - --.SS "\-A, \-\-af \fIfamlia\fI" --Usa um mtodo diferente para configurar as famlias de endereos. --.I famlia -- uma lista de palavras-chave de famlias de endereos separadas por vrgulas -+.SS "\-A, \-\-af \fIfamília\fI" -+Usa um método diferente para configurar as famílias de endereços. -+.I família -+é uma lista de palavras-chave de famílias de endereços separadas por vírgulas - (',') como - .BR inet , - .BR unix , -@@ -155,7 +157,7 @@ Usa um m - .B netrom - e - .BR ddp . --Tem o mesmo efeito de usar as opes longas -+Tem o mesmo efeito de usar as opções longas - .BR \-\-inet , - .BR \-\-unix , - .BR \-\-ipx , -@@ -165,99 +167,99 @@ e - .BR \-\-ddp. - - .SS "\-c, \-\-continuous" --Isto far com que -+Isto fará com que - .B netstat --mostre a tabela selecionada a cada segundo, continuamente na tela at que --voc o interrompa. -+mostre a tabela selecionada a cada segundo, continuamente na tela até que -+você o interrompa. - - .PP --.SH SADA -+.SH SAÍDA - - .PP --.SS Conexes Internet Ativas \fR(TCP, UDP, RAW)\fR -+.SS Conexões Internet Ativas \fR(TCP, UDP, RAW)\fR - - .SS "Proto" - O protocolo (tcp, udp, raw) usado pelo socket. - - .SS "Recv-Q" --O contador de bytes no copiados pelo programa conectado a este socket. -+O contador de bytes não copiados pelo programa conectado a este socket. - - .SS "Send-Q" --O contador de bytes no confirmados pela mquina remota. -+O contador de bytes não confirmados pela máquina remota. - --.SS "Endereo Local" --O endereo local (nome da mquina local) e o numero da porta do socket. A menos -+.SS "Endereço Local" -+O endereço local (nome da máquina local) e o numero da porta do socket. A menos - que a chave - .B -n --seja especificada o endereo do socket ser resolvido para seu nome de mquina --cannico e o nmero da porta ser traduzido para o servio correspondente. -+seja especificada o endereço do socket será resolvido para seu nome de máquina -+canônico e o número da porta será traduzido para o serviço correspondente. - --.SS "Endereo Remoto" --O endereo remoto (nome da mquina remota) e o nmero da porta do socket. Como --com o endereo local, a chave -+.SS "Endereço Remoto" -+O endereço remoto (nome da máquina remota) e o número da porta do socket. Como -+com o endereço local, a chave - .B -n --desliga a resoluo do nome da mquina e do servio. -+desliga a resolução do nome da máquina e do serviço. - - .SS "Estado" --O estado do socket. Uma vez que no existem estados no modo RAW e normalmente --nenhum estado usado em UDP, esta linha pode ser deixada em branco. Normalmente --ele pode assumir um de vrios valores: -+O estado do socket. Uma vez que não existem estados no modo RAW e normalmente -+nenhum estado é usado em UDP, esta linha pode ser deixada em branco. Normalmente -+ele pode assumir um de vários valores: - .TP - .I - ESTABELECIDO --O socket tem uma conexo estabelecida. -+O socket tem uma conexão estabelecida. - .TP - .I - SYN_SENT --O socket est ativamente tentando estabelecer uma conexo. -+O socket está ativamente tentando estabelecer uma conexão. - .TP - .I - SYN_RECV --Uma requisio de conexo foi recebida da rede. -+Uma requisição de conexão foi recebida da rede. - .TP - .I - FIN_WAIT1 --O socket est fechado e a conexo est terminando. -+O socket está fechado e a conexão está terminando. - .TP - .I - FIN_WAIT2 --A conexo est fechada e o socket est esperando por uma terminao pela --mquina remota. -+A conexão está fechada e o socket está esperando por uma terminação pela -+máquina remota. - .TP - .I - TIME_WAIT --O socket est esperando aps o fechamento para tratar os pacotes ainda na rede. -+O socket está esperando após o fechamento para tratar os pacotes ainda na rede. - .TP - .I - FECHADO --O socket no est sendo usado. -+O socket não está sendo usado. - .TP - .I - CLOSE_WAIT - O lado remoto terminou, esperando pelo fechamento do socket. - .TP - .I --LTIMO_ACK --O lado remoto terminou, e o socket est fechado. Esperando por uma --confirmao. -+ÚLTIMO_ACK -+O lado remoto terminou, e o socket está fechado. Esperando por uma -+confirmação. - .TP - .I - OUVINDO --O socket est ouvindo por conexes. Estes socket so somente mostrados se -+O socket está ouvindo por conexões. Estes socket são somente mostrados se - a chave - .BR -a , --listening - for especificada. - .TP - .I - FECHANDO --Ambos os sockets esto terminados mas ns ainda no enviamos todos os nossos -+Ambos os sockets estão terminados mas nós ainda não enviamos todos os nossos - dados. - .TP - .I - DESCONHECIDO --O estado do socket desconhecido. -+O estado do socket é desconhecido. - --.SS "Usurio" -+.SS "Usuário" - O nome ou UID do dono do socket. - - .SS "Temporizador" -@@ -272,198 +274,195 @@ O nome ou UID do dono do socket. - O protocolo (normalmente unix) usado pelo socket. - - .SS "CntRef" --O contador de referncias (i.e. processos conectados via este socket). -+O contador de referências (i.e. processos conectados via este socket). - - .SS "Flags" --As flags mostradas so SO_ACCEPTON (mostrada como -+As flags mostradas são SO_ACCEPTON (mostrada como - .BR ACC ), - SO_WAITDATA - .RB ( W ) - ou SO_NOSPACE - .RB ( N ). - SO_ACCECPTON -- usada para sockets no-conectados se seus processos correspondentes --estiverem esperando por uma solicitao de conexo. As demais flags no --so de interesse comum. -+é usada para sockets não-conectados se seus processos correspondentes -+estiverem esperando por uma solicitação de conexão. As demais flags não -+são de interesse comum. - - .SS "Tipos" --H diversos tipos de acesso a sockets: -+Há diversos tipos de acesso a sockets: - .TP - .I - SOCK_DGRAM --O socket usado no modo de Datagramas (sem conexo). -+O socket é usado no modo de Datagramas (sem conexão). - .TP - .I - SOCK_STREAM -- um socket usado quando h conexes (stream socket). -+É um socket usado quando há conexões (stream socket). - .TP - .I - SOCK_RAW -- usado como o socket bsico (raw socket). -+É usado como o socket básico (raw socket). - .TP - .I - SOCK_RDM --Este usado para confirmao de entrega de mensagens. -+Este é usado para confirmação de entrega de mensagens. - .TP - .I - SOCK_SEQPACKET -- um socket para um pacote sequencial. -+É um socket para um pacote sequencial. - .TP - .I - SOCK_PACKET --Socket para acesso da interface BSICA. -+Socket para acesso da interface BÁSICA. - .TP - .I - UNKNOWN --Quem sabe o que nos trar o futuro? Preencha aqui :-) -+Quem sabe o que nos trará o futuro? Preencha aqui :-) - - .PP - .SS "Estados" --Este campo conter uma das seguintes palavras-chave: -+Este campo conterá uma das seguintes palavras-chave: - .TP - .I - FREE --Este socket no est alocado. -+Este socket não está alocado. - .TP - .I - LISTENING --O socket est aguardando por uma solicitao de conexo. So mostrados --apenas se as opes -+O socket está aguardando por uma solicitação de conexão. São mostrados -+apenas se as opções - .BR -a , --listening - forem selecionadas. - .TP - .I - CONNECTING --O socket est por estabelecer uma conexo. -+O socket está por estabelecer uma conexão. - .TP - .I - CONNECTED --O socket est conectado. -+O socket está conectado. - .TP - .I - DISCONNECTING --O socket est desconectado. -+O socket está desconectado. - .TP - .I - (nada) --O socket no est conectado a nenhum outro. -+O socket não está conectado a nenhum outro. - .TP - .I - UNKNOWN --Isto no deve acontecer nunca. -+Isto não deve acontecer nunca. - - .SS "Path" --Mostra o caminho (path) do processo do qual est tratando esse socket. -+Mostra o caminho (path) do processo do qual está tratando esse socket. - - .PP - .SS Sockets IPX ativos - --(Isso precisa ser feito por algum que saiba faz-lo.) -+(Isso precisa ser feito por alguém que saiba fazê-lo.) - - .PP - .SS Sockets NET/ROM ativos - --(Isso precisa ser feito por algum que saiba faz-lo.) -+(Isso precisa ser feito por alguém que saiba fazê-lo.) - - .PP - .SS Sockets AX.25 ativos - --(Isso precisa ser feito por algum que saiba faz-lo.) -+(Isso precisa ser feito por alguém que saiba fazê-lo.) - - .PP - .SH NOTAS --Desde o kernel 2.2 o netstat -i no mostra estatsticas para apelidos (aliases) --de interfaces. Para obter contadores por apelido de interface voc precisa --configurar regras explcitas usando o comando --+.BR ipchains(8) -+Desde o kernel 2.2 o netstat -i não mostra estatísticas para apelidos (aliases) -+de interfaces. Para obter contadores por apelido de interface você precisa -+configurar regras explícitas usando o comando -++.BR iptables(8) - . - .SH FILES - .ta - .I /etc/services ---- O arquivo de "traduo" (correspondncia) entre socket e servio. -+-- O arquivo de "tradução" (correspondência) entre socket e serviço. - - .I /proc/net/dev ---- Informaes de dispositivos. -+-- Informações de dispositivos. - - .I /proc/net/snmp ---- Estatsticas da rede. -+-- Estatísticas da rede. - - .I /proc/net/raw ---- Informao sobre o socket BSICO (RAW). -+-- Informação sobre o socket BÁSICO (RAW). - - .I /proc/net/tcp ---- Informao sobre o socket TCP. -+-- Informação sobre o socket TCP. - - .I /proc/net/udp ---- Informao sobre o socket UDP. -+-- Informação sobre o socket UDP. - - .I /proc/net/unix ---- Informao sobre o socket de domnio Unix. -+-- Informação sobre o socket de domínio Unix. - - .I /proc/net/ipx ---- Informao sobre o socket IPX. -+-- Informação sobre o socket IPX. - - .I /proc/net/ax25 ---- Informao sobre o socket AX25. -+-- Informação sobre o socket AX25. - - .I /proc/net/appletalk ---- Informao sobre o socket DDP (Appletalk). -+-- Informação sobre o socket DDP (Appletalk). - - .I /proc/net/nr ---- Informao sobre o socket NET/ROM. -+-- Informação sobre o socket NET/ROM. - - .I /proc/net/route ---- Informao sobre os roteamentos IP realizados pelo kernel -+-- Informação sobre os roteamentos IP realizados pelo kernel - - .I /proc/net/ax25_route ---- Informao sobre os roteamentos AX25 realizados pelo kernel -+-- Informação sobre os roteamentos AX25 realizados pelo kernel - - .I /proc/net/ipx_route ---- Informao sobre os roteamentos IPX realizados pelo kernel -+-- Informação sobre os roteamentos IPX realizados pelo kernel - - .I /proc/net/nr_nodes ---- Lista de ns NET/ROM do kernel -+-- Lista de nós NET/ROM do kernel - - .I /proc/net/nr_neigh - -- "Vizinhos" NET/ROM do kernel - - .I /proc/net/ip_masquerade ---- Conexes mascaradas do kernel -+-- Conexões mascaradas do kernel - - .fi - - .PP --.SH VEJA TAMBM -+.SH VEJA TAMBÉM - .BR route (8), - .BR ifconfig (8), --.BR ipfw (4), --.BR ipfw (8), --.BR ipfwadm (8) --.BR ipchains (8) -+.BR iptables (8) - - .PP - .SH BUGS --Ocasionalmente informaes estranhas podem surgir se um socket mudar --enquanto visualizado. Isso incomum. -+Ocasionalmente informações estranhas podem surgir se um socket mudar -+enquanto é visualizado. Isso é incomum. - .br --As opes descritas para -+As opções descritas para - .B netstat -i --foram descritas como devero funcionar aps alguma limpeza da liberao -+foram descritas como deverão funcionar após alguma limpeza da liberação - BETA do pacote net-tools. - - .PP - .SH AUTORES --A interface com o usurio foi escrita por Fred Baumgarten --<dc6iq@insu1.etec.uni-karlsruhe.de> a pgina do manual basicamente -+A interface com o usuário foi escrita por Fred Baumgarten -+<dc6iq@insu1.etec.uni-karlsruhe.de> a página do manual basicamente - por Matt Welsh <mdw@tc.cornell.edu>. Foi atualizada por - Alan Cox <Alan.Cox@linux.org> mas poderia ter sido feita com um pouco - mais de trabalho. - .BR - .LP --A pgina do manual e os comandos includos no pacote net-tools -+A página do manual e os comandos incluídos no pacote net-tools - foram totalmente reescritos desde Bernd Eckenfels - <ecki@linux.de>. - .BR --.SH TRADUO E REVISO PARA PORTUGUS --Traduzido para o portugus por Arnaldo Carvalho de Melo -+.SH TRADUÇÃO E REVISÃO PARA PORTUGUÊS -+Traduzido para o português por Arnaldo Carvalho de Melo - <acme@conectiva.com.br> e Jorge Luiz Godoy Filho <jorge@bestway.com.br>. -diff --git a/man/pt_BR/rarp.8 b/man/pt_BR/rarp.8 -index de31931..b19f1b7 100644 ---- a/man/pt_BR/rarp.8 -+++ b/man/pt_BR/rarp.8 -@@ -2,30 +2,30 @@ - .SH NOME - rarp \- manipula a tabela RARP do sistema - .SH SINOPSE --.B "rarp [-v] [-t tipo] -a [mquina]" -+.B "rarp [-v] [-t tipo] -a [máquina]" - .br --.B "rarp [-v] -d mquina ..." -+.B "rarp [-v] -d máquina ..." - .br --.B "rarp [-v] [-t tipo] -s mquina endereo_hardware" --.SH DESCRIO -+.B "rarp [-v] [-t tipo] -s máquina endereço_hardware" -+.SH DESCRIÇÃO - .B Rarp --manipula as tabelas RARP do kernel de varias formas. As opes principais --so limpar uma entrada de mapeamento de endereos e manualmente configurar uma. --Para propsitos de depurao, o programa -+manipula as tabelas RARP do kernel de varias formas. As opções principais -+são limpar uma entrada de mapeamento de endereços e manualmente configurar uma. -+Para propósitos de depuração, o programa - .B rarp --tambm permite um dump completo da tabela RARP. --.SH OPES -+também permite um dump completo da tabela RARP. -+.SH OPÇÕES - .TP - .B \-v --Informe o usurio o que esta acontecendo, sendo detalhado. -+Informe o usuário o que esta acontecendo, sendo detalhado. - .TP - .B "\-t tipo" --quando configurando ou lendo a tabela RARP, este parmetro opcional informa ao -+quando configurando ou lendo a tabela RARP, este parâmetro opcional informa ao - .B rarp --que classe de entradas devem ser verificadas. O valor default para este parmetro -- -+que classe de entradas devem ser verificadas. O valor default para este parâmetro -+é - .B ether --(i.e. cdigo de hardware -+(i.e. código de hardware - .B 0x01 - para - .B "IEEE 802.3 10Mbps Ethernet". -@@ -34,31 +34,31 @@ Outros valores podem incluir tecnologias de rede como - e - .B NET/ROM (netrom). - .TP --.B "\-a [mquina]" --Mostra as entradas dos mquinas especificadas. Se o --Mostra as entradas das mquinas especificadas. Se o parmetro --.B mquina --no for usado -+.B "\-a [máquina]" -+Mostra as entradas dos máquinas especificadas. Se o -+Mostra as entradas das máquinas especificadas. Se o parâmetro -+.B máquina -+não for usado - .B todas --as entradas sero mostradas. -+as entradas serão mostradas. - .TP --.B "\-d mquina" --Remove a(s) entrada(s) para a mquina especificada. Isto pode ser usado se a --mquina indicada for desligada, por exemplo. -+.B "\-d máquina" -+Remove a(s) entrada(s) para a máquina especificada. Isto pode ser usado se a -+máquina indicada for desligada, por exemplo. - .TP --.B "\-s mquina endereo_hardware" --Cria um mapeamento de endereos RARP para a mquina --.B mquina --com endereo de hardware configurado para --.B endereo_hardware --. O formato do endereo de hardware depende da classe do hardware, mas --para a maioria das classes voc pode assumir que a apresentao usual pode --ser usada. Para a classe Ethernet, so 6 bytes em hexadecimal, separados -+.B "\-s máquina endereço_hardware" -+Cria um mapeamento de endereços RARP para a máquina -+.B máquina -+com endereço de hardware configurado para -+.B endereço_hardware. -+O formato do endereço de hardware depende da classe do hardware, mas -+para a maioria das classes você pode assumir que a apresentação usual pode -+ser usada. Para a classe Ethernet, são 6 bytes em hexadecimal, separados - por dois pontos (:). --.SH ATENO --Alguns arquivos (principalmente Suns velhas) assumem que a mquina respondendo --ao query ARP tambm podem oferecer outros servios de boot remoto. Portanto --nunca adiciona gratuitamente entradas rarp a menos que deseje encontrar a fria -+.SH ATENÇÃO -+Alguns arquivos (principalmente Suns velhas) assumem que a máquina respondendo -+ao query ARP também podem oferecer outros serviços de boot remoto. Portanto -+nunca adiciona gratuitamente entradas rarp a menos que deseje encontrar a fúria - do administrador da rede. - .SH ARQUIVOS - .I /proc/net/rarp, -@@ -66,5 +66,5 @@ do administrador da rede. - Ross D. Martin, <martin@trcsun3.eas.asu.edu> - .br - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> --.SH TRADUO -+.SH TRADUÇÃO - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998 -diff --git a/man/pt_BR/route.8 b/man/pt_BR/route.8 -index c440974..eb152e2 100644 ---- a/man/pt_BR/route.8 -+++ b/man/pt_BR/route.8 -@@ -50,44 +50,44 @@ If] - .RB [ \--help ] - .SH DESCRICAO - .B Route --manipula a tabela de roteamento IP do kernel. Seu principal uso --configurar rotas estticas para hosts ou redes especificadas atravs de --uma interface, aps a mesma ter sido configurada com o programa -+manipula a tabela de roteamento IP do kernel. Seu principal uso é -+configurar rotas estáticas para hosts ou redes especificadas através de -+uma interface, após a mesma ter sido configurada com o programa - .BR ifconfig (8) - . - --.SH OPES -+.SH OPÇÕES - .TP - .B \-v --flag para detalhamento (no usada). -+flag para detalhamento (não usada). - - .TP - .B \-n --mostra endereos numricos, sem tentar resolver o nomes simblicos das --mquinas. til se voc esta tentando determinar por que a rota para o seu -+mostra endereços numéricos, sem tentar resolver o nomes simbólicos das -+máquinas. Útil se você esta tentando determinar por que a rota para o seu - servidor de nomes sumiu. - - .TP - .B \-e - use o formato - .BR netstat (8) --na apresentao da tabela de roteamento. -+na apresentação da tabela de roteamento. - .B \-ee --produzira uma linha bem grande com todos os parmetros da tabela de roteamento. -+produzira uma linha bem grande com todos os parâmetros da tabela de roteamento. - - .TP - .B \-net - o - .B Alvo -- o endereo de uma rede (encontrado no arquivo -+é o endereço de uma rede (encontrado no arquivo - .I /etc/networks --pela funo -+pela função - .BR getnetbyname (2) - ). - - .TP - .B -host -- o endereo de uma mquina (descoberto com a funo -+é o endereço de uma máquina (descoberto com a função - .BR gethostbyname (2) - ). - -@@ -110,150 +110,150 @@ adiciona uma rota. - - .TP - .B Alvo --A mquina ou rede destino. Voc pode fornecer endereos IP em formato --decimal separado por pontos ou nomes de mquinas/redes. -+A máquina ou rede destino. Você pode fornecer endereços IP em formato -+decimal separado por pontos ou nomes de máquinas/redes. - - .TP - .B netmask Nm - modificador para especificar a mascara de rede da rota a ser adicionada. --Somente faz sentido para uma rota para uma rede e quanto o endereo -+Somente faz sentido para uma rota para uma rede e quanto o endereço - .B Alvo -- valido com relao a mascara especificada. Se nenhuma mascara de rede -+é valido com relação a mascara especificada. Se nenhuma mascara de rede - for especificada, o comando - .B route --descobre-a, desta forma, para a maioria das configuraes normais voc no -+descobre-a, desta forma, para a maioria das configurações normais você não - precisa especificar uma mascara de rede. - - .TP - .B gw Gw --Quaisquer pacotes IP para a rede/mquina destino sero roteadas atravs -+Quaisquer pacotes IP para a rede/máquina destino serão roteadas através - do gateway/roteador especificado. - .B NOTA: --O gateway especificado deve ser alcanvel antes deste comando. Isto --normalmente significa que voc ter que configurar uma rota esttica para --o gateway antes de emitir este comando. Se voc especificar o endereo --de uma de suas interfaces locais, isto ser usado para decidir sobre --qual interface deve ser usada para rotear os pacotes. Isto esta disponvel -+O gateway especificado deve ser alcançável antes deste comando. Isto -+normalmente significa que você terá que configurar uma rota estática para -+o gateway antes de emitir este comando. Se você especificar o endereço -+de uma de suas interfaces locais, isto será usado para decidir sobre -+qual interface deve ser usada para rotear os pacotes. Isto esta disponível - para manter compatibilidade com os sistemas baseados em BSD. - - .TP - .B metric M --Configura o campo de mtrica na tabela de roteamento, usado em daemons --para roteamento dinmico. -+Configura o campo de métrica na tabela de roteamento, usado em daemons -+para roteamento dinâmico. - - .TP - .B mss M --Especifica o Tamanho Mximo do Segmento TCP em Bytes (MSS) para conexes --TCP atravs desta rota. Isto normalmente usado somente para otimizao --fina de configuraes de roteamento. -+Especifica o Tamanho Máximo do Segmento TCP em Bytes (MSS) para conexões -+TCP através desta rota. Isto é normalmente usado somente para otimização -+fina de configurações de roteamento. - - .TP - .B window W --Especifica o tamanho da janela TCP para conexes TCP atravs desta rota. -+Especifica o tamanho da janela TCP para conexões TCP através desta rota. - Tipicamente somente usado para redes AX.25 e em drivers incapazes de - de tratar frames back to back. - - .TP - .B irtt I --Especifica o tempo de ida e volta inicial (irtt) para conexes TCP atravs --desta rota. Tipicamente usado somente em redes AX.25. O numero especificado --em milisegundos (1-12000). Se omitido o default da RFC 1122 de 300ms usado. -+Especifica o tempo de ida e volta inicial (irtt) para conexões TCP através -+desta rota. Tipicamente usado somente em redes AX.25. O numero é especificado -+em milisegundos (1-12000). Se omitido o default da RFC 1122 de 300ms é usado. - - .TP - .B reject --Instala uma rota de bloqueio, que forar falha na procura por esta rota. --Exemplo de utilizao: bloquear rotas antes do uso da rota default. --Isto no firewalling. -+Instala uma rota de bloqueio, que forçará falha na procura por esta rota. -+Exemplo de utilização: bloquear rotas antes do uso da rota default. -+Isto não é firewalling. - - .TP - .B mod, dyn, reinstate --Instala uma rota modificada ou dinmica. Ambas as flags so geralmente somente --configuradas por um daemon de roteamento. Somente para propsitos de diagnostico. -+Instala uma rota modificada ou dinâmica. Ambas as flags são geralmente somente -+configuradas por um daemon de roteamento. Somente para propósitos de diagnostico. - - .TP - .B dev If --Fora a associao da rota com o dispositivo especificado, pois o kernel --de outra forma tentara determinar o dispositivo por conta prpria --(atravs da checagem de rotas e especificaes de dispositivos j existentes -+Força a associação da rota com o dispositivo especificado, pois o kernel -+de outra forma tentara determinar o dispositivo por conta própria -+(através da checagem de rotas e especificações de dispositivos já existentes - e onde a rota esta adicionada). - - If - .B dev If -- a ltima opo na linha de comando, a palavra -+é a última opção na linha de comando, a palavra - .B dev --pode ser omitida, pois o default. De outra forma a ordem dos outros --modificadores do route (metric - netmask - gw - dev) no importa. -+pode ser omitida, pois é o default. De outra forma a ordem dos outros -+modificadores do route (metric - netmask - gw - dev) não importa. - - .SH EXEMPLOS - .TP - .B route add -net 127.0.0.0 - Adiciona a entrada para a interface loopback normal, usando mascara igual --a 255.0.0.0 (rede classe A, determinada a partir do endereo de destino), -+a 255.0.0.0 (rede classe A, determinada a partir do endereço de destino), - associada ao dispositivo "lo" (assumindo que este dispositivo tenha sido - previamente configurado com o - .BR ifconfig (8)). - - .TP - .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 --Adiciona uma rota para a rede 192.56.76.x atravs da interface "eth0". O --modificador de mascara classe C no realmente necessrio aqui por que --192.* um endereo IP de classe C. A palavra "dev" pode ser omitida aqui. -+Adiciona uma rota para a rede 192.56.76.x através da interface "eth0". O -+modificador de mascara classe C não é realmente necessário aqui por que -+192.* é um endereço IP de classe C. A palavra "dev" pode ser omitida aqui. - - .TP - .B route add default gw mango-gw --Adiciona uma rota default (que ser usada se nenhuma outra rota for encontrada). --Todos os pacotes que usarem esta rota sero passados para a mquina "mango-gw". --O dispositivo que ser utilizado para esta rota depende de como possvel --alcanar "mango-gw" - a rota esttica para "mango-gw" ter que ser configurada -+Adiciona uma rota default (que será usada se nenhuma outra rota for encontrada). -+Todos os pacotes que usarem esta rota serão passados para a máquina "mango-gw". -+O dispositivo que será utilizado para esta rota depende de como é possível -+alcançar "mango-gw" - a rota estática para "mango-gw" terá que ser configurada - previamente. - - .TP - .B route add ipx4 sl0 --Adiciona uma rota para a mquina "ipx4" atravs da interface SLIP (assumindo --que "ipx4" a mquina SLIP). -+Adiciona uma rota para a máquina "ipx4" através da interface SLIP (assumindo -+que "ipx4" é a máquina SLIP). - - .TP - .B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4 --Este comando adiciona a rede "192.57.66.x" para ser alcanada atravs da --rota anterior atravs da interface SLIP. -+Este comando adiciona a rede "192.57.66.x" para ser alcançada através da -+rota anterior através da interface SLIP. - - .TP - .B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0 --Isto bem obscura, documentada para que as pessoas saibam como us-la. --Configura para que todas as rotas IP classe D (multicast) vo atravs da --interface "eth0". Esta a linha de configurao normal a ser usada com -+Isto é bem obscura, documentada para que as pessoas saibam como usá-la. -+Configura para que todas as rotas IP classe D (multicast) vão através da -+interface "eth0". Esta é a linha de configuração normal a ser usada com - um kernel multicast. - - .TP - .B route add 10.0.0.0 netmask 255.0.0.0 reject --Esta instala uma rota de rejeio para a rede privada "10.x.x.x" -+Esta instala uma rota de rejeição para a rede privada "10.x.x.x" - - .LP --.SH SADA --A sada da tabela de roteamento do kernel organizada nas seguintes colunas -+.SH SAÍDA -+A saída da tabela de roteamento do kernel é organizada nas seguintes colunas - .TP - .B Destino --A rede ou mquina de destino. -+A rede ou máquina de destino. - .TP - .B Roteador --A mquina roteador ou '*' se nenhuma estiver configurada. -+A máquina roteador ou '*' se nenhuma estiver configurada. - .TP --.B Mascara Genrica --A mascara para a rede destino. '255.255.255.255' para uma mquina de destino, --'0.0.0.0' para a rota -+.B Mascara Genérica -+A mascara para a rede destino. '255.255.255.255' para uma máquina de -+destino, '0.0.0.0' para a rota - .B default - . - .TP - .B Flags --Os flags possveis so -+Os flags possíveis são - .br - .B U - (rota esta - .BR Up ) - .br - .B H --(alvo uma --.BR mquina ) -+(alvo é uma -+.BR máquina ) - .br - .B G - (use -@@ -261,7 +261,7 @@ Os flags poss - .br - .B R - .RB ( reinstate --rota para roteamento dinmico) -+rota para roteamento dinâmico) - .br - .B D - Instalada -@@ -278,29 +278,29 @@ Rota - ) - .TP - .B Metric --A 'distncia' at o alvo (geralmente contada em hops). No utilizada pelos -+A 'distância' até o alvo (geralmente contada em hops). Não é utilizada pelos - kernels recentes, somente daemons de roteamento podem usa-la. - .TP - .B Ref --Numero de referncias a esta rota. No usado no kernel do Linux, sempre 0. -+Numero de referências a esta rota. Não usado no kernel do Linux, sempre 0. - .TP - .B Uso --Contagem de procuras por esta rota. Nos kernels recentes estes nmeros so --bem baixos, pois os sockets tem seu prprio cache e no precisam procurar -+Contagem de procuras por esta rota. Nos kernels recentes estes números são -+bem baixos, pois os sockets tem seu próprio cache e não precisam procurar - por rotas. - .TP - .B Iface --Interface atravs da qual os pacotes IP sero enviados. -+Interface através da qual os pacotes IP serão enviados. - .TP - .B MSS --Tamanho mximo de segmento default para conexes TCP atravs desta rota. -+Tamanho máximo de segmento default para conexões TCP através desta rota. - .TP - .B Window --Tamanho de janela default para conexes TCP atravs desta rota. -+Tamanho de janela default para conexões TCP através desta rota. - .TP - .B irtt - RTT (Tempo de Ida e Volta) Inicial. O kernel usa isto para inferir os melhores --parmetros do protocolo TCP sem esperar por respostas (possivelmente lentas). -+parâmetros do protocolo TCP sem esperar por respostas (possivelmente lentas). - .LP - .SH ARQUIVOS - .I /proc/net/route -@@ -311,17 +311,17 @@ par - .br - .I /etc/init.d/network - .LP --.SH VEJA TAMBM -+.SH VEJA TAMBÉM - .I ifconfig(8), netstat(8), arp(8) - .LP --.SH HISTRICO -+.SH HISTÓRICO - .B Route - para o linux foi originalmente escrito por Fred N. van Kempen, - <waltje@uwalt.nl.mugnet.org> e depois modificado por Johannes Stille e --Linus Torvalds para a verso pl15. Alan Cox adicionou as opes para -+Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para - mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o - netstat) foi feito por Bernd Eckenfels. --.SH TRADUO -+.SH TRADUÇÃO - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998 - .SH BUGS - nenhum :) -diff --git a/mii-tool.c b/mii-tool.c -index ef2d48a..1cfecc2 100644 ---- a/mii-tool.c -+++ b/mii-tool.c -@@ -29,8 +29,6 @@ - http://www.national.com/pf/DP/DP83840.html - */ - --static char version[] = --"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n"; - - #include <unistd.h> - #include <stdlib.h> -@@ -46,16 +44,25 @@ static char version[] = - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <net/if.h> -+#include <linux/sockios.h> -+ - #ifndef __GLIBC__ - #include <linux/if_arp.h> - #include <linux/if_ether.h> - #endif --#include "mii.h" -+#include <linux/mii.h> -+#include <linux/sockios.h> -+#include "version.h" -+#include "net-support.h" -+#include "util.h" -+ -+static char *Release = RELEASE, *Signature = "David Hinds based on Donald Becker's mii-diag"; - - #define MAX_ETH 8 /* Maximum # of interfaces */ -+#define LPA_ABILITY_MASK 0x07e0 - - /* Table of known MII's */ --static struct { -+static const struct { - u_short id1, id2; - char *name; - } mii_id[] = { -@@ -64,16 +71,25 @@ static struct { - { 0x0000, 0x6b90, "AMD 79C901A HomePNA" }, - { 0x0000, 0x6b70, "AMD 79C901A 10baseT" }, - { 0x0181, 0xb800, "Davicom DM9101" }, -- { 0x0043, 0x7411, "Enable EL40-331" }, -+ { 0x0043, 0x7410, "Enable EL40-331" }, -+ { 0x0243, 0x0c50, "ICPlus IP101A" }, - { 0x0015, 0xf410, "ICS 1889" }, - { 0x0015, 0xf420, "ICS 1890" }, - { 0x0015, 0xf430, "ICS 1892" }, - { 0x02a8, 0x0150, "Intel 82555" }, - { 0x7810, 0x0000, "Level One LXT970/971" }, -+ { 0x0022, 0x1510, "Micrel KSZ8041" }, -+ { 0x0022, 0x1610, "Micrel KSZ9021" }, - { 0x2000, 0x5c00, "National DP83840A" }, -+ { 0x2000, 0x5c70, "National DP83865" }, - { 0x0181, 0x4410, "Quality QS6612" }, - { 0x0282, 0x1c50, "SMSC 83C180" }, -+ { 0x0203, 0x8460, "STMicroelectronics ST802RT" }, -+ { 0x1c04, 0x0010, "STMicroelectronics STE100P" }, - { 0x0300, 0xe540, "TDK 78Q2120" }, -+ { 0x0141, 0x0c20, "Yukon 88E1011" }, -+ { 0x0141, 0x0cc0, "Yukon-EC 88E1111" }, -+ { 0x0141, 0x0c90, "Yukon-2 88E1112" }, - }; - #define NMII (sizeof(mii_id)/sizeof(mii_id[0])) - -@@ -81,10 +97,10 @@ static struct { - - struct option longopts[] = { - /* { name has_arg *flag val } */ -- {"advertise", 1, 0, 'A'}, /* Change capabilities advertised. */ -- {"force", 1, 0, 'F'}, /* Change capabilities advertised. */ -+ {"advertise", 1, 0, 'A'}, /* Advertise only specified media. */ -+ {"force", 1, 0, 'F'}, /* Force specified media technology. */ - {"phy", 1, 0, 'p'}, /* Set PHY (MII address) to report. */ -- {"log", 0, 0, 'l'}, /* Set PHY (MII address) to report. */ -+ {"log", 0, 0, 'l'}, /* With --watch, write events to syslog. */ - {"restart", 0, 0, 'r'}, /* Restart link negotiation */ - {"reset", 0, 0, 'R'}, /* Reset the transceiver. */ - {"verbose", 0, 0, 'v'}, /* Report each action taken. */ -@@ -112,7 +128,7 @@ static struct ifreq ifr; - - static int mdio_read(int skfd, int location) - { -- struct mii_data *mii = (struct mii_data *)&ifr.ifr_data; -+ struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data; - mii->reg_num = location; - if (ioctl(skfd, SIOCGMIIREG, &ifr) < 0) { - fprintf(stderr, "SIOCGMIIREG on %s failed: %s\n", ifr.ifr_name, -@@ -124,7 +140,7 @@ static int mdio_read(int skfd, int location) - - static void mdio_write(int skfd, int location, int value) - { -- struct mii_data *mii = (struct mii_data *)&ifr.ifr_data; -+ struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data; - mii->reg_num = location; - mii->val_in = value; - if (ioctl(skfd, SIOCSMIIREG, &ifr) < 0) { -@@ -137,40 +153,48 @@ static void mdio_write(int skfd, int location, int value) - - const struct { - char *name; -- u_short value; -+ u_short value[2]; - } media[] = { - /* The order through 100baseT4 matches bits in the BMSR */ -- { "10baseT-HD", MII_AN_10BASET_HD }, -- { "10baseT-FD", MII_AN_10BASET_FD }, -- { "100baseTx-HD", MII_AN_100BASETX_HD }, -- { "100baseTx-FD", MII_AN_100BASETX_FD }, -- { "100baseT4", MII_AN_100BASET4 }, -- { "100baseTx", MII_AN_100BASETX_FD | MII_AN_100BASETX_HD }, -- { "10baseT", MII_AN_10BASET_FD | MII_AN_10BASET_HD }, -+ { "10baseT-HD", {LPA_10HALF} }, -+ { "10baseT-FD", {LPA_10FULL} }, -+ { "100baseTx-HD", {LPA_100HALF} }, -+ { "100baseTx-FD", {LPA_100FULL} }, -+ { "100baseT4", {LPA_100BASE4} }, -+ { "100baseTx", {LPA_100FULL | LPA_100HALF} }, -+ { "10baseT", {LPA_10FULL | LPA_10HALF} }, -+ -+ { "1000baseT-HD", {0, ADVERTISE_1000HALF} }, -+ { "1000baseT-FD", {0, ADVERTISE_1000FULL} }, -+ { "1000baseT", {0, ADVERTISE_1000HALF|ADVERTISE_1000FULL} }, - }; - #define NMEDIA (sizeof(media)/sizeof(media[0])) -- -+ - /* Parse an argument list of media types */ --static int parse_media(char *arg) -+static int parse_media(char *arg, unsigned *bmcr2) - { - int mask, i; - char *s; - mask = strtoul(arg, &s, 16); - if ((*arg != '\0') && (*s == '\0')) { -- if ((mask & MII_AN_ABILITY_MASK) && -- !(mask & ~MII_AN_ABILITY_MASK)) -- return mask; -+ if ((mask & LPA_ABILITY_MASK) && -+ !(mask & ~LPA_ABILITY_MASK)) { -+ *bmcr2 = 0; -+ return mask; -+ } - goto failed; -- } else { -- mask = 0; -- s = strtok(arg, ", "); -- do { -+ } -+ mask = 0; -+ *bmcr2 = 0; -+ s = strtok(arg, ", "); -+ do { - for (i = 0; i < NMEDIA; i++) -- if (strcasecmp(media[i].name, s) == 0) break; -+ if (s && strcasecmp(media[i].name, s) == 0) break; - if (i == NMEDIA) goto failed; -- mask |= media[i].value; -- } while ((s = strtok(NULL, ", ")) != NULL); -- } -+ mask |= media[i].value[0]; -+ *bmcr2 |= media[i].value[1]; -+ } while ((s = strtok(NULL, ", ")) != NULL); -+ - return mask; - failed: - fprintf(stderr, "Invalid media specification '%s'.\n", arg); -@@ -179,11 +203,25 @@ failed: - - /*--------------------------------------------------------------------*/ - --static char *media_list(int mask, int best) -+static const char *media_list(unsigned mask, unsigned mask2, int best) - { - static char buf[100]; - int i; - *buf = '\0'; -+ -+ if (mask & BMCR_SPEED1000) { -+ if (mask2 & ADVERTISE_1000HALF) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-HD"); -+ if (best) goto out; -+ } -+ if (mask2 & ADVERTISE_1000FULL) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-FD"); -+ if (best) goto out; -+ } -+ } -+ - mask >>= 5; - for (i = 4; i >= 0; i--) { - if (mask & (1<<i)) { -@@ -192,6 +230,7 @@ static char *media_list(int mask, int best) - if (best) break; - } - } -+ out: - if (mask & (1<<5)) - strcat(buf, " flow-control"); - return buf; -@@ -199,49 +238,82 @@ static char *media_list(int mask, int best) - - int show_basic_mii(int sock, int phy_id) - { -- char buf[100]; -+ char buf[200]; - int i, mii_val[32]; -- int bmcr, bmsr, advert, lkpar; -+ unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2; - - /* Some bits in the BMSR are latched, but we can't rely on being - the only reader, so only the current values are meaningful */ - mdio_read(sock, MII_BMSR); -- for (i = 0; i < ((verbose > 1) ? 32 : 8); i++) -- mii_val[i] = mdio_read(sock, i); -+ for (i = 0; i < ((verbose > 1) ? 32 : (MII_STAT1000+1)); i++) -+ switch (i & 0x1F) { -+ case MII_BMCR: -+ case MII_BMSR: -+ case MII_PHYSID1: -+ case MII_PHYSID2: -+ case MII_ADVERTISE: -+ case MII_LPA: -+ case MII_EXPANSION: -+ case MII_CTRL1000: -+ case MII_STAT1000: -+ case MII_ESTATUS: -+ case MII_DCOUNTER: -+ case MII_FCSCOUNTER: -+ case MII_NWAYTEST: -+ case MII_RERRCOUNTER: -+ case MII_SREVISION: -+ case MII_RESV1: -+ case MII_LBRERROR: -+ case MII_PHYADDR: -+ case MII_RESV2: -+ case MII_TPISTATUS: -+ case MII_NCONFIG: -+ mii_val[i] = mdio_read(sock, i); -+ break; -+ default: -+ if (verbose > 2) -+ mii_val[i] = mdio_read(sock, i); -+ else -+ mii_val[i] = 0; -+ break; -+ } - -- if (mii_val[MII_BMCR] == 0xffff) { -+ if (mii_val[MII_BMCR] == 0xffff || mii_val[MII_BMSR] == 0x0000) { - fprintf(stderr, " No MII transceiver present!.\n"); - return -1; - } - - /* Descriptive rename. */ - bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR]; -- advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR]; -+ advert = mii_val[MII_ADVERTISE]; lkpar = mii_val[MII_LPA]; -+ bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000]; - - sprintf(buf, "%s: ", ifr.ifr_name); -- if (bmcr & MII_BMCR_AN_ENA) { -- if (bmsr & MII_BMSR_AN_COMPLETE) { -+ if (bmcr & BMCR_ANENABLE) { -+ if (bmsr & BMSR_ANEGCOMPLETE) { - if (advert & lkpar) { -- strcat(buf, (lkpar & MII_AN_ACK) ? -+ strcat(buf, (lkpar & LPA_LPACK) ? - "negotiated" : "no autonegotiation,"); -- strcat(buf, media_list(advert & lkpar, 1)); -+ strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1)); - strcat(buf, ", "); - } else { - strcat(buf, "autonegotiation failed, "); - } -- } else if (bmcr & MII_BMCR_RESTART) { -+ } else if (bmcr & BMCR_ANRESTART) { - strcat(buf, "autonegotiation restarted, "); - } - } else { - sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ", -- (bmcr & MII_BMCR_100MBIT) ? "100" : "10", -- (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); -+ ((bmcr2 & (ADVERTISE_1000HALF | ADVERTISE_1000FULL)) & lpa2 >> 2) -+ ? "1000" -+ : (bmcr & BMCR_SPEED100) ? "100" : "10", -+ (bmcr & BMCR_FULLDPLX) ? "full" : "half"); - } -- strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); -+ strcat(buf, (bmsr & BMSR_LSTATUS) ? "link ok" : "no link"); - - if (opt_watch) { - if (opt_log) { -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - } else { - char s[20]; - time_t t = time(NULL); -@@ -273,35 +345,36 @@ int show_basic_mii(int sock, int phy_id) - ((mii_val[2]<<6)|(mii_val[3]>>10))&0xff, - (mii_val[3]>>4)&0x3f, mii_val[3]&0x0f); - printf(" basic mode: "); -- if (bmcr & MII_BMCR_RESET) -+ if (bmcr & BMCR_RESET) - printf("software reset, "); -- if (bmcr & MII_BMCR_LOOPBACK) -+ if (bmcr & BMCR_LOOPBACK) - printf("loopback, "); -- if (bmcr & MII_BMCR_ISOLATE) -+ if (bmcr & BMCR_ISOLATE) - printf("isolate, "); -- if (bmcr & MII_BMCR_COLTEST) -+ if (bmcr & BMCR_CTST) - printf("collision test, "); -- if (bmcr & MII_BMCR_AN_ENA) { -+ if (bmcr & BMCR_ANENABLE) { - printf("autonegotiation enabled\n"); - } else { - printf("%s Mbit, %s duplex\n", -- (bmcr & MII_BMCR_100MBIT) ? "100" : "10", -- (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); -+ (bmcr & BMCR_SPEED100) ? "100" : "10", -+ (bmcr & BMCR_FULLDPLX) ? "full" : "half"); - } - printf(" basic status: "); -- if (bmsr & MII_BMSR_AN_COMPLETE) -+ if (bmsr & BMSR_ANEGCOMPLETE) - printf("autonegotiation complete, "); -- else if (bmcr & MII_BMCR_RESTART) -+ else if (bmcr & BMCR_ANRESTART) - printf("autonegotiation restarted, "); -- if (bmsr & MII_BMSR_REMOTE_FAULT) -+ if (bmsr & BMSR_RFAULT) - printf("remote fault, "); -- printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); -- printf("\n capabilities:%s", media_list(bmsr >> 6, 0)); -- printf("\n advertising: %s", media_list(advert, 0)); -- if (lkpar & MII_AN_ABILITY_MASK) -- printf("\n link partner:%s", media_list(lkpar, 0)); -+ printf((bmsr & BMSR_LSTATUS) ? "link ok" : "no link"); -+ printf("\n capabilities:%s", media_list(bmsr >> 6, bmcr2, 0)); -+ printf("\n advertising: %s", media_list(advert, bmcr2, 0)); -+ if (lkpar & LPA_ABILITY_MASK) -+ printf("\n link partner:%s", media_list(lkpar, lpa2 >> 2, 0)); - printf("\n"); - } -+ fflush(stdout); - return 0; - } - -@@ -309,10 +382,10 @@ int show_basic_mii(int sock, int phy_id) - - static int do_one_xcvr(int skfd, char *ifname, int maybe) - { -- struct mii_data *mii = (struct mii_data *)&ifr.ifr_data; -+ struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data; - - /* Get the vitals from the interface. */ -- strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(skfd, SIOCGMIIPHY, &ifr) < 0) { - if (!maybe || (errno != ENODEV)) - fprintf(stderr, "SIOCGMIIPHY on '%s' failed: %s\n", -@@ -327,23 +400,23 @@ static int do_one_xcvr(int skfd, char *ifname, int maybe) - - if (opt_reset) { - printf("resetting the transceiver...\n"); -- mdio_write(skfd, MII_BMCR, MII_BMCR_RESET); -+ mdio_write(skfd, MII_BMCR, BMCR_RESET); - } -- if (nway_advertise) { -- mdio_write(skfd, MII_ANAR, nway_advertise | 1); -+ if (nway_advertise > 0) { -+ mdio_write(skfd, MII_ADVERTISE, nway_advertise | 1); - opt_restart = 1; - } - if (opt_restart) { - printf("restarting autonegotiation...\n"); - mdio_write(skfd, MII_BMCR, 0x0000); -- mdio_write(skfd, MII_BMCR, MII_BMCR_AN_ENA|MII_BMCR_RESTART); -+ mdio_write(skfd, MII_BMCR, BMCR_ANENABLE|BMCR_ANRESTART); - } - if (fixed_speed) { - int bmcr = 0; -- if (fixed_speed & (MII_AN_100BASETX_FD|MII_AN_100BASETX_HD)) -- bmcr |= MII_BMCR_100MBIT; -- if (fixed_speed & (MII_AN_100BASETX_FD|MII_AN_10BASET_FD)) -- bmcr |= MII_BMCR_DUPLEX; -+ if (fixed_speed & (LPA_100FULL|LPA_100HALF)) -+ bmcr |= BMCR_SPEED100; -+ if (fixed_speed & (LPA_100FULL|LPA_10FULL)) -+ bmcr |= BMCR_FULLDPLX; - mdio_write(skfd, MII_BMCR, bmcr); - } - -@@ -357,12 +430,12 @@ static int do_one_xcvr(int skfd, char *ifname, int maybe) - - static void watch_one_xcvr(int skfd, char *ifname, int index) - { -- struct mii_data *mii = (struct mii_data *)&ifr.ifr_data; -+ struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data; - static int status[MAX_ETH] = { 0, /* ... */ }; - int now; - - /* Get the vitals from the interface. */ -- strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(skfd, SIOCGMIIPHY, &ifr) < 0) { - if (errno != ENODEV) - fprintf(stderr, "SIOCGMIIPHY on '%s' failed: %s\n", -@@ -379,27 +452,38 @@ static void watch_one_xcvr(int skfd, char *ifname, int index) - /*--------------------------------------------------------------------*/ - - const char *usage = --"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] -- -V, --version display version information -- -v, --verbose more verbose output -- -R, --reset reset MII to poweron state -- -r, --restart restart autonegotiation -- -w, --watch monitor for link status changes -- -l, --log with -w, write events to syslog -- -A, --advertise=media,... advertise only specified media -- -F, --force=media force specified media technology --media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, -- (to advertise both HD and FD) 100baseTx, 10baseT\n"; -+"usage: %s [-VvRrwl] [-A media,... | -F media] [-p addr] <interface ...>\n" -+" -V, --version display version information\n" -+" -v, --verbose more verbose output\n" -+" -R, --reset reset MII to poweron state\n" -+" -r, --restart restart autonegotiation\n" -+" -w, --watch monitor for link status changes\n" -+" -l, --log with -w, write events to syslog\n" -+" -A, --advertise=media,... advertise only specified media\n" -+" -F, --force=media force specified media technology\n" -+" -p, --phy=addr set PHY (MII address) to report\n" -+"media: 1000baseTx-HD, 1000baseTx-FD,\n" -+" 100baseT4, 100baseTx-FD, 100baseTx-HD,\n" -+" 10baseT-FD, 10baseT-HD,\n" -+" (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n"; -+ -+ -+static void version(void) -+{ -+ fprintf(stderr, "%s\n%s\n", Release, Signature); -+ exit(E_VERSION); -+} -+ - - int main(int argc, char **argv) - { - int i, c, ret, errflag = 0; -- char s[6]; -- -+ unsigned ctrl1000 = 0; -+ - while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF) - switch (c) { -- case 'A': nway_advertise = parse_media(optarg); break; -- case 'F': fixed_speed = parse_media(optarg); break; -+ case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break; -+ case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break; - case 'p': override_phy = atoi(optarg); break; - case 'r': opt_restart++; break; - case 'R': opt_reset++; break; -@@ -411,6 +495,10 @@ int main(int argc, char **argv) - } - /* Check for a few inappropriate option combinations */ - if (opt_watch) verbose = 0; -+ -+ if ((nway_advertise < 0) || (fixed_speed < 0)) -+ return 2; -+ - if (errflag || (fixed_speed & (fixed_speed-1)) || - (fixed_speed && (opt_restart || nway_advertise))) { - fprintf(stderr, usage, argv[0]); -@@ -418,7 +506,7 @@ int main(int argc, char **argv) - } - - if (opt_version) -- printf(version); -+ version(); - - /* Open a basic socket. */ - if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { -@@ -426,15 +514,15 @@ int main(int argc, char **argv) - exit(-1); - } - -+ if (verbose > 1) -+ printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY); -+ - /* No remaining args means show all interfaces. */ - if (optind == argc) { -- ret = 1; -- for (i = 0; i < MAX_ETH; i++) { -- sprintf(s, "eth%d", i); -- ret &= do_one_xcvr(skfd, s, 1); -- } -- if (ret) -- fprintf(stderr, "no MII interfaces found\n"); -+ fprintf(stderr, "No interface specified\n"); -+ fprintf(stderr, usage, argv[0]); -+ close(skfd); -+ return 2; - } else { - ret = 0; - for (i = optind; i < argc; i++) { -@@ -445,15 +533,8 @@ int main(int argc, char **argv) - if (opt_watch && (ret == 0)) { - while (1) { - sleep(1); -- if (optind == argc) { -- for (i = 0; i < MAX_ETH; i++) { -- sprintf(s, "eth%d", i); -- watch_one_xcvr(skfd, s, i); -- } -- } else { -- for (i = optind; i < argc; i++) -+ for (i = optind; i < argc; i++) - watch_one_xcvr(skfd, argv[i], i-optind); -- } - } - } - -diff --git a/nameif.c b/nameif.c -index 8d79b50..b280e59 100644 ---- a/nameif.c -+++ b/nameif.c -@@ -1,11 +1,11 @@ --/* -+/* - * Name Interfaces based on MAC address. - * Writen 2000 by Andi Kleen. -- * Subject to the Gnu Public License, version 2. -+ * Subject to the Gnu Public License, version 2. - * TODO: make it support token ring etc. -- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $ -- */ --#ifndef _GNU_SOURCE -+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $ -+ */ -+#ifndef _GNU_SOURCE - #define _GNU_SOURCE - #endif - #include <stdio.h> -@@ -21,73 +21,68 @@ - #include <net/if.h> - #include <linux/sockios.h> - #include <errno.h> --#include "intl.h" -- --const char default_conf[] = "/etc/mactab"; --const char *fname = default_conf; --int use_syslog; --int ctl_sk = -1; -- --void err(char *msg) --{ -- if (use_syslog) { -- syslog(LOG_ERR,"%s: %m", msg); -- } else { -- perror(msg); -- } -- exit(1); -+#include "intl.h" -+#include "net-support.h" -+#include "util.h" -+ -+const char default_conf[] = "/etc/mactab"; -+const char *fname = default_conf; -+int use_syslog; -+int ctl_sk = -1; -+ -+void err(char *msg) -+{ -+ if (use_syslog) { -+ syslog(LOG_ERR,"%s: %m", msg); -+ } else { -+ perror(msg); -+ } -+ exit(1); - } - --void complain(char *fmt, ...) --{ -+void complain(char *fmt, ...) -+{ - va_list ap; - va_start(ap,fmt); -- if (use_syslog) { -+ if (use_syslog) { - vsyslog(LOG_ERR,fmt,ap); - } else { - vfprintf(stderr,fmt,ap); -- fputc('\n',stderr); -+ fputc('\n',stderr); - } -- va_end(ap); -+ va_end(ap); - exit(1); --} -+} - --void warning(char *fmt, ...) --{ -+void warning(char *fmt, ...) -+{ - va_list ap; - va_start(ap,fmt); -- if (use_syslog) { -+ if (use_syslog) { - vsyslog(LOG_ERR,fmt,ap); - } else { - vfprintf(stderr,fmt,ap); -- fputc('\n',stderr); -+ fputc('\n',stderr); - } -- va_end(ap); --} -+ va_end(ap); -+} - - int parsemac(char *str, unsigned char *mac) --{ -- char *s; -- while ((s = strsep(&str, ":")) != NULL) { -+{ -+ char *s; -+ while ((s = strsep(&str, ":")) != NULL) { - unsigned byte; -- if (sscanf(s,"%x", &byte)!=1 || byte > 0xff) -+ if (sscanf(s,"%x", &byte)!=1 || byte > 0xff) - return -1; -- *mac++ = byte; -- } -+ *mac++ = byte; -+ } - return 0; --} -- --void *xmalloc(unsigned sz) --{ -- void *p = calloc(sz,1); -- if (!p) errno=ENOMEM, err("xmalloc"); -- return p; --} -+} - - void opensock(void) - { -- if (ctl_sk < 0) -- ctl_sk = socket(PF_INET,SOCK_DGRAM,0); -+ if (ctl_sk < 0) -+ ctl_sk = socket(PF_INET,SOCK_DGRAM,0); - } - - #ifndef ifr_newname -@@ -97,10 +92,10 @@ void opensock(void) - int setname(char *oldname, char *newname) - { - struct ifreq ifr; -- opensock(); -+ opensock(); - memset(&ifr,0,sizeof(struct ifreq)); -- strcpy(ifr.ifr_name, oldname); -- strcpy(ifr.ifr_newname, newname); -+ safe_strncpy(ifr.ifr_name, oldname, IFNAMSIZ); -+ safe_strncpy(ifr.ifr_newname, newname, IFNAMSIZ); - return ioctl(ctl_sk, SIOCSIFNAME, &ifr); - } - -@@ -108,118 +103,118 @@ int getmac(char *name, unsigned char *mac) - { - int r; - struct ifreq ifr; -- opensock(); -+ opensock(); - memset(&ifr,0,sizeof(struct ifreq)); -- strcpy(ifr.ifr_name, name); -+ safe_strncpy(ifr.ifr_name, name, IFNAMSIZ); - r = ioctl(ctl_sk, SIOCGIFHWADDR, &ifr); -- memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); -- return r; -+ memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); -+ return r; - } - --struct change { -- struct change *next,**pprev; -+struct change { -+ struct change *next; -+ int found; - char ifname[IFNAMSIZ+1]; - unsigned char mac[6]; --}; -+}; - struct change *clist; - --struct change *lookupmac(unsigned char *mac) --{ -+struct change *lookupmac(unsigned char *mac) -+{ - struct change *ch; -- for (ch = clist;ch;ch = ch->next) -+ for (ch = clist;ch;ch = ch->next) - if (!memcmp(ch->mac, mac, 6)) - return ch; -- return NULL; --} -+ return NULL; -+} - - int addchange(char *p, struct change *ch, char *pos) - { - if (strchr(ch->ifname, ':')) -- warning(_("alias device %s at %s probably has no mac"), -- ch->ifname, pos); -- if (parsemac(p,ch->mac) < 0) -- complain(_("cannot parse MAC `%s' at %s"), p, pos); -- if (clist) -- clist->pprev = &ch->next; -+ warning(_("alias device %s at %s probably has no mac"), -+ ch->ifname, pos); -+ if (parsemac(p,ch->mac) < 0) -+ complain(_("cannot parse MAC `%s' at %s"), p, pos); - ch->next = clist; -- ch->pprev = &clist; - clist = ch; -- return 0; -+ return 0; - } - - void readconf(void) - { -- char *line; -- size_t linel; -- int linenum; -+ char *line; -+ size_t linel; -+ int linenum; - FILE *ifh; - char *p; - int n; -+ struct change *ch = NULL; - - ifh = fopen(fname, "r"); -- if (!ifh) -- complain(_("opening configuration file %s: %s"),fname,strerror(errno)); -+ if (!ifh) -+ complain(_("opening configuration file %s: %s"),fname,strerror(errno)); - -- line = NULL; -+ line = NULL; - linel = 0; -- linenum = 1; -+ linenum = 1; - while (getdelim(&line, &linel, '\n', ifh) > 0) { -- struct change *ch = xmalloc(sizeof(struct change)); -- char pos[20]; -+ char pos[20]; - -- sprintf(pos, _("line %d"), linenum); -+ sprintf(pos, _("line %d"), linenum); - - if ((p = strchr(line,'#')) != NULL) - *p = '\0'; -- p = line; -+ p = line; - while (isspace(*p)) -- ++p; -+ ++p; - if (*p == '\0') -- continue; -- n = strcspn(p, " \t"); -- if (n > IFNAMSIZ) -- complain(_("interface name too long at line %d"), line); -- memcpy(ch->ifname, p, n); -- ch->ifname[n] = 0; -- p += n; -- p += strspn(p, " \t"); -- n = strspn(p, "0123456789ABCDEFabcdef:"); -- p[n] = 0; -+ continue; -+ n = strcspn(p, " \t"); -+ if (n > IFNAMSIZ-1) -+ complain(_("interface name too long at line %d"), line); -+ ch = xmalloc(sizeof(struct change)); -+ memcpy(ch->ifname, p, n); -+ ch->ifname[n] = 0; -+ p += n; -+ p += strspn(p, " \t"); -+ n = strspn(p, "0123456789ABCDEFabcdef:"); -+ p[n] = 0; - addchange(p, ch, pos); - linenum++; -- } -- fclose(ifh); -+ } -+ fclose(ifh); - } - --struct option lopt[] = { -+struct option lopt[] = { - {"syslog", 0, NULL, 's' }, - {"config-file", 1, NULL, 'c' }, -- {"help", 0, NULL, '?' }, -- {NULL}, --}; -+ {"help", 0, NULL, '?' }, -+ {NULL}, -+}; - - void usage(void) - { -- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); -- exit(1); -+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); -+ exit(E_USAGE); - } - --int main(int ac, char **av) --{ -- FILE *ifh; -+int main(int ac, char **av) -+{ -+ FILE *ifh; - char *p; - int n; -- int linenum; -+ int linenum; - char *line = NULL; - size_t linel = 0; -+ int ret = 0; - - for (;;) { - int c = getopt_long(ac,av,"c:s",lopt,NULL); - if (c == -1) break; -- switch (c) { -+ switch (c) { - default: - case '?': -- usage(); -+ usage(); - case 'c': - fname = optarg; - break; -@@ -229,74 +224,76 @@ int main(int ac, char **av) - } - } - -- if (use_syslog) -+ if (use_syslog) - openlog("nameif",0,LOG_LOCAL0); -- -- while (optind < ac) { -- struct change *ch = xmalloc(sizeof(struct change)); -+ -+ while (optind < ac) { -+ struct change *ch = xmalloc(sizeof(struct change)); - char pos[30]; - -- if ((ac-optind) & 1) -+ if ((ac-optind) & 1) - usage(); -- if (strlen(av[optind])+1>IFNAMSIZ) -+ if (strlen(av[optind])+1>IFNAMSIZ) - complain(_("interface name `%s' too long"), av[optind]); -- strcpy(ch->ifname, av[optind]); -- optind++; -- sprintf(pos,_("argument %d"),optind); -- addchange(av[optind], ch, pos); -- optind++; -- } -+ safe_strncpy(ch->ifname, av[optind], sizeof(ch->ifname)); -+ optind++; -+ sprintf(pos,_("argument %d"),optind); -+ addchange(av[optind], ch, pos); -+ optind++; -+ } - -- if (!clist || fname != default_conf) -- readconf(); -+ if (!clist || fname != default_conf) -+ readconf(); - -- ifh = fopen("/proc/net/dev", "r"); -- if (!ifh) complain(_("open of /proc/net/dev: %s"), strerror(errno)); -+ ifh = fopen("/proc/net/dev", "r"); -+ if (!ifh) complain(_("open of /proc/net/dev: %s"), strerror(errno)); - - - linenum = 0; - while (getdelim(&line, &linel, '\n', ifh) > 0) { -- struct change *ch; -+ struct change *ch; - unsigned char mac[6]; - -- if (linenum++ < 2) -+ if (linenum++ < 2) - continue; -- -- p = line; -- while (isspace(*p)) -+ -+ p = line; -+ while (isspace(*p)) - ++p; -- n = strcspn(p, ": \t"); -- p[n] = 0; -- -- if (n > IFNAMSIZ-1) -- complain(_("interface name `%s' too long"), p); -- -- if (getmac(p, mac) < 0) -+ n = strcspn(p, ": \t"); -+ p[n] = 0; -+ -+ if (n > IFNAMSIZ-1) -+ complain(_("interface name `%s' too long"), p); -+ -+ if (getmac(p, mac) < 0) - continue; -- -- ch = lookupmac(mac); -- if (!ch) -+ -+ ch = lookupmac(mac); -+ if (!ch) - continue; -- -- *ch->pprev = ch->next; -- if (strcmp(p, ch->ifname)) { -- if (setname(p, ch->ifname) < 0) -+ -+ ch->found = 1; -+ if (strcmp(p, ch->ifname)) { -+ if (setname(p, ch->ifname) < 0) - complain(_("cannot change name of %s to %s: %s"), -- p, ch->ifname, strerror(errno)); -- } -- free(ch); -- } -- fclose(ifh); -- -- while (clist) { -+ p, ch->ifname, strerror(errno)); -+ } -+ } -+ fclose(ifh); -+ -+ while (clist) { - struct change *ch = clist; - clist = clist->next; -- warning(_("interface '%s' not found"), ch->ifname); -- free(ch); -+ if (!ch->found){ -+ warning(_("interface '%s' not found"), ch->ifname); -+ ret = 1; -+ } -+ free(ch); - } - - if (use_syslog) - closelog(); -- return 0; --} -+ return ret; -+} - -diff --git a/netstat.c b/netstat.c -index 1ef790e..d0c364f 100644 ---- a/netstat.c -+++ b/netstat.c -@@ -6,7 +6,7 @@ - * NET-3 Networking Distribution for the LINUX operating - * system. - * -- * Version: $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $ -+ * Version: $Id: netstat.c,v 1.73 2011-04-20 01:35:22 ecki Exp $ - * - * Authors: Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de> - * Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> -@@ -23,24 +23,24 @@ - * Modified: - * - *960116 {1.01} Bernd Eckenfels: verbose, cleanups -- *960204 {1.10} Bernd Eckenfels: aftrans, usage, new route_info, -+ *960204 {1.10} Bernd Eckenfels: aftrans, usage, new route_info, - * DLFT_AF - *960204 {1.11} Bernd Eckenfels: netlink support - *960204 {1.12} Bernd Eckenfels: route_init() - *960215 {1.13} Bernd Eckenfels: netlink_print honors HAVE_ -- *960217 {1.14} Bernd Eckenfels: masq_info from Jos Vos and -+ *960217 {1.14} Bernd Eckenfels: masq_info from Jos Vos and - * ax25_info from Jonathan Naylor. - *960218 {1.15} Bernd Eckenfels: ipx_info rewritten, -e for tcp/ipx - *960220 {1.16} Bernd Eckenfels: minor output reformats, -a for -x - *960221 {1.17} Bernd Eckenfels: route_init->getroute_init - *960426 {1.18} Bernd Eckenfels: new RTACTION, SYM/NUM, FIB/CACHE -- *960517 {1.19} Bernd Eckenfels: usage() spelling fix and --unix inode, -+ *960517 {1.19} Bernd Eckenfels: usage() spelling fix and --unix inode, - * ':' is part of sock_addr for --inet - *960822 {x.xx} Frank Strauss: INET6 support - * - *970406 {1.33} Philip Copeland Added snmp reporting support module -s - * code provided by Andi Kleen -- * (relly needs to be kernel hooked but -+ * (relly needs to be kernel hooked but - * this will do in the meantime) - * minor header file misplacement tidy up. - *980815 {1.xx} Stephane Fillod: X.25 support -@@ -58,6 +58,8 @@ - * - *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() - *20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale -+ *20081201 {1.42} Brian Micek added -L|--udplite options for RFC 3828 -+ *20020722 {1.51} Thomas Preusser added SCTP over IPv4 support - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -83,6 +85,7 @@ - #include <arpa/inet.h> - #include <netinet/in.h> - #include <sys/ioctl.h> -+#include <sys/stat.h> - #include <net/if.h> - #include <dirent.h> - -@@ -94,8 +97,18 @@ - #include "sockets.h" - #include "interface.h" - #include "util.h" -+#include "proc.h" -+ -+#if HAVE_SELINUX -+#include <selinux/selinux.h> -+#endif -+ -+#if HAVE_AFBLUETOOTH -+#include <bluetooth/bluetooth.h> -+#endif - - #define PROGNAME_WIDTH 20 -+#define SELINUX_WIDTH 50 - - #if !defined(s6_addr32) && defined(in6a_words) - #define s6_addr32 in6a_words /* libinet6 */ -@@ -104,6 +117,8 @@ - /* prototypes for statistics.c */ - void parsesnmp(int, int, int); - void inittab(void); -+void parsesnmp6(int, int, int); -+void inittab6(void); - - typedef enum { - SS_FREE = 0, /* not allocated */ -@@ -122,7 +137,7 @@ typedef enum { - #define FEATURE_NETSTAT - #include "lib/net-features.h" - --char *Release = RELEASE, *Version = "netstat 1.42 (2001-04-15)", *Signature = "Fred Baumgarten, Alan Cox, Bernd Eckenfels, Phil Blundell, Tuan Hoang and others"; -+static char *Release = RELEASE, *Signature = "Fred Baumgarten, Alan Cox, Bernd Eckenfels, Phil Blundell, Tuan Hoang, Brian Micek and others"; - - - #define E_READ -1 -@@ -142,18 +157,24 @@ int flag_cf = 0; - int flag_opt = 0; - int flag_raw = 0; - int flag_tcp = 0; -+int flag_sctp= 0; - int flag_udp = 0; -+int flag_udplite = 0; - int flag_igmp= 0; - int flag_rom = 0; - int flag_exp = 1; -+int flag_wide= 0; - int flag_prg = 0; - int flag_arg = 0; - int flag_ver = 0; -+int flag_l2cap = 0; -+int flag_rfcomm = 0; -+int flag_selinux = 0; - - FILE *procinfo; - --#define INFO_GUTS1(file,name,proc) \ -- procinfo = fopen((file), "r"); \ -+#define INFO_GUTS1(file,name,proc,prot) \ -+ procinfo = proc_fopen((file)); \ - if (procinfo == NULL) { \ - if (errno != ENOENT) { \ - perror((file)); \ -@@ -166,58 +187,63 @@ FILE *procinfo; - } else { \ - do { \ - if (fgets(buffer, sizeof(buffer), procinfo)) \ -- (proc)(lnr++, buffer); \ -+ (proc)(lnr++, buffer,prot); \ - } while (!feof(procinfo)); \ - fclose(procinfo); \ - } - - #if HAVE_AFINET6 --#define INFO_GUTS2(file,proc) \ -+#define INFO_GUTS2(file,proc,prot) \ - lnr = 0; \ -- procinfo = fopen((file), "r"); \ -+ procinfo = proc_fopen((file)); \ - if (procinfo != NULL) { \ - do { \ - if (fgets(buffer, sizeof(buffer), procinfo)) \ -- (proc)(lnr++, buffer); \ -+ (proc)(lnr++, buffer,prot); \ - } while (!feof(procinfo)); \ - fclose(procinfo); \ - } - #else --#define INFO_GUTS2(file,proc) -+#define INFO_GUTS2(file,proc,prot) - #endif - - #define INFO_GUTS3 \ - return rc; - --#define INFO_GUTS6(file,file6,name,proc) \ -+#define INFO_GUTS6(file,file6,name,proc,prot4,prot6) \ - char buffer[8192]; \ - int rc = 0; \ - int lnr = 0; \ - if (!flag_arg || flag_inet) { \ -- INFO_GUTS1(file,name,proc) \ -+ INFO_GUTS1(file,name,proc,prot4) \ - } \ - if (!flag_arg || flag_inet6) { \ -- INFO_GUTS2(file6,proc) \ -+ INFO_GUTS2(file6,proc,prot6) \ - } \ - INFO_GUTS3 - --#define INFO_GUTS(file,name,proc) \ -+#define INFO_GUTS(file,name,proc,prot) \ - char buffer[8192]; \ - int rc = 0; \ - int lnr = 0; \ -- INFO_GUTS1(file,name,proc) \ -+ INFO_GUTS1(file,name,proc,prot) \ - INFO_GUTS3 - - #define PROGNAME_WIDTHs PROGNAME_WIDTH1(PROGNAME_WIDTH) - #define PROGNAME_WIDTH1(s) PROGNAME_WIDTH2(s) - #define PROGNAME_WIDTH2(s) #s - -+#define SELINUX_WIDTHs SELINUX_WIDTH1(SELINUX_WIDTH) -+#define SELINUX_WIDTH1(s) SELINUX_WIDTH2(s) -+#define SELINUX_WIDTH2(s) #s -+ - #define PRG_HASH_SIZE 211 - - static struct prg_node { - struct prg_node *next; -- int inode; -+ unsigned long inode; - char name[PROGNAME_WIDTH]; -+ char scon[SELINUX_WIDTH]; - } *prg_hash[PRG_HASH_SIZE]; - - static char prg_cache_loaded = 0; -@@ -225,8 +251,11 @@ static char prg_cache_loaded = 0; - #define PRG_HASHIT(x) ((x) % PRG_HASH_SIZE) - - #define PROGNAME_BANNER "PID/Program name" -+#define SELINUX_BANNER "Security Context" -+ -+#define print_progname_banner() do { if (flag_prg) printf(" %-" PROGNAME_WIDTHs "s",PROGNAME_BANNER); } while (0) - --#define print_progname_banner() do { if (flag_prg) printf("%-" PROGNAME_WIDTHs "s"," " PROGNAME_BANNER); } while (0) -+#define print_selinux_banner() do { if (flag_selinux) printf("%-" SELINUX_WIDTHs "s"," " SELINUX_BANNER); } while (0) - - #define PRG_LOCAL_ADDRESS "local_address" - #define PRG_INODE "inode" -@@ -246,40 +275,57 @@ static char prg_cache_loaded = 0; - #define PATH_PROC_X_FD PATH_PROC "/%s/" PATH_FD_SUFF - #define PATH_CMDLINE "cmdline" - #define PATH_CMDLINEl strlen(PATH_CMDLINE) --/* NOT working as of glibc-2.0.7: */ --#undef DIRENT_HAVE_D_TYPE_WORKS - --static void prg_cache_add(int inode, char *name) -+static void prg_cache_add(unsigned long inode, char *name, const char *scon) - { - unsigned hi = PRG_HASHIT(inode); - struct prg_node **pnp,*pn; - -- prg_cache_loaded=2; -- for (pnp=prg_hash+hi;(pn=*pnp);pnp=&pn->next) { -- if (pn->inode==inode) { -+ prg_cache_loaded = 2; -+ for (pnp = prg_hash + hi; (pn = *pnp); pnp = &pn->next) { -+ if (pn->inode == inode) { - /* Some warning should be appropriate here - as we got multiple processes for one i-node */ - return; - } - } -- if (!(*pnp=malloc(sizeof(**pnp)))) -+ if (!(*pnp = malloc(sizeof(**pnp)))) - return; -- pn=*pnp; -- pn->next=NULL; -- pn->inode=inode; -- if (strlen(name)>sizeof(pn->name)-1) -- name[sizeof(pn->name)-1]='\0'; -- strcpy(pn->name,name); -+ pn = *pnp; -+ pn->next = NULL; -+ pn->inode = inode; -+ safe_strncpy(pn->name, name, sizeof(pn->name)); -+ -+ { -+ int len = (strlen(scon) - sizeof(pn->scon)) + 1; -+ if (len > 0) -+ safe_strncpy(pn->scon, &scon[len + 1], sizeof(pn->scon)); -+ else -+ safe_strncpy(pn->scon, scon, sizeof(pn->scon)); -+ } -+ -+} -+ -+static const char *prg_cache_get(unsigned long inode) -+{ -+ unsigned hi = PRG_HASHIT(inode); -+ struct prg_node *pn; -+ -+ for (pn = prg_hash[hi]; pn; pn = pn->next) -+ if (pn->inode == inode) -+ return (pn->name); -+ return ("-"); - } - --static const char *prg_cache_get(int inode) -+static const char *prg_cache_get_con(unsigned long inode) - { -- unsigned hi=PRG_HASHIT(inode); -+ unsigned hi = PRG_HASHIT(inode); - struct prg_node *pn; - -- for (pn=prg_hash[hi];pn;pn=pn->next) -- if (pn->inode==inode) return(pn->name); -- return("-"); -+ for (pn = prg_hash[hi]; pn; pn = pn->next) -+ if (pn->inode == inode) -+ return (pn->scon); -+ return ("-"); - } - - static void prg_cache_clear(void) -@@ -287,143 +333,164 @@ static void prg_cache_clear(void) - struct prg_node **pnp,*pn; - - if (prg_cache_loaded == 2) -- for (pnp=prg_hash;pnp<prg_hash+PRG_HASH_SIZE;pnp++) -- while ((pn=*pnp)) { -- *pnp=pn->next; -+ for (pnp = prg_hash; pnp < prg_hash + PRG_HASH_SIZE; pnp++) -+ while ((pn = *pnp)) { -+ *pnp = pn->next; - free(pn); - } -- prg_cache_loaded=0; -+ prg_cache_loaded = 0; -+} -+ -+static void wait_continous(void) -+{ -+ fflush(stdout); -+ sleep(1); - } - --static void extract_type_1_socket_inode(const char lname[], long * inode_p) { -+static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) { - - /* If lname is of the form "socket:[12345]", extract the "12345" - as *inode_p. Otherwise, return -1 as *inode_p. - */ - -- if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1; -- else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1; -- else if (lname[strlen(lname)-1] != ']') *inode_p = -1; -- else { -+ if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1); -+ -+ if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1); -+ if (lname[strlen(lname)-1] != ']') return(-1); -+ -+ { - char inode_str[strlen(lname + 1)]; /* e.g. "12345" */ - const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1; - char *serr; - - strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len); - inode_str[inode_str_len] = '\0'; -- *inode_p = strtol(inode_str,&serr,0); -- if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) -- *inode_p = -1; -+ *inode_p = strtoul(inode_str, &serr, 0); -+ if (!serr || *serr || *inode_p == ~0) -+ return(-1); - } -+ return(0); - } - - - --static void extract_type_2_socket_inode(const char lname[], long * inode_p) { -+static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) { - - /* If lname is of the form "[0000]:12345", extract the "12345" - as *inode_p. Otherwise, return -1 as *inode_p. - */ - -- if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1; -- else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1; -- else { -+ if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1); -+ if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1); -+ -+ { - char *serr; - -- *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0); -- if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) -- *inode_p = -1; -+ *inode_p = strtoul(lname + PRG_SOCKET_PFX2l, &serr, 0); -+ if (!serr || *serr || *inode_p == ~0) -+ return(-1); - } -+ return(0); - } - - - -+ - static void prg_cache_load(void) - { -- char line[LINE_MAX],eacces=0; -- int procfdlen,fd,cmdllen,lnamelen; -- char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH]; -- long inode; -- const char *cs,*cmdlp; -- DIR *dirproc=NULL,*dirfd=NULL; -- struct dirent *direproc,*direfd; -+ char line[LINE_MAX], eacces=0; -+ int procfdlen, fd, cmdllen, lnamelen; -+ char lname[30], cmdlbuf[512], finbuf[PROGNAME_WIDTH]; -+ unsigned long inode; -+ const char *cs, *cmdlp; -+ DIR *dirproc = NULL, *dirfd = NULL; -+ struct dirent *direproc, *direfd; -+#if HAVE_SELINUX -+ security_context_t scon = NULL; -+#endif - - if (prg_cache_loaded || !flag_prg) return; -- prg_cache_loaded=1; -- cmdlbuf[sizeof(cmdlbuf)-1]='\0'; -+ prg_cache_loaded = 1; -+ cmdlbuf[sizeof(cmdlbuf) - 1] = '\0'; - if (!(dirproc=opendir(PATH_PROC))) goto fail; -- while (errno=0,direproc=readdir(dirproc)) { --#ifdef DIRENT_HAVE_D_TYPE_WORKS -- if (direproc->d_type!=DT_DIR) continue; --#endif -- for (cs=direproc->d_name;*cs;cs++) -- if (!isdigit(*cs)) -+ while (errno = 0, direproc = readdir(dirproc)) { -+ for (cs = direproc->d_name; *cs; cs++) -+ if (!isdigit(*cs)) - break; -- if (*cs) -+ if (*cs) - continue; -- procfdlen=snprintf(line,sizeof(line),PATH_PROC_X_FD,direproc->d_name); -- if (procfdlen<=0 || procfdlen>=sizeof(line)-5) -+ procfdlen = snprintf(line,sizeof(line),PATH_PROC_X_FD,direproc->d_name); -+ if (procfdlen <= 0 || procfdlen >= sizeof(line) - 5) - continue; -- errno=0; -- dirfd=opendir(line); -+ errno = 0; -+ dirfd = opendir(line); - if (! dirfd) { -- if (errno==EACCES) -- eacces=1; -+ if (errno == EACCES) -+ eacces = 1; - continue; - } - line[procfdlen] = '/'; - cmdlp = NULL; - while ((direfd = readdir(dirfd))) { --#ifdef DIRENT_HAVE_D_TYPE_WORKS -- if (direfd->d_type!=DT_LNK) -- continue; --#endif -- if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) -+ /* Skip . and .. */ -+ if (!isdigit(direfd->d_name[0])) -+ continue; -+ if (procfdlen + 1 + strlen(direfd->d_name) + 1 > sizeof(line)) - continue; - memcpy(line + procfdlen - PATH_FD_SUFFl, PATH_FD_SUFF "/", -- PATH_FD_SUFFl+1); -- strcpy(line + procfdlen + 1, direfd->d_name); -- lnamelen=readlink(line,lname,sizeof(lname)-1); -+ PATH_FD_SUFFl + 1); -+ safe_strncpy(line + procfdlen + 1, direfd->d_name, -+ sizeof(line) - procfdlen - 1); -+ lnamelen = readlink(line, lname, sizeof(lname) - 1); -+ if (lnamelen == -1) -+ continue; - lname[lnamelen] = '\0'; /*make it a null-terminated string*/ - -- extract_type_1_socket_inode(lname, &inode); -- -- if (inode < 0) extract_type_2_socket_inode(lname, &inode); -- -- if (inode < 0) continue; -+ if (extract_type_1_socket_inode(lname, &inode) < 0) -+ if (extract_type_2_socket_inode(lname, &inode) < 0) -+ continue; - - if (!cmdlp) { -- if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= -- sizeof(line) - 5) -+ if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= -+ sizeof(line) - 5) - continue; -- strcpy(line + procfdlen-PATH_FD_SUFFl, PATH_CMDLINE); -+ safe_strncpy(line + procfdlen - PATH_FD_SUFFl, PATH_CMDLINE, -+ sizeof(line) - procfdlen + PATH_FD_SUFFl); - fd = open(line, O_RDONLY); -- if (fd < 0) -+ if (fd < 0) - continue; - cmdllen = read(fd, cmdlbuf, sizeof(cmdlbuf) - 1); -- if (close(fd)) -+ if (close(fd)) - continue; -- if (cmdllen == -1) -+ if (cmdllen == -1) - continue; -- if (cmdllen < sizeof(cmdlbuf) - 1) -+ if (cmdllen < sizeof(cmdlbuf) - 1) - cmdlbuf[cmdllen]='\0'; -- if ((cmdlp = strrchr(cmdlbuf, '/'))) -+ if (cmdlbuf[0] == '/' && (cmdlp = strrchr(cmdlbuf, '/'))) - cmdlp++; -- else -+ else - cmdlp = cmdlbuf; - } - - snprintf(finbuf, sizeof(finbuf), "%s/%s", direproc->d_name, cmdlp); -- prg_cache_add(inode, finbuf); -+#if HAVE_SELINUX -+ if (getpidcon(atoi(direproc->d_name), &scon) == -1) { -+ scon=xstrdup("-"); -+ } -+ prg_cache_add(inode, finbuf, scon); -+ freecon(scon); -+#else -+ prg_cache_add(inode, finbuf, "-"); -+#endif - } -- closedir(dirfd); -+ closedir(dirfd); - dirfd = NULL; - } -- if (dirproc) -+ if (dirproc) - closedir(dirproc); -- if (dirfd) -+ if (dirfd) - closedir(dirfd); -- if (!eacces) -+ if (!eacces) - return; - if (prg_cache_loaded == 1) { - fail: -@@ -450,7 +517,7 @@ static int netrom_info(void) - char buffer[256], dev[16]; - int st, vs, vr, sendq, recvq, ret; - -- f = fopen(_PATH_PROCNET_NR, "r"); -+ f = proc_fopen(_PATH_PROCNET_NR); - if (f == NULL) { - if (errno != ENOENT) { - perror(_PATH_PROCNET_NR); -@@ -465,7 +532,8 @@ static int netrom_info(void) - } - printf(_("Active NET/ROM sockets\n")); - printf(_("User Dest Source Device State Vr/Vs Send-Q Recv-Q\n")); -- fgets(buffer, 256, f); -+ if (fgets(buffer, 256, f)) -+ /* eat line */; - - while (fgets(buffer, 256, f)) { - buffer[9] = 0; -@@ -527,19 +595,22 @@ static void finish_this_one(int uid, unsigned long inode, const char *timers) - - if (flag_exp > 1) { - if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL)) -- printf("%-10s ", pw->pw_name); -+ printf(" %-10s ", pw->pw_name); - else -- printf("%-10d ", uid); -- printf("%-10ld ",inode); -+ printf(" %-10d ", uid); -+ printf("%-10lu",inode); - } - if (flag_prg) -- printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); -+ printf(" %-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); -+ if (flag_selinux) -+ printf(" %-" SELINUX_WIDTHs "s",prg_cache_get_con(inode)); -+ - if (flag_opt) -- printf("%s", timers); -+ printf(" %s", timers); - putchar('\n'); - } - --static void igmp_do_one(int lnr, const char *line) -+static void igmp_do_one(int lnr, const char *line,const char *prot) - { - char mcast_addr[128]; - #if HAVE_AFINET6 -@@ -598,8 +669,8 @@ static void igmp_do_one(int lnr, const char *line) - ((struct sockaddr *) &mcastaddr)->sa_family); - return; - } -- safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr, -- flag_not), sizeof(mcast_addr)); -+ safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr, -+ flag_not & FLAG_NUM_HOST), sizeof(mcast_addr)); - printf("%-15s %-6d %s\n", device, refcnt, mcast_addr); - #endif - } else { /* IPV4 */ -@@ -630,14 +701,14 @@ static void igmp_do_one(int lnr, const char *line) - fprintf(stderr, _("warning, got bogus igmp line %d.\n"), lnr); - return; - } -- -+ - if ((ap = get_afntype(((struct sockaddr *) &mcastaddr)->sa_family)) == NULL) { - fprintf(stderr, _("netstat: unsupported address family %d !\n"), - ((struct sockaddr *) &mcastaddr)->sa_family); - return; - } -- safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr, -- flag_not), sizeof(mcast_addr)); -+ safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr, -+ flag_not & FLAG_NUM_HOST), sizeof(mcast_addr)); - printf("%-15s %-6d %s\n", device, refcnt, mcast_addr ); - #endif - } /* IPV4 */ -@@ -646,7 +717,7 @@ static void igmp_do_one(int lnr, const char *line) - #if HAVE_AFX25 - static int x25_info(void) - { -- FILE *f=fopen(_PATH_PROCNET_X25, "r"); -+ FILE *f=proc_fopen(_PATH_PROCNET_X25); - char buffer[256],dev[16]; - int st,vs,vr,sendq,recvq,lci; - static char *x25_state[5]= -@@ -657,7 +728,7 @@ static int x25_info(void) - "ESTABLISHED", - "RECOVERY" - }; -- if(!(f=fopen(_PATH_PROCNET_X25, "r"))) -+ if(!f) - { - if (errno != ENOENT) { - perror(_PATH_PROCNET_X25); -@@ -673,7 +744,8 @@ static int x25_info(void) - printf( _("Active X.25 sockets\n")); - /* IMHO, Vr/Vs is not very usefull --SF */ - printf( _("Dest Source Device LCI State Vr/Vs Send-Q Recv-Q\n")); -- fgets(buffer,256,f); -+ if (fgets(buffer,256,f)) -+ /* eat line */; - while(fgets(buffer,256,f)) - { - buffer[10]=0; -@@ -690,21 +762,206 @@ static int x25_info(void) - vr,vs,sendq,recvq); - } - fclose(f); -- return 0; -+ return 0; - } - #endif - - static int igmp_info(void) - { - INFO_GUTS6(_PATH_PROCNET_IGMP, _PATH_PROCNET_IGMP6, "AF INET (igmp)", -- igmp_do_one); -+ igmp_do_one, "igmp", "igmp6"); -+} -+ -+static int ip_parse_dots(uint32_t *addr, char const *src) { -+ unsigned a, b, c, d; -+ unsigned ret = 4-sscanf(src, "%u.%u.%u.%u", &a, &b, &c, &d); -+ *addr = htonl((a << 24)|(b << 16)|(c << 8)|d); -+ return ret; -+} -+ -+static void print_ip_service(struct sockaddr_in *addr, char const *protname, -+ char *buf, unsigned size) { -+ struct aftype *ap; -+ -+ if(size == 0) return; -+ -+ /* print host */ -+ if((ap = get_afntype(addr->sin_family)) == NULL) { -+ fprintf(stderr, _("netstat: unsupported address family %d !\n"), -+ addr->sin_family); -+ return; -+ } -+ safe_strncpy(buf, ap->sprint((struct sockaddr*)addr, flag_not), size); -+ -+ /* print service */ -+ if(flag_all || (flag_lst && !addr->sin_port) || (!flag_lst && addr->sin_port)) { -+ char bfs[32]; -+ -+ snprintf(bfs, sizeof(bfs), "%s", -+ get_sname(addr->sin_port, (char*)protname, flag_not & FLAG_NUM_PORT)); -+ -+ /* check if we must cut on host and/or service name */ -+ { -+ unsigned const bufl = strlen(buf); -+ unsigned const bfsl = strlen(bfs); -+ -+ if(bufl+bfsl+2 > size) { -+ unsigned const half = (size-2)>>1; -+ if(bufl > half) { -+ if(bfsl > half) { -+ buf[size-2-half] = '\0'; -+ bfs[half+1] = '\0'; -+ } -+ else buf[size-2-bfsl] = '\0'; -+ } -+ else bfs[size-2-bufl] = '\0'; -+ } -+ } -+ strcat(buf, ":"); -+ strcat(buf, bfs); -+ } -+} -+ -+/* process single SCTP endpoint */ -+static void sctp_do_ept(int lnr, char const *line, const char *prot) -+{ -+ struct sockaddr_in laddr, raddr; -+ unsigned uid, inode; -+ -+ char l_addr[23], r_addr[23]; -+ -+ /* fill sockaddr_in structures */ -+ { -+ unsigned lport; -+ unsigned ate; -+ -+ if(lnr == 0) return; -+ if(sscanf(line, "%*X %*X %*u %*u %*u %u %u %u %n", -+ &lport, &uid, &inode, &ate) < 3) goto err; -+ -+ /* decode IP address */ -+ if(ip_parse_dots(&laddr.sin_addr.s_addr, line+ate)) goto err; -+ raddr.sin_addr.s_addr = htonl(0); -+ laddr.sin_family = raddr.sin_family = AF_INET; -+ laddr.sin_port = htons(lport); -+ raddr.sin_port = htons(0); -+ } -+ -+ /* print IP:service to l_addr and r_addr */ -+ print_ip_service(&laddr, prot, l_addr, sizeof(l_addr)); -+ print_ip_service(&raddr, prot, r_addr, sizeof(r_addr)); -+ -+ /* Print line */ -+ printf("%-4s %6d %6d %-*s %-*s %-11s", -+ prot, 0, 0, -+ (int)netmax(23,strlen(l_addr)), l_addr, -+ (int)netmax(23,strlen(r_addr)), r_addr, -+ _(tcp_state[TCP_LISTEN])); -+ finish_this_one(uid, inode, ""); -+ return; -+ err: -+ fprintf(stderr, "SCTP error in line: %d\n", lnr); -+} -+ -+/* process single SCTP association */ -+static void sctp_do_assoc(int lnr, char const *line, const char *prot) -+{ -+ struct sockaddr_in laddr, raddr; -+ unsigned long rxq, txq; -+ unsigned uid, inode; -+ -+ char l_addr[23], r_addr[23]; -+ -+ /* fill sockaddr_in structures */ -+ { -+ unsigned lport, rport; -+ unsigned ate; -+ char const *addr; -+ -+ if(lnr == 0) return; -+ if(sscanf(line, "%*X %*X %*u %*u %*u %*u %*u %lu %lu %u %u %u %u %n", -+ &txq, &rxq, &uid, &inode, &lport, &rport, &ate) < 6) goto err; -+ -+ /* decode IP addresses */ -+ addr = strchr(line+ate, '*'); -+ if(addr == 0) goto err; -+ if(ip_parse_dots(&laddr.sin_addr.s_addr, ++addr)) goto err; -+ addr = strchr(addr, '*'); -+ if(addr == 0) goto err; -+ if(ip_parse_dots(&raddr.sin_addr.s_addr, ++addr)) goto err; -+ -+ /* complete sockaddr_in structures */ -+ laddr.sin_family = raddr.sin_family = AF_INET; -+ laddr.sin_port = htons(lport); -+ raddr.sin_port = htons(rport); -+ } -+ -+ /* print IP:service to l_addr and r_addr */ -+ print_ip_service(&laddr, prot, l_addr, sizeof(l_addr)); -+ print_ip_service(&raddr, prot, r_addr, sizeof(r_addr)); -+ -+ /* Print line */ -+ printf("%-4s %6ld %6ld %-*s %-*s %-11s", -+ prot, rxq, txq, -+ (int)netmax(23,strlen(l_addr)), l_addr, -+ (int)netmax(23,strlen(r_addr)), r_addr, -+ _(tcp_state[TCP_ESTABLISHED])); -+ finish_this_one(uid, inode, ""); -+ return; -+ err: -+ fprintf(stderr, "SCTP error in line: %d\n", lnr); -+} -+ -+static int sctp_info_epts(void) { -+ INFO_GUTS6(_PATH_PROCNET_SCTPEPTS, _PATH_PROCNET_SCTP6EPTS, "AF INET (sctp)", -+ sctp_do_ept, "sctp", "sctp6"); -+} -+ -+static int sctp_info_assocs(void) { -+ INFO_GUTS6(_PATH_PROCNET_SCTPASSOCS, _PATH_PROCNET_SCTP6ASSOCS, "AF INET (sctp)", -+ sctp_do_assoc, "sctp", "sctp6"); -+} -+ -+static int sctp_info(void) { -+ int res; -+ res = sctp_info_epts(); -+ if(res) return res; -+ return sctp_info_assocs(); -+} -+ -+static void addr_do_one(char *buf, size_t buf_len, size_t short_len, struct aftype *ap, -+#if HAVE_AFINET6 -+ struct sockaddr_in6 *addr, -+#else -+ struct sockaddr_in *addr, -+#endif -+ int port, const char *proto -+) -+{ -+ const char *sport, *saddr; -+ size_t port_len, addr_len; -+ -+ saddr = ap->sprint((struct sockaddr *)addr, flag_not & FLAG_NUM_HOST); -+ sport = get_sname(htons(port), proto, flag_not & FLAG_NUM_PORT); -+ addr_len = strlen(saddr); -+ port_len = strlen(sport); -+ if (!flag_wide && (addr_len + port_len > short_len)) { -+ /* Assume port name is short */ -+ port_len = netmin(port_len, short_len - 4); -+ addr_len = short_len - port_len; -+ strncpy(buf, saddr, addr_len); -+ buf[addr_len] = '\0'; -+ strcat(buf, ":"); -+ strncat(buf, sport, port_len); -+ } else -+ snprintf(buf, buf_len, "%s:%s", saddr, sport); - } - --static void tcp_do_one(int lnr, const char *line) -+static void tcp_do_one(int lnr, const char *line, const char *prot) - { - unsigned long rxq, txq, time_len, retr, inode; - int num, local_port, rem_port, d, state, uid, timer_run, timeout; -- char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512]; -+ char rem_addr[128], local_addr[128], timers[64]; - struct aftype *ap; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; -@@ -719,9 +976,17 @@ static void tcp_do_one(int lnr, const char *line) - return; - - num = sscanf(line, -- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", -+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n", - &d, local_addr, &local_port, rem_addr, &rem_port, &state, -- &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); -+ &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode); -+ -+ if (num < 11) { -+ fprintf(stderr, _("warning, got bogus tcp line.\n")); -+ return; -+ } -+ -+ if (!flag_all && ((flag_lst && rem_port) || (!flag_lst && !rem_port))) -+ return; - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -@@ -748,45 +1013,16 @@ static void tcp_do_one(int lnr, const char *line) - ((struct sockaddr *) &remaddr)->sa_family = AF_INET; - } - -- if (num < 11) { -- fprintf(stderr, _("warning, got bogus tcp line.\n")); -- return; -- } - if ((ap = get_afntype(((struct sockaddr *) &localaddr)->sa_family)) == NULL) { - fprintf(stderr, _("netstat: unsupported address family %d !\n"), - ((struct sockaddr *) &localaddr)->sa_family); - return; - } -- if (state == TCP_LISTEN) { -- time_len = 0; -- retr = 0L; -- rxq = 0L; -- txq = 0L; -- } -- safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, -- flag_not), sizeof(local_addr)); -- safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag_not), -- sizeof(rem_addr)); -- if (flag_all || (flag_lst && !rem_port) || (!flag_lst && rem_port)) { -- snprintf(buffer, sizeof(buffer), "%s", -- get_sname(htons(local_port), "tcp", -- flag_not & FLAG_NUM_PORT)); -- -- if ((strlen(local_addr) + strlen(buffer)) > 22) -- local_addr[22 - strlen(buffer)] = '\0'; -- -- strcat(local_addr, ":"); -- strcat(local_addr, buffer); -- snprintf(buffer, sizeof(buffer), "%s", -- get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT)); -- -- if ((strlen(rem_addr) + strlen(buffer)) > 22) -- rem_addr[22 - strlen(buffer)] = '\0'; -- -- strcat(rem_addr, ":"); -- strcat(rem_addr, buffer); -- timers[0] = '\0'; - -+ addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "tcp"); -+ addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "tcp"); -+ -+ timers[0] = '\0'; - if (flag_opt) - switch (timer_run) { - case 0: -@@ -813,23 +1049,23 @@ static void tcp_do_one(int lnr, const char *line) - timer_run, (double) time_len / HZ, retr, timeout); - break; - } -- printf("tcp %6ld %6ld %-23s %-23s %-12s", -- rxq, txq, local_addr, rem_addr, _(tcp_state[state])); -+ -+ printf("%-4s %6ld %6ld %-*s %-*s %-11s", -+ prot, rxq, txq, (int)netmax(23,strlen(local_addr)), local_addr, (int)netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state])); - - finish_this_one(uid,inode,timers); -- } - } - - static int tcp_info(void) - { - INFO_GUTS6(_PATH_PROCNET_TCP, _PATH_PROCNET_TCP6, "AF INET (tcp)", -- tcp_do_one); -+ tcp_do_one, "tcp", "tcp6"); - } - --static void udp_do_one(int lnr, const char *line) -+static void udp_do_one(int lnr, const char *line,const char *prot) - { -- char buffer[8192], local_addr[64], rem_addr[64]; -- char *udp_state, timers[64], more[512]; -+ char local_addr[64], rem_addr[64]; -+ char *udp_state, timers[64]; - int num, local_port, rem_port, d, state, timer_run, uid, timeout; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; -@@ -845,12 +1081,16 @@ static void udp_do_one(int lnr, const char *line) - if (lnr == 0) - return; - -- more[0] = '\0'; - num = sscanf(line, -- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", -+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n", - &d, local_addr, &local_port, - rem_addr, &rem_port, &state, -- &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); -+ &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode); -+ -+ if (num < 10) { -+ fprintf(stderr, _("warning, got bogus udp line.\n")); -+ return; -+ } - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -@@ -877,13 +1117,7 @@ static void udp_do_one(int lnr, const char *line) - } - - retr = 0L; -- if (!flag_opt) -- more[0] = '\0'; - -- if (num < 10) { -- fprintf(stderr, _("warning, got bogus udp line.\n")); -- return; -- } - if ((ap = get_afntype(((struct sockaddr *) &localaddr)->sa_family)) == NULL) { - fprintf(stderr, _("netstat: unsupported address family %d !\n"), - ((struct sockaddr *) &localaddr)->sa_family); -@@ -917,24 +1151,8 @@ static void udp_do_one(int lnr, const char *line) - - if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr) && flag_lst)) - { -- safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, -- flag_not), sizeof(local_addr)); -- snprintf(buffer, sizeof(buffer), "%s", -- get_sname(htons(local_port), "udp", -- flag_not & FLAG_NUM_PORT)); -- if ((strlen(local_addr) + strlen(buffer)) > 22) -- local_addr[22 - strlen(buffer)] = '\0'; -- strcat(local_addr, ":"); -- strcat(local_addr, buffer); -- -- snprintf(buffer, sizeof(buffer), "%s", -- get_sname(htons(rem_port), "udp", flag_not & FLAG_NUM_PORT)); -- safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, -- flag_not), sizeof(rem_addr)); -- if ((strlen(rem_addr) + strlen(buffer)) > 22) -- rem_addr[22 - strlen(buffer)] = '\0'; -- strcat(rem_addr, ":"); -- strcat(rem_addr, buffer); -+ addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "udp"); -+ addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "udp"); - - timers[0] = '\0'; - if (flag_opt) -@@ -953,8 +1171,8 @@ static void udp_do_one(int lnr, const char *line) - retr, timeout); - break; - } -- printf("udp %6ld %6ld %-23s %-23s %-12s", -- rxq, txq, local_addr, rem_addr, udp_state); -+ printf("%-5s %6ld %6ld %-23s %-23s %-11s", -+ prot, rxq, txq, local_addr, rem_addr, udp_state); - - finish_this_one(uid,inode,timers); - } -@@ -963,13 +1181,19 @@ static void udp_do_one(int lnr, const char *line) - static int udp_info(void) - { - INFO_GUTS6(_PATH_PROCNET_UDP, _PATH_PROCNET_UDP6, "AF INET (udp)", -- udp_do_one); -+ udp_do_one, "udp", "udp6"); - } - --static void raw_do_one(int lnr, const char *line) -+static int udplite_info(void) - { -- char buffer[8192], local_addr[64], rem_addr[64]; -- char timers[64], more[512]; -+ INFO_GUTS6(_PATH_PROCNET_UDPLITE, _PATH_PROCNET_UDPLITE6, -+ "AF INET (udplite)", udp_do_one, "udpl", "udpl6" ); -+} -+ -+static void raw_do_one(int lnr, const char *line,const char *prot) -+{ -+ char local_addr[64], rem_addr[64]; -+ char timers[64]; - int num, local_port, rem_port, d, state, timer_run, uid, timeout; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; -@@ -985,11 +1209,15 @@ static void raw_do_one(int lnr, const char *line) - if (lnr == 0) - return; - -- more[0] = '\0'; - num = sscanf(line, -- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", -+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n", - &d, local_addr, &local_port, rem_addr, &rem_port, &state, -- &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); -+ &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode); -+ -+ if (num < 10) { -+ fprintf(stderr, _("warning, got bogus raw line.\n")); -+ return; -+ } - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -@@ -1026,34 +1254,10 @@ static void raw_do_one(int lnr, const char *line) - } - #endif - -- if (!flag_opt) -- more[0] = '\0'; -- -- if (num < 10) { -- fprintf(stderr, _("warning, got bogus raw line.\n")); -- return; -- } -- - if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr) && flag_lst)) - { -- snprintf(buffer, sizeof(buffer), "%s", -- get_sname(htons(local_port), "raw", -- flag_not & FLAG_NUM_PORT)); -- safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, -- flag_not), sizeof(local_addr)); -- if ((strlen(local_addr) + strlen(buffer)) > 22) -- local_addr[22 - strlen(buffer)] = '\0'; -- strcat(local_addr, ":"); -- strcat(local_addr, buffer); -- -- snprintf(buffer, sizeof(buffer), "%s", -- get_sname(htons(rem_port), "raw", flag_not & FLAG_NUM_PORT)); -- safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, -- flag_not), sizeof(rem_addr)); -- if ((strlen(rem_addr) + strlen(buffer)) > 22) -- rem_addr[22 - strlen(buffer)] = '\0'; -- strcat(rem_addr, ":"); -- strcat(rem_addr, buffer); -+ addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "raw"); -+ addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "raw"); - - timers[0] = '\0'; - if (flag_opt) -@@ -1074,8 +1278,8 @@ static void raw_do_one(int lnr, const char *line) - retr, timeout); - break; - } -- printf("raw %6ld %6ld %-23s %-23s %-12d", -- rxq, txq, local_addr, rem_addr, state); -+ printf("%-4s %6ld %6ld %-23s %-23s %-11d", -+ prot, rxq, txq, local_addr, rem_addr, state); - - finish_this_one(uid,inode,timers); - } -@@ -1084,7 +1288,7 @@ static void raw_do_one(int lnr, const char *line) - static int raw_info(void) - { - INFO_GUTS6(_PATH_PROCNET_RAW, _PATH_PROCNET_RAW6, "AF INET (raw)", -- raw_do_one); -+ raw_do_one, "raw", "raw6"); - } - - #endif -@@ -1094,14 +1298,14 @@ static int raw_info(void) - - #define HAS_INODE 1 - --static void unix_do_one(int nr, const char *line) -+static void unix_do_one(int nr, const char *line, const char *prot) - { - static int has = 0; - char path[MAXPATHLEN], ss_flags[32]; - char *ss_proto, *ss_state, *ss_type; -- int num, state, type, inode; -+ int num, state, type; - void *d; -- unsigned long refcnt, proto, flags; -+ unsigned long refcnt, proto, flags, inode; - - if (nr == 0) { - if (strstr(line, "Inode")) -@@ -1109,14 +1313,14 @@ static void unix_do_one(int nr, const char *line) - return; - } - path[0] = '\0'; -- num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s", -+ num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s", - &d, &refcnt, &proto, &flags, &type, &state, &inode, path); - if (num < 6) { - fprintf(stderr, _("warning, got bogus unix line.\n")); - return; - } - if (!(has & HAS_INODE)) -- snprintf(path,sizeof(path),"%d",inode); -+ snprintf(path,sizeof(path),"%lu",inode); - - if (!flag_all) { - if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) { -@@ -1195,7 +1399,7 @@ static void unix_do_one(int nr, const char *line) - ss_state = _("UNKNOWN"); - } - -- strcpy(ss_flags, "[ "); -+ safe_strncpy(ss_flags, "[ ", sizeof(ss_flags)); - if (flags & SO_ACCEPTCON) - strcat(ss_flags, "ACC "); - if (flags & SO_WAITDATA) -@@ -1208,12 +1412,15 @@ static void unix_do_one(int nr, const char *line) - printf("%-5s %-6ld %-11s %-10s %-13s ", - ss_proto, refcnt, ss_flags, ss_type, ss_state); - if (has & HAS_INODE) -- printf("%-6d ",inode); -+ printf("%-8lu",inode); - else -- printf("- "); -+ printf("- "); - if (flag_prg) -- printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-")); -- puts(path); -+ printf(" %-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-")); -+ if (flag_selinux) -+ printf(" %-" SELINUX_WIDTHs "s",(has & HAS_INODE?prg_cache_get_con(inode):"-")); -+ -+ printf(" %s\n", path); - } - - static int unix_info(void) -@@ -1229,12 +1436,13 @@ static int unix_info(void) - printf(_("(w/o servers)")); - } - -- printf(_("\nProto RefCnt Flags Type State I-Node")); -+ printf(_("\nProto RefCnt Flags Type State I-Node ")); - print_progname_banner(); -+ print_selinux_banner(); - printf(_(" Path\n")); /* xxx */ - - { -- INFO_GUTS(_PATH_PROCNET_UNIX, "AF UNIX", unix_do_one); -+ INFO_GUTS(_PATH_PROCNET_UNIX, "AF UNIX", unix_do_one, "unix"); - } - } - #endif -@@ -1256,7 +1464,7 @@ static int ax25_info(void) - N_("ESTABLISHED"), - N_("RECOVERY") - }; -- if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) { -+ if (!(f = proc_fopen(_PATH_PROCNET_AX25))) { - if (errno != ENOENT) { - perror(_PATH_PROCNET_AX25); - return (-1); -@@ -1350,18 +1558,37 @@ static int ipx_info(void) - char sad[50], dad[50]; - struct sockaddr sa; - unsigned sport = 0, dport = 0; -- -- if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) { -- if (errno != ENOENT) { -- perror(_PATH_PROCNET_IPX); -- return (-1); -- } -- if (flag_arg || flag_ver) -- ESYSNOT("netstat", "AF IPX"); -- if (flag_arg) -- return (1); -- else -- return (0); -+ struct stat s; -+ -+ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1); -+ if (!f) { -+ if (errno != ENOENT) { -+ perror(_PATH_PROCNET_IPX_SOCKET1); -+ return (-1); -+ } -+ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2); -+ -+ /* We need to check for directory */ -+ if (f) { -+ if (fstat (fileno(f), &s) == -1 || -+ !S_ISREG(s.st_mode)) { -+ fclose(f); -+ f=NULL; -+ } -+ } -+ -+ if (!f) { -+ if (errno != ENOENT) { -+ perror(_PATH_PROCNET_IPX_SOCKET2); -+ return (-1); -+ } -+ if (flag_arg || flag_ver) -+ ESYSNOT("netstat", "AF IPX"); -+ if (flag_arg) -+ return (1); -+ else -+ return (0); -+ } - } - printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address Foreign Address State")); /* xxx */ - if (flag_exp > 1) -@@ -1369,19 +1596,22 @@ static int ipx_info(void) - printf("\n"); - if ((ap = get_afntype(AF_IPX)) == NULL) { - EINTERN("netstat.c", "AF_IPX missing"); -+ fclose(f); - return (-1); - } -- fgets(buf, 255, f); -+ if (fgets(buf, 255, f)) -+ /* eat line */; - - while (fgets(buf, 255, f) != NULL) { -- sscanf(buf, "%s %s %lX %lX %d %d", -+ sscanf(buf, "%s %s %lX %lX %u %u", - sad, dad, &txq, &rxq, &state, &uid); - if ((st = rindex(sad, ':'))) { - *st++ = '\0'; - sscanf(st, "%X", &sport); /* net byt order */ - sport = ntohs(sport); - } else { -- EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error"); -+ EINTERN("netstat.c", "ipx socket format error in source port"); -+ fclose(f); - return (-1); - } - nc = 0; -@@ -1391,7 +1621,8 @@ static int ipx_info(void) - sscanf(st, "%X", &dport); /* net byt order */ - dport = ntohs(dport); - } else { -- EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error"); -+ EINTERN("netstat.c", "ipx socket format error in destination port"); -+ fclose(f); - return (-1); - } - } else -@@ -1413,16 +1644,16 @@ static int ipx_info(void) - - /* Fetch and resolve the Source */ - (void) ap->input(4, sad, &sa); -- safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf)); -+ safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf)); - snprintf(sad, sizeof(sad), "%s:%04X", buf, sport); - - if (!nc) { - /* Fetch and resolve the Destination */ - (void) ap->input(4, dad, &sa); -- safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf)); -+ safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf)); - snprintf(dad, sizeof(dad), "%s:%04X", buf, dport); - } else -- strcpy(dad, "-"); -+ safe_strncpy(dad, "-", sizeof(dad)); - - printf("IPX %6ld %6ld %-26s %-26s %-5s", txq, rxq, sad, dad, st); - if (flag_exp > 1) { -@@ -1438,6 +1669,116 @@ static int ipx_info(void) - } - #endif - -+#if HAVE_AFBLUETOOTH -+const char *bluetooth_state(int state) -+{ -+ switch (state) { -+ case BT_CONNECTED: -+ return _("CONNECTED"); -+ case BT_OPEN: -+ return _("OPEN"); -+ case BT_BOUND: -+ return _("BOUND"); -+ case BT_LISTEN: -+ return _("LISTEN"); -+ case BT_CONNECT: -+ return _("CONNECT"); -+ case BT_CONNECT2: -+ return _("CONNECT2"); -+ case BT_CONFIG: -+ return _("CONFIG"); -+ case BT_DISCONN: -+ return _("DISCONN"); -+ case BT_CLOSED: -+ return _("CLOSED"); -+ default: -+ return _("UNKNOWN"); -+ } -+} -+ -+static void l2cap_do_one(int nr, const char *line, const char *prot) -+{ -+ char daddr[18], saddr[18]; -+ unsigned state, psm, dcid, scid, imtu, omtu, sec_level; -+ int num; -+ const char *bt_state, *bt_sec_level; -+ -+ num = sscanf(line, "%17s %17s %d %d 0x%04x 0x%04x %d %d %d", -+ daddr, saddr, &state, &psm, &dcid, &scid, &imtu, &omtu, &sec_level); -+ -+ if (num < 9) { -+ fprintf(stderr, _("warning, got bogus l2cap line.\n")); -+ return; -+ } -+ -+ if (flag_lst && !(state == BT_LISTEN || state == BT_BOUND)) -+ return; -+ if (!(flag_all || flag_lst) && (state == BT_LISTEN || state == BT_BOUND)) -+ return; -+ -+ bt_state = bluetooth_state(state); -+ switch (sec_level) { -+ case BT_SECURITY_SDP: -+ bt_sec_level = _("SDP"); -+ break; -+ case BT_SECURITY_LOW: -+ bt_sec_level = _("LOW"); -+ break; -+ case BT_SECURITY_MEDIUM: -+ bt_sec_level = _("MEDIUM"); -+ break; -+ case BT_SECURITY_HIGH: -+ bt_sec_level = _("HIGH"); -+ break; -+ default: -+ bt_sec_level = _("UNKNOWN"); -+ } -+ -+ printf("l2cap %-17s %-17s %-9s %7d 0x%04x 0x%04x %7d %7d %-7s\n", -+ (strcmp (daddr, "00:00:00:00:00:00") == 0 ? "*" : daddr), -+ (strcmp (saddr, "00:00:00:00:00:00") == 0 ? "*" : saddr), -+ bt_state, psm, dcid, scid, imtu, omtu, bt_sec_level); -+} -+ -+static int l2cap_info(void) -+{ -+ printf("%-6s %-17s %-17s %-9s %7s %-6s %-6s %7s %7s %-7s\n", -+ "Proto", "Destination", "Source", "State", "PSM", "DCID", "SCID", "IMTU", "OMTU", "Security"); -+ INFO_GUTS(_PATH_SYS_BLUETOOTH_L2CAP, "AF BLUETOOTH", l2cap_do_one, "l2cap"); -+} -+ -+static void rfcomm_do_one(int nr, const char *line, const char *prot) -+{ -+ char daddr[18], saddr[18]; -+ unsigned state, channel; -+ int num; -+ const char *bt_state; -+ -+ num = sscanf(line, "%17s %17s %d %d", daddr, saddr, &state, &channel); -+ if (num < 4) { -+ fprintf(stderr, _("warning, got bogus rfcomm line.\n")); -+ return; -+ } -+ -+ if (flag_lst && !(state == BT_LISTEN || state == BT_BOUND)) -+ return; -+ if (!(flag_all || flag_lst) && (state == BT_LISTEN || state == BT_BOUND)) -+ return; -+ -+ bt_state = bluetooth_state(state); -+ printf("rfcomm %-17s %-17s %-9s %7d\n", -+ (strcmp (daddr, "00:00:00:00:00:00") == 0 ? "*" : daddr), -+ (strcmp (saddr, "00:00:00:00:00:00") == 0 ? "*" : saddr), -+ bt_state, channel); -+} -+ -+static int rfcomm_info(void) -+{ -+ printf("%-6s %-17s %-17s %-9s %7s\n", "Proto", "Destination", "Source", "State", "Channel"); -+ INFO_GUTS(_PATH_SYS_BLUETOOTH_RFCOMM, "AF BLUETOOTH", rfcomm_do_one, "rfcomm"); -+} -+#endif -+ - static int iface_info(void) - { - if (skfd < 0) { -@@ -1449,7 +1790,7 @@ static int iface_info(void) - } - if (flag_exp < 2) { - ife_short = 1; -- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); -+ printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); - } - - if (for_all_interfaces(do_if_print, &flag_all) < 0) { -@@ -1457,7 +1798,7 @@ static int iface_info(void) - exit(1); - } - if (flag_cnt) -- free_interface_list(); -+ if_cache_free(); - else { - close(skfd); - skfd = -1; -@@ -1469,16 +1810,16 @@ static int iface_info(void) - - static void version(void) - { -- printf("%s\n%s\n%s\n%s\n", Release, Version, Signature, Features); -+ printf("%s\n%s\n%s\n", Release, Signature, Features); - exit(E_VERSION); - } - - - static void usage(void) - { -- fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n")); -- fprintf(stderr, _(" netstat [-vnNcaeol] [<Socket> ...]\n")); -- fprintf(stderr, _(" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n")); -+ fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n")); -+ fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n")); -+ fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n")); - - fprintf(stderr, _(" -r, --route display routing table\n")); - fprintf(stderr, _(" -i, --interfaces display interface table\n")); -@@ -1487,7 +1828,9 @@ static void usage(void) - #if HAVE_FW_MASQUERADE - fprintf(stderr, _(" -M, --masquerade display masqueraded connections\n\n")); - #endif -+ - fprintf(stderr, _(" -v, --verbose be verbose\n")); -+ fprintf(stderr, _(" -W, --wide don't truncate IP addresses\n")); - fprintf(stderr, _(" -n, --numeric don't resolve names\n")); - fprintf(stderr, _(" --numeric-hosts don't resolve host names\n")); - fprintf(stderr, _(" --numeric-ports don't resolve port names\n")); -@@ -1495,15 +1838,19 @@ static void usage(void) - fprintf(stderr, _(" -N, --symbolic resolve hardware names\n")); - fprintf(stderr, _(" -e, --extend display other/more information\n")); - fprintf(stderr, _(" -p, --programs display PID/Program name for sockets\n")); -+ fprintf(stderr, _(" -o, --timers display timers\n")); - fprintf(stderr, _(" -c, --continuous continuous listing\n\n")); - fprintf(stderr, _(" -l, --listening display listening server sockets\n")); -- fprintf(stderr, _(" -a, --all, --listening display all sockets (default: connected)\n")); -- fprintf(stderr, _(" -o, --timers display timers\n")); -+ fprintf(stderr, _(" -a, --all display all sockets (default: connected)\n")); - fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); -- fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); -+ fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n")); -+#if HAVE_SELINUX -+ fprintf(stderr, _(" -Z, --context display SELinux security context for sockets\n")); -+#endif - -- fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); -- fprintf(stderr, _(" <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); -+ fprintf(stderr, _("\n <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-S|--sctp} {-w|--raw}\n")); -+ fprintf(stderr, _(" {-x|--unix} --ax25 --ipx --netrom\n")); -+ fprintf(stderr, _(" <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); - fprintf(stderr, _(" List of possible address families (which support routing):\n")); - print_aflist(1); /* 1 = routeable */ - exit(E_USAGE); -@@ -1514,7 +1861,7 @@ int main - (int argc, char *argv[]) { - int i; - int lop; -- struct option longopts[] = -+ static struct option longopts[] = - { - AFTRANS_OPTS, - {"version", 0, 0, 'V'}, -@@ -1526,9 +1873,13 @@ int main - #endif - {"protocol", 1, 0, 'A'}, - {"tcp", 0, 0, 't'}, -+ {"sctp", 0, 0, 'S'}, - {"udp", 0, 0, 'u'}, -+ {"udplite", 0, 0, 'U'}, - {"raw", 0, 0, 'w'}, - {"unix", 0, 0, 'x'}, -+ {"l2cap", 0, 0, '2'}, -+ {"rfcomm", 0, 0, 'f'}, - {"listening", 0, 0, 'l'}, - {"all", 0, 0, 'a'}, - {"timers", 0, 0, 'o'}, -@@ -1537,6 +1888,7 @@ int main - {"programs", 0, 0, 'p'}, - {"verbose", 0, 0, 'v'}, - {"statistics", 0, 0, 's'}, -+ {"wide", 0, 0, 'W'}, - {"numeric", 0, 0, 'n'}, - {"numeric-hosts", 0, 0, '!'}, - {"numeric-ports", 0, 0, '@'}, -@@ -1545,6 +1897,7 @@ int main - {"cache", 0, 0, 'C'}, - {"fib", 0, 0, 'F'}, - {"groups", 0, 0, 'g'}, -+ {"context", 0, 0, 'Z'}, - {NULL, 0, 0, 0} - }; - -@@ -1556,7 +1909,7 @@ int main - getroute_init(); /* Set up AF routing support */ - - afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -1600,6 +1953,9 @@ int main - case 'i': - flag_int++; - break; -+ case 'W': -+ flag_wide++; -+ break; - case 'n': - flag_not |= FLAG_NUM; - break; -@@ -1624,6 +1980,14 @@ int main - case 'o': - flag_opt++; - break; -+ case '6': -+ if (aftrans_opt("inet6")) -+ exit(1); -+ break; -+ case '4': -+ if (aftrans_opt("inet")) -+ exit(1); -+ break; - case 'V': - version(); - /*NOTREACHED */ -@@ -1633,21 +1997,45 @@ int main - case 'r': - flag_rou++; - break; -- - case 't': - flag_tcp++; - break; -- -+ case 'S': -+ flag_sctp++; -+ break; - case 'u': - flag_udp++; - break; -+ case 'U': -+ flag_udplite++; -+ break; - case 'w': - flag_raw++; - break; -+ case '2': -+ flag_l2cap++; -+ break; -+ case 'f': -+ flag_rfcomm++; -+ break; - case 'x': - if (aftrans_opt("unix")) - exit(1); - break; -+ case 'Z': -+#if HAVE_SELINUX -+ if (is_selinux_enabled() <= 0) { -+ fprintf(stderr, _("SELinux is not enabled on this machine.\n")); -+ exit(1); -+ } -+ flag_prg++; -+ flag_selinux++; -+#else -+ fprintf(stderr, _("SELinux is not enabled for this application.\n")); -+ exit(1); -+#endif -+ -+ break; - case '?': - case 'h': - usage(); -@@ -1658,46 +2046,71 @@ int main - if (flag_int + flag_rou + flag_mas + flag_sta > 1) - usage(); - -- if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_raw)) -- flag_tcp = flag_udp = flag_raw = 1; -+ if ((flag_inet || flag_inet6 || flag_sta) && -+ !(flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw)) -+ flag_tcp = flag_sctp = flag_udp = flag_udplite = flag_raw = 1; - -- if ((flag_tcp || flag_udp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) -+ if ((flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw || flag_igmp) && -+ !(flag_inet || flag_inet6)) - flag_inet = flag_inet6 = 1; - -- flag_arg = flag_tcp + flag_udp + flag_raw + flag_unx + flag_ipx -- + flag_ax25 + flag_netrom + flag_igmp + flag_x25; -+ if (flag_bluetooth && !(flag_l2cap || flag_rfcomm)) -+ flag_l2cap = flag_rfcomm = 1; -+ -+ flag_arg = flag_tcp + flag_sctp + flag_udplite + flag_udp + flag_raw + flag_unx -+ + flag_ipx + flag_ax25 + flag_netrom + flag_igmp + flag_x25 + flag_rose -+ + flag_l2cap + flag_rfcomm; - - if (flag_mas) { - #if HAVE_FW_MASQUERADE && HAVE_AFINET - #if MORE_THAN_ONE_MASQ_AF - if (!afname[0]) -- strcpy(afname, DFLT_AF); -+ safe_strncpy(afname, DFLT_AF, sizeof(afname)); - #endif - for (;;) { - i = ip_masq_info(flag_not & FLAG_NUM_HOST, - flag_not & FLAG_NUM_PORT, flag_exp); - if (i || !flag_cnt) - break; -- sleep(1); -+ wait_continous(); - } - #else -- ENOSUPP("netstat.c", "FW_MASQUERADE"); -+ ENOSUPP("netstat", "FW_MASQUERADE"); - i = -1; - #endif - return (i); - } - - if (flag_sta) { -- inittab(); -- parsesnmp(flag_raw, flag_tcp, flag_udp); -- exit(0); -+ if (!afname[0]) -+ safe_strncpy(afname, DFLT_AF, sizeof(afname)); -+ -+ if (!strcmp(afname, "inet")) { -+#if HAVE_AFINET -+ inittab(); -+ parsesnmp(flag_raw, flag_tcp, flag_udp); -+#else -+ ENOSUPP("netstat", "AF INET"); -+#endif -+ } else if(!strcmp(afname, "inet6")) { -+#if HAVE_AFINET6 -+ inittab6(); -+ parsesnmp6(flag_raw, flag_tcp, flag_udp); -+#else -+ ENOSUPP("netstat", "AF INET6"); -+#endif -+ } else { -+ printf(_("netstat: No statistics support for specified address family: %s\n"), afname); -+ exit(1); -+ } -+ exit(0); - } -- -+ - if (flag_rou) { - int options = 0; - - if (!afname[0]) -- strcpy(afname, DFLT_AF); -+ safe_strncpy(afname, DFLT_AF, sizeof(afname)); - - if (flag_exp == 2) - flag_exp = 1; -@@ -1712,7 +2125,7 @@ int main - i = route_info(afname, options); - if (i || !flag_cnt) - break; -- sleep(1); -+ wait_continous(); - } - return (i); - } -@@ -1721,12 +2134,12 @@ int main - i = iface_info(); - if (!flag_cnt || i) - break; -- sleep(1); -+ wait_continous(); - } - return (i); - } - for (;;) { -- if (!flag_arg || flag_tcp || flag_udp || flag_raw) { -+ if (!flag_arg || flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw) { - #if HAVE_AFINET - prg_cache_load(); - printf(_("Active Internet connections ")); /* xxx */ -@@ -1743,6 +2156,7 @@ int main - if (flag_exp > 1) - printf(_(" User Inode ")); - print_progname_banner(); -+ print_selinux_banner(); - if (flag_opt) - printf(_(" Timer")); /* xxx */ - printf("\n"); -@@ -1759,11 +2173,25 @@ int main - if (i) - return (i); - } -+ -+ if (!flag_arg || flag_sctp) { -+ i = sctp_info(); -+ if (i) -+ return (i); -+ } -+ - if (!flag_arg || flag_udp) { - i = udp_info(); - if (i) - return (i); - } -+ -+ if (!flag_arg || flag_udplite) { -+ i = udplite_info(); -+ if (i) -+ return (i); -+ } -+ - if (!flag_arg || flag_raw) { - i = raw_info(); - if (i) -@@ -1845,9 +2273,55 @@ int main - } - #endif - } -+ if (!flag_arg || flag_rose) { -+#if 0 && HAVE_AFROSE -+ i = rose_info(); -+ if (i) -+ return (i); -+#else -+ if (flag_arg) { -+ i = 1; -+ ENOSUPP("netstat", "AF ROSE"); -+ } -+#endif -+ } -+ -+ if (!flag_arg || flag_l2cap || flag_rfcomm) { -+#if HAVE_AFBLUETOOTH -+ printf(_("Active Bluetooth connections ")); /* xxx */ -+ -+ if (flag_all) -+ printf(_("(servers and established)")); -+ else { -+ if (flag_lst) -+ printf(_("(only servers)")); -+ else -+ printf(_("(w/o servers)")); -+ } -+ printf("\n"); -+#else -+ if (flag_arg) { -+ i = 1; -+ ENOSUPP("netstat", "AF BLUETOOTH"); -+ } -+#endif -+ } -+#if HAVE_AFBLUETOOTH -+ if (!flag_arg || flag_l2cap) { -+ i = l2cap_info(); -+ if (i) -+ return (i); -+ } -+ if (!flag_arg || flag_rfcomm) { -+ i = rfcomm_info(); -+ if (i) -+ return (i); -+ } -+#endif -+ - if (!flag_cnt || i) - break; -- sleep(1); -+ wait_continous(); - prg_cache_clear(); - } - return (i); -diff --git a/plipconfig.c b/plipconfig.c -index 1f972a7..86fa890 100644 ---- a/plipconfig.c -+++ b/plipconfig.c -@@ -4,7 +4,7 @@ - Copyright (c) 1994 John Paul Morrison (VE7JPM). - - version 0.2 -- -+ - Changed by Alan Cox, to reflect the way SIOCDEVPRIVATE is meant to work - and for the extra parameter added by Niibe. - -@@ -42,31 +42,27 @@ - #include "intl.h" - #include "net-support.h" - #include "version.h" -+#include "util.h" - --int opt_a = 0; --int opt_i = 0; --int opt_v = 0; - int skfd = -1; - - struct ifreq ifr; - struct plipconf *plip; - --char *Release = RELEASE, -- *Version = "plipconfig 0.2", -- *Signature = "John Paul Morrison, Alan Cox et al."; -+static char *Release = RELEASE, *Signature = "John Paul Morrison, Alan Cox et al."; - - static void version(void) - { -- printf("%s\n%s\n%s\n", Release, Version, Signature); -+ printf("%s\n%s\n", Release, Signature); - exit(E_VERSION); - } - - void usage(void) - { -- fprintf(stderr, _("Usage: plipconfig [-a] [-i] [-v] interface\n")); -- fprintf(stderr, _(" [nibble NN] [trigger NN]\n")); -+ fprintf(stderr, _("Usage: plipconfig interface [nibble NN] [trigger NN]\n")); - fprintf(stderr, _(" plipconfig -V | --version\n")); -- exit(-1); -+ fprintf(stderr, _(" plipconfig -h | --help\n")); -+ exit(E_USAGE); - } - - void print_plip(void) -@@ -93,12 +89,10 @@ int main(int argc, char **argv) - argc--; - argv++; - while (argv[0] && *argv[0] == '-') { -- if (!strcmp(*argv, "-a")) -- opt_a = 1; -- if (!strcmp(*argv, "-v")) -- opt_v = 1; - if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version")) - version(); -+ else -+ usage(); - argv++; - argc--; - } -@@ -107,7 +101,7 @@ int main(int argc, char **argv) - usage(); - - spp = argv; -- strncpy(ifr.ifr_name, *spp++, IFNAMSIZ); -+ safe_strncpy(ifr.ifr_name, *spp++, IFNAMSIZ); - plip=(struct plipconf *)&ifr.ifr_data; - - plip->pcmd = PLIP_GET_TIMEOUT; /* get current settings for device */ -diff --git a/po/Makefile b/po/Makefile -index 0fdf82d..c7f27fb 100644 ---- a/po/Makefile -+++ b/po/Makefile -@@ -3,16 +3,24 @@ INSTALL_PROGRAM= ${INSTALL} - INSTALL_DATA= ${INSTALL} -m 644 - INSTALLNLSDIR=${BASEDIR}/usr/share/locale - --TUPDATE = tupdate -+TUPDATE = msgmerge - - NLSPACKAGE = net-tools - - -include ../config.make -+ALL_POS = $(wildcard *.po) -+ALL_LANGS = $(ALL_POS:%.po=%) -+ALL_CATALOGS = $(ALL_LANGS:%=%.mo) - ifeq ($(I18N),1) --CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo -+ifeq ($(LINGUAS),) -+LANGS = $(ALL_LANGS) - else --CATALOGS = -+LANGS = $(filter $(LINGUAS),$(ALL_LANGS)) - endif -+else -+LANGS = -+endif -+CATALOGS = $(LANGS:%=%.mo) - - POTFILES=../arp.c ../hostname.c ../ifconfig.c ../netstat.c ../rarp.c \ - ../route.c ../plipconfig.c ../iptunnel.c ../statistics.c \ -@@ -44,12 +52,12 @@ $(NLSPACKAGE).pot: $(POTFILES) - - update-po: Makefile - $(MAKE) $(NLSPACKAGE).pot -- catalogs='$(CATALOGS)'; \ -- for cat in $$catalogs; do \ -- lang=`echo $$cat | sed 's/.mo//'`; \ -+ langs='$(ALL_LANGS)'; \ -+ for lang in $$langs; do \ -+ cat=$$lang.mo; \ - mv $$lang.po $$lang.old.po; \ - echo "$$lang:"; \ -- if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \ -+ if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \ - rm -f $$lang.old.po; \ - else \ - echo "tupdate for $$cat failed!"; \ -@@ -61,18 +69,19 @@ update-po: Makefile - clean: - rm -f *mo - -+dist: $(ALL_CATALOGS) -+ - distclean: clean - rm -f .depend Makefile - - depend: - - install: $(CATALOGS) -- catalogs='$(CATALOGS)'; \ -- for n in $$catalogs; do \ -- l=`basename $$n .mo`; \ -+ langs='$(LANGS)'; \ -+ for l in $$langs; do \ - $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l; \ - $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l/LC_MESSAGES; \ -- $(INSTALL) -m 644 $$n $(INSTALLNLSDIR)/$$l/LC_MESSAGES/net-tools.mo; \ -+ $(INSTALL) -m 644 $$l.mo $(INSTALLNLSDIR)/$$l/LC_MESSAGES/net-tools.mo; \ - done - - %.mo: %.po -diff --git a/po/cs.po b/po/cs.po -index b4b66a1..c1d6a8a 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -1,359 +1,385 @@ - # Czech translation of net-tools - # Copyright (C) 1999 Free Software Foundation, Inc. --# Ji Pavlovsk <pavlovsk@ffcuni.cz>, 1999. -+# Jiří Pavlovský <pavlovsk@ffcuni.cz>, 1999. -+# Petr Pisar <petr.pisar@atlas.cz>, 2009. - # - msgid "" - msgstr "" --"Project-Id-Version: net-tools-1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" --"PO-Revision-Date: 1999-08-29 23:20+0200\n" --"Last-Translator: Ji Pavlovsk <pavlovsk@ff.cuni.cz>\n" --"Language-Team: Czech <cs@li.org>\n" -+"Project-Id-Version: net-tools cvs-20090825\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2009-08-25 18:34+0200\n" -+"PO-Revision-Date: 2009-08-26 22:18+0200\n" -+"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" -+"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=iso-8859-2\n" -+"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" --msgstr "arp: je teba jmno potae\n" -+msgstr "arp: je třeba jméno počítače\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" --msgstr "Pro %s neexistuje ARP poloka\n" -+msgstr "Pro %s neexistuje ARP položka\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: HW adresu `%s' nelze zjistit: %s\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" --msgstr "arp: chybn zadan typ protokolu\n" -+msgstr "arp: chybně zadaný typ protokolu\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" --msgstr "arp: zazen `%s' m Hw adresu %s `%s'.\n" -+msgstr "arp: zařízení `%s' má Hw adresu %s `%s'.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" --msgstr "arp: je teba hardwarov adresa\n" -+msgstr "arp: je třeba hardwarová adresa\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" --msgstr "arp: nesprvn hardwarov adresa\n" -+msgstr "arp: nesprávná hardwarová adresa\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" --msgstr "arp: databzi ethernetovch adres %s nelze otevt!\n" -+msgstr "arp: databázi ethernetových adres %s nelze otevřít!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" --msgstr "arp: syntaktick chyba na dku %u databze ethernetovch adres %s!\n" -+msgstr "arp: syntaktická chyba na řádku %u databáze ethernetových adres %s!\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" --"arp: poloku na dku %u databze ethernetovch adres %s nelze nastavit!\n" -+"arp: položku na řádku %u databáze ethernetových adres %s nelze nastavit!\n" -+ -+#: ../arp.c:448 -+#, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "" -+"Adresa HWtyp HWadresa Příz. Maska " -+"Rozhr\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" --msgstr "Adresa\t\t\t HWtyp\t HWadresa\t Pz Maska\t\t Rozhran\n" -+#: ../arp.c:476 -+msgid "<from_interface>" -+msgstr "<z_rozhraní>" - --#: ../arp.c:467 -+#: ../arp.c:478 - msgid "(incomplete)" --msgstr "(nekompletn)" -+msgstr "(nekompletní)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) na " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " --msgstr "<nekompletn>" -+msgstr "<nekompletní>" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " --msgstr "sov maska %s " -+msgstr "síťová maska %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "na %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" --msgstr "Poloky: %d\tVynechno: %d\tNalezeno: %d\n" -+msgstr "Položky: %d\tVynecháno: %d\tNalezeno: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" --msgstr "%s (%s) -- dn poloka\n" -+msgstr "%s (%s) -- žádná položka\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" --msgstr "arp: dn z poloek (%d) nevyhovuje.\n" -+msgstr "arp: žádná z položek (%d) nevyhovuje.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" --"Pouit:\n" --" arp [-vn] [<HW>] [-i <if> [-a] [<pota>] <-Zobraz ARP " -+"Použití:\n" -+" arp [-vn] [<HW>] [-i <rozhraní>] [-a] [<počítač>] <-Zobrazí ARP " - "cache\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, c-format - msgid "" --" arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " - "entry\n" - msgstr "" --" arp [-v] [-i <if>] -d <pota> [pub][nopub] <-Smae poloku " -+" arp [-v] [-i <rozhraní>] -d <počítač> [pub] <-Smaže položku " - "ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr "" --" arp [-vnD] [<HW>] [-i <if>] -f <soubor> <-Pid poloku " --"ze\n" --" souboru\n" -+" arp [-vnD] [<HW>] [-i <rozhraní>] -f [<soubor>] <-Přidá položku ze " -+"souboru\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " - "entry\n" - msgstr "" --" arp [-v] [<HW> [-i <if> -s <pota> <hwadr> [temp][nopub] <-Pid " --"poloku\n" -- --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <soubor> <hwadr> [smask <s>] <-''-\n" -+" arp [-v] [<HW>] [-i <rozhraní>] -s <počítač> <hwadr> [temp] <-Přidá " -+"položku\n" - --#: ../arp.c:618 -+#: ../arp.c:630 -+#, c-format - msgid "" --" arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr "" --" arp [-v] [<HW> [-i <if> -Ds <pota> <if> [smask <s>] pub " --"<-''-\n" -+" arp [-v] [<HW>] [-i <rozhraní>] -Ds <počítač> <rozhraní> [síťmask <čís>] " -+"pub\n" -+" <-Totéž\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr "" --" -a zobraz jmna vech pota alternativnm\n" --" (BSD) zpsobem\n" -+" -a zobrazí jména všech počítačů alternativním\n" -+" (BSD) způsobem\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" --msgstr " -s, --set nastav novou ARP poloku\n" -+msgstr " -s, --set nastaví novou ARP položku\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" --msgstr " -d, --delete smae zadanou ARP poloku\n" -+msgstr " -d, --delete smaže zadanou ARP položku\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1520 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" --" -v, --verbose bude vypisovat podrobn zprvy\n" --" o innosti\n" -+" -v, --verbose bude vypisovat podrobné zprávy o činnosti\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" --msgstr "" --" -n, --numeric nebude pevdt seln adresy\n" --" na kanonick jmna\n" -+#: ../arp.c:636 ../netstat.c:1522 ../route.c:87 -+#, c-format -+msgid " -n, --numeric don't resolve names\n" -+msgstr " -n, --numeric nebude převádět jména\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr " -i, --device zadv sov rozhran (nap. eth0)\n" -+msgstr " -i, --device zadává síťové rozhraní (např. eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" --msgstr " -D, --use-device te <hwadr> ze zadanho zazen\n" -+msgstr " -D, --use-device čte <hwadr> ze zadaného zařízení\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" --msgstr " -r, --route vype smrovac tabulku\n" -+msgstr " -A, -p, --protocol určuje rodinu protokolů\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" --" -f, --file te nov poloky ze souboru\n" --"\n" -+" -f, --file čte nové položky ze souboru nebo z /etc/" -+"ethers\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:183 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" --" <HW>=Pouijte '-H <hw> pro zadn hardwarovho typu adresy.\n" --" Implicitn: %s\n" -+" <HW>=Použijte '-H <hw> pro zadání hardwarového typu adresy.\n" -+" Implicitně: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:184 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" --msgstr " Seznam monch hardwarovch typ (podporujcch ARP):\n" -+msgstr " Seznam možných hardwarových typů (podporujících ARP):\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" --msgstr "hardwarov typ %s nen podporovn!\n" -+msgstr "hardwarový typ %s není podporován!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" --msgstr "tda adres %s nen podporovna!\n" -+msgstr "třída adres %s není podporována!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" --msgstr "arp: pepna -N nen zatm podporovn\n" -+msgstr "arp: přepínač -N není zatím podporován\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" --msgstr "arp: neznm tda adres %s.\n" -+msgstr "arp: neznámá třída adres %s.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" --msgstr "arp: neznm hardwarov typ %s.\n" -+msgstr "arp: neznámý hardwarový typ %s.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" --msgstr "arp: %s: jdro podporuje pouze 'inet'.\n" -+msgstr "arp: %s: jádro podporuje pouze 'inet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" --msgstr "arp: hardwarov typ %s nepodporuje ARP.\n" -+msgstr "arp: hardwarový typ %s nepodporuje ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" --msgstr "Nastavuji jmno uzlu na `%s'\n" -+msgstr "Nastavuji jméno uzlu na `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" --msgstr "%s: jmno uzlu me zmnit pouze superuivatel\n" -+msgstr "%s: jméno uzlu může změnit pouze superuživatel\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:100 ../hostname.c:118 - #, c-format - msgid "%s: name too long\n" --msgstr "jmno %s je pli dlouh\n" -+msgstr "jméno %s je příliš dlouhé\n" - --#: ../hostname.c:89 -+#: ../hostname.c:92 - #, c-format - msgid "Setting hostname to `%s'\n" --msgstr "Nastavuji jmno potae na `%s'\n" -+msgstr "Nastavuji jméno počítače na `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:97 - #, c-format - msgid "%s: you must be root to change the host name\n" --msgstr "%s: jmno potae me zmnit pouze superuivatel\n" -+msgstr "%s: jméno počítače může změnit pouze superuživatel\n" - --#: ../hostname.c:108 -+#: ../hostname.c:110 - #, c-format - msgid "Setting domainname to `%s'\n" --msgstr "Nastavuji jmno domny na `%s'\n" -+msgstr "Nastavuji jméno domény na `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:115 - #, c-format - msgid "%s: you must be root to change the domain name\n" --msgstr "%s: jmno domny me zmnit pouze superuivatel\n" -+msgstr "%s: jméno domény může změnit pouze superuživatel\n" - --#: ../hostname.c:131 -+#: ../hostname.c:132 - #, c-format - msgid "Resolving `%s' ...\n" --msgstr "Vyhledvm `%s' ...\n" -+msgstr "Vyhledávám `%s' ...\n" - --#: ../hostname.c:137 -+#: ../hostname.c:138 - #, c-format - msgid "Result: h_name=`%s'\n" --msgstr "Vsledek: h_name=`%s'\n" -+msgstr "Výsledek: h_name=`%s'\n" - --#: ../hostname.c:142 -+#: ../hostname.c:143 - #, c-format - msgid "Result: h_aliases=`%s'\n" --msgstr "Vsledek: h_aliases=`%s'\n" -+msgstr "Výsledek: h_aliases=`%s'\n" - --#: ../hostname.c:147 -+#: ../hostname.c:148 - #, c-format - msgid "Result: h_addr_list=`%s'\n" --msgstr "Vsledek: h_addr_list=`%s'\n" -+msgstr "Výsledek: h_addr_list=`%s'\n" - - #: ../hostname.c:209 - #, c-format - msgid "%s: can't open `%s'\n" --msgstr "%s: `%s' nelze otevt\n" -+msgstr "%s: `%s' nelze otevřít\n" - - #: ../hostname.c:223 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" --"Pouit:\n" --" hostname [-v] {jmno|-F soubor} nastav jmno potae (ze " -+"Použití:\n" -+" hostname [-v] {jméno|-F soubor} nastaví jméno počítače (ze " - "souboru)\n" - - #: ../hostname.c:224 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" --" domainname [-v] {jmno|-F soubor} nastav jmno NIS domny (ze\n" -+" domainname [-v] {jméno|-F soubor} nastaví jméno NIS domény (ze\n" - " souboru)\n" - - #: ../hostname.c:226 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr "" --" nodename [-v] {jmno|-F soubor} nastav jmno DECnet uzlu (ze\n" -+" nodename [-v] {jméno|-F soubor} nastaví jméno DECnet uzlu (ze\n" - " souboru)\n" - - #: ../hostname.c:228 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" --msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] vype formtovan jmno\n" -+msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] vypíše formátované jméno\n" - - #: ../hostname.c:229 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr "" --" hostname [-v] vype jmno potae\n" -+" hostname [-v] vypíše jméno počítače\n" - "\n" - - #: ../hostname.c:230 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" - msgstr "" --" hostname -V|--version|-h|--help vype informace a skon\n" -+" hostname -V|--version|-h|--help vypíše informace a skončí\n" - "\n" - - #: ../hostname.c:231 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -362,42 +388,51 @@ msgstr "" - "\n" - - #: ../hostname.c:232 -+#, c-format - msgid " -s, --short short host name\n" --msgstr " -s, --short krtk jmno potae\n" -+msgstr " -s, --short krátké jméno počítače\n" - - #: ../hostname.c:233 -+#, c-format - msgid " -a, --alias alias names\n" --msgstr " -a, --alias pezdvky\n" -+msgstr " -a, --alias přezdívky\n" - - #: ../hostname.c:234 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" --msgstr " -i, --ip-address adresy odpovdajc jmnu potae\n" -+msgstr " -i, --ip-address adresy odpovídající jménu počítače\n" - - #: ../hostname.c:235 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" --msgstr " -f, --fqdn, --long dlouh jmno potae (kanonick)\n" -+msgstr " -f, --fqdn, --long dlouhé jméno počítače (kanonické)\n" - - #: ../hostname.c:236 -+#, c-format - msgid " -d, --domain DNS domain name\n" --msgstr " -d, --domain jmno DNS domny\n" -+msgstr " -d, --domain jméno DNS domény\n" - - #: ../hostname.c:237 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" --msgstr " -y, --yp, --nis jmno NIS/YP domny\n" -+msgstr " -y, --yp, --nis jméno NIS/YP domény\n" - - #: ../hostname.c:239 -+#, c-format - msgid " -n, --node DECnet node name\n" --msgstr " -n, --node jmno DECnet uzlu\n" -+msgstr " -n, --node jméno DECnet uzlu\n" - - #: ../hostname.c:241 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file te jmno potae i nis domny ze souboru\n" -+" -F, --file čte jméno počítače či nis domény ze souboru\n" - "\n" - - #: ../hostname.c:243 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -405,931 +440,929 @@ msgid "" - " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" -+" Tento příkaz může přečíst nebo nastavit název stroje nebo doménové jméno\n" -+" NIS. Načíst lze rovněž DNS doménu nebo FQDN (plně kvalifikované doménové\n" -+" jméno). Pokud pro vyhledávání strojů nepoužíváte bind nebo NIS, můžete\n" -+" změnit FQDN (Fully Qualified Domain Name) a doménové jméno DNS (což je\n" -+" část FQDN) v souboru /etc/hosts.\n" - --#: ../hostname.c:338 -+#: ../hostname.c:340 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" --msgstr "%s: Tmto pkazem nelze DNS jmno domny zmnit\n" -+msgstr "%s: Tímto příkazem nelze DNS jméno domény změnit\n" - --#: ../hostname.c:339 -+#: ../hostname.c:341 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Pokud nepouvte bind i NIS pro vyhledvn jmen pota, pak mete " --"zmnit\n" -+"Pokud nepoužíváte bind či NIS pro vyhledávání jmen počítačů, pak můžete " -+"změnit\n" - --#: ../hostname.c:340 -+#: ../hostname.c:342 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" --"DNS jmno domny (je soust kanonickho jmna potae) v souboru\n" -+"DNS jméno domény (je součástí kanonického jména počítače) v souboru\n" - "/etc/hosts\n" - --#: ../hostname.c:357 -+#: ../hostname.c:359 - #, c-format - msgid "gethostname()=`%s'\n" - msgstr "gethostname()=`%s'\n" - --#: ../hostname.c:374 -+#: ../hostname.c:376 - #, c-format - msgid "getdomainname()=`%s'\n" - msgstr "getdomainname()=`%s'\n" - --#: ../hostname.c:389 -+#: ../hostname.c:391 - #, c-format - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Zapouzden:%s " -- --#: ../ifconfig.c:164 -+#: ../ifconfig.c:107 ../netstat.c:1482 - #, c-format --msgid "HWaddr %s " --msgstr "HWadr %s " -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "" -+"Rozhr MTU Met PŘ-OK PŘ-CHYB PŘ-ZAH PŘ-PŘT OD-OK OD-CHYB OD-ZAH OD-PŘT " -+"Přízn\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:132 ../ifconfig.c:164 - #, c-format --msgid "Media:%s" --msgstr "Mdium:%s" -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: CHYBA při získávání příznaků rozhraní: %s\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -- --#: ../ifconfig.c:176 -+#: ../ifconfig.c:156 ../ifconfig.c:188 ../ifconfig.c:794 ../ifconfig.c:887 -+#: ../ifconfig.c:1000 - #, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+msgid "No support for INET on this system.\n" -+msgstr "Tento systém nepodporuje INET.\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:196 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: CHYBA při zkoušení příznaků rozhraní: %s\n" - --# V ostatnch katalozch se pekld Broadcast -> vesmrov vysln. --# Tudi bcast -> Vesmr :) --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Vesmr:%s " -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Použití:\n" -+" ifconfig [-a] [-v] [-s] <rozhraní> [[<AF>] <adresa>]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:207 - #, c-format --msgid " Mask:%s\n" --msgstr "Maska:%s\n" -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <adresa>[/<délka prefixu>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:208 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6-adr: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Rozsah:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Globl" -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <adresa>[/<délka prefixu>]]\n" - - #: ../ifconfig.c:209 --msgid "Link" --msgstr "Linka" -- --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Stanovit" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilita" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Pota" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Neznm." -- --#: ../ifconfig.c:236 --#, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II adr: %s\n" -- --#: ../ifconfig.c:239 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP adr:%s\n" -- --#: ../ifconfig.c:242 --#, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 adr:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<adresa>]] [[-]pointopoint [<adresa>]]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:210 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 adr:%s\n" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <adresa>] [dstaddr <adresa>] [tunnel <adresa>]\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:213 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 adr:%s\n" -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:215 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet adr:%s\n" -- --# Hic sunt leones ... --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[DN PZNAKY]" -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "AKTIVOVNO " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "VESMROV_VYSLN " -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "SMYKA " -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -- --# ?? --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -- --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "B̮ " -- --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NEARP " -- --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISK " -- --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -- --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -- --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -- --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -- --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <adresa>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:216 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metrika:%d" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:217 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:218 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "pijmutch paket:%lu chyb:%lu zahozeno:%lu peteen:%lu rmc:%lu\n" -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <typ>]\n" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:220 - #, c-format --msgid " compressed:%lu\n" --msgstr " komprimovno:%lu\n" -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen délka]\n" - --# carrier? --#: ../ifconfig.c:329 -+#: ../ifconfig.c:223 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "odeslanch paket:%lu chyb:%lu zahozeno:%lu peteen:%lu penos:%lu\n" -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:225 - #, c-format --msgid " collisions:%lu " --msgstr " koliz:%lu " -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:227 - #, c-format --msgid "compressed:%lu " --msgstr "komprimovno:%lu " -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW> = Hardwarový Typ.\n" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:228 - #, c-format --msgid "txqueuelen:%d " --msgstr "dlka odchoz fronty:%d " -+msgid " List of possible hardware types:\n" -+msgstr " Seznam možných hardwarových typů:\n" - --#: ../ifconfig.c:345 -+#. 1 = ARPable -+#: ../ifconfig.c:230 - #, c-format --msgid "Interrupt:%d " --msgstr "Peruen:%d " -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF> = Třída adres. Implicitní: %s\n" - --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 -+#: ../ifconfig.c:231 - #, c-format --msgid "Base address:0x%x " --msgstr "Vstupn/Vstupn port:0x%x " -+msgid " List of possible address families:\n" -+msgstr " Seznam možných tříd adres:\n" - --#: ../ifconfig.c:350 -+#: ../ifconfig.c:307 - #, c-format --msgid "Memory:%lx-%lx " --msgstr "Pam:%lx-%lx " -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "ifconfig: přepínač „%s“ nebyl rozpoznán.\n" - --#: ../ifconfig.c:353 -+#: ../ifconfig.c:309 ../ifconfig.c:990 - #, c-format --msgid "DMA chan:%x " --msgstr "Kanl DMA:%x " -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "ifconfig: návod na použití lze získat pomocí „--help“\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:384 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: rozhran %s nen znmo\n" -+msgid "Unknown media type.\n" -+msgstr "Neznámý typ média.\n" - - #: ../ifconfig.c:421 -+#, c-format - msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" - msgstr "" --"Pouit:\n" --" ifconfig [-a] [-i] [-v] <rozhran> [[<AF>] <adresa>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <adresa>[/<dlka prefixu>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <adresa>[/<dlka prefixu>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<adresa>]] [[-]pointopoint [<adresa>]]\n" -+"Pozor: Rozhraní %s je stále v promiskuitním režimu. Neběží jiná aplikace?\n" - - #: ../ifconfig.c:433 --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <adresa>] [dstaddr <adresa>] [tunnel <adresa>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "Pozor: Rozhraní %s je stále v režimu MULTICAST.\n" - --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <adresa>] [metric <NN>] [mtu <NN>]\n" -+#: ../ifconfig.c:445 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "Pozor: Rozhraní %s je stále v režimu ALLMULTI.\n" - --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+#: ../ifconfig.c:469 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "Pozor: Rozhraní %s je stále v režimu DYNAMIC.\n" - --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -+#: ../ifconfig.c:527 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "Pozor: Rozhraní %s je stále v režimu VŠESMĚR.\n" - --#: ../ifconfig.c:441 --msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" --msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <typ>]\n" -+#: ../ifconfig.c:538 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for broadcast\n" -+msgstr "ifconfig: Chyba při překládání „%s“ pro všesměr\n" - --#: ../ifconfig.c:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen dlka]\n" -+#: ../ifconfig.c:563 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for dstaddr\n" -+msgstr "ifconfig: Chyba při překládání „%s“ pro adresu cíle\n" - --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -+#: ../ifconfig.c:586 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for netmask\n" -+msgstr "ifconfig: Chyba při překládání „%s“ pro masku sítě\n" - --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" --msgstr "" --" [up|down] ...\n" --"\n" -+#: ../ifconfig.c:665 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "Pozor: Rozhraní %s je stále v DVOUBODOVÉM režimu.\n" - --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Hardwarov Typ.\n" -+#: ../ifconfig.c:676 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for pointopoint\n" -+msgstr "ifconfig: Chyba při překládání „%s“ pro dvoubodové nastavení\n" - --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Seznam monch hardwarovch typ:\n" -+#: ../ifconfig.c:700 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" -+"Pro typ hardwarové adresy „%s“ neexistuje obsluha na nastavování adresy.\n" -+"Operace selhala.\n" - --#. 1 = ARPable --#: ../ifconfig.c:453 -+#: ../ifconfig.c:709 - #, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=tda adres. Implicitn: %s\n" -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Seznam monch td adres:\n" -+#: ../ifconfig.c:749 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for add\n" -+msgstr "ifconfig: Chyba při překládání „%s“ pro adresu\n" - --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Neznm typ mdia.\n" -+#: ../ifconfig.c:760 ../ifconfig.c:850 ../ifconfig.c:938 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "Tento systém nepodporuje INET6.\n" - --#: ../ifconfig.c:881 -+#: ../ifconfig.c:803 ../ifconfig.c:896 - #, c-format --msgid "%s: invalid %s address.\n" --msgstr "%s: adresa %s je nesprvn.\n" -+msgid "Interface %s not initialized\n" -+msgstr "Rozhraní %s není inicializováno\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Tento systm nepodporuje INET6.\n" -+#: ../ifconfig.c:815 ../ifconfig.c:907 -+#, c-format -+msgid "Bad address.\n" -+msgstr "Chybná adresa.\n" - --#: ../ifconfig.c:983 -+#: ../ifconfig.c:910 -+#, c-format - msgid "Address deletion not supported on this system.\n" --msgstr "Tento systm nepodporuje mazn adres.\n" -+msgstr "Tento systém nepodporuje mazání adres.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Tento systm nepodporuje INET.\n" -+#: ../ifconfig.c:982 -+#, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "ifconfig: Pro tuto rodinu protokolů nelze nastavit adresu.\n" -+ -+#: ../ifconfig.c:989 -+#, c-format -+msgid "ifconfig: error resolving '%s' to set address for af=%s\n" -+msgstr "ifconfig: chyba při překládání „%s“ za účelem nastavení adresy AF=%s\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:1010 -+#, c-format - msgid "No support for ECONET on this system.\n" --msgstr "Tento systm nepodporuje ECONET.\n" -+msgstr "Tento systém nepodporuje ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:1018 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" --msgstr "Nevm, jak nastavit adresu tdy %d.\n" -+msgstr "Nevím, jak nastavit adresu třídy %d.\n" -+ -+#: ../ifconfig.c:1053 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "POZOR: Vyskytla se alespoň jedna chyba. (%d)\n" - --#: ../netstat.c:383 -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" --"(Pro \"-p\" nelze zskat dn informace: geteuid()=%d, ale je teba, aby " -+"(Pro \"-p\" nelze získat žádné informace: geteuid()=%d, ale je třeba, aby " - "jste\n" --"byl superuivatelem)\n" -+"byl superuživatelem)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" --"(Vechny procesy nemohly bt identifikovny. Budou vypsany informace\n" --"pouze o procesech, jich jste vlastnkem. Aby jste mohl vidt ve, musel\n" --"byste bt superuivatelem.)\n" -+"(Všechny procesy nemohly být identifikovány. Budou vypsány informace\n" -+"pouze o procesech, jichž jste vlastníkem. Aby jste mohl vidět vše, musel\n" -+"byste být superuživatelem.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1186 ../netstat.c:1264 - msgid "LISTENING" --msgstr "NASLOUCH" -+msgstr "NASLOUCHÁ" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" --msgstr "CONN ODESLN" -+msgstr "CONN ODESLÁN" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1266 - msgid "DISC SENT" --msgstr "DISC ODESLN" -+msgstr "DISC ODESLÁN" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:898 ../netstat.c:1267 - msgid "ESTABLISHED" - msgstr "SPOJENO" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" --msgstr "Aktivn NET/ROM sokety\n" -+msgstr "Aktivní NET/ROM sokety\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" --"Uivatel Cl Zdroj Zazen Stav Vr/Vs Odch-F " --"Pch-F\n" -+"Uživatel Cíl Zdroj Zařízení Stav Vr/Vs Odch-F Přích-" -+"F\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1306 - #, c-format - msgid "Problem reading data from %s\n" --msgstr "Chyba pi ten dat z %s\n" -+msgstr "Chyba při čtení dat z %s\n" - --# nsledujc radji ponechat v originle ?! --#: ../netstat.c:465 -+# následující raději ponechat v originále ?! -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" --msgstr "ZAVEN" -+msgstr "ZAVŘEN" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" --msgstr "POSLEDN ACK" -+msgstr "POSLEDNÍ ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" --msgstr "LISTEN" -+msgstr "NASLOUCHÁ" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" --msgstr "ZAVR" -+msgstr "ZAVíRÁ" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" --msgstr "varovn, nesmysln igmp6 dek %d.\n" -+msgstr "varování, nesmyslný igmp6 řádek %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:892 -+#: ../netstat.c:1029 ../netstat.c:1034 - #, c-format - msgid "netstat: unsupported address family %d !\n" --msgstr "netstat: tda adres %d nen podporovna !\n" -+msgstr "netstat: třída adres %d není podporována !\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" --msgstr "varovn, nesmysln igmp dek %d.\n" -+msgstr "varování, nesmyslný igmp řádek %d.\n" -+ -+#: ../netstat.c:677 -+#, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktivní X.25 sokety\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "" -+"Cíl Zdroj Zaříz LCI Stav Vr/Vs Odhod-F Přích-" -+"F\n" - --#: ../netstat.c:666 -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" --msgstr "varovn, nesmysln tcp dek.\n" -+msgstr "varování, nesmyslný tcp řádek.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:798 ../netstat.c:947 ../netstat.c:1072 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "vyp (0.00/%ld/%d)" - --#: ../netstat.c:708 --#, fuzzy, c-format -+#: ../netstat.c:802 -+#, c-format - msgid "on (%2.2f/%ld/%d)" --msgstr "zap%d (%2.2f/%ld/%d)" -+msgstr "zapnut (%2.2f/%ld/%d)" - --#: ../netstat.c:713 --#, fuzzy, c-format -+#: ../netstat.c:807 -+#, c-format - msgid "keepalive (%2.2f/%ld/%d)" --msgstr "zap%d (%2.2f/%ld/%d)" -+msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:718 --#, fuzzy, c-format -+#: ../netstat.c:812 -+#, c-format - msgid "timewait (%2.2f/%ld/%d)" --msgstr "zap%d (%2.2f/%ld/%d)" -+msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:817 ../netstat.c:956 ../netstat.c:1082 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "nezn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:888 -+#, c-format - msgid "warning, got bogus udp line.\n" --msgstr "varovn, nesmysln udp dek.\n" -+msgstr "varování, nesmyslný udp řádek.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:906 ../netstat.c:1172 ../netstat.c:1205 - msgid "UNKNOWN" --msgstr "NEZNM" -+msgstr "NEZNÁM" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:952 ../netstat.c:1077 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1043 -+#, c-format - msgid "warning, got bogus raw line.\n" --msgstr "varovn, nesmysln 'raw' dek.\n" -+msgstr "varování, nesmyslný 'raw' řádek.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1125 -+#, c-format - msgid "warning, got bogus unix line.\n" --msgstr "varovn, netstat 'unix' dek.\n" -+msgstr "varování, netstat 'unix' řádek.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1152 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1156 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1160 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1164 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1168 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1177 - msgid "FREE" --msgstr "NEALOKOVN" -+msgstr "NEALOKOVÁN" - --#: ../netstat.c:1096 -+#: ../netstat.c:1193 - msgid "CONNECTING" - msgstr "SPOJUJE" - --#: ../netstat.c:1100 -+#: ../netstat.c:1197 - msgid "CONNECTED" - msgstr "SPOJEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1201 - msgid "DISCONNECTING" - msgstr "ODPOJUJE" - --#: ../netstat.c:1135 -+#: ../netstat.c:1233 -+#, c-format - msgid "Active UNIX domain sockets " --msgstr "Aktivn sokety domny UNIX " -+msgstr "Aktivní sokety domény UNIX " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1235 ../netstat.c:1801 -+#, c-format - msgid "(servers and established)" --msgstr "(servery a navzan spojen)" -+msgstr "(servery a navázaná spojení)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1238 ../netstat.c:1804 -+#, c-format - msgid "(only servers)" - msgstr "(pouze servery)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1240 ../netstat.c:1806 -+#, c-format - msgid "(w/o servers)" - msgstr "(w/o servery)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1243 -+#, c-format - msgid "" - "\n" --"Proto RefCnt Flags Type State I-Node" -+"Proto RefCnt Flags Type State I-Node " - msgstr "" - "\n" --"Proto ta Pznaky Typ Stav I-Uzel" -+"Proto Čítač Příznaky Typ Stav I-Uzel " - --#: ../netstat.c:1147 -+#: ../netstat.c:1245 -+#, c-format - msgid " Path\n" - msgstr " Cesta\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1265 - msgid "SABM SENT" --msgstr "SABM ODESLN" -+msgstr "SABM ODESLÁN" - --#: ../netstat.c:1170 -+#: ../netstat.c:1268 - msgid "RECOVERY" - msgstr "OBNOVA" - --#: ../netstat.c:1184 -+#: ../netstat.c:1282 -+#, c-format - msgid "Active AX.25 sockets\n" --msgstr "Aktivn AX.25 sokety\n" -+msgstr "Aktivní AX.25 sokety\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1283 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" --msgstr "Cl Zdroj Zaz Stav Vr/Vs Odhod-F Pch-F\n" -+msgstr "Cíl Zdroj Zaříz Stav Vr/Vs Odhod-F Přích-F\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1326 - #, c-format - msgid "problem reading data from %s\n" --msgstr "chyba pi ten dat z %s\n" -+msgstr "chyba při čtení dat z %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1396 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" --"Aktivn IPX sokety\n" --"Proto Pch-F Odch-F Lokl adresa Vzdlen adresa " --" Stav" -+"Aktivní IPX sokety\n" -+"Proto Přích-F Odch-F Lokál adresa Vzdálená " -+"adresa Stav" - --#: ../netstat.c:1281 -+#: ../netstat.c:1398 -+#, c-format - msgid " User" --msgstr " Uivatel" -+msgstr " Uživatel" - --#: ../netstat.c:1315 -+#: ../netstat.c:1432 - msgid "ESTAB" - msgstr "SPOJEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1440 - msgid "UNK." - msgstr "NEZ." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - statistick data nejsou dostupn -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[DN PZNAKY]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1478 -+#, c-format - msgid "Kernel Interface table\n" --msgstr "Tabulka rozhran v jdru\n" -+msgstr "Tabulka rozhraní v jádru\n" - --#: ../netstat.c:1401 --msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " --"Flg\n" --msgstr "" --"Rozhr MTU Met P-OK P-CHYB P-ZAH P-PT OD-OK OD-CHYB OD-ZAH OD-PT " --"PZ\n" -- --#: ../netstat.c:1404 -+#: ../netstat.c:1486 - msgid "missing interface information" --msgstr "chyb informace o rozhran" -+msgstr "chybí informace o rozhraní" - --#: ../netstat.c:1425 -+#: ../netstat.c:1509 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" --"Pouit: netstat [--veenNcCF] [<TA>] -r netstat " --"{-V|--version|-h|--help}\n" -+"Použití: netstat [-vWeenNcCF] [<AF>] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 --msgid " netstat [-vnNcaeol] [<Socket> ...]\n" --msgstr " netstat [-vnNcaeol] [<Soket> ...]\n" -+#: ../netstat.c:1510 -+#, c-format -+msgid " netstat [-vWnNcaeol] [<Socket> ...]\n" -+msgstr " netstat [-vWnNcaeol] [<Socket>…]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1511 -+#, c-format - msgid "" --" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" -+" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n" - "\n" - msgstr "" --" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" -+" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1513 -+#, c-format - msgid " -r, --route display routing table\n" --msgstr " -r, --route vype smrovac tabulku\n" -+msgstr " -r, --route vypíše směrovací tabulku\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1514 -+#, c-format - msgid " -i, --interfaces display interface table\n" --msgstr " -i, --interfaces vype tabulku rozhran\n" -+msgstr " -i, --interfaces vypíše tabulku rozhraní\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1515 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" --" -g, --groups vype lenstv v multicast skupinch\n" -+" -g, --groups vypíše členství v multicast skupinách\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1516 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" --" -s, --statistics vype statistiku sov aktivity (jako " -+" -s, --statistics vypíše statistiku síťové aktivity (jako " - "SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1518 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" - msgstr "" --" -M, --masquerade vype maskovan spojen\n" -+" -M, --masquerade vypíše maskovaná spojení\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1521 -+#, c-format -+msgid " -W, --wide don't truncate IP addresses\n" -+msgstr " -W, --wide nezkracuje IP adresy\n" -+ -+#: ../netstat.c:1523 -+#, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " --numeric-hosts nepřekládá názvy strojů\n" -+ -+#: ../netstat.c:1524 -+#, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " --numeric-ports nepřekládá názvy portů\n" -+ -+#: ../netstat.c:1525 -+#, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " --numeric-users nepřekládá uživatelské jména\n" -+ -+#: ../netstat.c:1526 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" --msgstr " -N, --symbolic pevede hw jmna\n" -+msgstr " -N, --symbolic převede hw jména\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1527 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" --msgstr " -e, --extend vype podrobnj informace\n" -+msgstr " -e, --extend vypíše podrobnější informace\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1528 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" --" -p, --programs vype PID/jmno programu pro sokety\n" -+" -p, --programs vypíše PID/jméno programu pro sokety\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1529 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" - msgstr "" --" -c, --continuous neperuovan vpis\n" -+" -c, --continuous nepřerušovaný výpis\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1530 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" --" -l, --listening vype sokety, na nich je naslouchno\n" -+" -l, --listening vypíše sokety, na nichž je nasloucháno\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1531 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" --" -a, --all, --listening vype vechny sokety (implicitn: " --"spojen)\n" -+" -a, --all, --listening vypíše všechny sokety (implicitně: " -+"spojené)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1532 -+#, c-format - msgid " -o, --timers display timers\n" --msgstr " -o, --timers zobraz asovae\n" -+msgstr " -o, --timers zobrazí časovače\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1533 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" - msgstr "" --" -F, --fib zobraz Forwarding Infomation Base\n" --" (implicitn)\n" -+" -F, --fib zobrazí Forwarding Information Base\n" -+" (implicitní)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1534 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" --msgstr " -C, --cache msto FIB zobraz smrovac cache\n" -+msgstr " -C, --cache místo FIB zobrazí směrovací cache\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1536 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-w|--raw} {-x|--unix} --" -+"ax25 --ipx --netrom\n" - msgstr "" --" <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-w|--raw} {-x|--unix} --" -+"ax25 --ipx --netrom\n" - --#: ../netstat.c:1449 ../route.c:92 -+#: ../netstat.c:1537 - #, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" --msgstr " <AF>=Pouijte '-A <af>' or '--<af>' Implicitn: %s\n" -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Použijte „-6|-4“ nebo „-A <af>“ nebo „--<af>“. Implicitní: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1538 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" --msgstr " Seznam monch td adres (podporujcch smrovn):\n" -+msgstr " Seznam možných tříd adres (podporujících směrování):\n" -+ -+#: ../netstat.c:1756 -+#, c-format -+msgid "netstat: No statistics support for specified address family: %s\n" -+msgstr "netstat: Pro zadanou rodinu adres není podporována statistika: %s\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1798 -+#, c-format - msgid "Active Internet connections " --msgstr "Aktivn Internetov spojen " -+msgstr "Aktivní Internetová spojení " - --#: ../netstat.c:1673 -+#: ../netstat.c:1808 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Pch-F Odch-F Mstn Adresa Vzdlen Adresa Stav " -+"Proto Přích-F Odch-F Místní Adresa Vzdálená Adresa Stav " - --#: ../netstat.c:1675 -+#: ../netstat.c:1810 -+#, c-format - msgid " User Inode " --msgstr " Uivatel I-uzel " -+msgstr " Uživatel I-uzel " - --#: ../netstat.c:1678 -+#: ../netstat.c:1813 -+#, c-format - msgid " Timer" --msgstr " asova" -+msgstr " Časovač" - --#: ../netstat.c:1708 -+#: ../netstat.c:1851 -+#, c-format - msgid "IPv4 Group Memberships\n" --msgstr "lenstv v IPv4 skupinch\n" -+msgstr "Členství v IPv4 skupinách\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1852 -+#, c-format - msgid "Interface RefCnt Group\n" --msgstr "Rozhran ta Skupina\n" -+msgstr "Rozhraní Čítač Skupina\n" - --#: ../rarp.c:43 -+#: ../rarp.c:45 - msgid "This kernel does not support RARP.\n" --msgstr "Toto jdro nepodporuje RARP.\n" -+msgstr "Toto jádro nepodporuje RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:84 - #, c-format - msgid "no RARP entry for %s.\n" --msgstr "pro %s neexistuje RARP poloka.\n" -+msgstr "pro %s neexistuje RARP položka.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:97 - #, c-format - msgid "%s: bad hardware address\n" --msgstr "hardwarov adresa %s je nesprvn\n" -+msgstr "hardwarová adresa %s je nesprávná\n" - --#: ../rarp.c:127 -+#: ../rarp.c:129 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" --msgstr "rarp: soubor %s:%s nelze otevt.\n" -+msgstr "rarp: soubor %s:%s nelze otevřít.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:141 - #, c-format - msgid "rarp: format error at %s:%u\n" --msgstr "rarp: syntaktick chyba na dku %2$u souboru %1$s\n" -+msgstr "rarp: syntaktická chyba na řádku %2$u souboru %1$s\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:145 ../rarp.c:290 - #, c-format - msgid "rarp: %s: unknown host\n" --msgstr "rarp: pota %s nen znm\n" -+msgstr "rarp: počítač %s není znám\n" - --#: ../rarp.c:146 -+#: ../rarp.c:148 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" --msgstr "rarp: nelze nastavit poloku z dku %2$u souboru %1$s\n" -+msgstr "rarp: nelze nastavit položku z řádku %2$u souboru %1$s\n" - --#: ../rarp.c:175 -+#: ../rarp.c:177 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "Pouit: rarp -a vype poloky z cache.\n" -+msgstr "Použití: rarp -a vypíše položky z cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr " rarp -d <jmno> smae poloku z cache.\n" -+msgstr " rarp -d <jméno> smaže položku z cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:179 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr "" --" rarp [<HW>] -s <jmno> <hwadr> pid poloku do cache.\n" -+" rarp [<HW>] -s <jméno> <hwadr> přidá položku do cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" --" rarp -f pid poloky z /etc/ethers.\n" -+" rarp -f přidá položky z /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:181 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" - msgstr "" --" rarp -V vype oznaen verze " -+" rarp -V vypíše označení verze " - "programu.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:239 - #, c-format - msgid "%s: illegal option mix.\n" --msgstr "Kombinace pepna %s je nesprvn.\n" -+msgstr "Kombinace přepínačů %s je nesprávná.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:270 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" --msgstr "rarp: hardwarov typ %s nen znm.\n" -+msgstr "rarp: hardwarový typ %s není znám.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" --"Pouit: route [-nNvee] [-FC] [<AF>] Zobraz smrovac tabulky v " --"jdru\n" -+"Použití: route [-nNvee] [-FC] [<AF>] Zobrazí směrovací tabulky v " -+"jádru\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" - msgstr "" --" route [-v] [-FC] {add|del|flush} ... Zmn smrovac tabulku pro " -+" route [-v] [-FC] {add|del|flush} ... Změní směrovací tabulku pro " - "AF.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" - msgstr "" --" route {-h|--help [<AF>] Npovda pro pouit s AF.\n" -+" route {-h|--help [<AF>] Nápověda pro použití s AF.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" --" route {-V|--version} Vype oznaen verze a autora\n" -+" route {-V|--version} Vypíše označení verze a autora\n" - " programu.\n" - -+#: ../route.c:92 -+#, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Použijte „-A <af>“ nebo „--<af>“. Implicitní: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" --msgstr "Pouit: plipconfig [-a] [-i] [-v] rozhran\n" -+msgstr "Použití: plipconfig [-a] [-i] [-v] rozhraní\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1338,25 +1371,30 @@ msgstr " plipconfig -V | --version\n" - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" --msgstr "Pouit: iptunnel { add | change | del | show } [ JMNO ]\n" -+msgstr "Použití: iptunnel { add | change | del | show } [ JMÉNO ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" --" [ mode { ipip | gre | sit } ] [ vzdlen ADR ] [ mstn ADR ]\n" -+" [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" --msgstr " [ [i|o]seq ] [ [i|o]key KL ] [ [i|o]csum ]\n" -+msgstr " [ [i|o]seq ] [ [i|o]key KLÍČ ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" --msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAZEN ]\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAŘÍZENÍ ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1364,1068 +1402,1781 @@ msgstr "" - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" --msgstr "Kde: JMNO := ETZEC\n" -+msgstr "Kde: JMÉNO := ŘETĚZEC\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " ADR := { IP-ADRESA | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" --msgstr " TOS := { SLO | inherit }\n" -+msgstr " TOS := { ČÍSLO | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" --msgstr " KL := { DOTTED_QUAD | SLO }\n" -+msgstr " KLÍČ := { DOTTED_QUAD | ČÍSLO }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" --msgstr "S ipip a sit nejsou kle povoleny.\n" -+msgstr "S ipip a sit nejsou klíče povoleny.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" --msgstr "Tunel se vesmrovm vyslnm vyaduje zdrojovou adresu.\n" -+msgstr "Tunel se všesměrovým vysíláním vyžaduje zdrojovou adresu.\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" --msgstr "ttl != 0 a noptmudisc se navzjem vyluuj\n" -+msgstr "ttl != 0 a noptmudisc se navzájem vylučují\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" --msgstr "reim tunelu (ipip, gre i sit) nelze zjistit\n" -+msgstr "režim tunelu (ipip, gre či sit) nelze zjistit\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " --msgstr "%s: %s/ip vzdlen %s mstn %s " -+msgstr "%s: %s/ip vzdálený %s místní %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" --msgstr "Neznm." -+msgstr "Neznám." - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" --msgstr " Zahazuje pakety mimo poad.\n" -+msgstr " Zahazuje pakety mimo pořadí.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" --msgstr " Pijman pakety mus mt kontroln souet.\n" -+msgstr " Přijímané pakety musí mít kontrolní součet.\n" - - # ??? --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" --msgstr " ad odchoz pakety.\n" -+msgstr " Řadí odchozí pakety.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" --msgstr " Odchoz pakety budou mt kontroln souet.\n" -+msgstr " Odchozí pakety budou mít kontrolní součet.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" --msgstr "Lituji, formt /proc/net/dev je chybn.\n" -+msgstr "Lituji, formát /proc/net/dev je chybný.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" --msgstr "Typ [%s] se nepodailo zjistit.\n" -+msgstr "Typ [%s] se nepodařilo zjistit.\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" --msgstr "RX: Pakety Bajty Chyby CsumChyb MimoPo Mcasts\n" -+msgstr "RX: Pakety Bajty Chyby CsumChyb MimoPoř Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakety Bajty Chyby DeadLoop NoRoute NoBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:48 - msgid "ICMP input histogram:" --msgstr "histogram ICMP vstupu:" -+msgstr "Histogram ICMP vstupu:" - --#: ../statistics.c:46 -+#: ../statistics.c:49 - msgid "ICMP output histogram:" --msgstr "histogram ICMP vstupu:" -+msgstr "Histogram ICMP výstupu:" -+ -+#: ../statistics.c:66 -+#, c-format -+msgid "Forwarding is %s" -+msgstr "Předávání je %s" -+ -+#: ../statistics.c:67 -+#, c-format -+msgid "Default TTL is %u" -+msgstr "Implicitní TTL je %u" -+ -+#: ../statistics.c:68 ../statistics.c:89 -+#, c-format -+msgid "%u total packets received" -+msgstr "Celkem přijatých paketů: %u" -+ -+#: ../statistics.c:69 ../statistics.c:90 -+#, c-format -+msgid "%u with invalid headers" -+msgstr "S nesprávnými hlavičkami: %u" -+ -+#: ../statistics.c:70 ../statistics.c:93 -+#, c-format -+msgid "%u with invalid addresses" -+msgstr "S nesprávnými adresami: %u" -+ -+#: ../statistics.c:71 ../statistics.c:98 -+#, c-format -+msgid "%u forwarded" -+msgstr "Přeposláno: %u" -+ -+#: ../statistics.c:72 ../statistics.c:94 -+#, c-format -+msgid "%u with unknown protocol" -+msgstr "S neznámým protokolem: %u" -+ -+#: ../statistics.c:73 ../statistics.c:96 -+#, c-format -+msgid "%u incoming packets discarded" -+msgstr "Počet zahozených příchozích paketů: %u" -+ -+#: ../statistics.c:74 ../statistics.c:97 -+#, c-format -+msgid "%u incoming packets delivered" -+msgstr "Počet doručených příchozích paketů: %u" -+ -+#: ../statistics.c:75 ../statistics.c:99 -+#, c-format -+msgid "%u requests sent out" -+msgstr "Počet požadavků na odeslání: %u" -+ -+#. ? -+#: ../statistics.c:76 ../statistics.c:100 -+#, c-format -+msgid "%u outgoing packets dropped" -+msgstr "Počet zahozených odchozích paketů: %u" -+ -+#: ../statistics.c:77 ../statistics.c:101 -+#, c-format -+msgid "%u dropped because of missing route" -+msgstr "Zahozeno kvůli chybějící cestě: %u" -+ -+#: ../statistics.c:78 ../statistics.c:102 -+#, c-format -+msgid "%u fragments dropped after timeout" -+msgstr "Počet fragmentů zahozených po vypršení času: %u" -+ -+#: ../statistics.c:79 ../statistics.c:103 -+#, c-format -+msgid "%u reassemblies required" -+msgstr "Počet nutných znovusestavení: %u" -+ -+#. ? -+#: ../statistics.c:80 ../statistics.c:104 -+#, c-format -+msgid "%u packets reassembled ok" -+msgstr "Počet v pořádku znovu sestavených paketů: %u" -+ -+#: ../statistics.c:81 ../statistics.c:105 -+#, c-format -+msgid "%u packet reassembles failed" -+msgstr "Počet paketů, jež se nepodařilo znovu sestavit: %u" -+ -+#: ../statistics.c:82 ../statistics.c:106 -+#, c-format -+msgid "%u fragments received ok" -+msgstr "Počet v pořádku přijatých fragmentů: %u" -+ -+#: ../statistics.c:83 ../statistics.c:107 -+#, c-format -+msgid "%u fragments failed" -+msgstr "Počet chybných fragmentů: %u" -+ -+#: ../statistics.c:84 ../statistics.c:108 -+#, c-format -+msgid "%u fragments created" -+msgstr "Počet vytvořených fragmentů: %u" -+ -+#: ../statistics.c:91 -+#, c-format -+msgid "%u with packets too big" -+msgstr "Počet příliš velkých packetů: %u" -+ -+#: ../statistics.c:92 -+#, c-format -+msgid "%u incoming packets with no route" -+msgstr "Počet příchozích paketů bez odpovídající cesty: %u" -+ -+#: ../statistics.c:95 -+#, c-format -+msgid "%u with truncated packets" -+msgstr "Počet zkrácených packetů: %u" -+ -+#: ../statistics.c:109 -+#, c-format -+msgid "%u incoming multicast packets" -+msgstr "Počet příchozích multicastových paketů: %u" -+ -+#: ../statistics.c:110 -+#, c-format -+msgid "%u outgoing multicast packets" -+msgstr "Počet odchozích multicastových paketů: %u" -+ -+#: ../statistics.c:115 ../statistics.c:145 -+#, c-format -+msgid "%u ICMP messages received" -+msgstr "Počet přijatých ICMP zpráv: %u" -+ -+#: ../statistics.c:116 ../statistics.c:146 -+#, c-format -+msgid "%u input ICMP message failed." -+msgstr "Počet chybných příchozích ICMP zpráv: %u" -+ -+#: ../statistics.c:117 ../statistics.c:130 ../statistics.c:147 -+#: ../statistics.c:162 -+#, c-format -+msgid "destination unreachable: %u" -+msgstr "Adresát nedostupný: %u" -+ -+#: ../statistics.c:118 -+#, c-format -+msgid "timeout in transit: %u" -+msgstr "Vypršel čas při přenosu: %u" -+ -+#: ../statistics.c:119 ../statistics.c:132 -+#, c-format -+msgid "wrong parameters: %u" -+msgstr "Chybné parametry: %u" -+ -+#. ? -+#: ../statistics.c:120 -+#, c-format -+msgid "source quenches: %u" -+msgstr "Zahlcení zdroje: %u" -+ -+#: ../statistics.c:121 ../statistics.c:160 ../statistics.c:175 -+#, c-format -+msgid "redirects: %u" -+msgstr "Počet přesměrování: %u" -+ -+#: ../statistics.c:122 ../statistics.c:151 ../statistics.c:166 -+#, c-format -+msgid "echo requests: %u" -+msgstr "Žádost o echo: %u" -+ -+#: ../statistics.c:123 ../statistics.c:136 ../statistics.c:152 -+#: ../statistics.c:167 -+#, c-format -+msgid "echo replies: %u" -+msgstr "Odpověď na žádost o echo: %u" -+ -+#: ../statistics.c:124 -+#, c-format -+msgid "timestamp request: %u" -+msgstr "Žádost o čas: %u" -+ -+#: ../statistics.c:125 -+#, c-format -+msgid "timestamp reply: %u" -+msgstr "Odpověď na žádost o čas: %u" -+ -+#: ../statistics.c:126 -+#, c-format -+msgid "address mask request: %u" -+msgstr "Žádost o masku podsítě: %u" -+ -+#. ? -+#: ../statistics.c:127 ../statistics.c:140 -+#, c-format -+msgid "address mask replies: %u" -+msgstr "Odpověď na žádost o masku podsítě: %u" -+ -+#. ? -+#: ../statistics.c:128 ../statistics.c:161 -+#, c-format -+msgid "%u ICMP messages sent" -+msgstr "Počet odeslaných ICMP zpráv: %u" -+ -+#: ../statistics.c:129 -+#, c-format -+msgid "%u ICMP messages failed" -+msgstr "Počet chybných ICMP zpráv: %u" -+ -+#: ../statistics.c:131 -+#, c-format -+msgid "time exceeded: %u" -+msgstr "Vypršení životnosti: %u" -+ -+#. ? -+#: ../statistics.c:133 -+#, c-format -+msgid "source quench: %u" -+msgstr "Zahlcení zdroje: %u" -+ -+#: ../statistics.c:134 -+#, c-format -+msgid "redirect: %u" -+msgstr "Počet přesměrování: %u" -+ -+#: ../statistics.c:135 -+#, c-format -+msgid "echo request: %u" -+msgstr "Žádost o echo: %u" -+ -+#: ../statistics.c:137 -+#, c-format -+msgid "timestamp requests: %u" -+msgstr "žádost o čas: %u" -+ -+#: ../statistics.c:138 -+#, c-format -+msgid "timestamp replies: %u" -+msgstr "Odpověď na žádost o čas: %u" -+ -+#: ../statistics.c:139 -+#, c-format -+msgid "address mask requests: %u" -+msgstr "Žádost o masku podsítě: %u" -+ -+#: ../statistics.c:148 ../statistics.c:163 -+#, c-format -+msgid "packets too big: %u" -+msgstr "Příliš velkých packetů: %u" -+ -+#: ../statistics.c:149 -+#, c-format -+msgid "received ICMPv6 time exceeded: %u" -+msgstr "Přijato ICMPv6 vypršení životnosti: %u" -+ -+#: ../statistics.c:150 ../statistics.c:165 -+#, c-format -+msgid "parameter problem: %u" -+msgstr "Problém s parametrem: %u" -+ -+#: ../statistics.c:153 ../statistics.c:168 -+#, c-format -+msgid "group member queries: %u" -+msgstr "Dotazů na členství ve skupině: %u" -+ -+#: ../statistics.c:154 ../statistics.c:169 -+#, c-format -+msgid "group member responses: %u" -+msgstr "Odpovědí na členství ve skupině: %u" -+ -+#: ../statistics.c:155 ../statistics.c:170 -+#, c-format -+msgid "group member reductions: %u" -+msgstr "Počet snížení členů skupiny: %u" -+ -+#: ../statistics.c:156 ../statistics.c:171 -+#, c-format -+msgid "router solicits: %u" -+msgstr "Počet výzev směrovači: %u" -+ -+#: ../statistics.c:157 ../statistics.c:172 -+#, c-format -+msgid "router advertisement: %u" -+msgstr "Počet oznámení směrovače: %u" -+ -+#: ../statistics.c:158 -+#, c-format -+msgid "neighbour solicits: %u" -+msgstr "Počet výzev sousedovi: %u" -+ -+#: ../statistics.c:159 -+#, c-format -+msgid "neighbour advertisement: %u" -+msgstr "Počet oznámení souseda: %u" -+ -+#: ../statistics.c:164 -+#, c-format -+msgid "sent ICMPv6 time exceeded: %u" -+msgstr "Počet odeslaných ICMPv6 vypršení životnosti: %u" -+ -+#: ../statistics.c:173 -+#, c-format -+msgid "neighbor solicits: %u" -+msgstr "Počet výzev sousedovi: %u" -+ -+#: ../statistics.c:174 -+#, c-format -+msgid "neighbor advertisements: %u" -+msgstr "Počet oznámení souseda: %u" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "RTO algorithm is %s" -+msgstr "RTO algoritmus je %s" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u active connections openings" -+msgstr "Počet aktivně navázaných spojení: %u" -+ -+#: ../statistics.c:185 -+#, c-format -+msgid "%u passive connection openings" -+msgstr "Počet pasivně navázaných spojení: %u" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "%u failed connection attempts" -+msgstr "Počet neúspěšných pokusů o spojení: %u" -+ -+#: ../statistics.c:187 -+#, c-format -+msgid "%u connection resets received" -+msgstr "Počet přijatých resetů spojení: %u" -+ -+#: ../statistics.c:188 -+#, c-format -+msgid "%u connections established" -+msgstr "Počet navázaných spojení: %u" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u segments received" -+msgstr "Počet přijatých segmentů: %u" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u segments send out" -+msgstr "Počet odeslaných segmentů: %u" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u segments retransmited" -+msgstr "Počet přenesených segmentů: %u" -+ -+#: ../statistics.c:192 -+#, c-format -+msgid "%u bad segments received." -+msgstr "Počet chybných příchozích segmentů: %u" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "%u resets sent" -+msgstr "Počet odeslaných resetů: %u" -+ -+#: ../statistics.c:198 ../statistics.c:206 -+#, c-format -+msgid "%u packets received" -+msgstr "Počet přijatých paketů: %u" -+ -+#: ../statistics.c:199 ../statistics.c:207 -+#, c-format -+msgid "%u packets to unknown port received." -+msgstr "Počet paketů přijatých pro neznámý port: %u" -+ -+#: ../statistics.c:200 ../statistics.c:208 -+#, c-format -+msgid "%u packet receive errors" -+msgstr "Počet chyb při příjmu paketů: %u" -+ -+#: ../statistics.c:201 ../statistics.c:209 -+#, c-format -+msgid "%u packets sent" -+msgstr "Počet odeslaných paketů: %u" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u SYN cookies sent" -+msgstr "Počet odeslaných SYN cookies: %u" - --#: ../statistics.c:63 -+#: ../statistics.c:215 - #, c-format --msgid "Forwarding is %s" --msgstr "Pedvn je %s" -+msgid "%u SYN cookies received" -+msgstr "Počet přijatých SYN cookies: %u" - --#: ../statistics.c:64 -+#: ../statistics.c:216 - #, c-format --msgid "Default TTL is %d" --msgstr "Implicitn TTL je %d" -+msgid "%u invalid SYN cookies received" -+msgstr "Počet chybných příchozích SYN cookies: %u" - --#: ../statistics.c:65 -+#: ../statistics.c:218 - #, c-format --msgid "%d total packets received" --msgstr "celkem pijmutch paket: %d" -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "Počet resetů přijatých pro sokety v zárodečném stavu SYN_PŘÍCH: %u" - --#: ../statistics.c:66 -+#: ../statistics.c:220 - #, c-format --msgid "%d with invalid headers" --msgstr "s nesprvnmi hlavikami: %d" -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "" -+"Počet packetů odstraněných z přijímací fronty kvůli přetečení bufferu " -+"socketu: %u" - --#: ../statistics.c:67 -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:223 - #, c-format --msgid "%d with invalid addresses" --msgstr "s nesprvnmi adresami: %d" -+msgid "%u packets pruned from receive queue" -+msgstr "Počet packetů odstraněných z přijímací fronty: %u" - --#: ../statistics.c:68 -+#: ../statistics.c:224 - #, c-format --msgid "%d forwarded" --msgstr "pedno: %d" -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "" -+"Počet packetů zahozených z fronty mimo-pořadí kvůli přetečení bufferu " -+"socketu: %u" - --#: ../statistics.c:69 -+#: ../statistics.c:226 - #, c-format --msgid "%d with unknown protocol" --msgstr "s neznmm protokolem: %d" -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "Počet ICMP packetů zahozených, protože byly mimo okno: %u" - --#: ../statistics.c:70 -+#: ../statistics.c:228 - #, c-format --msgid "%d incoming packets discarded" --msgstr "poet zahozench pchozch paket: %d" -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "Počet ICMP packetů zahozených kvůli zamčenému socketu: %u" - --#: ../statistics.c:71 -+#: ../statistics.c:230 - #, c-format --msgid "%d incoming packets delivered" --msgstr "poet doruench pchozch paket: %d" -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+"Počet TCP socketů, které ukončily fázi time-wait uvnitř rychlého časovače: %u" - --#: ../statistics.c:72 -+#: ../statistics.c:231 - #, c-format --msgid "%d requests sent out" --msgstr "poet odeslanch poadavk: %d" -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+"Počet socketů ve fázi time-wait, které byly znovu použity díky časovému " -+"razítku: %u" - --#. ? --#: ../statistics.c:73 -+#: ../statistics.c:232 - #, c-format --msgid "%d outgoing packets dropped" --msgstr "poet zahozench odchozch paket: %d" -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+"Počet TCP socketů, které ukončily fázi time-wait uvnitř pomalého časovače: %u" - --#: ../statistics.c:74 -+#: ../statistics.c:233 - #, c-format --msgid "%d dropped because of missing route" --msgstr "zahozeno kvli chybjc cest: %d" -+msgid "%u passive connections rejected because of time stamp" -+msgstr "Počet odmítnutých pasivních spojení kvůli časovému razítku: %u" - --#: ../statistics.c:75 -+#: ../statistics.c:235 - #, c-format --msgid "%d fragments dropped after timeout" --msgstr "poet fragment zahozench po vypren asu: %d" -+msgid "%u active connections rejected because of time stamp" -+msgstr "Počet odmítnutých aktivních spojení kvůli časovému razítku: %u" - --#: ../statistics.c:76 -+#: ../statistics.c:237 - #, c-format --msgid "%d reassemblies required" --msgstr "poet nutnch znovusestaven: %d" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+"Počet odmítnutých packetů uvnitř navázaného spojení kvůli časovému razítku: %" -+"u" - --#. ? --#: ../statistics.c:77 -+#: ../statistics.c:239 - #, c-format --msgid "%d packets reassembled ok" --msgstr "poet v podku znovu sestavench paket: %d" -+msgid "%u delayed acks sent" -+msgstr "Počet odeslaných zpožděných potvrzení: %u" - --#: ../statistics.c:78 -+#: ../statistics.c:240 - #, c-format --msgid "%d packet reassembles failed" --msgstr "poet paket, je se nepodailo znovu sestavit: %d" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" -+"Počet zpožděných potvrzení dále pozdržených kvůli zamčenému socketu: %u" - --#: ../statistics.c:79 -+#: ../statistics.c:242 - #, c-format --msgid "%d fragments received ok" --msgstr "poet v podku pijmutch fragment: %d" -+msgid "Quick ack mode was activated %u times" -+msgstr "Počet aktivovaní rychlého potvrzovacího režimu: %u" - --#: ../statistics.c:80 -+#: ../statistics.c:243 - #, c-format --msgid "%d fragments failed" --msgstr "poet chybnch fragment: %d" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "Počet přetečení naslouchací fronty socketu: %u" - --#: ../statistics.c:81 -+#: ../statistics.c:245 - #, c-format --msgid "%d fragments created" --msgstr "poet vytvoench fragment: %d" -+msgid "%u SYNs to LISTEN sockets dropped" -+msgstr "Počet zahozených SYN packetů určených naslouchajícímu socketu: %u" - --#: ../statistics.c:86 -+#: ../statistics.c:246 - #, c-format --msgid "%d ICMP messages received" --msgstr "poet pijmutch ICMP zprv: %d" -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "Počet packetů přímo zařazených do předfronty recvmsg: %u" - --#: ../statistics.c:87 -+#: ../statistics.c:248 - #, c-format --msgid "%d input ICMP message failed." --msgstr "poet chybnch pchozch ICMP zprv: %d" -+msgid "%u bytes directly in process context from backlog" -+msgstr "Počet bajtů předaných přímo z backlogu do kontextu procesu: %u" - --#: ../statistics.c:88 ../statistics.c:101 -+#: ../statistics.c:249 - #, c-format --msgid "destination unreachable: %d" --msgstr "adrest nedostupn: %d" -+msgid "%u bytes directly received in process context from prequeue" -+msgstr "Počet bajtů přímo přijatých do kontextu procesu z předfronty: %u" - --#: ../statistics.c:89 -+#: ../statistics.c:251 - #, c-format --msgid "timeout in transit: %d" --msgstr "vyprel as pi penosu: %d" -+msgid "%u packets dropped from prequeue" -+msgstr "Počet paketů odstraněných z předfronty: %u" - --#: ../statistics.c:90 ../statistics.c:103 -+#: ../statistics.c:252 - #, c-format --msgid "wrong parameters: %d" --msgstr "chybn parametry: %d" -+msgid "%u packet headers predicted" -+msgstr "Počet předpovězených hlaviček packetů: %u" - --#. ? --#: ../statistics.c:91 -+#: ../statistics.c:253 - #, c-format --msgid "source quenchs: %d" --msgstr "zen toku dat: %d" -+msgid "%u packets header predicted and directly queued to user" -+msgstr "Počet hlaviček packetů předpovězených a přímo předaných uživateli: %u" - --#: ../statistics.c:92 -+#: ../statistics.c:255 - #, c-format --msgid "redirects: %d" --msgstr "zmna cesty: %d" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "Kolikrát systému došla paměť při odesílání packetu: %u" - --#: ../statistics.c:93 -+#: ../statistics.c:257 - #, c-format --msgid "echo requests: %d" --msgstr "dost o echo: %d" -+msgid "%u acknowledgments not containing data payload received" -+msgstr "Počet přijatých potvrzení neobsahující data: %u" - --#: ../statistics.c:94 ../statistics.c:107 -+#: ../statistics.c:258 - #, c-format --msgid "echo replies: %d" --msgstr "odpov na dost o echo: %d" -+msgid "%u predicted acknowledgments" -+msgstr "Počet předpovězených potvrzení: %u" - --#: ../statistics.c:95 -+#: ../statistics.c:259 - #, c-format --msgid "timestamp request: %d" --msgstr "dost o as: %d" -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "Počet zotavení ze ztráty packetu kvůli rychle opakovanému odeslání: %u" - --#: ../statistics.c:96 -+#: ../statistics.c:260 - #, c-format --msgid "timestamp reply: %d" --msgstr "odpov na dost o as: %d" -+msgid "%u times recovered from packet loss by selective acknowledgements" -+msgstr "Počet zotavení ze ztráty packetu pomocí vyběrových potvrzení: %u" - --#: ../statistics.c:97 -+#: ../statistics.c:261 - #, c-format --msgid "address mask request: %d" --msgstr "dost o masku podst: %d" -+msgid "%u bad SACK blocks received" -+msgstr "Počet přijatých chybných SACK bloků: %u" - --#. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "odpovdi na dost o masku podst" -+#: ../statistics.c:262 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "Kolikrát byla nalezena změna pořadí pomocí FACK: %u" - --#. ? --#: ../statistics.c:99 -+#: ../statistics.c:263 - #, c-format --msgid "%d ICMP messages sent" --msgstr "poet odeslanch ICMP zprv: %d" -+msgid "Detected reordering %u times using SACK" -+msgstr "Kolikrát byla nalezena změna pořadí pomocí SACK: %u" - --#: ../statistics.c:100 -+#: ../statistics.c:264 - #, c-format --msgid "%d ICMP messages failed" --msgstr "poet chybnch ICMP zprv: %d" -+msgid "Detected reordering %u times using time stamp" -+msgstr "Kolikrát byla nalezena změna pořadí pomocí časového razítka: %u" - --#: ../statistics.c:102 -+#: ../statistics.c:265 - #, c-format --msgid "time exceeded: %d" --msgstr "vypren ivotnosti: %d" -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+"Kolikrát byla nalezena změna pořadí kvůli rychlému znovuodeslání Reno: %u" - --#. ? --#: ../statistics.c:104 -+#: ../statistics.c:266 - #, c-format --msgid "source quench: %d" --msgstr "zen toku dat: %d" -+msgid "%u congestion windows fully recovered without slow start" -+msgstr "Počet plných zotavení ze zahlcení okna bez pomalého startu: %u" - --#: ../statistics.c:105 -+#: ../statistics.c:267 - #, c-format --msgid "redirect: %d" --msgstr "zmna cesty: %d" -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "Počet částečných zotavení ze zahlcení okna pomocí heuristiky Hoe: %u" - --#: ../statistics.c:106 -+#: ../statistics.c:268 - #, c-format --msgid "echo request: %d" --msgstr "dost o echo: %d" -+msgid "%u congestion window recovered without slow start using DSACK" -+msgstr "Počet zotavení ze zahlceného okna bez pomalého startu pomocí DSACK: %u" - --#: ../statistics.c:108 -+#: ../statistics.c:269 - #, c-format --msgid "timestamp requests: %d" --msgstr "dost o as: %d" -+msgid "%u congestion windows recovered without slow start after partial ack" -+msgstr "" -+"Počet zotavení ze zahlcení okna bez pomalého startu po částečném potvrzení: %" -+"u" - --#: ../statistics.c:109 -+#: ../statistics.c:270 - #, c-format --msgid "timestamp replies: %d" --msgstr "odpov na dost o as: %d" -+msgid "%u retransmits lost" -+msgstr "Počet ztracených opakovaných odeslání: %u" - --#: ../statistics.c:110 -+#: ../statistics.c:271 - #, c-format --msgid "address mask requests: %d" --msgstr "dost o masku podst: %d" -+msgid "%u timeouts after reno fast retransmit" -+msgstr "Počet vypršení času po rychlém opakovaném odeslání Reno: %u" - --#: ../statistics.c:111 -+#: ../statistics.c:272 - #, c-format --msgid "address mask replies: %d" --msgstr "odpov na dost o masku podst: %d" -+msgid "%u timeouts after SACK recovery" -+msgstr "Počet vypršení času po zotavení pomocí SACK: %u" - --#: ../statistics.c:116 -+#: ../statistics.c:273 - #, c-format --msgid "RTO algorithm is %s" --msgstr "RTO algoritmus je %s" -+msgid "%u timeouts in loss state" -+msgstr "Počet vypršení času ve stavu ztráty: %u" - --#: ../statistics.c:120 -+#: ../statistics.c:274 - #, c-format --msgid "%d active connections openings" --msgstr "poet aktivn navzanch spojen: %d" -+msgid "%u fast retransmits" -+msgstr "Počet rychlých opakování odeslání: %u" - --#: ../statistics.c:121 -+#: ../statistics.c:275 - #, c-format --msgid "%d passive connection openings" --msgstr "poet pasivn navzanch spojen: %d" -+msgid "%u forward retransmits" -+msgstr "Počet dopředných opakovaných odeslání: %u" - --#: ../statistics.c:122 -+#: ../statistics.c:276 - #, c-format --msgid "%d failed connection attempts" --msgstr "poet nespnch pokus o spojen: %d" -+msgid "%u retransmits in slow start" -+msgstr "Počet opakovaných odeslání v pomalém startu: %u" - --#: ../statistics.c:123 -+#: ../statistics.c:277 - #, c-format --msgid "%d connection resets received" --msgstr "poet pijmutch reset: %d" -+msgid "%u other TCP timeouts" -+msgstr "Počet jiných vypršení časovače TCP: %u" - --#: ../statistics.c:124 -+#: ../statistics.c:278 - #, c-format --msgid "%d connections established" --msgstr "poet navzanch spojen: %d" -+msgid "%u reno fast retransmits failed" -+msgstr "Počet selhání rychlých opakovaných odeslání Reno: %u" - --#: ../statistics.c:125 -+#: ../statistics.c:279 - #, c-format --msgid "%d segments received" --msgstr "poet pijmutch segment: %d" -+msgid "%u SACK retransmits failed" -+msgstr "Počet selhání opakovaných odeslání SACK: %u" - --#: ../statistics.c:126 -+#: ../statistics.c:280 - #, c-format --msgid "%d segments send out" --msgstr "poet odeslanch segment: %d" -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "Kolikrát byl přijímač naplánován příliš pozdě na přímé zpracovaní: %u" - --#: ../statistics.c:127 -+#: ../statistics.c:281 - #, c-format --msgid "%d segments retransmited" --msgstr "poet penesench segment: %d" -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "" -+"Počet packetů sloučených v přijímací frontě kvůli malému bufferu socketu: %u" - --#: ../statistics.c:128 -+#: ../statistics.c:282 - #, c-format --msgid "%d bad segments received." --msgstr "poet chybnch pchozch segment: %d." -+msgid "%u DSACKs sent for old packets" -+msgstr "Počet packetů DSACK odeslaných kvůli starým packetům: %u" - --#: ../statistics.c:129 -+#: ../statistics.c:283 - #, c-format --msgid "%d resets sent" --msgstr "poet odeslanch reset: %d" -+msgid "%u DSACKs sent for out of order packets" -+msgstr "Počet packetů DSCACK odeslaných kvůli packetům mimo pořadí: %u" - --#: ../statistics.c:134 -+#: ../statistics.c:284 - #, c-format --msgid "%d packets received" --msgstr "poet pijmutch paket: %d" -+msgid "%u DSACKs received" -+msgstr "Počet přijatých paketů DSACK: %u" - --#: ../statistics.c:135 -+#: ../statistics.c:285 - #, c-format --msgid "%d packets to unknown port received." --msgstr "poet paket pijmutch pro neznm port: %d." -+msgid "%u DSACKs for out of order packets received" -+msgstr "Počet packetů DSACK přijatých kvůli packetům mimo pořadí: %u" - --#: ../statistics.c:136 -+#: ../statistics.c:286 - #, c-format --msgid "%d packet receive errors" --msgstr "poet chyb pi pjmu paket: %d" -+msgid "%u connections reset due to unexpected SYN" -+msgstr "Počet resetů spojení kvůli neočekávanému SYN: %u" - --#: ../statistics.c:137 -+#: ../statistics.c:287 - #, c-format --msgid "%d packets sent" --msgstr "poet odeslanch paket: %d" -+msgid "%u connections reset due to unexpected data" -+msgstr "Počet resetů spojení kvůli neočekávaným datům: %u" - --#: ../statistics.c:142 -+#: ../statistics.c:288 - #, c-format --msgid "%d SYN cookies sent" --msgstr "poet odeslanch SYN cookies: %d" -+msgid "%u connections reset due to early user close" -+msgstr "Počet resetů spojení kvůli časnému uzavření uživatelem: %u" - --#: ../statistics.c:143 -+#: ../statistics.c:289 - #, c-format --msgid "%d SYN cookies received" --msgstr "poet pijmutch SYN cookies: %d" -+msgid "%u connections aborted due to memory pressure" -+msgstr "Počet zrušených spojení kvůli paměťové tísni: %u" - --#: ../statistics.c:144 -+#: ../statistics.c:290 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "poet chybnch pchozch SYN cookies: %d" -+msgid "%u connections aborted due to timeout" -+msgstr "Počet zrušených spojení kvůli vypršení časovače: %u" - --#: ../statistics.c:146 -+#: ../statistics.c:291 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "poet reset pijmutch pro sokety ve stavu SYN_PCH: %d" -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+"Počet zrušených spojení po té, co je uživatel uzavřel ve fázi dožití: %u" - --#: ../statistics.c:148 -+#: ../statistics.c:292 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" --msgstr "poet paket odstrannch z fronty kvli peteen bufferu soketu: %d" -+msgid "%u times unabled to send RST due to no memory" -+msgstr "Kolikrát nebylo možné odeslat RST kvůli nedostatku paměti: %u" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:293 - #, c-format --msgid "%d packets pruned from out-of-order queue" --msgstr "poet paket odstrannch z fronty mimo-poad: %d" -+msgid "TCP ran low on memory %u times" -+msgstr "Kolikrát TCP zpomalilo kvůli paměti: %u" - --#: ../statistics.c:152 -+#: ../statistics.c:294 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" --msgstr "" --"poet paket zahozench z fronty mimo-poad kvli peteen bufferu soketu: " --"%d" -+msgid "%u TCP data loss events" -+msgstr "Počet ztrát dat TCP: %u" - --#: ../statistics.c:154 -+#: ../statistics.c:295 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "poet ICMP paket zahozench, protoe byly mimo-okno: %d" -+msgid "%u congestion windows recovered without slow start by DSACK" -+msgstr "Počet zotavení ze zahlcení okna bez pomalého startu pomocí DSACK: %u" - --#: ../statistics.c:156 -+#: ../statistics.c:297 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "poet ICMP paket zahozench kvli zamenmu soketu: %d" -+msgid "%u classic Reno fast retransmits failed" -+msgstr "Počet selhání klasického rychlého opakovaného odeslání Reno: %u" - --#: ../statistics.c:222 -+#: ../statistics.c:373 - msgid "enabled" - msgstr "zapnuto" - --#: ../statistics.c:222 -+#: ../statistics.c:373 - msgid "disabled" - msgstr "vypnuto" - --#: ../statistics.c:272 -+#: ../statistics.c:511 ../statistics.c:555 -+msgid "cannot open /proc/net/snmp" -+msgstr "/proc/net/snmp nelze otevřít" -+ -+#: ../statistics.c:516 - #, c-format --msgid "unknown title %s\n" --msgstr "titulek %s je neznm\n" -+msgid "Problem while parsing /proc/net/snmp\n" -+msgstr "Potíže při při zpracování /proc/net/snmp\n" - --#: ../statistics.c:298 --msgid "error parsing /proc/net/snmp" --msgstr "chyba pi zpracovn /proc/net/snmp" -+#: ../statistics.c:527 -+#, c-format -+msgid "Problem while parsing /proc/net/netstat\n" -+msgstr "Potíže při při zpracování /proc/net/netstat\n" - --#: ../statistics.c:311 --msgid "cannot open /proc/net/snmp" --msgstr "/proc/net/snmp nelze otevt" -+#: ../statistics.c:545 -+msgid "cannot open /proc/net/snmp6" -+msgstr "/proc/net/snmp6 nelze otevřít" - - #: ../lib/activate.c:69 - #, c-format - msgid "Hardware type `%s' not supported.\n" --msgstr "Hardwarov typ `%s' nen podporovn.\n" -+msgstr "Hardwarový typ „%s“ není podporován.\n" - - #: ../lib/activate.c:73 - #, c-format - msgid "Cannot change line discipline to `%s'.\n" --msgstr "Linkovou disciplnu nelze na `%s' zmnit.\n" -+msgstr "Linkovou disciplínu nelze na „%s“ změnit.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:157 ../lib/hw.c:166 - msgid "UNSPEC" --msgstr "NEZNM" -+msgstr "NEZNÁM" - --#: ../lib/af.c:147 -+#: ../lib/af.c:159 - msgid "UNIX Domain" --msgstr "Domna UNIX" -+msgstr "Doména UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:162 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:165 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:168 ../lib/hw.c:187 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:171 ../lib/hw.c:193 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:174 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:177 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:180 ../lib/hw.c:228 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:183 -+msgid "CCITT X.25" -+msgstr "CCITT X.25" -+ -+#: ../lib/af.c:186 ../lib/hw.c:190 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:189 ../lib/hw.c:178 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:247 -+#, c-format - msgid "Please don't supply more than one address family.\n" --msgstr "Nezadvejte vce ne jednu tdu adres.\n" -+msgstr "Nezadávejte více než jednu třídu adres.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:308 -+#, c-format - msgid "Too much address family arguments.\n" --msgstr "Bylo zadno pli mnoho td adres.\n" -+msgstr "Bylo zadáno příliš mnoho tříd adres.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:319 - #, c-format - msgid "Unknown address family `%s'.\n" --msgstr "Tda adres `%s' nen znma.\n" -- --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[NENASTAVENO]" -+msgstr "Třída adres `%s' není známa.\n" - --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" --msgstr "in_arcnet(%s): chybn arcnet adresa!\n" -+msgstr "in_arcnet(%s): chybná arcnet adresa!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" --msgstr "in_arcnet(%s): nadbyten : ignorovno!\n" -+msgstr "in_arcnet(%s): nadbytečné : ignorováno!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" --msgstr "in_arcnet(%s): nadbyten znaky!\n" -+msgstr "in_arcnet(%s): nadbytečné znaky!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" --msgstr "Chybn Ash adresa" -+msgstr "Chybná Ash adresa" -+ -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:145 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[NENASTAVENO]" - - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" --msgstr "Nesprvn volac znak" -+msgstr "Nesprávný volací znak" - - #: ../lib/ax25.c:110 ../lib/netrom.c:113 - msgid "Callsign too long" --msgstr "Volac znak je pli dlouh." -+msgstr "Volací znak je příliš dlouhý." - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" --msgstr "AX.25 nen na tomto systmu nakonfigurovno.\n" -+msgstr "AX.25 není na tomto systému nakonfigurováno.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" --msgstr "Smrovac tabulka v jdru pro AX.25\n" -+msgstr "Směrovací tabulka v jádru pro AX.25\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" --msgstr "Adrest Rozhran Uit\n" -- --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Smrovac tabulka pro `ddp' nen zatm podporovna.\n" -+msgstr "Adresát Rozhraní Užití\n" - - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" --msgstr "in_ether(%s): chybn ethernetov adresa!\n" -+msgstr "in_ether(%s): chybná ethernetová adresa!\n" - - #: ../lib/ether.c:105 - #, c-format - msgid "in_ether(%s): trailing : ignored!\n" --msgstr "in_ether(%s): nadbyten : ignorovno!\n" -+msgstr "in_ether(%s): nadbytečné : ignorováno!\n" - - #: ../lib/ether.c:117 - #, c-format - msgid "in_ether(%s): trailing junk!\n" --msgstr "in_ether(%s): nadbyten znaky!\n" -+msgstr "in_ether(%s): nadbytečné znaky!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" --msgstr "in_fddi(%s): chybn fddi adresa!\n" -+msgstr "in_fddi(%s): chybná fddi adresa!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" --msgstr "in_fddi(%s): nadbyten : ignorovno!\n" -+msgstr "in_fddi(%s): nadbytečné : ignorováno!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" --msgstr "in_fddi(%s): nadbyten znaky!\n" -+msgstr "in_fddi(%s): nadbytečné znaky!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" --msgstr "Tda adres `%s' nen podporovna.\n" -+msgstr "Třída adres `%s' není podporována.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" --msgstr "Pro tdu adres `%s' nen dn smrovn.\n" -+msgstr "Pro třídu adres `%s' není žádné směrování.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" --msgstr "in_hippi(%s): chybn hippi adresa!\n" -+msgstr "in_hippi(%s): chybná hippi adresa!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" --msgstr "in_hippi(%s): nadbyten : ignorovno!\n" -+msgstr "in_hippi(%s): nadbytečné : ignorováno!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" --msgstr "in_hippi(%s): nadbyten znaky!\n" -+msgstr "in_hippi(%s): nadbytečné znaky!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:165 - msgid "Local Loopback" --msgstr "Mstn smyka" -+msgstr "Místní smyčka" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:168 - msgid "Serial Line IP" --msgstr "IP po sriov lince" -+msgstr "IP po sériové lince" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:169 - msgid "VJ Serial Line IP" --msgstr "Vj IP po sriov lince" -+msgstr "VJ IP po sériové lince" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:170 - msgid "6-bit Serial Line IP" --msgstr "6bitov IP po sriov lince" -+msgstr "6bitový IP po sériové lince" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:171 - msgid "VJ 6-bit Serial Line IP" --msgstr "6bitov VJ IP po sriov lince" -+msgstr "6bitový VJ IP po sériové lince" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:172 - msgid "Adaptive Serial Line IP" --msgstr "Adaptivn IP po sriov lince" -+msgstr "Adaptivní IP po sériové lince" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:175 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:181 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:184 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:196 -+msgid "generic X.25" -+msgstr "obecné X.25" -+ -+#: ../lib/hw.c:199 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:202 - msgid "Point-to-Point Protocol" --msgstr "Point-to-Point Protokol" -+msgstr "Dvoubodový protokol" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:205 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:206 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:209 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:212 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:213 - msgid "Frame Relay Access Device" --msgstr "Pstupov zazen Frame Relay" -+msgstr "Přístupové zařízení Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:216 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:219 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:222 - msgid "16/4 Mbps Token Ring" - msgstr "Token Ring 16/4 Mb/s" - --#: ../lib/hw.c:203 --#, fuzzy -+#: ../lib/hw.c:224 - msgid "16/4 Mbps Token Ring (New)" --msgstr "Token Ring 16/4 Mb/s" -+msgstr "Token Ring 16/4 Mb/s (Nový)" - --#: ../lib/inet.c:153 ../lib/inet6.c:79 -+#: ../lib/hw.c:231 -+msgid "InfiniBand" -+msgstr "InfiniBand" -+ -+#: ../lib/hw.c:234 -+msgid "Generic EUI-64" -+msgstr "Obecné EUI-64" -+ -+#: ../lib/inet.c:153 ../lib/inet6.c:94 - #, c-format - msgid "rresolve: unsupport address family %d !\n" --msgstr "rresolve: tda adres %d nen podporovna!\n" -+msgstr "rresolve: třída adres %d není podporována!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:147 -+msgid "[UNKNOWN]" -+msgstr "[NEZNÁMÝ]" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" --msgstr "INET6 (IPv6) nen na tomto systmu nakonfigurovno.\n" -+msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:76 -+#, c-format -+msgid "Kernel IPv6 routing cache\n" -+msgstr "Směrovací cache v jádru pro IPv6\n" -+ -+#: ../lib/inet6_gr.c:78 -+#, c-format - msgid "Kernel IPv6 routing table\n" --msgstr "Smrovac tabulka v jdru pro IPv6\n" -+msgstr "Směrovací tabulka v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:80 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next Hop Flag Met Ref Use " -+"If\n" - msgstr "" --"Adrest Dal Smrova " --" Pzn Metrika Odkaz Uit Rozhran\n" -+"Adresát Další směrovač Příz Met Odk Užt " -+"Rozhr\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:174 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" --msgstr "Cache soused v jdru pro IPv6\n" -+msgstr "Cache sousedů v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:177 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" - msgstr "" --"Soused HW Adresa Rozhran Pzn " -+"Soused HW Adresa Rozhraní Přízn " - "Odkazy Stav\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:181 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" - msgstr "" --"Soused HW Adresa Rozhran " --"Pznaky Odkazy Stav Prol(sec) Smazat(sec)\n" -+"Soused HW Adresa Rozhraní " -+"Příznaky Odkazy Stav Prošlý(sec) Smazat(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" --msgstr "Pouit: inet6_route [-vF] del Cl\n" -+msgstr "Použití: inet6_route [-vF] del Cíl\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" --msgstr " inet6_route [-vF] add Cl [gw Gw] [metrika M] [[dev] If]\n" -+msgstr " inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" --msgstr " inet6_route [-FC] flush NEN podporovno\n" -+msgstr " inet6_route [-FC] flush NENÍ podporováno\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" --msgstr "Smrovac tabulku `inet6' nelze vyprazdovat\n" -+msgstr "Směrovací tabulku `inet6' nelze vyprazdňovat\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" --msgstr "INET (IPv4) nen na tomto systmu nakonfigurovno.\n" -+msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" --msgstr "Smrovac tabulka v jdru pro IP\n" -+msgstr "Směrovací tabulka v jádru pro IP\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" - msgstr "" --"Adrest Brna Maska Pzn Metrik Odkaz Ut " --"Rozhran\n" -+"Adresát Brána Maska Přízn Metrik Odkazů Užt " -+"Rozhraní\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" - msgstr "" --"Adrest Brna Maska Pzn MSS Okno irtt " --"Rozhran\n" -+"Adresát Brána Maska Přízn MSS Okno irtt " -+"Rozhraní\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" - msgstr "" --"Adrest Brna Maska Pzn Metrik Odkazy Ut " --"Rozhran MSS Okno irtt\n" -+"Adresát Brána Maska Přízn Metrik Odkazy Užt " -+"Rozhraní MSS Okno irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" --msgstr "Smrovac cache v jdru pro IP\n" -+msgstr "Směrovací cache v jádru pro IP\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" - msgstr "" --"Odeslatel Adrest Maska Pzn Metrik Odkazy Ut " --"Rozhran\n" -+"Odesílatel Adresát Maska Přízn Metrik Odkazy Užt " -+"Rozhraní\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" - msgstr "" --"Odeslatel Adrest Maska Pzn MSS Okno irtt " --"Rozhran\n" -+"Odesílatel Adresát Maska Přízn MSS Okno irtt " -+"Rozhraní\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" - msgstr "" --"Odeslatel Adrest Maska Pzn Metrik Odkazy Ut " --"Rozhran MSS Okno irtt HH Arp\n" -+"Odesílatel Adresát Maska Přízn Metrik Odkazy Užt " -+"Rozhraní MSS Okno irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" - msgstr "" --"Odeslatel Adrest Maska Pzn Metrik Odkazy Ut " --"Rozhran MSS Okno irtt TOS HHOdk HHAktul ZvltCl\n" -+"Odesílatel Adresát Maska Přízn Metrik Odkazy Užt " -+"Rozhraní MSS Okno irtt TOS HHOdk HHAktuál ZvláštCíl\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" - msgstr "" --"Pouit: inet_route [-vF] del {-host|-net} Cl[/prefix] [gw Gw] [metrika M] " -+"Použití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] " - "[[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" --" inet_route [-vF] add {-host|-net} Cl[/prefix] [gw Gw] [metrika M]\n" -+" inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" --" inet_route [-vF] add {-host|-net} Cl/[prefix] [metrika M] reject\n" -+" inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" --msgstr " inet_route [-FC] flush NEN podporovno\n" -+msgstr " inet_route [-FC] flush NENÍ podporováno\n" - - #: ../lib/inet_sr.c:158 - #, c-format - msgid "route: %s: cannot use a NETWORK as gateway!\n" --msgstr "route: %s: s nelze pout jako brnu!\n" -+msgstr "route: %s: síť nelze použít jako bránu!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, c-format - msgid "route: Invalid MSS/MTU.\n" --msgstr "route: Nesprvn NSS.\n" -+msgstr "route: Neplatné MSS/MTU.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" --msgstr "route: Nesprvn okno.\n" -+msgstr "route: Nesprávné okno.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" --msgstr "route: Nesprvn zahajovac rtt.\n" -+msgstr "route: Nesprávné zahajovací rtt.\n" - - #: ../lib/inet_sr.c:261 - #, c-format - msgid "route: netmask %.8x doesn't make sense with host route\n" --msgstr "route: sov maska %.8x nedv smysl, kdy clem je cesty pota\n" -+msgstr "route: síťová maska %.8x nedává smysl, když cílem je cesty počítač\n" - - #: ../lib/inet_sr.c:265 - #, c-format - msgid "route: bogus netmask %s\n" --msgstr "route: sov maska %s je nesprvn\n" -+msgstr "route: síťová maska %s je nesprávná\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" --msgstr "route: sov maska nevyhovuje adrese cesty\n" -+msgstr "route: síťová maska nevyhovuje adrese cesty\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" --msgstr "Smrovac cache `inet' nelze vyprazdovat\n" -+msgstr "Směrovací cache `inet' nelze vyprazdňovat\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" --msgstr "Smrovac cache `inet' nelze mnit\n" -+msgstr "Směrovací cache `inet' nelze měnit\n" - --#: ../lib/ipx_gr.c:52 --msgid "IPX not configured in this system.\n" --msgstr "IPX nen na tomto systmu nakonfigurovno.\n" -+#: ../lib/ipx_gr.c:53 -+#, c-format -+msgid "IPX routing not in file %s or %s found.\n" -+msgstr "Směrování IPX nenalezeno v souboru %s nebo %s.\n" - --#: ../lib/ipx_gr.c:56 -+#: ../lib/ipx_gr.c:62 -+#, c-format - msgid "Kernel IPX routing table\n" --msgstr "Smrovac tabulka v jdru pro IPX\n" -+msgstr "Směrovací tabulka v jádru pro IPX\n" - - #. xxx --#: ../lib/ipx_gr.c:57 -+#: ../lib/ipx_gr.c:63 -+#, c-format - msgid "Destination Router Net Router Node\n" --msgstr "Cl Smrova S Smrova Uzel\n" -+msgstr "Cíl Směrovač Síť Směrovač Uzel\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" --msgstr "IPX: toto je teba uloit\n" -+msgstr "IPX: toto je třeba uložit\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" --msgstr "IP maskovac poloky\n" -+msgstr "IP maskovací položky\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" --msgstr "prot ivot zdroj cl porty\n" -+msgstr "prot život zdroj cíl porty\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot ivot zahajsek delta pedchd zdroj cl " --" porty\n" -+"prot život zahajsek delta předchd zdroj " -+"cíl porty\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" --msgstr "NET/ROM nen na tomto systmu nakonfigurovno.\n" -+msgstr "NET/ROM není na tomto systému nakonfigurováno.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" --msgstr "Smrovac tabulka v jdru pro NET/ROM\n" -+msgstr "Směrovací tabulka v jádru pro NET/ROM\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" --msgstr "Cl Mnemonika Kvalita Soused Rozhran\n" -+msgstr "Cíl Mnemonika Kvalita Soused Rozhraní\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" --msgstr "pouit netrom\n" -+msgstr "použití netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" --msgstr "NET/ROM: toto je poteba uloit\n" -+msgstr "NET/ROM: toto je potřeba uložit\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" --msgstr "Tmto programem nelze PPP spustit.\n" -+msgstr "Tímto programem nelze PPP spustit.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" --msgstr "Lituji, pouijte pppd!\n" -+msgstr "Lituji, použijte pppd!\n" - - #: ../lib/rose.c:87 - msgid "Node address must be ten digits" --msgstr "Adresa uzlu mus mt 10 slic" -+msgstr "Adresa uzlu musí mít 10 číslic" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" --msgstr "ROSE nen na tomto systmu nakonfigurovno.\n" -+msgstr "ROSE není na tomto systému nakonfigurováno.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" --msgstr "Smrovac tabulka v jdru pro ROSE\n" -+msgstr "Směrovací tabulka v jádru pro ROSE\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" --msgstr "in_tr(%s): nesprvn token ring adresa!\n" -+msgstr "in_tr(%s): nesprávná token ring adresa!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" --msgstr "in_tr(%s): nadbyten: ignorovno!\n" -+msgstr "in_tr(%s): nadbytečné: ignorováno!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" --msgstr "in_tr(%s): nadbyten znaky!\n" -+msgstr "in_tr(%s): nadbytečné znaky!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" --msgstr "varovn: nen dostupn dn inet soket: %s\n" -+msgstr "varování: není dostupný žádný inet soket: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" --msgstr "" -+msgstr "Pozor: %s nelze otevřít (%s). Výstup omezen.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" --msgstr "Zazen nebylo nalezeno" -+msgstr "Zařízení nebylo nalezeno" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" --msgstr "%s: chyba pi zskvn informac o rozhran %s\n" -+msgstr "%s: chyba při získávání informací o rozhraní %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - statistická data nejsou dostupná -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[ŽÁDNÉ PŘÍZNAKY]" -+ -+#: ../lib/interface.c:694 -+msgid "UP," -+msgstr "AKTIVOVÁNO," -+ -+#: ../lib/interface.c:696 -+msgid "BROADCAST," -+msgstr "VŠESMĚR," -+ -+#: ../lib/interface.c:698 -+msgid "DEBUG," -+msgstr "LADĚNÍ," -+ -+#: ../lib/interface.c:700 -+msgid "LOOPBACK," -+msgstr "SMYČKA," -+ -+#: ../lib/interface.c:702 -+msgid "POINTOPOINT," -+msgstr "DVOUBODOVÉ," -+ -+# ?? -+#: ../lib/interface.c:704 -+msgid "NOTRAILERS," -+msgstr "ŽÁDNÉ_TRAILERS" -+ -+#: ../lib/interface.c:706 -+msgid "RUNNING," -+msgstr "BĚŽÍ," -+ -+#: ../lib/interface.c:708 -+msgid "NOARP," -+msgstr "NEARP," -+ -+#: ../lib/interface.c:710 -+msgid "PROMISC," -+msgstr "PROMISK," -+ -+#: ../lib/interface.c:712 -+msgid "ALLMULTI," -+msgstr "ALLMULTI," -+ -+#: ../lib/interface.c:714 -+msgid "SLAVE," -+msgstr "PODŘÍZENÝ," -+ -+#: ../lib/interface.c:716 -+msgid "MASTER," -+msgstr "NADŘÍZENÝ," -+ -+#: ../lib/interface.c:718 -+msgid "MULTICAST," -+msgstr "MULTICAST," -+ -+#: ../lib/interface.c:721 -+msgid "DYNAMIC," -+msgstr "DYNAMIC," -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid "%s: %s mtu %d metric %d" -+msgstr "%s: %s mtu %d metrika %d" -+ -+#: ../lib/interface.c:734 -+#, c-format -+msgid " outfill %d keepalive %d" -+msgstr " outfill %d keepalive %d" -+ -+#: ../lib/interface.c:743 ../lib/interface.c:841 -+#, c-format -+msgid " %s %s" -+msgstr " %s %s" -+ -+#: ../lib/interface.c:745 -+#, c-format -+msgid " netmask %s" -+msgstr " síťová_maska %s" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid " broadcast %s" -+msgstr " všesměr %s" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid " destination %s" -+msgstr " cíl %s" -+ -+#: ../lib/interface.c:769 -+#, c-format -+msgid " %s %s prefixlen %d" -+msgstr " %s %s délka_prefixu %d" -+ -+#: ../lib/interface.c:773 -+#, c-format -+msgid " scopeid 0x%x" -+msgstr " scopeid 0x%x" -+ -+#: ../lib/interface.c:777 -+msgid "compat," -+msgstr "kompat," -+ -+#: ../lib/interface.c:781 -+msgid "global," -+msgstr "globální," -+ -+#: ../lib/interface.c:783 -+msgid "link," -+msgstr "linka," -+ -+#: ../lib/interface.c:785 -+msgid "site," -+msgstr "oblast," -+ -+#: ../lib/interface.c:787 -+msgid "host," -+msgstr "stroj," -+ -+#: ../lib/interface.c:805 -+#, c-format -+msgid " %s Ethernet-II %s\n" -+msgstr " %s Ethernet-II %s\n" -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid " %s Ethernet-SNAP %s\n" -+msgstr " %s Ethernet-SNAP %s\n" -+ -+#: ../lib/interface.c:811 -+#, c-format -+msgid " %s Ethernet802.2 %s\n" -+msgstr " %s Ethernet802.2 %s\n" -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid " %s Ethernet802.3 %s\n" -+msgstr " %s Ethernet802.3 %s\n" -+ -+#: ../lib/interface.c:824 ../lib/interface.c:833 -+#, c-format -+msgid " %s %s\n" -+msgstr " %s %s\n" -+ -+#: ../lib/interface.c:843 -+#, c-format -+msgid " %s" -+msgstr " %s" -+ -+#: ../lib/interface.c:845 -+#, c-format -+msgid " txqueuelen %d" -+msgstr " délka_odchozí_fronty %d" -+ -+#: ../lib/interface.c:850 -+#, c-format -+msgid " media %s" -+msgstr " médium %s" -+ -+#: ../lib/interface.c:852 -+#, c-format -+msgid "autoselect" -+msgstr "automatika" -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "RX packets %llu bytes %llu (%lu.%lu %s)\n" -+msgstr "RX packetů %llu bajtů %llu (%lu,%lu %s)\n" -+ -+#: ../lib/interface.c:909 -+#, c-format -+msgid "RX compressed:%lu\n" -+msgstr "RX komprimováno %lu\n" -+ -+#: ../lib/interface.c:912 -+#, c-format -+msgid "RX errors %lu dropped %lu overruns %lu frame %lu\n" -+msgstr "RX chyb %lu zahozeno %lu přetečení %lu rámců %lu\n" -+ -+#: ../lib/interface.c:918 -+#, c-format -+msgid "TX packets %llu bytes %llu (%lu.%lu %s)\n" -+msgstr "TX packetů %llu bajtů %llu (%lu,%lu %s)\n" -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "TX compressed %lu\n" -+msgstr "TX komprimováno %lu\n" -+ -+# carrier? -+#: ../lib/interface.c:927 -+#, c-format -+msgid "TX errors %lu dropped %lu overruns %lu carrier %lu collisions %lu\n" -+msgstr "TX chyb %lu zahozeno %lu přetečení %lu přenos %lu kolizí %lu\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:937 -+#, c-format -+msgid "interrupt %d " -+msgstr "přerušení %d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:940 -+#, c-format -+msgid "base 0x%x " -+msgstr "základ 0x%x " -+ -+#: ../lib/interface.c:942 -+#, c-format -+msgid "memory 0x%lx-%lx " -+msgstr "paměť 0x%lx–%lx " -+ -+#: ../lib/interface.c:945 -+#, c-format -+msgid " dma 0x%x" -+msgstr " DMA 0x%x" -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" --msgstr "Nebyla nalezena dn pouiteln tda adres.\n" -+msgstr "Nebyla nalezena žádná použitelná třída adres.\n" - - #: ../lib/util-ank.c:229 - #, c-format - msgid "ip: %s is invalid inet address\n" --msgstr "ip: %s nen platnou inet adresou\n" -+msgstr "ip: %s není platnou inet adresou\n" - - #: ../lib/util-ank.c:238 - #, c-format - msgid "ip: %s is invalid inet prefix\n" --msgstr "ip: %s nen platnm inet prefixem\n" -+msgstr "ip: %s není platným inet prefixem\n" - - #: ../lib/util-ank.c:248 - #, c-format - msgid "ip: %s is invalid IPv4 address\n" --msgstr "ip: %s nen platnou IPv4 adresou\n" -+msgstr "ip: %s není platnou IPv4 adresou\n" - - #: ../lib/util-ank.c:256 - #, c-format - msgid "ip: argument is wrong: %s\n" --msgstr "ip: argument %s je nesprvn\n" -+msgstr "ip: argument %s je nesprávný\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" --msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ETZEC\n" -+msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ŘETĚZEC\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" --msgstr " ipmaddr show [ dev ETZEC ] [ ipv4 | ipv6 | link | all ]\n" -+msgstr " ipmaddr show [ dev ŘETĚZEC ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " --msgstr "tda %d " -+msgstr "třída %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" --msgstr " uivatel %d" -+msgstr " uživatelé %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:361 - msgid "Cannot create socket" --msgstr "Soket nelze vytvoit" -+msgstr "Soket nelze vytvořit" - - #: ../slattach.c:180 - #, c-format - msgid "slattach: /dev/%s already locked!\n" --msgstr "slattach: zazen /dev/%s je ji zameno!\n" -+msgstr "slattach: zařízení /dev/%s je již zamčeno!\n" - - #: ../slattach.c:186 - #, c-format -@@ -2433,80 +3184,169 @@ msgid "slattach: tty_lock: (%s): %s\n" - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: do PID souboru nelze zapisovat\n" - - #: ../slattach.c:202 - #, c-format - msgid "slattach: tty_lock: UUCP user %s unknown!\n" --msgstr "slattach: tty_lock: uivatel UUCP %s nen znm!\n" -+msgstr "slattach: tty_lock: uživatel UUCP %s není znám!\n" - --#: ../slattach.c:430 -+#: ../slattach.c:432 - #, c-format - msgid "slattach: tty_hangup(DROP): %s\n" - msgstr "slattach: tty_hangup(DROP): %s\n" - --#: ../slattach.c:437 -+#: ../slattach.c:439 - #, c-format - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:470 -+#, c-format -+msgid "slattach: tty name too long\n" -+msgstr "slattach: název TTY je příliš dlouhý\n" -+ -+#: ../slattach.c:500 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" --msgstr "slattach: tty_open: aktuln stav nelze zjistit!\n" -+msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:507 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" --msgstr "slattach: tty_open: aktuln linkovou disciplnu nelze zjistit!\n" -+msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:515 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" --msgstr "slattach: tty_open: reim RAW nelze nastavit!\n" -+msgstr "slattach: tty_open: režim RAW nelze nastavit!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:522 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: %s bps nelze nastavit!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:532 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" --msgstr "slattach: tty_open: reim 8N1 nelze nastavit!\n" -+msgstr "slattach: tty_open: režim 8N1 nelze nastavit!\n" -+ -+#: ../slattach.c:674 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "slattach: setvbuf(stdout, 0, _IOLBF, 0): %s\n" - --#: ../slattach.c:686 -+#: ../slattach.c:706 - #, c-format - msgid "%s started" --msgstr "protokol %s sputn" -+msgstr "protokol %s spuštěn" - --#: ../slattach.c:687 -+#: ../slattach.c:707 - #, c-format - msgid " on %s" - msgstr " na %s" - --#: ../slattach.c:688 -+#: ../slattach.c:708 - #, c-format - msgid " interface %s\n" --msgstr " rozhran %s\n" -+msgstr " rozhraní %s\n" -+ -+#~ msgid "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <soubor> <hwadr> [síťmask <čís>] <-''-\n" -+ -+#~ msgid "%-9.9s Link encap:%s " -+#~ msgstr "%-9.9s Zapouzdření:%s " -+ -+#~ msgid "HWaddr %s " -+#~ msgstr "HWadr %s " -+ -+#~ msgid "Media:%s" -+#~ msgstr "Médium:%s" -+ -+#~ msgid "(auto)" -+#~ msgstr "(auto)" -+ -+#~ msgid " P-t-P:%s " -+#~ msgstr " P-t-P:%s " -+ -+# V ostatních katalozích se překládá Broadcast -> všesměrové vysílání. -+# Tudiž bcast -> Všesměr :) -+#~ msgid " Bcast:%s " -+#~ msgstr " Všesměr:%s " -+ -+#~ msgid " Mask:%s\n" -+#~ msgstr "Maska:%s\n" -+ -+#~ msgid " Scope:" -+#~ msgstr " Rozsah:" -+ -+#~ msgid "Unknown" -+#~ msgstr "Neznám." -+ -+#~ msgid " EtherTalk Phase 2 addr:%s\n" -+#~ msgstr " EtherTalk Phase 2 adr:%s\n" -+ -+#~ msgid " econet addr:%s\n" -+#~ msgstr " econet adr:%s\n" -+ -+# Hic sunt leones ... -+#~ msgid "[NO FLAGS] " -+#~ msgstr "[ŽÁDNÉ PŘÍZNAKY]" -+ -+#~ msgid " MTU:%d Metric:%d" -+#~ msgstr " MTU:%d Metrika:%d" -+ -+#~ msgid " compressed:%lu\n" -+#~ msgstr " komprimováno:%lu\n" -+ -+#~ msgid " collisions:%lu " -+#~ msgstr " kolizí:%lu " -+ -+#~ msgid "DMA chan:%x " -+#~ msgstr "Kanál DMA:%x " -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: rozhraní %s není známo\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "odpovědi na žádost o masku podsítě" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "titulek %s je neznámý\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Směrovací tabulka pro `ddp' není zatím podporována.\n" -+ -+#~ msgid "IPX not configured in this system.\n" -+#~ msgstr "IPX není na tomto systému nakonfigurováno.\n" - - #~ msgid "" --#~ " This comand can read or set the hostname or the NIS domainname. You can\n" -+#~ " This comand can read or set the hostname or the NIS domainname. You " -+#~ "can\n" - #~ msgstr "" --#~ " Tento program zjiuje a nastavuje jmno potae i NIS domny. Me " --#~ "tak\n" -+#~ " Tento program zjišťuje a nastavuje jméno počítače či NIS domény. Může " -+#~ "také\n" - - #~ msgid "" - #~ " also read the DNS domain or the FQDN (fully qualified domain name).\n" --#~ msgstr " zjistit DNS domnu i kanonick jmno potae.\n" -+#~ msgstr " zjistit DNS doménu či kanonické jméno počítače.\n" - - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" - #~ msgstr "" --#~ " Pokud nepouvte bind i NIS pro vyhledvn jmen pota, pak mete\n" -+#~ " Pokud nepoužíváte bind či NIS pro vyhledávání jmen počítačů, pak " -+#~ "můžete\n" - - #~ msgid "" - #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" - #~ msgstr "" --#~ " zmnit kanonick jmno potae a jmno DNS domny (je soust " --#~ "kanonickho\n" -+#~ " změnit kanonické jméno počítače a jméno DNS domény (je součástí " -+#~ "kanonického\n" - - #~ msgid " part of the FQDN) in the /etc/hosts file.\n" --#~ msgstr " jmna potae) v souboru /etc/hosts.\n" -+#~ msgstr " jména počítače) v souboru /etc/hosts.\n" -diff --git a/po/de.po b/po/de.po -index f884dd9..9f8f679 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -1,4 +1,4 @@ --# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $ -+# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $ - # German translation for net-tools 1.51 - # Copyright (C) 1999 Ralf Bchle <ralf@gnu.org> - msgid "" -@@ -9,7 +9,7 @@ msgstr "" - "Last-Translator: Ralf Bchle <ralf@gnu.org>\n" - "Language-Team:\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=iso8859-1\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - - #: ../arp.c:110 ../arp.c:269 -@@ -59,12 +59,16 @@ msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n" - - #: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" --msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t Flags Maske\t\t Iface\n" -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "" -+"Adresse HW-Typ HW-Adresse Flags Maske " -+"Iface\n" - - #: ../arp.c:467 - msgid "(incomplete)" --msgstr "(unvollsndig)" -+msgstr "(unvollstndig)" - - #: ../arp.c:484 - #, c-format -diff --git a/po/et_EE.po b/po/et_EE.po -index d748410..827406d 100644 ---- a/po/et_EE.po -+++ b/po/et_EE.po -@@ -1,66 +1,65 @@ - # Estonian translations for net-tools --# Copyright (C) 1999 Free Software Foundation, Inc. --# Meelis Roos <Meelis.Roos@mail.ee>, 1999. -+# Copyright (C) 1999-2001 Free Software Foundation, Inc. -+# Meelis Roos <mroos@linux.ee>, 1999-2001. - # --#, fuzzy - msgid "" - msgstr "" --"Project-Id-Version: net-tools 1.58\n" --"POT-Creation-Date: 2001-02-15 21:28+0200\n" --"PO-Revision-Date: 2001-02-15 18:00+0300\n" -+"Project-Id-Version: net-tools 1.60\n" -+"POT-Creation-Date: 2001-04-16 20:24+0200\n" -+"PO-Revision-Date: 2001-04-16 20:30+0200\n" - "Last-Translator: Meelis Roos <mroos@linux.ee>\n" - "Language-Team: Estonian <linux-ee@eenet.ee>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso-8859-15\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:111 ../arp.c:270 - msgid "arp: need host name\n" - msgstr "arp: puudub hosti nimi\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:208 ../arp.c:222 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "%s jaoks pole ARP kirjet\n" - --#: ../arp.c:239 -+#: ../arp.c:240 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n" - --#: ../arp.c:243 -+#: ../arp.c:244 - msgid "arp: protocol type mismatch.\n" - msgstr "arp: vale protokolli tp\n" - --#: ../arp.c:252 -+#: ../arp.c:253 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n" - --#: ../arp.c:282 -+#: ../arp.c:283 - msgid "arp: need hardware address\n" - msgstr "arp: puudub riistvaraline aadress\n" - --#: ../arp.c:290 -+#: ../arp.c:291 - msgid "arp: invalid hardware address\n" - msgstr "arp: vigane riistvaraline aadress\n" - --#: ../arp.c:387 -+#: ../arp.c:388 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ei saa avada faili %s\n" - --#: ../arp.c:403 -+#: ../arp.c:404 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: formaadiviga real %u failis %s\n" - --#: ../arp.c:416 -+#: ../arp.c:417 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n" - --#: ../arp.c:437 -+#: ../arp.c:438 - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" -@@ -68,45 +67,45 @@ msgstr "" - "Aadress HWtp HWaadress Lipud Mask " - "Liides\n" - --#: ../arp.c:467 -+#: ../arp.c:468 - msgid "(incomplete)" - msgstr "(mittetielik)" - --#: ../arp.c:484 -+#: ../arp.c:485 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) aadressil " - --#: ../arp.c:490 -+#: ../arp.c:491 - msgid "<incomplete> " - msgstr "<mittetielik>" - --#: ../arp.c:496 -+#: ../arp.c:497 - #, c-format - msgid "netmask %s " - msgstr "vrgumask %s " - --#: ../arp.c:513 -+#: ../arp.c:514 - #, c-format - msgid "on %s\n" - msgstr "liides %s\n" - --#: ../arp.c:592 -+#: ../arp.c:593 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:597 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- pole kirjet\n" - --#: ../arp.c:598 -+#: ../arp.c:599 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: ei leidnud %d kirje hulgast sobivat\n" - --#: ../arp.c:613 -+#: ../arp.c:614 - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -@@ -116,7 +115,7 @@ msgstr "" - "ARP cache vaatamine:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hosti nimi>]\n" - --#: ../arp.c:614 -+#: ../arp.c:615 - msgid "" - " arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " - "entry\n" -@@ -124,7 +123,7 @@ msgstr "" - "ARP kirje kustutamine:\n" - " arp [-v] [-i <if>] -d <hosti nimi> [pub] [nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:616 - msgid "" - " arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" -@@ -132,7 +131,7 @@ msgstr "" - "ARP kirjete lisamine failist:\n" - " arp [-vnD] [<HW>] [-i <if>] -f [<failinimi>]\n" - --#: ../arp.c:616 -+#: ../arp.c:617 - msgid "" - " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " - "entry\n" -@@ -140,14 +139,14 @@ msgstr "" - "ARP kirje lisamine:\n" - " arp [-v] [<HW>] [-i <if>] -s <hosti nimi> <hwaddr> [temp] [nopub]\n" - --#: ../arp.c:617 -+#: ../arp.c:618 - msgid "" - " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " - "<-''-\n" - msgstr "" - " arp [-v] [<HW>] [-i <if>] -s <hosti nimi> <hwaddr> [netmask <nm>] pub\n" - --#: ../arp.c:618 -+#: ../arp.c:619 - msgid "" - " arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " - "<-''-\n" -@@ -156,7 +155,7 @@ msgstr "" - " arp [-v] [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:621 - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -164,37 +163,37 @@ msgstr "" - " -a nita kiki hoste alternatiivsel (BSD) " - "kujul\n" - --#: ../arp.c:621 -+#: ../arp.c:622 - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set uue ARP kirje seadmine\n" - --#: ../arp.c:622 -+#: ../arp.c:623 - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete mratud kirje kustutamine\n" - --#: ../arp.c:623 ../netstat.c:1485 ../route.c:85 -+#: ../arp.c:624 ../netstat.c:1490 ../route.c:86 - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose jutukas vljund\n" - --#: ../arp.c:624 -+#: ../arp.c:625 ../netstat.c:1491 ../route.c:87 - msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric mitte lahendada nimesid\n" - --#: ../arp.c:625 -+#: ../arp.c:626 - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device vrguliidese tpsustamine (niteks eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:627 - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device lugeda <hwaddr> vastavalt liideselt\n" - --#: ../arp.c:627 -+#: ../arp.c:628 - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol protokollipere mramine\n" - --#: ../arp.c:628 -+#: ../arp.c:629 - msgid "" - " -f, --file read new entries from file or from " - "/etc/ethers\n" -@@ -204,125 +203,125 @@ msgstr "" - "/etc/ethers'st\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:631 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" - " <HW>=kasutage '-H <hw>' riistvaralise aadressi mramiseks.\n" - " Vaikimisi: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:632 ../rarp.c:183 - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Vimalike ARP-i toetavate riistvara tpide nimekiri:\n" - --#: ../arp.c:664 ../arp.c:749 -+#: ../arp.c:666 ../arp.c:751 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "arp: riistvara tpi %s ei toetata\n" - --#: ../arp.c:668 -+#: ../arp.c:670 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "arp: aadressiperekonda %s ei toetata\n" - --#: ../arp.c:703 -+#: ../arp.c:705 - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N toetust pole veel\n" - --#: ../arp.c:713 -+#: ../arp.c:715 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: tundmatu aadressiperekond %s\n" - --#: ../arp.c:722 -+#: ../arp.c:724 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: tundmatu riistvara tp %s\n" - --#: ../arp.c:741 -+#: ../arp.c:743 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n" - --#: ../arp.c:754 -+#: ../arp.c:756 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: riistvara tbil %s pole ARP toetust\n" - --#: ../hostname.c:69 -+#: ../hostname.c:70 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Sean slme nimeks `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:75 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: ainult root saab slme nime muuta\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nimi on liiga pikk\n" - --#: ../hostname.c:89 -+#: ../hostname.c:90 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Sean hosti nimeks `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:95 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: ainult root saab hosti nime muuta\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Sean domeeni nimeks `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: ainult root saab domeeni nime muuta\n" - --#: ../hostname.c:131 -+#: ../hostname.c:132 - #, c-format - msgid "Resolving `%s' ...\n" - msgstr "Lahendan `%s' ...\n" - --#: ../hostname.c:137 -+#: ../hostname.c:138 - #, c-format - msgid "Result: h_name=`%s'\n" - msgstr "Tulemus: h_name=`%s'\n" - --#: ../hostname.c:142 -+#: ../hostname.c:143 - #, c-format - msgid "Result: h_aliases=`%s'\n" - msgstr "Tulemus: h_aliases=`%s'\n" - --#: ../hostname.c:147 -+#: ../hostname.c:148 - #, c-format - msgid "Result: h_addr_list=`%s'\n" - msgstr "Tulemus: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:210 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: ei saa avada faili `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:224 - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Kasutamine:\n" - " hostname [-v] {hosti nimi|-F fail} hosti nime seadmine (ka " - "failist)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:225 - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {nisdomeen|-F fail} NIS domeeni nime seadmine\n" - --#: ../hostname.c:226 -+#: ../hostname.c:227 - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" -@@ -330,18 +329,18 @@ msgstr "" - " nodename [-v] {nodename|-F fail} DECneti vrguslme nime " - "seadmine\n" - --#: ../hostname.c:228 -+#: ../hostname.c:229 - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr "" - " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] nime nitamine antud formaadis\n" - --#: ../hostname.c:229 -+#: ../hostname.c:230 - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr " hostname [-v] hosti nime nitamine\n" - --#: ../hostname.c:230 -+#: ../hostname.c:231 - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +349,7 @@ msgstr "" - " hostname -h|--help seesama abiinfo\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:232 - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -358,36 +357,36 @@ msgstr "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:233 - msgid " -s, --short short host name\n" - msgstr " -s, --short lhike hosti nimi\n" - --#: ../hostname.c:233 -+#: ../hostname.c:234 - msgid " -a, --alias alias names\n" - msgstr " -a, --alias alias-nimed\n" - --#: ../hostname.c:234 -+#: ../hostname.c:235 - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address hosti IP aadressid\n" - --#: ../hostname.c:235 -+#: ../hostname.c:236 - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - " -f, --fqdn, --long pikk hosti nimi (FQDN - tielik ssteeminimi)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:237 - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain DNS domeeni nimi\n" - --#: ../hostname.c:237 -+#: ../hostname.c:238 - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis NIS/YP domeeni nimi\n" - --#: ../hostname.c:239 -+#: ../hostname.c:240 - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node DECneti vrguslme nimi\n" - --#: ../hostname.c:241 -+#: ../hostname.c:242 - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -395,7 +394,7 @@ msgstr "" - " -F, --file lugeda hosti vi NIS domeeni nimi failist\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:244 - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -409,12 +408,12 @@ msgstr "" - " tielikku ssteeminime (FQDN) ja DNS domeeni nime (mis on tieliku nime\n" - " osa) muuta failist /etc/hosts.\n" - --#: ../hostname.c:338 -+#: ../hostname.c:340 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" - msgstr "%s: selle ksuga ei saa muuta DNS domeeni nime\n" - --#: ../hostname.c:339 -+#: ../hostname.c:341 - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -422,26 +421,26 @@ msgstr "" - "\n" - "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n" - --#: ../hostname.c:340 -+#: ../hostname.c:342 - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "(mis on tieliku nime osa) nime muuta failist /etc/hosts.\n" - --#: ../hostname.c:357 -+#: ../hostname.c:359 - #, c-format - msgid "gethostname()=`%s'\n" - msgstr "gethostname()=`%s'\n" - --#: ../hostname.c:374 -+#: ../hostname.c:376 - #, c-format - msgid "getdomainname()=`%s'\n" - msgstr "getdomainname()=`%s'\n" - --#: ../hostname.c:389 -+#: ../hostname.c:391 - #, c-format - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:110 -+#: ../ifconfig.c:108 - msgid "" - "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" -@@ -449,16 +448,16 @@ msgstr "" - "Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Lip\n" - --#: ../ifconfig.c:132 ../ifconfig.c:164 -+#: ../ifconfig.c:130 ../ifconfig.c:162 - #, c-format - msgid "%s: unknown interface: %s\n" - msgstr "ifconfig: tundmatu liides %s: %s\n" - --#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937 -+#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936 - msgid "No support for INET on this system.\n" - msgstr "Antud ssteem ei toeta INET aadressiperekonda\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:177 - msgid "" - "Usage:\n" - " ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n" -@@ -466,51 +465,51 @@ msgstr "" - "Kasutamine:\n" - " ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:179 - msgid " [add <address>[/<prefixlen>]]\n" - msgstr " [add <aadress>[/<prefiksi pikkus>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:180 - msgid " [del <address>[/<prefixlen>]]\n" - msgstr " [del <aadress>[/<prefiksi pikkus>]]\n" - --#: ../ifconfig.c:183 -+#: ../ifconfig.c:181 - msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" - msgstr " [[-]broadcast [<aadress>]] [[-]pointopoint [<aadress>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:182 - msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" - msgstr " [netmask <aadress>] [dstaddr <aadress>] [tunnel <aadress>]\n" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:185 - msgid " [outfill <NN>] [keepalive <NN>]\n" - msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:187 - msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" - msgstr " [hw <HW> <aadress>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:188 - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:191 -+#: ../ifconfig.c:189 - msgid " [multicast] [[-]promisc]\n" - msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:190 - msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <tp>]\n" - --#: ../ifconfig.c:194 -+#: ../ifconfig.c:192 - msgid " [txqueuelen <NN>]\n" - msgstr " [txqueuelen <NN>]\n" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:195 - msgid " [[-]dynamic]\n" - msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:197 - msgid "" - " [up|down] ...\n" - "\n" -@@ -518,73 +517,86 @@ msgstr "" - " [up|down] ...\n" - "\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:199 - msgid " <HW>=Hardware Type.\n" - msgstr " <HW>=riistvara tp\n" - --#: ../ifconfig.c:202 -+#: ../ifconfig.c:200 - msgid " List of possible hardware types:\n" - msgstr " Vimalike riistvara tpide nimekiri:\n" - - #. 1 = ARPable --#: ../ifconfig.c:204 -+#: ../ifconfig.c:202 - #, c-format - msgid " <AF>=Address family. Default: %s\n" - msgstr " <AF>=aadressiperekond, vaikimisi %s\n" - --#: ../ifconfig.c:205 -+#: ../ifconfig.c:203 - msgid " List of possible address families:\n" - msgstr " Vimalike aadressiperekondade nimekiri:\n" - --#: ../ifconfig.c:361 -+#: ../ifconfig.c:278 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" -+ -+#: ../ifconfig.c:280 ../ifconfig.c:925 -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" -+ -+#: ../ifconfig.c:355 - msgid "Unknown media type.\n" - msgstr "Tundmatu meedia tp\n" - --#: ../ifconfig.c:653 -+#: ../ifconfig.c:647 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - "riistvara aadressi tbil `%s' pole ksitlejat aadressi seadmiseks - ebann\n" - --#: ../ifconfig.c:662 -+#: ../ifconfig.c:656 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "%s: vigane %s aadress\n" - --#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882 -+#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876 - msgid "No support for INET6 on this system.\n" - msgstr "Antud ssteem ei toeta INET6 aadressiperekonda\n" - --#: ../ifconfig.c:749 ../ifconfig.c:840 -+#: ../ifconfig.c:743 ../ifconfig.c:834 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "Liides %s pole initsialiseeritud\n" - --#: ../ifconfig.c:761 ../ifconfig.c:851 -+#: ../ifconfig.c:755 ../ifconfig.c:845 - msgid "Bad address.\n" - msgstr "Vigane aadress\n" - --#: ../ifconfig.c:854 -+#: ../ifconfig.c:848 - msgid "Address deletion not supported on this system.\n" - msgstr "Antud ssteem ei toeta aadresside kustutamist\n" - --#: ../ifconfig.c:947 -+#: ../ifconfig.c:920 -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ei oska seada aadresse selle aadressiperekonna jaoks\n" -+ -+#: ../ifconfig.c:946 - msgid "No support for ECONET on this system.\n" - msgstr "Antud ssteem ei toeta ECONET aadressiperekonda\n" - --#: ../ifconfig.c:955 -+#: ../ifconfig.c:954 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" - --#: ../netstat.c:429 -+#: ../netstat.c:430 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" - "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n" - --#: ../netstat.c:433 -+#: ../netstat.c:434 - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -592,27 +604,27 @@ msgstr "" - "(Mnesid protsesse ei saanud identifitseerida, teiste kasutajate\n" - "info lugemiseks peab olema root)\n" - --#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248 -+#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:441 -+#: ../netstat.c:442 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:442 ../netstat.c:1250 -+#: ../netstat.c:443 ../netstat.c:1255 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251 -+#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:465 -+#: ../netstat.c:466 - msgid "Active NET/ROM sockets\n" - msgstr "Aktiivsed NET/ROM soklid\n" - --#: ../netstat.c:466 -+#: ../netstat.c:467 - msgid "" - "User Dest Source Device State Vr/Vs Send-Q " - "Recv-Q\n" -@@ -620,182 +632,182 @@ msgstr "" - "Kasutaja Sihtpunkt Lhtepunkt Liides Olek Vr/Vs SaatJrk " - "VvJrk\n" - --#: ../netstat.c:476 ../netstat.c:1290 -+#: ../netstat.c:477 ../netstat.c:1295 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:511 -+#: ../netstat.c:512 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:512 -+#: ../netstat.c:513 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:513 -+#: ../netstat.c:514 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:514 -+#: ../netstat.c:515 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:515 -+#: ../netstat.c:516 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:516 -+#: ../netstat.c:517 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:517 -+#: ../netstat.c:518 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:518 -+#: ../netstat.c:519 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:519 -+#: ../netstat.c:520 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:520 -+#: ../netstat.c:521 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:587 -+#: ../netstat.c:592 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n" - --#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883 --#: ../netstat.c:1014 ../netstat.c:1019 -+#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888 -+#: ../netstat.c:1019 ../netstat.c:1024 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: aadressiperekonda %d ei toetata\n" - --#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625 -+#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n" - --#: ../netstat.c:668 -+#: ../netstat.c:673 - msgid "Active X.25 sockets\n" - msgstr "Aktiivsed X.25 soklid\n" - - #. IMHO, Vr/Vs is not very usefull --SF --#: ../netstat.c:670 -+#: ../netstat.c:675 - msgid "" - "Dest Source Device LCI State Vr/Vs Send-Q " - "Recv-Q\n" - msgstr "" - "Sihtpunkt Lhtepunkt Liides LCI Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:747 -+#: ../netstat.c:752 - msgid "warning, got bogus tcp line.\n" - msgstr "Hoiatus - sain imeliku tcp rea\n" - --#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057 -+#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "eiki ((0.00/%ld/%d)" - --#: ../netstat.c:792 -+#: ../netstat.c:797 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "kib (%2.2f/%ld/%d)" - --#: ../netstat.c:797 -+#: ../netstat.c:802 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:802 -+#: ../netstat.c:807 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067 -+#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "eitea-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:879 -+#: ../netstat.c:884 - msgid "warning, got bogus udp line.\n" - msgstr "Hoiatus - sain imeliku udp rea\n" - --#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190 -+#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195 - msgid "UNKNOWN" - msgstr "TUNDMATU" - --#: ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:948 ../netstat.c:1067 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "kib-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:1028 -+#: ../netstat.c:1033 - msgid "warning, got bogus raw line.\n" - msgstr "Hoiatus - sain imeliku raw rea\n" - --#: ../netstat.c:1110 -+#: ../netstat.c:1115 - msgid "warning, got bogus unix line.\n" - msgstr "Hoiatus - sain imeliku unix rea\n" - --#: ../netstat.c:1137 -+#: ../netstat.c:1142 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1141 -+#: ../netstat.c:1146 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1145 -+#: ../netstat.c:1150 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1149 -+#: ../netstat.c:1154 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1153 -+#: ../netstat.c:1158 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1162 -+#: ../netstat.c:1167 - msgid "FREE" - msgstr "VABA" - --#: ../netstat.c:1178 -+#: ../netstat.c:1183 - msgid "CONNECTING" - msgstr "HENDUMAS" - --#: ../netstat.c:1182 -+#: ../netstat.c:1187 - msgid "CONNECTED" - msgstr "HENDATUD" - --#: ../netstat.c:1186 -+#: ../netstat.c:1191 - msgid "DISCONNECTING" - msgstr "LAHTIHENDUMAS" - --#: ../netstat.c:1217 -+#: ../netstat.c:1222 - msgid "Active UNIX domain sockets " - msgstr "Aktiivsed UNIX domeeni soklid " - --#: ../netstat.c:1219 ../netstat.c:1729 -+#: ../netstat.c:1224 ../netstat.c:1735 - msgid "(servers and established)" - msgstr "(serverid ja hendatud)" - --#: ../netstat.c:1222 ../netstat.c:1732 -+#: ../netstat.c:1227 ../netstat.c:1738 - msgid "(only servers)" - msgstr "(ainult serverid)" - --#: ../netstat.c:1224 ../netstat.c:1734 -+#: ../netstat.c:1229 ../netstat.c:1740 - msgid "(w/o servers)" - msgstr "(ilma serveriteta)" - --#: ../netstat.c:1227 -+#: ../netstat.c:1232 - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -803,32 +815,32 @@ msgstr "" - "\n" - "Proto Mitu Lipud Tp Olek I-kirje " - --#: ../netstat.c:1229 -+#: ../netstat.c:1234 - msgid " Path\n" - msgstr "Tee\n" - --#: ../netstat.c:1249 -+#: ../netstat.c:1254 - msgid "SABM SENT" - msgstr "SABM SENT" - --#: ../netstat.c:1252 -+#: ../netstat.c:1257 - msgid "RECOVERY" - msgstr "RECOVERY" - --#: ../netstat.c:1266 -+#: ../netstat.c:1271 - msgid "Active AX.25 sockets\n" - msgstr "Aktiivsed AX.25 soklid\n" - --#: ../netstat.c:1267 -+#: ../netstat.c:1272 - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Sihtpunkt Lhtepunkt Liides Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:1310 -+#: ../netstat.c:1315 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:1361 -+#: ../netstat.c:1366 - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " -@@ -838,23 +850,23 @@ msgstr "" - "Proto VvJrk SaatJrk Kohalik aadress Vline aadress " - "Olek " - --#: ../netstat.c:1363 -+#: ../netstat.c:1368 - msgid " User" - msgstr " Kasutaja" - --#: ../netstat.c:1397 -+#: ../netstat.c:1402 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1405 -+#: ../netstat.c:1410 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1443 -+#: ../netstat.c:1448 - msgid "Kernel Interface table\n" - msgstr "Tuuma liideste tabel\n" - --#: ../netstat.c:1447 -+#: ../netstat.c:1452 - msgid "" - "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" -@@ -862,11 +874,11 @@ msgstr "" - "Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Lip\n" - --#: ../netstat.c:1451 -+#: ../netstat.c:1456 - msgid "missing interface information" - msgstr "Puudulik informatsioon liideste kohta" - --#: ../netstat.c:1474 -+#: ../netstat.c:1479 - msgid "" - "usage: netstat [-veenNcCF] [<Af>] -r netstat " - "{-V|--version|-h|--help}\n" -@@ -874,11 +886,11 @@ msgstr "" - "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1475 -+#: ../netstat.c:1480 - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Sokkel> ...]\n" - --#: ../netstat.c:1476 -+#: ../netstat.c:1481 - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -886,25 +898,25 @@ msgstr "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1478 -+#: ../netstat.c:1483 - msgid " -r, --route display routing table\n" - msgstr " -r, --route ruutingutabeli nitamine\n" - --#: ../netstat.c:1479 -+#: ../netstat.c:1484 - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces liideste tabeli nitamine\n" - --#: ../netstat.c:1480 -+#: ../netstat.c:1485 - msgid " -g, --groups display multicast group memberships\n" - msgstr " -g, --groups multiedastuse gruppide nitamine\n" - --#: ../netstat.c:1481 -+#: ../netstat.c:1486 - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics vrgu statistika nitamine (SNMP stiilis)\n" - --#: ../netstat.c:1483 -+#: ../netstat.c:1488 - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -912,36 +924,32 @@ msgstr "" - " -M, --masquerade maskeeritavate henduste nitamine\n" - "\n" - --#: ../netstat.c:1486 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" --msgstr " -n, --numeric mitte lahendada numbreid nimedeks\n" -- --#: ../netstat.c:1487 --msgid " --numeric-hosts dont resolve host names\n" -+#: ../netstat.c:1492 -+msgid " --numeric-hosts don't resolve host names\n" - msgstr " --numeric-hosts mitte lahendada hostinimesid\n" - --#: ../netstat.c:1488 --msgid " --numeric-ports dont resolve port names\n" -+#: ../netstat.c:1493 -+msgid " --numeric-ports don't resolve port names\n" - msgstr " --numeric-ports mitte lahendada pordinimesid\n" - --#: ../netstat.c:1489 --msgid " --numeric-users dont resolve user names\n" -+#: ../netstat.c:1494 -+msgid " --numeric-users don't resolve user names\n" - msgstr " --numeric-users mitte lahendada kasutajanimesid\n" - --#: ../netstat.c:1490 -+#: ../netstat.c:1495 - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic lahendada riistvara aadressid\n" - --#: ../netstat.c:1491 ../route.c:87 -+#: ../netstat.c:1496 ../route.c:88 - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend muu info/lisainfo nitamine\n" - --#: ../netstat.c:1492 -+#: ../netstat.c:1497 - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs soklite kohta PID/protsessi nime nitamine\n" - --#: ../netstat.c:1493 -+#: ../netstat.c:1498 - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -949,22 +957,22 @@ msgstr "" - " -c, --continuous pidevalt uuenev nimekiri\n" - "\n" - --#: ../netstat.c:1494 -+#: ../netstat.c:1499 - msgid " -l, --listening display listening server sockets\n" - msgstr " -l, --listening kuulavate serversoklite nitamine\n" - --#: ../netstat.c:1495 -+#: ../netstat.c:1500 - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening kigi soklite nitamine (vaikimisi " - "hendatud)\n" - --#: ../netstat.c:1496 -+#: ../netstat.c:1501 - msgid " -o, --timers display timers\n" - msgstr " -o, --timers taimerite nitamine\n" - --#: ../netstat.c:1497 ../route.c:88 -+#: ../netstat.c:1502 ../route.c:89 - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -972,7 +980,7 @@ msgstr "" - " -F, --fib ldiste ruutingutabelite nitamine " - "(vaikimisi)\n" - --#: ../netstat.c:1498 ../route.c:89 -+#: ../netstat.c:1503 ../route.c:90 - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -981,7 +989,7 @@ msgstr "" - "nitamine\n" - "\n" - --#: ../netstat.c:1500 -+#: ../netstat.c:1505 - msgid "" - " <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " - "--netrom\n" -@@ -989,20 +997,19 @@ msgstr "" - " <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " - "--netrom\n" - --#: ../netstat.c:1501 ../route.c:91 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" --msgstr " <AF>=kasutage '-A <af>' vi '--<af>' vaikimisi: %s\n" -+#: ../netstat.c:1506 ../route.c:92 -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=kasutage '-A <af>' vi '--<af>'; vaikimisi: %s\n" - --#: ../netstat.c:1502 ../route.c:92 -+#: ../netstat.c:1507 ../route.c:93 - msgid " List of possible address families (which support routing):\n" - msgstr " Vimalike ruutingu toetavate aadressiperekondade nimekiri:\n" - --#: ../netstat.c:1726 -+#: ../netstat.c:1732 - msgid "Active Internet connections " - msgstr "Aktiivsed internetihendused " - --#: ../netstat.c:1736 -+#: ../netstat.c:1742 - msgid "" - "\n" - "Proto Recv-Q Send-Q Local Address Foreign Address State " -@@ -1012,77 +1019,77 @@ msgstr "" - "Proto VvJrk SaatJrk Kohalik aadress Vline aadress Olek " - " " - --#: ../netstat.c:1738 -+#: ../netstat.c:1744 - msgid " User Inode " - msgstr " Kasutaja I-kirje " - --#: ../netstat.c:1741 -+#: ../netstat.c:1747 - msgid " Timer" - msgstr " Taimer" - --#: ../netstat.c:1771 -+#: ../netstat.c:1777 - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 grupikuuluvused\n" - --#: ../netstat.c:1772 -+#: ../netstat.c:1778 - msgid "Interface RefCnt Group\n" - msgstr "Liides Mitu Grupp\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "rarp: tuum ei toeta RARP'i\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "rarp: %s jaoks pole RARP kirjet\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "rarp: vigane riistvaraline aadress %s\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: ei saa avada faili %s:%s\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: vorminguviga failis %s real %u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: tundmatu host %s\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - "Kasutamine:\n" - " rarp -a puhvris olevate kirjete vaatamine\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr " rarp -d <hosti nimi> kirje kustutamine puhvrist\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr " rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f kirjete lisamine failist /etc/ethers\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1090,24 +1097,24 @@ msgstr "" - " rarp -V programmi versiooni nitamine\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: lubamatu vtmete kombinatsioon\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: tundmatu riistvara tp %s\n" - --#: ../route.c:79 -+#: ../route.c:80 - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Kasutamine:\n" - " route [-nNvee] [-FC] [<AF>] Tuuma ruutingutabeli nitamine\n" - --#: ../route.c:80 -+#: ../route.c:81 - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1115,7 +1122,7 @@ msgstr "" - " route [-v] [-FC] {add|del|flush} ... Tuuma ruutingutabeli muutmine\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" -@@ -1123,7 +1130,7 @@ msgstr "" - " route {-h|--help} [<AF>] Detailne sntaks perekonna AF " - "jaoks\n" - --#: ../route.c:83 -+#: ../route.c:84 - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1149,25 +1156,25 @@ msgstr " plipconfig -V | --version\n" - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:85 - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:86 - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - " [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:87 - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:88 - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:89 - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1175,83 +1182,83 @@ msgstr "" - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:89 -+#: ../iptunnel.c:90 - msgid "Where: NAME := STRING\n" - msgstr "Kus: NIMI := STRING\n" - --#: ../iptunnel.c:90 -+#: ../iptunnel.c:91 - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " AADR := { IP_AADRESS | any }\n" - --#: ../iptunnel.c:91 -+#: ../iptunnel.c:92 - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { ARV | inherit }\n" - --#: ../iptunnel.c:92 -+#: ../iptunnel.c:93 - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:93 -+#: ../iptunnel.c:94 - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - " KEY := { PUNKTIDEGA_ARVUNELIK | ARV }\n" - " LIIDES := FSILISE_LIIDESE_NIMI\n" - --#: ../iptunnel.c:331 -+#: ../iptunnel.c:332 - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "ipip ja sit juures ei ole vtmed lubatud\n" - --#: ../iptunnel.c:351 -+#: ../iptunnel.c:352 - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Leviedastusega tunnel vajab lhteaadressi\n" - --#: ../iptunnel.c:366 -+#: ../iptunnel.c:367 - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n" - --#: ../iptunnel.c:378 -+#: ../iptunnel.c:379 - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "Ei suuda mrata tunneli moodi (ipip, gre vi sit)\n" - --#: ../iptunnel.c:416 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip teises otsas %s siin %s " - --#: ../iptunnel.c:420 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "tundmatu" - --#: ../iptunnel.c:452 -+#: ../iptunnel.c:453 - msgid " Drop packets out of sequence.\n" - msgstr " Jrjekorravlised paketid visatakse minema\n" - --#: ../iptunnel.c:454 -+#: ../iptunnel.c:455 - msgid " Checksum in received packet is required.\n" - msgstr " Vastuvetavates pakettides on kontrollsumma kohustuslik\n" - --#: ../iptunnel.c:456 -+#: ../iptunnel.c:457 - msgid " Sequence packets on output.\n" - msgstr " Vljuvad paketid varustatakse jrjekorranumbritega\n" - --#: ../iptunnel.c:458 -+#: ../iptunnel.c:459 - msgid " Checksum output packets.\n" - msgstr " Vljuvad paketid varustatakse kontrollsummaga\n" - --#: ../iptunnel.c:486 -+#: ../iptunnel.c:487 - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n" - --#: ../iptunnel.c:499 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Ei suutnud kindlaks teha liidese %s tpi\n" - --#: ../iptunnel.c:515 -+#: ../iptunnel.c:516 - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakette Baite Vigu KSumVigu JrkVigu Levipakette\n" - --#: ../iptunnel.c:518 -+#: ../iptunnel.c:519 - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakette Baite Vigu DeadLoop EiRuudi MluOtsas\n" - -@@ -1972,15 +1979,15 @@ msgstr "rresolve: toetuseta aadressiperekond %d\n" - msgid "[UNKNOWN]" - msgstr "[TUNDMATU]" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6_gr.c:71 - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pole antud ssteemis konfigureeritud\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 - msgid "Kernel IPv6 routing table\n" - msgstr "Tuuma IPv6 ruutingutabel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 - msgid "" - "Destination Next Hop " - " Flags Metric Ref Use Iface\n" -@@ -1988,11 +1995,11 @@ msgstr "" - "Sihtpunkt Jrgmine samm " - " Lipud Meetr Mitu Kasut Liides\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Tuuma IPv6 naabrite puhver\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2000,7 +2007,7 @@ msgstr "" - "Naaber HW Aadress Liides Lipud " - "Mitu Olek\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" -@@ -2538,29 +2545,29 @@ msgstr "iptunnel: %s on vigane IPv4 aadress\n" - msgid "ip: argument is wrong: %s\n" - msgstr "iptunnel: vale argument %s\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:61 - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n" - --#: ../ipmaddr.c:59 -+#: ../ipmaddr.c:62 - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:60 -+#: ../ipmaddr.c:63 - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:260 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "perekond %d " - --#: ../ipmaddr.c:269 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " kasutajaid %d" - --#: ../ipmaddr.c:355 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Ei saa avada soklit" - -diff --git a/po/fr.po b/po/fr.po -index e8e7542..e4e8245 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -9,7 +9,7 @@ msgstr "" - "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n" - "Language-Team:\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=iso8859-1\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - - #: ../arp.c:110 ../arp.c:269 -@@ -59,8 +59,12 @@ msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ne peut dfinir l'entre en ligne %u du fichier ether %s !\n" - - #: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" --msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t Indicateurs\t\t Iface\n" -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "" -+"Adresse TypeMap AdresseMat Indicateurs " -+"Iface\n" - - #: ../arp.c:467 - msgid "(incomplete)" -diff --git a/po/net-tools.pot b/po/net-tools.pot -index 0231aac..cdeccc9 100644 ---- a/po/net-tools.pot -+++ b/po/net-tools.pot -@@ -1,263 +1,285 @@ - # SOME DESCRIPTIVE TITLE. --# Copyright (C) YEAR Free Software Foundation, Inc. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. - # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. - # - #, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2001-04-15 15:40+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2005-05-16 05:18+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" - "Language-Team: LANGUAGE <LL@li.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" --"Content-Transfer-Encoding: ENCODING\n" -+"Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:111 ../arp.c:270 -+#: ../arp.c:111 ../arp.c:276 -+#, c-format - msgid "arp: need host name\n" - msgstr "" - --#: ../arp.c:208 ../arp.c:222 -+#: ../arp.c:213 ../arp.c:228 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "" - --#: ../arp.c:240 -+#: ../arp.c:246 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "" - --#: ../arp.c:244 -+#: ../arp.c:250 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:253 -+#: ../arp.c:259 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:283 -+#: ../arp.c:289 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "" - --#: ../arp.c:291 -+#: ../arp.c:297 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "" - --#: ../arp.c:388 -+#: ../arp.c:394 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "" - --#: ../arp.c:404 -+#: ../arp.c:410 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:417 -+#: ../arp.c:423 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:438 -+#: ../arp.c:444 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" - msgstr "" - --#: ../arp.c:468 -+#: ../arp.c:472 -+msgid "<from_interface>" -+msgstr "" -+ -+#: ../arp.c:474 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:485 -+#: ../arp.c:491 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:491 -+#: ../arp.c:497 -+#, c-format - msgid "<incomplete> " - msgstr "" - --#: ../arp.c:497 -+#: ../arp.c:503 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:514 -+#: ../arp.c:520 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:593 -+#: ../arp.c:599 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "" - --#: ../arp.c:597 -+#: ../arp.c:603 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:599 -+#: ../arp.c:605 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "" - --#: ../arp.c:614 -+#: ../arp.c:620 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - --#: ../arp.c:615 -+#: ../arp.c:621 -+#, c-format - msgid "" - " arp [-v] [-i <if>] -d <hostname> [pub][nopub] <-Delete ARP " - "entry\n" - msgstr "" - --#: ../arp.c:616 -+#: ../arp.c:622 -+#, c-format - msgid "" --" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " - "file\n" - msgstr "" - --#: ../arp.c:617 -+#: ../arp.c:623 -+#, c-format - msgid "" - " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [temp][nopub] <-Add " - "entry\n" - msgstr "" - --#: ../arp.c:618 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" -- --#: ../arp.c:619 -+#: ../arp.c:624 -+#, c-format - msgid "" - " arp [-v] [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub " - "<-''-\n" - "\n" - msgstr "" - --#: ../arp.c:621 -+#: ../arp.c:626 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr "" - --#: ../arp.c:622 -+#: ../arp.c:627 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr "" - --#: ../arp.c:623 -+#: ../arp.c:628 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr "" - --#: ../arp.c:624 ../netstat.c:1490 ../route.c:86 -+#: ../arp.c:629 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" - --#: ../arp.c:625 ../netstat.c:1491 ../route.c:87 -+#: ../arp.c:630 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr "" - --#: ../arp.c:626 -+#: ../arp.c:631 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - --#: ../arp.c:627 -+#: ../arp.c:632 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr "" - --#: ../arp.c:628 -+#: ../arp.c:633 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr "" - --#: ../arp.c:629 -+#: ../arp.c:634 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:636 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" - --#: ../arp.c:632 ../rarp.c:183 -+#: ../arp.c:637 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr "" - --#: ../arp.c:666 ../arp.c:751 -+#: ../arp.c:671 ../arp.c:756 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "" - --#: ../arp.c:670 -+#: ../arp.c:675 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "" - --#: ../arp.c:705 -+#: ../arp.c:710 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "" - --#: ../arp.c:715 -+#: ../arp.c:720 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "" - --#: ../arp.c:724 -+#: ../arp.c:729 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "" - --#: ../arp.c:743 -+#: ../arp.c:748 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "" - --#: ../arp.c:756 -+#: ../arp.c:761 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "" - --#: ../hostname.c:70 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "" - --#: ../hostname.c:75 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "" - --#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117 -+#: ../hostname.c:79 ../hostname.c:100 ../hostname.c:118 - #, c-format - msgid "%s: name too long\n" - msgstr "" - --#: ../hostname.c:90 -+#: ../hostname.c:92 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "" - --#: ../hostname.c:95 -+#: ../hostname.c:97 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "" - --#: ../hostname.c:109 -+#: ../hostname.c:110 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "" - --#: ../hostname.c:114 -+#: ../hostname.c:115 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "" -@@ -282,83 +304,99 @@ msgstr "" - msgid "Result: h_addr_list=`%s'\n" - msgstr "" - --#: ../hostname.c:210 -+#: ../hostname.c:209 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - --#: ../hostname.c:225 -+#: ../hostname.c:224 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - --#: ../hostname.c:227 -+#: ../hostname.c:226 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr "" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr "" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr "" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" - msgstr "" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - msgstr "" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -s, --short short host name\n" - msgstr "" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr "" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr "" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr "" - --#: ../hostname.c:238 -+#: ../hostname.c:237 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr "" - --#: ../hostname.c:240 -+#: ../hostname.c:239 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr "" - --#: ../hostname.c:242 -+#: ../hostname.c:241 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" - --#: ../hostname.c:244 -+#: ../hostname.c:243 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -373,12 +411,14 @@ msgid "%s: You can't change the DNS domain name with this command\n" - msgstr "" - - #: ../hostname.c:341 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - - #: ../hostname.c:342 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - -@@ -397,557 +437,697 @@ msgstr "" - msgid "getnodename()=`%s'\n" - msgstr "" - --#: ../ifconfig.c:108 -+#: ../ifconfig.c:107 ../netstat.c:1465 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - --#: ../ifconfig.c:130 ../ifconfig.c:162 -+#: ../ifconfig.c:129 ../ifconfig.c:161 - #, c-format --msgid "%s: unknown interface: %s\n" -+msgid "%s: ERROR while getting interface flags: %s\n" - msgstr "" - --#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:791 ../ifconfig.c:884 -+#: ../ifconfig.c:997 -+#, c-format - msgid "No support for INET on this system.\n" - msgstr "" - --#: ../ifconfig.c:177 -+#: ../ifconfig.c:193 -+#, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "" -+ -+#: ../ifconfig.c:202 -+#, c-format - msgid "" - "Usage:\n" --" ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" - msgstr "" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 -+#, c-format - msgid " [add <address>[/<prefixlen>]]\n" - msgstr "" - --#: ../ifconfig.c:180 -+#: ../ifconfig.c:205 -+#, c-format - msgid " [del <address>[/<prefixlen>]]\n" - msgstr "" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:206 -+#, c-format - msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" - msgstr "" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:207 -+#, c-format - msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" - msgstr "" - --#: ../ifconfig.c:185 -+#: ../ifconfig.c:210 -+#, c-format - msgid " [outfill <NN>] [keepalive <NN>]\n" - msgstr "" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:212 -+#, c-format - msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" - msgstr "" - --#: ../ifconfig.c:188 -+#: ../ifconfig.c:213 -+#, c-format - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr "" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:214 -+#, c-format - msgid " [multicast] [[-]promisc]\n" - msgstr "" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:215 -+#, c-format - msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - msgstr "" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:217 -+#, c-format - msgid " [txqueuelen <NN>]\n" - msgstr "" - --#: ../ifconfig.c:195 -+#: ../ifconfig.c:220 -+#, c-format - msgid " [[-]dynamic]\n" - msgstr "" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:222 -+#, c-format - msgid "" - " [up|down] ...\n" - "\n" - msgstr "" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:224 -+#, c-format - msgid " <HW>=Hardware Type.\n" - msgstr "" - --#: ../ifconfig.c:200 -+#: ../ifconfig.c:225 -+#, c-format - msgid " List of possible hardware types:\n" - msgstr "" - - #. 1 = ARPable --#: ../ifconfig.c:202 -+#: ../ifconfig.c:227 - #, c-format - msgid " <AF>=Address family. Default: %s\n" - msgstr "" - --#: ../ifconfig.c:203 -+#: ../ifconfig.c:228 -+#, c-format - msgid " List of possible address families:\n" - msgstr "" - --#: ../ifconfig.c:278 -+#: ../ifconfig.c:304 - #, c-format - msgid "ifconfig: option `%s' not recognised.\n" - msgstr "" - --#: ../ifconfig.c:280 ../ifconfig.c:925 -+#: ../ifconfig.c:306 ../ifconfig.c:987 -+#, c-format - msgid "ifconfig: `--help' gives usage information.\n" - msgstr "" - --#: ../ifconfig.c:355 -+#: ../ifconfig.c:381 -+#, c-format - msgid "Unknown media type.\n" - msgstr "" - --#: ../ifconfig.c:647 -+#: ../ifconfig.c:418 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:430 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:442 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:466 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:524 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:535 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for broadcast\n" -+msgstr "" -+ -+#: ../ifconfig.c:560 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for dstaddr\n" -+msgstr "" -+ -+#: ../ifconfig.c:583 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for netmask\n" -+msgstr "" -+ -+#: ../ifconfig.c:662 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:673 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for pointopoint\n" -+msgstr "" -+ -+#: ../ifconfig.c:697 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - --#: ../ifconfig.c:656 -+#: ../ifconfig.c:706 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "" - --#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876 -+#: ../ifconfig.c:746 -+#, c-format -+msgid "ifconfig: Error resolving '%s' for add\n" -+msgstr "" -+ -+#: ../ifconfig.c:757 ../ifconfig.c:847 ../ifconfig.c:935 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "" - --#: ../ifconfig.c:743 ../ifconfig.c:834 -+#: ../ifconfig.c:800 ../ifconfig.c:893 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "" - --#: ../ifconfig.c:755 ../ifconfig.c:845 -+#: ../ifconfig.c:812 ../ifconfig.c:904 -+#, c-format - msgid "Bad address.\n" - msgstr "" - --#: ../ifconfig.c:848 -+#: ../ifconfig.c:907 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "" - --#: ../ifconfig.c:920 -+#: ../ifconfig.c:979 -+#, c-format - msgid "ifconfig: Cannot set address for this protocol family.\n" - msgstr "" - --#: ../ifconfig.c:946 -+#: ../ifconfig.c:986 -+#, c-format -+msgid "ifconfig: error resolving '%s' to set address for af=%s\n" -+msgstr "" -+ -+#: ../ifconfig.c:1007 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "" - --#: ../ifconfig.c:954 -+#: ../ifconfig.c:1015 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "" - --#: ../netstat.c:430 -+#: ../ifconfig.c:1050 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" - --#: ../netstat.c:434 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" - --#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "" - --#: ../netstat.c:442 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "" - --#: ../netstat.c:443 ../netstat.c:1255 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "" - --#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "" - --#: ../netstat.c:466 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "" - --#: ../netstat.c:467 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - --#: ../netstat.c:477 ../netstat.c:1295 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:512 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "" - --#: ../netstat.c:513 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "" - --#: ../netstat.c:514 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "" - --#: ../netstat.c:515 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "" - --#: ../netstat.c:516 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "" - --#: ../netstat.c:517 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "" - --#: ../netstat.c:518 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "" - --#: ../netstat.c:519 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "" - --#: ../netstat.c:520 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "" - --#: ../netstat.c:521 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "" - --#: ../netstat.c:592 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "" - --#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888 --#: ../netstat.c:1019 ../netstat.c:1024 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "" - --#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "" - --#: ../netstat.c:673 -+#: ../netstat.c:677 -+#, c-format - msgid "Active X.25 sockets\n" - msgstr "" - - #. IMHO, Vr/Vs is not very usefull --SF --#: ../netstat.c:675 -+#: ../netstat.c:679 -+#, c-format - msgid "" --"Dest Source Device LCI State Vr/Vs Send-Q " --"Recv-Q\n" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - --#: ../netstat.c:752 -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "" - --#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "" - --#: ../netstat.c:797 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:802 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:807 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:884 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "" - --#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "" - --#: ../netstat.c:948 ../netstat.c:1067 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:1033 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "" - --#: ../netstat.c:1115 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "" - --#: ../netstat.c:1142 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "" - --#: ../netstat.c:1146 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "" - --#: ../netstat.c:1150 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "" - --#: ../netstat.c:1154 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "" - --#: ../netstat.c:1158 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "" - --#: ../netstat.c:1167 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "" - --#: ../netstat.c:1183 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "" - --#: ../netstat.c:1187 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "" - --#: ../netstat.c:1191 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "" - --#: ../netstat.c:1222 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "" - --#: ../netstat.c:1224 ../netstat.c:1735 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "" - --#: ../netstat.c:1227 ../netstat.c:1738 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "" - --#: ../netstat.c:1229 ../netstat.c:1740 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "" - --#: ../netstat.c:1232 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" - msgstr "" - --#: ../netstat.c:1234 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr "" - --#: ../netstat.c:1254 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "" - --#: ../netstat.c:1257 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "" - --#: ../netstat.c:1271 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "" - --#: ../netstat.c:1272 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "" - --#: ../netstat.c:1315 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:1366 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - --#: ../netstat.c:1368 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr "" - --#: ../netstat.c:1402 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "" - --#: ../netstat.c:1410 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "" - --#: ../netstat.c:1448 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "" - --#: ../netstat.c:1452 --msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " --"Flg\n" --msgstr "" -- --#: ../netstat.c:1456 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "" - --#: ../netstat.c:1479 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - --#: ../netstat.c:1480 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr "" - --#: ../netstat.c:1481 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - msgstr "" - --#: ../netstat.c:1483 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr "" - --#: ../netstat.c:1484 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr "" - --#: ../netstat.c:1485 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - --#: ../netstat.c:1486 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - --#: ../netstat.c:1488 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" - msgstr "" - --#: ../netstat.c:1492 -+#: ../netstat.c:1505 -+#, c-format - msgid " --numeric-hosts don't resolve host names\n" - msgstr "" - --#: ../netstat.c:1493 -+#: ../netstat.c:1506 -+#, c-format - msgid " --numeric-ports don't resolve port names\n" - msgstr "" - --#: ../netstat.c:1494 -+#: ../netstat.c:1507 -+#, c-format - msgid " --numeric-users don't resolve user names\n" - msgstr "" - --#: ../netstat.c:1495 -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr "" - --#: ../netstat.c:1496 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr "" - --#: ../netstat.c:1497 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - --#: ../netstat.c:1498 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" - msgstr "" - --#: ../netstat.c:1499 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - --#: ../netstat.c:1500 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - --#: ../netstat.c:1501 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr "" - --#: ../netstat.c:1502 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" - msgstr "" - --#: ../netstat.c:1503 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" - msgstr "" - --#: ../netstat.c:1505 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" - --#: ../netstat.c:1506 ../route.c:92 -+#: ../netstat.c:1519 - #, c-format --msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr "" - --#: ../netstat.c:1507 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr "" - --#: ../netstat.c:1732 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "" - --#: ../netstat.c:1742 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - --#: ../netstat.c:1744 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr "" - --#: ../netstat.c:1747 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr "" - --#: ../netstat.c:1777 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "" - --#: ../netstat.c:1778 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "" - -@@ -986,23 +1166,28 @@ msgid "rarp: cannot set entry from %s:%u\n" - msgstr "" - - #: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - - #: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr "" - - #: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr "" - - #: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - - #: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1019,38 +1204,50 @@ msgid "rarp: %s: unknown hardware type.\n" - msgstr "" - - #: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - - #: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" - msgstr "" - - #: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" - msgstr "" - - #: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" - -+#: ../route.c:92 -+#, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr "" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr "" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr "" - -@@ -1060,61 +1257,75 @@ msgid "%s\tnibble %lu trigger %lu\n" - msgstr "" - - #: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "" - - #: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - - #: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr "" - - #: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr "" - - #: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" - - #: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "" - - #: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr "" - - #: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr "" - - #: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr "" - - #: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - - #: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "" - - #: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "" - - #: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "" - - #: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - -@@ -1128,22 +1339,27 @@ msgid "unknown" - msgstr "" - - #: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr "" - - #: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr "" - - #: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr "" - - #: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr "" - - #: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "" - -@@ -1153,10 +1369,12 @@ msgid "Failed to get type of [%s]\n" - msgstr "" - - #: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "" - - #: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "" - -@@ -1323,287 +1541,487 @@ msgstr "" - - #: ../statistics.c:99 - #, c-format --msgid "address mask request: %u" -+msgid "address mask request: %u" -+msgstr "" -+ -+#. ? -+#: ../statistics.c:100 ../statistics.c:113 -+#, c-format -+msgid "address mask replies: %u" -+msgstr "" -+ -+#. ? -+#: ../statistics.c:101 -+#, c-format -+msgid "%u ICMP messages sent" -+msgstr "" -+ -+#: ../statistics.c:102 -+#, c-format -+msgid "%u ICMP messages failed" -+msgstr "" -+ -+#: ../statistics.c:104 -+#, c-format -+msgid "time exceeded: %u" -+msgstr "" -+ -+#. ? -+#: ../statistics.c:106 -+#, c-format -+msgid "source quench: %u" -+msgstr "" -+ -+#: ../statistics.c:107 -+#, c-format -+msgid "redirect: %u" -+msgstr "" -+ -+#: ../statistics.c:108 -+#, c-format -+msgid "echo request: %u" -+msgstr "" -+ -+#: ../statistics.c:110 -+#, c-format -+msgid "timestamp requests: %u" -+msgstr "" -+ -+#: ../statistics.c:111 -+#, c-format -+msgid "timestamp replies: %u" -+msgstr "" -+ -+#: ../statistics.c:112 -+#, c-format -+msgid "address mask requests: %u" -+msgstr "" -+ -+#: ../statistics.c:118 -+#, c-format -+msgid "RTO algorithm is %s" -+msgstr "" -+ -+#: ../statistics.c:122 -+#, c-format -+msgid "%u active connections openings" -+msgstr "" -+ -+#: ../statistics.c:123 -+#, c-format -+msgid "%u passive connection openings" -+msgstr "" -+ -+#: ../statistics.c:124 -+#, c-format -+msgid "%u failed connection attempts" -+msgstr "" -+ -+#: ../statistics.c:125 -+#, c-format -+msgid "%u connection resets received" -+msgstr "" -+ -+#: ../statistics.c:126 -+#, c-format -+msgid "%u connections established" -+msgstr "" -+ -+#: ../statistics.c:127 -+#, c-format -+msgid "%u segments received" -+msgstr "" -+ -+#: ../statistics.c:128 -+#, c-format -+msgid "%u segments send out" -+msgstr "" -+ -+#: ../statistics.c:129 -+#, c-format -+msgid "%u segments retransmited" -+msgstr "" -+ -+#: ../statistics.c:130 -+#, c-format -+msgid "%u bad segments received." -+msgstr "" -+ -+#: ../statistics.c:131 -+#, c-format -+msgid "%u resets sent" -+msgstr "" -+ -+#: ../statistics.c:136 -+#, c-format -+msgid "%u packets received" -+msgstr "" -+ -+#: ../statistics.c:137 -+#, c-format -+msgid "%u packets to unknown port received." -+msgstr "" -+ -+#: ../statistics.c:138 -+#, c-format -+msgid "%u packet receive errors" -+msgstr "" -+ -+#: ../statistics.c:139 -+#, c-format -+msgid "%u packets sent" -+msgstr "" -+ -+#: ../statistics.c:144 -+#, c-format -+msgid "%u SYN cookies sent" -+msgstr "" -+ -+#: ../statistics.c:145 -+#, c-format -+msgid "%u SYN cookies received" -+msgstr "" -+ -+#: ../statistics.c:146 -+#, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "" -+ -+#: ../statistics.c:148 -+#, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "" -+ -+#: ../statistics.c:150 -+#, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "" -+ -+#: ../statistics.c:154 -+#, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "" -+ -+#: ../statistics.c:156 -+#, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "" -+ -+#: ../statistics.c:158 -+#, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "" -+ -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" - msgstr "" - --#. ? --#: ../statistics.c:100 ../statistics.c:113 -+#: ../statistics.c:169 - #, c-format --msgid "address mask replies: %u" -+msgid "%u delayed acks sent" - msgstr "" - --#. ? --#: ../statistics.c:101 -+#: ../statistics.c:170 - #, c-format --msgid "%u ICMP messages sent" -+msgid "%u delayed acks further delayed because of locked socket" - msgstr "" - --#: ../statistics.c:102 -+#: ../statistics.c:172 - #, c-format --msgid "%u ICMP messages failed" -+msgid "Quick ack mode was activated %u times" - msgstr "" - --#: ../statistics.c:104 -+#: ../statistics.c:173 - #, c-format --msgid "time exceeded: %u" -+msgid "%u times the listen queue of a socket overflowed" - msgstr "" - --#. ? --#: ../statistics.c:106 -+#: ../statistics.c:175 - #, c-format --msgid "source quench: %u" -+msgid "%u SYNs to LISTEN sockets dropped" - msgstr "" - --#: ../statistics.c:107 -+#: ../statistics.c:176 - #, c-format --msgid "redirect: %u" -+msgid "%u packets directly queued to recvmsg prequeue." - msgstr "" - --#: ../statistics.c:108 -+#: ../statistics.c:178 - #, c-format --msgid "echo request: %u" -+msgid "%u bytes directly in process context from backlog" - msgstr "" - --#: ../statistics.c:110 -+#: ../statistics.c:179 - #, c-format --msgid "timestamp requests: %u" -+msgid "%u bytes directly received in process context from prequeue" - msgstr "" - --#: ../statistics.c:111 -+#: ../statistics.c:181 - #, c-format --msgid "timestamp replies: %u" -+msgid "%u packets dropped from prequeue" - msgstr "" - --#: ../statistics.c:112 -+#: ../statistics.c:182 - #, c-format --msgid "address mask requests: %u" -+msgid "%u packet headers predicted" - msgstr "" - --#: ../statistics.c:118 -+#: ../statistics.c:183 - #, c-format --msgid "RTO algorithm is %s" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" - --#: ../statistics.c:122 -+#: ../statistics.c:185 - #, c-format --msgid "%u active connections openings" -+msgid "Ran %u times out of system memory during packet sending" - msgstr "" - --#: ../statistics.c:123 -+#: ../statistics.c:187 - #, c-format --msgid "%u passive connection openings" -+msgid "%u acknowledgments not containing data payload received" - msgstr "" - --#: ../statistics.c:124 -+#: ../statistics.c:188 - #, c-format --msgid "%u failed connection attempts" -+msgid "%u predicted acknowledgments" - msgstr "" - --#: ../statistics.c:125 -+#: ../statistics.c:189 - #, c-format --msgid "%u connection resets received" -+msgid "%u times recovered from packet loss due to fast retransmit" - msgstr "" - --#: ../statistics.c:126 -+#: ../statistics.c:190 - #, c-format --msgid "%u connections established" -+msgid "%u times recovered from packet loss by selective acknowledgements" - msgstr "" - --#: ../statistics.c:127 -+#: ../statistics.c:191 - #, c-format --msgid "%u segments received" -+msgid "%u bad SACK blocks received" - msgstr "" - --#: ../statistics.c:128 -+#: ../statistics.c:192 - #, c-format --msgid "%u segments send out" -+msgid "Detected reordering %u times using FACK" - msgstr "" - --#: ../statistics.c:129 -+#: ../statistics.c:193 - #, c-format --msgid "%u segments retransmited" -+msgid "Detected reordering %u times using SACK" - msgstr "" - --#: ../statistics.c:130 -+#: ../statistics.c:194 - #, c-format --msgid "%u bad segments received." -+msgid "Detected reordering %u times using time stamp" - msgstr "" - --#: ../statistics.c:131 -+#: ../statistics.c:195 - #, c-format --msgid "%u resets sent" -+msgid "Detected reordering %u times using reno fast retransmit" - msgstr "" - --#: ../statistics.c:136 -+#: ../statistics.c:196 - #, c-format --msgid "%u packets received" -+msgid "%u congestion windows fully recovered without slow start" - msgstr "" - --#: ../statistics.c:137 -+#: ../statistics.c:197 - #, c-format --msgid "%u packets to unknown port received." -+msgid "%u congestion windows partially recovered using Hoe heuristic" - msgstr "" - --#: ../statistics.c:138 -+#: ../statistics.c:198 - #, c-format --msgid "%u packet receive errors" -+msgid "%u congestion window recovered without slow start using DSACK" - msgstr "" - --#: ../statistics.c:139 -+#: ../statistics.c:199 - #, c-format --msgid "%u packets sent" -+msgid "%u congestion windows recovered without slow start after partial ack" - msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:200 - #, c-format --msgid "%u SYN cookies sent" -+msgid "%u retransmits lost" - msgstr "" - --#: ../statistics.c:145 -+#: ../statistics.c:201 - #, c-format --msgid "%u SYN cookies received" -+msgid "%u timeouts after reno fast retransmit" - msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:202 - #, c-format --msgid "%u invalid SYN cookies received" -+msgid "%u timeouts after SACK recovery" - msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:203 - #, c-format --msgid "%u resets received for embryonic SYN_RECV sockets" -+msgid "%u timeouts in loss state" - msgstr "" - --#: ../statistics.c:150 -+#: ../statistics.c:204 - #, c-format --msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgid "%u fast retransmits" - msgstr "" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:153 -+#: ../statistics.c:205 - #, c-format --msgid "%u packets pruned from receive queue" -+msgid "%u forward retransmits" - msgstr "" - --#: ../statistics.c:154 -+#: ../statistics.c:206 - #, c-format --msgid "" --"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u retransmits in slow start" - msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:207 - #, c-format --msgid "%u ICMP packets dropped because they were out-of-window" -+msgid "%u other TCP timeouts" - msgstr "" - --#: ../statistics.c:158 -+#: ../statistics.c:208 - #, c-format --msgid "%u ICMP packets dropped because socket was locked" -+msgid "%u reno fast retransmits failed" - msgstr "" - --#: ../statistics.c:160 -+#: ../statistics.c:209 - #, c-format --msgid "%u TCP sockets finished time wait in fast timer" -+msgid "%u SACK retransmits failed" - msgstr "" - --#: ../statistics.c:161 -+#: ../statistics.c:210 - #, c-format --msgid "%u time wait sockets recycled by time stamp" -+msgid "%u times receiver scheduled too late for direct processing" - msgstr "" - --#: ../statistics.c:162 -+#: ../statistics.c:211 - #, c-format --msgid "%u TCP sockets finished time wait in slow timer" -+msgid "%u packets collapsed in receive queue due to low socket buffer" - msgstr "" - --#: ../statistics.c:163 -+#: ../statistics.c:212 - #, c-format --msgid "%u passive connections rejected because of time stamp" -+msgid "%u DSACKs sent for old packets" - msgstr "" - --#: ../statistics.c:165 -+#: ../statistics.c:213 - #, c-format --msgid "%u active connections rejected because of time stamp" -+msgid "%u DSACKs sent for out of order packets" - msgstr "" - --#: ../statistics.c:167 -+#: ../statistics.c:214 - #, c-format --msgid "%u packets rejects in established connections because of timestamp" -+msgid "%u DSACKs received" - msgstr "" - --#: ../statistics.c:169 -+#: ../statistics.c:215 - #, c-format --msgid "%u delayed acks sent" -+msgid "%u DSACKs for out of order packets received" - msgstr "" - --#: ../statistics.c:170 -+#: ../statistics.c:216 - #, c-format --msgid "%u delayed acks further delayed because of locked socket" -+msgid "%u connections reset due to unexpected SYN" - msgstr "" - --#: ../statistics.c:172 -+#: ../statistics.c:217 - #, c-format --msgid "Quick ack mode was activated %u times" -+msgid "%u connections reset due to unexpected data" - msgstr "" - --#: ../statistics.c:173 -+#: ../statistics.c:218 - #, c-format --msgid "%u times the listen queue of a socket overflowed" -+msgid "%u connections reset due to early user close" - msgstr "" - --#: ../statistics.c:175 -+#: ../statistics.c:219 - #, c-format --msgid "%u SYNs to LISTEN sockets ignored" -+msgid "%u connections aborted due to memory pressure" - msgstr "" - --#: ../statistics.c:176 -+#: ../statistics.c:220 - #, c-format --msgid "%u packets directly queued to recvmsg prequeue." -+msgid "%u connections aborted due to timeout" - msgstr "" - --#: ../statistics.c:178 -+#: ../statistics.c:221 - #, c-format --msgid "%u packets directly received from backlog" -+msgid "%u connections aborted after user close in linger timeout" - msgstr "" - --#: ../statistics.c:180 -+#: ../statistics.c:222 - #, c-format --msgid "%u packets directly received from prequeue" -+msgid "%u times unabled to send RST due to no memory" - msgstr "" - --#: ../statistics.c:182 -+#: ../statistics.c:223 - #, c-format --msgid "%u packets dropped from prequeue" -+msgid "TCP ran low on memory %u times" - msgstr "" - --#: ../statistics.c:183 -+#: ../statistics.c:224 - #, c-format --msgid "%u packets header predicted" -+msgid "%u TCP data loss events" - msgstr "" - --#: ../statistics.c:184 -+#: ../statistics.c:225 - #, c-format --msgid "%u packets header predicted and directly queued to user" -+msgid "%u congestion windows recovered without slow start by DSACK" - msgstr "" - --#: ../statistics.c:186 -+#: ../statistics.c:227 - #, c-format --msgid "Ran %u times out of system memory during packet sending" -+msgid "%u classic Reno fast retransmits failed" - msgstr "" - --#: ../statistics.c:253 -+#: ../statistics.c:294 - msgid "enabled" - msgstr "" - --#: ../statistics.c:253 -+#: ../statistics.c:294 - msgid "disabled" - msgstr "" - --#: ../statistics.c:336 -+#: ../statistics.c:377 - msgid "error parsing /proc/net/snmp" - msgstr "" - --#: ../statistics.c:349 -+#: ../statistics.c:390 - msgid "cannot open /proc/net/snmp" - msgstr "" - -@@ -1617,7 +2035,7 @@ msgstr "" - msgid "Cannot change line discipline to `%s'.\n" - msgstr "" - --#: ../lib/af.c:153 ../lib/hw.c:156 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "" - -@@ -1633,11 +2051,11 @@ msgstr "" - msgid "IPv6" - msgstr "" - --#: ../lib/af.c:164 ../lib/hw.c:177 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "" - --#: ../lib/af.c:167 ../lib/hw.c:183 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "" - -@@ -1649,7 +2067,7 @@ msgstr "" - msgid "Appletalk DDP" - msgstr "" - --#: ../lib/af.c:176 ../lib/hw.c:218 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "" - -@@ -1657,19 +2075,21 @@ msgstr "" - msgid "CCITT X.25" - msgstr "" - --#: ../lib/af.c:182 ../lib/hw.c:180 -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "" - --#: ../lib/af.c:185 ../lib/hw.c:168 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "" - - #: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "" - - #: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "" - -@@ -1694,11 +2114,12 @@ msgid "in_arcnet(%s): trailing junk!\n" - msgstr "" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "" - - #: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 --#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/inet.c:259 ../lib/inet6.c:145 ../lib/ipx.c:81 ../lib/netrom.c:78 - #: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 - msgid "[NONE SET]" - msgstr "" -@@ -1712,22 +2133,21 @@ msgid "Callsign too long" - msgstr "" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1783,225 +2203,260 @@ msgstr "" - msgid "in_hippi(%s): trailing junk!\n" - msgstr "" - --#: ../lib/hw.c:155 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "" - --#: ../lib/hw.c:158 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "" - --#: ../lib/hw.c:159 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "" - --#: ../lib/hw.c:160 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "" - --#: ../lib/hw.c:161 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "" - --#: ../lib/hw.c:162 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "" - --#: ../lib/hw.c:165 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "" - --#: ../lib/hw.c:171 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "" - --#: ../lib/hw.c:174 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "" - --#: ../lib/hw.c:186 -+#: ../lib/hw.c:191 - msgid "generic X.25" - msgstr "" - --#: ../lib/hw.c:189 -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "" - --#: ../lib/hw.c:196 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "" - --#: ../lib/hw.c:199 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "" - --#: ../lib/hw.c:202 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "" - --#: ../lib/hw.c:206 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "" - --#: ../lib/hw.c:209 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "" - --#: ../lib/hw.c:212 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:214 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - --#: ../lib/inet.c:153 ../lib/inet6.c:79 -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ -+#: ../lib/inet.c:153 ../lib/inet6.c:94 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "" - --#: ../lib/inet6.c:131 -+#: ../lib/inet6.c:147 - msgid "[UNKNOWN]" - msgstr "" - - #: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "" - --#: ../lib/inet6_gr.c:74 -+#: ../lib/inet6_gr.c:76 -+#, c-format -+msgid "Kernel IPv6 routing cache\n" -+msgstr "" -+ -+#: ../lib/inet6_gr.c:78 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "" - --#: ../lib/inet6_gr.c:76 -+#: ../lib/inet6_gr.c:80 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next Hop Flag Met Ref Use " -+"If\n" - msgstr "" - --#: ../lib/inet6_gr.c:150 -+#: ../lib/inet6_gr.c:174 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "" - --#: ../lib/inet6_gr.c:153 -+#: ../lib/inet6_gr.c:177 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" - msgstr "" - --#: ../lib/inet6_gr.c:157 -+#: ../lib/inet6_gr.c:181 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" - msgstr "" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr "" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr "" - - #: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" - msgstr "" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" - msgstr "" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" - msgstr "" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" - msgstr "" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr "" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr "" - -@@ -2011,14 +2466,17 @@ msgid "route: %s: cannot use a NETWORK as gateway!\n" - msgstr "" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "" - -@@ -2033,73 +2491,90 @@ msgid "route: bogus netmask %s\n" - msgstr "" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "" - - #: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "" - - #: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "" - - #: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "" - -@@ -2108,287 +2583,314 @@ msgid "Node address must be ten digits" - msgstr "" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "" - --#: ../lib/interface.c:164 -+#: ../lib/interface.c:174 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "" - --#: ../lib/interface.c:316 -+#: ../lib/interface.c:323 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:556 -+#: ../lib/interface.c:570 - msgid "Device not found" - msgstr "" - --#: ../lib/interface.c:560 -+#: ../lib/interface.c:574 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "" - --#: ../lib/interface.c:593 -+#: ../lib/interface.c:607 - msgid " - no statistics available -" - msgstr "" - --#: ../lib/interface.c:597 -+#: ../lib/interface.c:611 -+#, c-format - msgid "[NO FLAGS]" - msgstr "" - --#: ../lib/interface.c:673 -+#: ../lib/interface.c:687 - #, c-format - msgid "%-9.9s Link encap:%s " - msgstr "" - --#: ../lib/interface.c:678 -+#: ../lib/interface.c:692 - #, c-format - msgid "HWaddr %s " - msgstr "" - --#: ../lib/interface.c:681 -+#: ../lib/interface.c:695 - #, c-format - msgid "Media:%s" - msgstr "" - --#: ../lib/interface.c:683 -+#: ../lib/interface.c:697 -+#, c-format - msgid "(auto)" - msgstr "" - --#: ../lib/interface.c:690 -+#: ../lib/interface.c:704 - #, c-format - msgid " %s addr:%s " - msgstr "" - --#: ../lib/interface.c:693 -+#: ../lib/interface.c:707 - #, c-format - msgid " P-t-P:%s " - msgstr "" - --#: ../lib/interface.c:696 -+#: ../lib/interface.c:710 - #, c-format - msgid " Bcast:%s " - msgstr "" - --#: ../lib/interface.c:698 -+#: ../lib/interface.c:712 - #, c-format - msgid " Mask:%s\n" - msgstr "" - --#: ../lib/interface.c:715 -+#: ../lib/interface.c:729 - #, c-format - msgid " inet6 addr: %s/%d" - msgstr "" - --#: ../lib/interface.c:717 -+#: ../lib/interface.c:731 -+#, c-format - msgid " Scope:" - msgstr "" - --#: ../lib/interface.c:720 -+#: ../lib/interface.c:734 -+#, c-format - msgid "Global" - msgstr "" - --#: ../lib/interface.c:723 -+#: ../lib/interface.c:737 -+#, c-format - msgid "Link" - msgstr "" - --#: ../lib/interface.c:726 -+#: ../lib/interface.c:740 -+#, c-format - msgid "Site" - msgstr "" - --#: ../lib/interface.c:729 -+#: ../lib/interface.c:743 -+#, c-format - msgid "Compat" - msgstr "" - --#: ../lib/interface.c:732 -+#: ../lib/interface.c:746 -+#, c-format - msgid "Host" - msgstr "" - --#: ../lib/interface.c:735 -+#: ../lib/interface.c:749 -+#, c-format - msgid "Unknown" - msgstr "" - --#: ../lib/interface.c:750 -+#: ../lib/interface.c:764 - #, c-format - msgid " IPX/Ethernet II addr:%s\n" - msgstr "" - --#: ../lib/interface.c:753 -+#: ../lib/interface.c:767 - #, c-format - msgid " IPX/Ethernet SNAP addr:%s\n" - msgstr "" - --#: ../lib/interface.c:756 -+#: ../lib/interface.c:770 - #, c-format - msgid " IPX/Ethernet 802.2 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:759 -+#: ../lib/interface.c:773 - #, c-format - msgid " IPX/Ethernet 802.3 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:769 -+#: ../lib/interface.c:783 - #, c-format - msgid " EtherTalk Phase 2 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:778 -+#: ../lib/interface.c:792 - #, c-format - msgid " econet addr:%s\n" - msgstr "" - --#: ../lib/interface.c:785 -+#: ../lib/interface.c:799 -+#, c-format - msgid "[NO FLAGS] " - msgstr "" - --#: ../lib/interface.c:787 -+#: ../lib/interface.c:801 -+#, c-format - msgid "UP " - msgstr "" - --#: ../lib/interface.c:789 -+#: ../lib/interface.c:803 -+#, c-format - msgid "BROADCAST " - msgstr "" - --#: ../lib/interface.c:791 -+#: ../lib/interface.c:805 -+#, c-format - msgid "DEBUG " - msgstr "" - --#: ../lib/interface.c:793 -+#: ../lib/interface.c:807 -+#, c-format - msgid "LOOPBACK " - msgstr "" - --#: ../lib/interface.c:795 -+#: ../lib/interface.c:809 -+#, c-format - msgid "POINTOPOINT " - msgstr "" - --#: ../lib/interface.c:797 -+#: ../lib/interface.c:811 -+#, c-format - msgid "NOTRAILERS " - msgstr "" - --#: ../lib/interface.c:799 -+#: ../lib/interface.c:813 -+#, c-format - msgid "RUNNING " - msgstr "" - --#: ../lib/interface.c:801 -+#: ../lib/interface.c:815 -+#, c-format - msgid "NOARP " - msgstr "" - --#: ../lib/interface.c:803 -+#: ../lib/interface.c:817 -+#, c-format - msgid "PROMISC " - msgstr "" - --#: ../lib/interface.c:805 -+#: ../lib/interface.c:819 -+#, c-format - msgid "ALLMULTI " - msgstr "" - --#: ../lib/interface.c:807 -+#: ../lib/interface.c:821 -+#, c-format - msgid "SLAVE " - msgstr "" - --#: ../lib/interface.c:809 -+#: ../lib/interface.c:823 -+#, c-format - msgid "MASTER " - msgstr "" - --#: ../lib/interface.c:811 -+#: ../lib/interface.c:825 -+#, c-format - msgid "MULTICAST " - msgstr "" - --#: ../lib/interface.c:814 -+#: ../lib/interface.c:828 -+#, c-format - msgid "DYNAMIC " - msgstr "" - - #. DONT FORGET TO ADD THE FLAGS IN ife_print_short --#: ../lib/interface.c:817 -+#: ../lib/interface.c:831 - #, c-format - msgid " MTU:%d Metric:%d" - msgstr "" - --#: ../lib/interface.c:821 -+#: ../lib/interface.c:835 - #, c-format - msgid " Outfill:%d Keepalive:%d" - msgstr "" - --#: ../lib/interface.c:835 -+#: ../lib/interface.c:849 - #, c-format - msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" - msgstr "" - --#: ../lib/interface.c:840 -+#: ../lib/interface.c:854 - #, c-format - msgid " compressed:%lu\n" - msgstr "" - --#: ../lib/interface.c:852 -+#: ../lib/interface.c:894 - #, c-format - msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" - msgstr "" - --#: ../lib/interface.c:856 -+#: ../lib/interface.c:898 - #, c-format - msgid " collisions:%lu " - msgstr "" - --#: ../lib/interface.c:858 -+#: ../lib/interface.c:900 - #, c-format - msgid "compressed:%lu " - msgstr "" - --#: ../lib/interface.c:860 -+#: ../lib/interface.c:902 - #, c-format - msgid "txqueuelen:%d " - msgstr "" - --#: ../lib/interface.c:862 -+#: ../lib/interface.c:904 - #, c-format - msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "" - --#: ../lib/interface.c:873 -+#: ../lib/interface.c:915 - #, c-format - msgid "Interrupt:%d " - msgstr "" - - #. Only print devices using it for - #. I/O maps --#: ../lib/interface.c:876 -+#: ../lib/interface.c:918 - #, c-format - msgid "Base address:0x%x " - msgstr "" - --#: ../lib/interface.c:878 -+#: ../lib/interface.c:920 - #, c-format - msgid "Memory:%lx-%lx " - msgstr "" - --#: ../lib/interface.c:881 -+#: ../lib/interface.c:923 - #, c-format - msgid "DMA chan:%x " - msgstr "" - - #: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "" - -@@ -2413,14 +2915,17 @@ msgid "ip: argument is wrong: %s\n" - msgstr "" - - #: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "" - - #: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr "" - - #: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - -@@ -2449,6 +2954,7 @@ msgid "slattach: tty_lock: (%s): %s\n" - msgstr "" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "" - -@@ -2468,18 +2974,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "" - - #: ../slattach.c:468 -+#, c-format - msgid "slattach: tty name too long\n" - msgstr "" - - #: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "" - - #: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - - #: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "" - -@@ -2489,6 +2999,7 @@ msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "" - - #: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "" - -diff --git a/po/pt_BR.po b/po/pt_BR.po -index 7c5dd37..17f1e5a 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -2,7 +2,7 @@ - # Copyright (C) 2000 Free Software Foundation, Inc. - # Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2000. - # --# $Id: pt_BR.po,v 1.7 2000/02/13 22:28:11 ralf Exp $ -+# $Id: pt_BR.po,v 1.8 2006/12/14 23:36:24 ecki Exp $ - # Brazilian portuguese translation for net-tools 1.54 - # Copyright (C) 1998, 1999 Free Software Foundation, Inc. - # Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998-2000 -@@ -14,7 +14,7 @@ msgstr "" - "PO-Revision-Date: 1999-03-01 02:38+0100\n" - "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=ISO8859-9\n" -+"Content-Type: text/plain; charset=iso-8859-9\n" - "Content-Transfer-Encoding: 8bit\n" - - #: ../arp.c:110 ../arp.c:269 -@@ -64,8 +64,12 @@ msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: no foi possvel configurar a linha %u do arquivo etherfile %s!\n" - - #: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" --msgstr "Endereo\t\tTipoHW\tEndereoHW\t Flags Mascara\t\t Iface\n" -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "" -+"Endereo TipoHW EndereoHW Flags Mascara " -+"Iface\n" - - #: ../arp.c:467 - msgid "(incomplete)" -@@ -2361,17 +2365,15 @@ msgstr "aten - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Ateno: no foi possvel abrir %s (%s). Sada limitada.\n" - --#. Give better error message for this case. -+#. better translation? - #: ../lib/interface.c:504 - msgid "Device not found" --msgstr "%s: dispositivo no encontrado" -+msgstr "dispositivo no encontrado" - - #: ../lib/interface.c:508 - #, c-format - msgid "%s: error fetching interface information: %s\n" --msgstr "" --"%s: erro obtendo informaes da interface: %s\n" --"\n" -+msgstr "%s: erro obtendo informaes da interface: %s\n" - - #: ../lib/sockets.c:59 - msgid "No usable address families found.\n" -diff --git a/rarp.c b/rarp.c -index aab05b3..ab8f710 100644 ---- a/rarp.c -+++ b/rarp.c -@@ -3,7 +3,7 @@ - * that maintains the kernel's RARP cache. It is derived - * from Fred N. van Kempen's arp command. - * -- * Version: $Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $ -+ * Version: $Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $ - * - * Usage: rarp -d hostname Delete entry - * rarp -s hostname ethernet_address Add entry -@@ -40,10 +40,11 @@ - #include "net-support.h" - #include "version.h" - #include "pathnames.h" -+#include "proc.h" - - static char no_rarp_message[] = N_("This kernel does not support RARP.\n"); - --static char version_string[] = RELEASE "\nrarp 1.03 (2001-04-04)\n"; -+static char *Release = RELEASE; - - static struct hwtype *hardware = NULL; - -@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char *name) - - static int display_cache(void) - { -- FILE *fd = fopen(_PATH_PROCNET_RARP, "r"); -+ FILE *fd = proc_fopen(_PATH_PROCNET_RARP); - char buffer[256]; - if (fd == NULL) { - if (errno == ENOENT) -@@ -225,7 +226,7 @@ int main(int argc, char **argv) - case 'h': - usage(); - case 'V': -- fprintf(stderr, version_string); -+ fprintf(stderr, "%s\n", Release); - exit(E_VERSION); - break; - case 'v': -diff --git a/route.c b/route.c -index f8c2bc3..4eaed49 100644 ---- a/route.c -+++ b/route.c -@@ -2,7 +2,7 @@ - * route This file contains an implementation of the command - * that manages the IP routing table in the kernel. - * -- * Version: $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $ -+ * Version: $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -10,7 +10,7 @@ - * (derived from FvK's 'route.c 1.70 01/04/94') - * - * Modifications: -- * Johannes Stille: for Net-2Debugged by -+ * Johannes Stille: for Net-2Debugged by - * <johannes@titan.os.open.de> - * Linus Torvalds: Misc Changes - * Alan Cox: add the new mtu/window stuff -@@ -19,7 +19,7 @@ - * {1.80} Bernd Eckenfels: reject, metric, irtt, 1.2.x support. - * {1.81} Bernd Eckenfels: reject routes need a dummy device - *960127 {1.82} Bernd Eckenfels: 'mod' and 'dyn' 'reinstate' added -- *960129 {1.83} Bernd Eckenfels: resolve and getsock now in lib/, -+ *960129 {1.83} Bernd Eckenfels: resolve and getsock now in lib/, - * REJECT displays '-' as gatway. - *960202 {1.84} Bernd Eckenfels: net-features support added - *960203 {1.85} Bernd Eckenfels: "#ifdef' in '#if' for net-features -@@ -60,20 +60,21 @@ - #include "intl.h" - #include "pathnames.h" - #include "version.h" -+#include "util.h" - - #define DFLT_AF "inet" - - #define FEATURE_ROUTE - #include "lib/net-features.h" /* needs some of the system includes above! */ - --char *Release = RELEASE, *Version = "route 1.98 (2001-04-15)"; -+static char *Release = RELEASE; - --int opt_n = 0; /* numerical output flag */ --int opt_v = 0; /* debugging output flag */ --int opt_e = 1; /* 1,2,3=type of routetable */ --int opt_fc = 0; /* routing cache/FIB */ --int opt_h = 0; /* help selected */ --struct aftype *ap; /* current address family */ -+int opt_n = 0; // numerical output FLAG_NUM | FLAG_SYM -+int opt_v = 0; // debugging output flag -+int opt_e = 1; // 1,2,3=type of routetable -+int opt_fc = 0; // routing cache/FIB -+int opt_h = 0; // help selected -+struct aftype *ap; // selected address family - - static void usage(void) - { -@@ -89,7 +90,7 @@ static void usage(void) - fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); - fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); - -- fprintf(stderr, _(" <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); -+ fprintf(stderr, _(" <AF>=Use -4, -6, '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); - fprintf(stderr, _(" List of possible address families (which support routing):\n")); - print_aflist(1); /* 1 = routeable */ - exit(E_USAGE); -@@ -98,7 +99,7 @@ static void usage(void) - - static void version(void) - { -- fprintf(stderr, "%s\n%s\n%s\n", Release, Version, Features); -+ fprintf(stderr, "%s\n%s\n", Release, Features); - exit(E_VERSION); - } - -@@ -135,14 +136,12 @@ int main(int argc, char **argv) - - /* getopts and -net wont work :-/ */ - for (tmp = argv; *tmp; tmp++) { -- if (!strcmp(*tmp, "-net")) -- strcpy(*tmp, "#net"); -- else if (!strcmp(*tmp, "-host")) -- strcpy(*tmp, "#host"); -+ if (!strcmp(*tmp, "-net") || !strcmp(*tmp, "-host")) -+ (*tmp)[0]='#'; - } - - /* Fetch the command-line arguments. */ -- while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -176,6 +175,14 @@ int main(int argc, char **argv) - if ((i = aftrans_opt(optarg))) - exit(i); - break; -+ case '6': -+ if ((i = aftrans_opt("inet6"))) -+ exit(i); -+ break; -+ case '4': -+ if ((i = aftrans_opt("inet"))) -+ exit(i); -+ break; - case 'V': - version(); - case 'h': -diff --git a/slattach.c b/slattach.c -index cedae1b..5c81584 100644 ---- a/slattach.c -+++ b/slattach.c -@@ -40,7 +40,7 @@ - #include <limits.h> - #include <pwd.h> - #include <signal.h> --#include <stdlib.h> -+#include <stdlib.h> - #include <string.h> - #include <unistd.h> - #include <getopt.h> -@@ -62,26 +62,27 @@ - #include "util.h" - - #ifndef _PATH_LOCKD --#define _PATH_LOCKD "/var/lock" /* lock files */ -+#define _PATH_LOCKD "/var/lock" /* lock files */ - #endif - #ifndef _UID_UUCP --#define _UID_UUCP "uucp" /* owns locks */ -+#define _UID_UUCP "uucp" /* owns locks */ -+#endif -+#ifndef _PATH_DEVPTMX -+#define _PATH_DEVPTMX "/dev/ptmx" /* pseudo-terminal master */ - #endif - - - #define DEF_PROTO "cslip" - - --const char *Release = RELEASE, -- *Version = "@(#) slattach 1.21 (1999-11-21)", -- *Signature = "net-tools, Fred N. van Kempen et al."; -+static char *Release = RELEASE, *Signature = "Fred N. van Kempen et al."; - - - struct { - const char *speed; - int code; - } tty_speeds[] = { /* table of usable baud rates */ -- { "50", B50 }, { "75", B75 }, -+ { "50", B50 }, { "75", B75 }, - { "110", B110 }, { "300", B300 }, - { "600", B600 }, { "1200", B1200 }, - { "2400", B2400 }, { "4800", B4800 }, -@@ -108,6 +109,7 @@ struct termios tty_saved, /* saved TTY device state */ - int tty_sdisc, /* saved TTY line discipline */ - tty_ldisc, /* current TTY line discipline */ - tty_fd = -1; /* TTY file descriptor */ -+char * path_pts = NULL; /* slave pseudo-terminal device */ - int opt_c = 0; /* "command" to run at exit */ - int opt_e = 0; /* "activate only" flag */ - int opt_h = 0; /* "hangup" on carrier loss */ -@@ -115,7 +117,7 @@ int opt_h = 0; /* "hangup" on carrier loss */ - int opt_k = 0; /* "keepalive" value */ - #endif - int opt_l = 0; /* "lock it" flag */ --int opt_L = 0; /* clocal flag */ -+int opt_L = 0; /* 3-wire mode flag */ - int opt_m = 0; /* "set RAW mode" flag */ - int opt_n = 0; /* "set No Mesg" flag */ - #ifdef SIOCSOUTFILL -@@ -149,7 +151,7 @@ tty_already_locked(char *nam) - /* that lock. */ - i = fscanf(fd, "%d", &pid); - (void) fclose(fd); -- -+ - if (i != 1) /* Lock file format's wrong! Kill't */ - return(0); - -@@ -195,15 +197,18 @@ tty_lock(char *path, int mode) - return(-1); - } - -- (void) close(fd); -- - /* Make sure UUCP owns the lockfile. Required by some packages. */ - if ((pw = getpwnam(_UID_UUCP)) == NULL) { - if (opt_q == 0) fprintf(stderr, _("slattach: tty_lock: UUCP user %s unknown!\n"), - _UID_UUCP); -+ (void) close(fd); - return(0); /* keep the lock anyway */ - } -- (void) chown(saved_path, pw->pw_uid, pw->pw_gid); -+ if (fchown(fd, pw->pw_uid, pw->pw_gid)) -+ /* keep the lock anyway */; -+ -+ (void) close(fd); -+ - saved_lock = 1; - } else { /* unlock */ - if (saved_lock != 1) return(0); -@@ -294,7 +299,7 @@ tty_set_parity(struct termios *tty, char *parity) - switch(toupper(*parity)) { - case 'N': - tty->c_cflag &= ~(PARENB | PARODD); -- break; -+ break; - - case 'O': - tty->c_cflag &= ~(PARENB | PARODD); -@@ -342,9 +347,11 @@ tty_set_raw(struct termios *tty) - tty->c_oflag = (0); /* output flags */ - tty->c_lflag = (0); /* local flags */ - speed = (tty->c_cflag & CBAUD); /* save current speed */ -- tty->c_cflag = (CRTSCTS | HUPCL | CREAD); /* UART flags */ -- if (opt_L) -+ tty->c_cflag = (HUPCL | CREAD); /* UART flags */ -+ if (opt_L) - tty->c_cflag |= CLOCAL; -+ else -+ tty->c_cflag |= CRTSCTS; - tty->c_cflag |= speed; /* restore speed */ - return(0); - } -@@ -410,7 +417,7 @@ static int - tty_get_name(char *name) - { - if (ioctl(tty_fd, SIOCGIFNAME, name) < 0) { -- if (opt_q == 0) -+ if (opt_q == 0) - perror("tty_get_name"); - return(-errno); - } -@@ -464,7 +471,7 @@ tty_open(char *name, const char *speed) - if (name != NULL) { - if (name[0] != '/') { - if (strlen(name + 6) > sizeof(pathbuf)) { -- if (opt_q == 0) fprintf(stderr, -+ if (opt_q == 0) fprintf(stderr, - _("slattach: tty name too long\n")); - return (-1); - } -@@ -488,7 +495,28 @@ tty_open(char *name, const char *speed) - return(-errno); - } - tty_fd = fd; -- if (opt_d) printf("slattach: tty_open: %s (fd=%d) ", path_open, fd); -+ if (opt_d) printf("slattach: tty_open: %s (fd=%d)\n", path_open, fd); -+ if (!strcmp(path_open, _PATH_DEVPTMX)) { -+ if (opt_d) printf("slattach: tty_open: trying to grantpt and unlockpt\n"); -+ if (grantpt(fd) < 0) { -+ if (opt_q == 0) fprintf(stderr, -+ "slattach: tty_open: grantpt: %s\n", strerror(errno)); -+ return(-errno); -+ } -+ if (unlockpt(fd) < 0) { -+ if (opt_q == 0) fprintf(stderr, -+ "slattach: tty_open: unlockpt: %s\n", strerror(errno)); -+ return(-errno); -+ } -+ path_pts = ptsname(fd); -+ if (path_pts == NULL) { -+ if (opt_q == 0) fprintf(stderr, -+ "slattach: tty_open: ptsname: %s\n", strerror(errno)); -+ return(-errno); -+ } -+ if (opt_d) printf("slattach: tty_open: %s: slave pseudo-terminal is %s\n", -+ path_open, path_pts); -+ } - } else { - tty_fd = 0; - } -@@ -504,7 +532,7 @@ tty_open(char *name, const char *speed) - if (tty_get_disc(&tty_sdisc) < 0) { - if (opt_q == 0) fprintf(stderr, _("slattach: tty_open: cannot get current line disc!\n")); - return(-errno); -- } -+ } - tty_ldisc = tty_sdisc; - - /* Put this terminal line in a 8-bit transparent mode. */ -@@ -565,15 +593,15 @@ usage(void) - "[-c cmd] [-s speed] [-p protocol] tty | -\n" - " slattach -V | --version\n"; - -- fprintf(stderr, usage_msg); -- exit(1); -+ fputs(usage_msg, stderr); -+ exit(E_USAGE); - } - - --static void -+static void - version(void) - { -- printf("%s\n%s\n%s\n", Release, Version, Signature); -+ printf("%s\n%s\n", Release, Signature); - exit(E_VERSION); - } - -@@ -581,7 +609,7 @@ version(void) - int - main(int argc, char *argv[]) - { -- char path_buf[128]; -+ char path_buf[128] = ""; - char *path_dev; - char buff[128]; - const char *speed = NULL; -@@ -593,7 +621,6 @@ main(int argc, char *argv[]) - { NULL, 0, NULL, 0 } - }; - -- strcpy(path_buf, ""); - path_dev = path_buf; - - /* Scan command line for any arguments. */ -@@ -667,7 +694,7 @@ main(int argc, char *argv[]) - usage(); - /*NOTREACHED*/ - } -- -+ - if (setvbuf(stdout,0,_IOLBF,0)) { - if (opt_q == 0) fprintf(stderr, _("slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"), - strerror(errno)); -@@ -703,6 +730,7 @@ main(int argc, char *argv[]) - if (tty_get_name(buff)) { return(3); } - printf(_("%s started"), proto); - if (path_dev != NULL) printf(_(" on %s"), path_dev); -+ if (path_pts != NULL) printf(_(" ptsname %s"), path_pts); - printf(_(" interface %s\n"), buff); - } - -@@ -738,7 +766,7 @@ main(int argc, char *argv[]) - - tty_close(); - if(extcmd) /* external command on exit */ -- system(extcmd); -+ exit(system(extcmd)); - } - exit(0); - } -diff --git a/statistics.c b/statistics.c -index a878df8..fe8ee4e 100644 ---- a/statistics.c -+++ b/statistics.c -@@ -1,9 +1,9 @@ - /* -- * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. -- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $ -- * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> -- * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> -- * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels -+ * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. -+ * $Id: statistics.c,v 1.23 2010-10-29 19:24:36 ecki Exp $ -+ * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> -+ * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> -+ * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels - */ - #include <ctype.h> - #include <stdio.h> -@@ -11,6 +11,7 @@ - #include <string.h> - #include "config.h" - #include "intl.h" -+#include "proc.h" - - /* #define WARN 1 */ - -@@ -35,26 +36,26 @@ struct entry { - enum State type; - }; - --struct statedesc { -+struct statedesc { - int indent; -- char *title; --}; -+ char *title; -+}; - --struct statedesc states[] = { -+struct statedesc states[] = { - [number] = { 4, NULL }, -- [opt_number] = { 4, NULL }, -+ [opt_number] = { 4, NULL }, - [i_forward] = { 4, NULL }, - [i_inp_icmp] = { 8, N_("ICMP input histogram:") }, - [i_outp_icmp] = { 8, N_("ICMP output histogram:") }, - [MaxState] = {0}, --}; -+}; - - static enum State state; - - #define I_STATIC (1<<16) /* static configuration option. */ - #define I_TITLE (1<<17) - --/* -+/* - * XXX check against the snmp mib rfc. - * - * Don't mark the first field as translatable! It's a snmp MIB standard. -@@ -63,54 +64,115 @@ static enum State state; - struct entry Iptab[] = - { - {"Forwarding", N_("Forwarding is %s"), i_forward | I_STATIC}, -- {"DefaultTTL", N_("Default TTL is %u"), number | I_STATIC}, -- {"InReceives", N_("%u total packets received"), number}, -- {"InHdrErrors", N_("%u with invalid headers"), opt_number}, -- {"InAddrErrors", N_("%u with invalid addresses"), opt_number}, -- {"ForwDatagrams", N_("%u forwarded"), number}, -- {"InUnknownProtos", N_("%u with unknown protocol"), opt_number}, -- {"InDiscards", N_("%u incoming packets discarded"), number}, -- {"InDelivers", N_("%u incoming packets delivered"), number}, -- {"OutRequests", N_("%u requests sent out"), number}, /*? */ -- {"OutDiscards", N_("%u outgoing packets dropped"), opt_number}, -- {"OutNoRoutes", N_("%u dropped because of missing route"), opt_number}, -- {"ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number}, -- {"ReasmReqds", N_("%u reassemblies required"), opt_number}, /* ? */ -- {"ReasmOKs", N_("%u packets reassembled ok"), opt_number}, -- {"ReasmFails", N_("%u packet reassembles failed"), opt_number}, -- {"FragOKs", N_("%u fragments received ok"), opt_number}, -- {"FragFails", N_("%u fragments failed"), opt_number}, -- {"FragCreates", N_("%u fragments created"), opt_number} -+ {"DefaultTTL", N_("Default TTL is %llu"), number | I_STATIC}, -+ {"InReceives", N_("%llu total packets received"), number}, -+ {"InHdrErrors", N_("%llu with invalid headers"), opt_number}, -+ {"InAddrErrors", N_("%llu with invalid addresses"), opt_number}, -+ {"ForwDatagrams", N_("%llu forwarded"), number}, -+ {"InUnknownProtos", N_("%llu with unknown protocol"), opt_number}, -+ {"InDiscards", N_("%llu incoming packets discarded"), number}, -+ {"InDelivers", N_("%llu incoming packets delivered"), number}, -+ {"OutRequests", N_("%llu requests sent out"), number}, /*? */ -+ {"OutDiscards", N_("%llu outgoing packets dropped"), opt_number}, -+ {"OutNoRoutes", N_("%llu dropped because of missing route"), opt_number}, -+ {"ReasmTimeout", N_("%llu fragments dropped after timeout"), opt_number}, -+ {"ReasmReqds", N_("%llu reassemblies required"), opt_number}, /* ? */ -+ {"ReasmOKs", N_("%llu packets reassembled ok"), opt_number}, -+ {"ReasmFails", N_("%llu packet reassembles failed"), opt_number}, -+ {"FragOKs", N_("%llu fragments received ok"), opt_number}, -+ {"FragFails", N_("%llu fragments failed"), opt_number}, -+ {"FragCreates", N_("%llu fragments created"), opt_number} -+}; -+ -+struct entry Ip6tab[] = -+{ -+ {"Ip6InReceives", N_("%llu total packets received"), number}, -+ {"Ip6InHdrErrors", N_("%llu with invalid headers"), opt_number}, -+ {"Ip6InTooBigErrors", N_("%llu with packets too big"), opt_number}, -+ {"Ip6InNoRoutes", N_("%llu incoming packets with no route"), opt_number}, -+ {"Ip6InAddrErrors", N_("%llu with invalid addresses"), opt_number}, -+ {"Ip6InUnknownProtos", N_("%llu with unknown protocol"), opt_number}, -+ {"Ip6InTruncatedPkts", N_("%llu with truncated packets"), opt_number}, -+ {"Ip6InDiscards", N_("%llu incoming packets discarded"), number}, -+ {"Ip6InDelivers", N_("%llu incoming packets delivered"), number}, -+ {"Ip6OutForwDatagrams", N_("%llu forwarded"), number}, -+ {"Ip6OutRequests", N_("%llu requests sent out"), number}, /*? */ -+ {"Ip6OutDiscards", N_("%llu outgoing packets dropped"), opt_number}, -+ {"Ip6OutNoRoutes", N_("%llu dropped because of missing route"), opt_number}, -+ {"Ip6ReasmTimeout", N_("%llu fragments dropped after timeout"), opt_number}, -+ {"Ip6ReasmReqds", N_("%llu reassemblies required"), opt_number}, /* ? */ -+ {"Ip6ReasmOKs", N_("%llu packets reassembled ok"), opt_number}, -+ {"Ip6ReasmFails", N_("%llu packet reassembles failed"), opt_number}, -+ {"Ip6FragOKs", N_("%llu fragments received ok"), opt_number}, -+ {"Ip6FragFails", N_("%llu fragments failed"), opt_number}, -+ {"Ip6FragCreates", N_("%llu fragments created"), opt_number}, -+ {"Ip6InMcastPkts", N_("%llu incoming multicast packets"), opt_number}, -+ {"Ip6OutMcastPkts", N_("%llu outgoing multicast packets"), opt_number} - }; - - struct entry Icmptab[] = - { -- {"InMsgs", N_("%u ICMP messages received"), number}, -- {"InErrors", N_("%u input ICMP message failed."), number}, -- {"InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE}, -- {"InTimeExcds", N_("timeout in transit: %u"), i_inp_icmp | I_TITLE}, -- {"InParmProbs", N_("wrong parameters: %u"), i_inp_icmp | I_TITLE}, /*? */ -- {"InSrcQuenchs", N_("source quenches: %u"), i_inp_icmp | I_TITLE}, -- {"InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE}, -- {"InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE}, -- {"InEchoReps", N_("echo replies: %u"), i_inp_icmp | I_TITLE}, -- {"InTimestamps", N_("timestamp request: %u"), i_inp_icmp | I_TITLE}, -- {"InTimestampReps", N_("timestamp reply: %u"), i_inp_icmp | I_TITLE}, -- {"InAddrMasks", N_("address mask request: %u"), i_inp_icmp | I_TITLE}, /*? */ -- {"InAddrMaskReps", N_("address mask replies: %u"), i_inp_icmp | I_TITLE}, /*? */ -- {"OutMsgs", N_("%u ICMP messages sent"), number}, -- {"OutErrors", N_("%u ICMP messages failed"), number}, -- {"OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE}, -- {"OutTimeExcds", N_("time exceeded: %u"), i_outp_icmp | I_TITLE}, -- {"OutParmProbs", N_("wrong parameters: %u"), i_outp_icmp | I_TITLE}, /*? */ -- {"OutSrcQuenchs", N_("source quench: %u"), i_outp_icmp | I_TITLE}, -- {"OutRedirects", N_("redirect: %u"), i_outp_icmp | I_TITLE}, -- {"OutEchos", N_("echo request: %u"), i_outp_icmp | I_TITLE}, -- {"OutEchoReps", N_("echo replies: %u"), i_outp_icmp | I_TITLE}, -- {"OutTimestamps", N_("timestamp requests: %u"), i_outp_icmp | I_TITLE}, -- {"OutTimestampReps", N_("timestamp replies: %u"), i_outp_icmp | I_TITLE}, -- {"OutAddrMasks", N_("address mask requests: %u"), i_outp_icmp | I_TITLE}, -- {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE}, -+ {"InMsgs", N_("%llu ICMP messages received"), number}, -+ {"InErrors", N_("%llu input ICMP message failed."), number}, -+ {"InDestUnreachs", N_("destination unreachable: %llu"), i_inp_icmp | I_TITLE}, -+ {"InTimeExcds", N_("timeout in transit: %llu"), i_inp_icmp | I_TITLE}, -+ {"InParmProbs", N_("wrong parameters: %llu"), i_inp_icmp | I_TITLE}, /*? */ -+ {"InSrcQuenchs", N_("source quenches: %llu"), i_inp_icmp | I_TITLE}, -+ {"InRedirects", N_("redirects: %llu"), i_inp_icmp | I_TITLE}, -+ {"InEchos", N_("echo requests: %llu"), i_inp_icmp | I_TITLE}, -+ {"InEchoReps", N_("echo replies: %llu"), i_inp_icmp | I_TITLE}, -+ {"InTimestamps", N_("timestamp request: %llu"), i_inp_icmp | I_TITLE}, -+ {"InTimestampReps", N_("timestamp reply: %llu"), i_inp_icmp | I_TITLE}, -+ {"InAddrMasks", N_("address mask request: %llu"), i_inp_icmp | I_TITLE}, /*? */ -+ {"InAddrMaskReps", N_("address mask replies: %llu"), i_inp_icmp | I_TITLE}, /*? */ -+ {"OutMsgs", N_("%llu ICMP messages sent"), number}, -+ {"OutErrors", N_("%llu ICMP messages failed"), number}, -+ {"OutDestUnreachs", N_("destination unreachable: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutTimeExcds", N_("time exceeded: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutParmProbs", N_("wrong parameters: %llu"), i_outp_icmp | I_TITLE}, /*? */ -+ {"OutSrcQuenchs", N_("source quench: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutRedirects", N_("redirect: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutEchos", N_("echo request: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutEchoReps", N_("echo replies: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutTimestamps", N_("timestamp requests: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutTimestampReps", N_("timestamp replies: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutAddrMasks", N_("address mask requests: %llu"), i_outp_icmp | I_TITLE}, -+ {"OutAddrMaskReps", N_("address mask replies: %llu"), i_outp_icmp | I_TITLE}, -+}; -+ -+struct entry Icmp6tab[] = -+{ -+ {"Icmp6InMsgs", N_("%llu ICMP messages received"), number}, -+ {"Icmp6InErrors", N_("%llu input ICMP message failed."), number}, -+ {"Icmp6InDestUnreachs", N_("destination unreachable: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InPktTooBigs", N_("packets too big: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InTimeExcds", N_("received ICMPv6 time exceeded: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InParmProblems", N_("parameter problem: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InEchos", N_("echo requests: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InEchoReplies", N_("echo replies: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InGroupMembQueries", N_("group member queries: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InGroupMembResponses", N_("group member responses: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InGroupMembReductions", N_("group member reductions: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InRouterSolicits", N_("router solicits: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InRouterAdvertisements", N_("router advertisement: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InNeighborSolicits", N_("neighbour solicits: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InNeighborAdvertisements", N_("neighbour advertisement: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6InRedirects", N_("redirects: %llu"), i_inp_icmp | I_TITLE}, -+ {"Icmp6OutMsgs", N_("%llu ICMP messages sent"), number}, -+ {"Icmp6OutDestUnreachs", N_("destination unreachable: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutPktTooBigs", N_("packets too big: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutTimeExcds", N_("sent ICMPv6 time exceeded: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutParmProblems", N_("parameter problem: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutEchos", N_("echo requests: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutEchoReplies", N_("echo replies: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutGroupMembQueries", N_("group member queries: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutGroupMembResponses", N_("group member responses: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutGroupMembReductions", N_("group member reductions: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutRouterSolicits", N_("router solicits: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutRouterAdvertisements ", N_("router advertisement: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutNeighborSolicits", N_("neighbor solicits: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutNeighborAdvertisements", N_("neighbor advertisements: %llu"), i_outp_icmp | I_TITLE}, -+ {"Icmp6OutRedirects", N_("redirects: %llu"), i_outp_icmp | I_TITLE}, - }; - - struct entry Tcptab[] = -@@ -119,79 +181,129 @@ struct entry Tcptab[] = - {"RtoMin", "", number}, - {"RtoMax", "", number}, - {"MaxConn", "", number}, -- {"ActiveOpens", N_("%u active connections openings"), number}, -- {"PassiveOpens", N_("%u passive connection openings"), number}, -- {"AttemptFails", N_("%u failed connection attempts"), number}, -- {"EstabResets", N_("%u connection resets received"), number}, -- {"CurrEstab", N_("%u connections established"), number}, -- {"InSegs", N_("%u segments received"), number}, -- {"OutSegs", N_("%u segments send out"), number}, -- {"RetransSegs", N_("%u segments retransmited"), number}, -- {"InErrs", N_("%u bad segments received."), number}, -- {"OutRsts", N_("%u resets sent"), number}, -+ {"ActiveOpens", N_("%llu active connections openings"), number}, -+ {"PassiveOpens", N_("%llu passive connection openings"), number}, -+ {"AttemptFails", N_("%llu failed connection attempts"), number}, -+ {"EstabResets", N_("%llu connection resets received"), number}, -+ {"CurrEstab", N_("%llu connections established"), number}, -+ {"InSegs", N_("%llu segments received"), number}, -+ {"OutSegs", N_("%llu segments send out"), number}, -+ {"RetransSegs", N_("%llu segments retransmited"), number}, -+ {"InErrs", N_("%llu bad segments received."), number}, -+ {"OutRsts", N_("%llu resets sent"), number}, - }; - - struct entry Udptab[] = - { -- {"InDatagrams", N_("%u packets received"), number}, -- {"NoPorts", N_("%u packets to unknown port received."), number}, -- {"InErrors", N_("%u packet receive errors"), number}, -- {"OutDatagrams", N_("%u packets sent"), number}, -+ {"InDatagrams", N_("%llu packets received"), number}, -+ {"NoPorts", N_("%llu packets to unknown port received."), number}, -+ {"InErrors", N_("%llu packet receive errors"), number}, -+ {"OutDatagrams", N_("%llu packets sent"), number}, -+ {"RcvbufErrors", N_("%llu receive buffer errors"), number}, -+ {"SndbufErrors", N_("%llu send buffer errors"), number}, -+ }; -+ -+struct entry Udp6tab[] = -+{ -+ {"Udp6InDatagrams", N_("%llu packets received"), number}, -+ {"Udp6NoPorts", N_("%llu packets to unknown port received."), number}, -+ {"Udp6InErrors", N_("%llu packet receive errors"), number}, -+ {"Udp6OutDatagrams", N_("%llu packets sent"), number}, - }; - - struct entry Tcpexttab[] = - { -- {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number}, -- {"SyncookiesRecv", N_("%u SYN cookies received"), opt_number}, -- {"SyncookiesFailed", N_("%u invalid SYN cookies received"), opt_number}, -- -- { "EmbryonicRsts", N_("%u resets received for embryonic SYN_RECV sockets"), -- opt_number }, -- { "PruneCalled", N_("%u packets pruned from receive queue because of socket" -- " buffer overrun"), opt_number }, -+ {"SyncookiesSent", N_("%llu SYN cookies sent"), opt_number}, -+ {"SyncookiesRecv", N_("%llu SYN cookies received"), opt_number}, -+ {"SyncookiesFailed", N_("%llu invalid SYN cookies received"), opt_number}, -+ -+ { "EmbryonicRsts", N_("%llu resets received for embryonic SYN_RECV sockets"), -+ opt_number }, -+ { "PruneCalled", N_("%llu packets pruned from receive queue because of socket" -+ " buffer overrun"), opt_number }, - /* obsolete: 2.2.0 doesn't do that anymore */ -- { "RcvPruned", N_("%u packets pruned from receive queue"), opt_number }, -- { "OfoPruned", N_("%u packets dropped from out-of-order queue because of" -- " socket buffer overrun"), opt_number }, -- { "OutOfWindowIcmps", N_("%u ICMP packets dropped because they were " -- "out-of-window"), opt_number }, -- { "LockDroppedIcmps", N_("%u ICMP packets dropped because" -+ { "RcvPruned", N_("%llu packets pruned from receive queue"), opt_number }, -+ { "OfoPruned", N_("%llu packets dropped from out-of-order queue because of" -+ " socket buffer overrun"), opt_number }, -+ { "OutOfWindowIcmps", N_("%llu ICMP packets dropped because they were " -+ "out-of-window"), opt_number }, -+ { "LockDroppedIcmps", N_("%llu ICMP packets dropped because" - " socket was locked"), opt_number }, -- { "TW", N_("%u TCP sockets finished time wait in fast timer"), opt_number }, -- { "TWRecycled", N_("%u time wait sockets recycled by time stamp"), opt_number }, -- { "TWKilled", N_("%u TCP sockets finished time wait in slow timer"), opt_number }, -- { "PAWSPassive", N_("%u passive connections rejected because of" -+ { "TW", N_("%llu TCP sockets finished time wait in fast timer"), opt_number }, -+ { "TWRecycled", N_("%llu time wait sockets recycled by time stamp"), opt_number }, -+ { "TWKilled", N_("%llu TCP sockets finished time wait in slow timer"), opt_number }, -+ { "PAWSPassive", N_("%llu passive connections rejected because of" - " time stamp"), opt_number }, -- { "PAWSActive", N_("%u active connections rejected because of " -+ { "PAWSActive", N_("%llu active connections rejected because of " - "time stamp"), opt_number }, -- { "PAWSEstab", N_("%u packets rejects in established connections because of" -+ { "PAWSEstab", N_("%llu packets rejects in established connections because of" - " timestamp"), opt_number }, -- { "DelayedACKs", N_("%u delayed acks sent"), opt_number }, -- { "DelayedACKLocked", N_("%u delayed acks further delayed because of" -+ { "DelayedACKs", N_("%llu delayed acks sent"), opt_number }, -+ { "DelayedACKLocked", N_("%llu delayed acks further delayed because of" - " locked socket"), opt_number }, -- { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number }, -- { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"), -+ { "DelayedACKLost", N_("Quick ack mode was activated %llu times"), opt_number }, -+ { "ListenOverflows", N_("%llu times the listen queue of a socket overflowed"), - opt_number }, -- { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number }, -- { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), -+ { "ListenDrops", N_("%llu SYNs to LISTEN sockets dropped"), opt_number }, -+ { "TCPPrequeued", N_("%llu packets directly queued to recvmsg prequeue."), - opt_number }, -- { "TCPDirectCopyFromBacklog", N_("%u packets directly received" -- " from backlog"), opt_number }, -- { "TCPDirectCopyFromPrequeue", N_("%u packets directly received" -- " from prequeue"), opt_number }, -- { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number }, -- { "TCPHPHits", N_("%u packets header predicted"), number }, -- { "TCPHPHitsToUser", N_("%u packets header predicted and " -+ { "TCPDirectCopyFromBacklog", N_("%llu bytes directly in process context from backlog"), opt_number }, -+ { "TCPDirectCopyFromPrequeue", N_("%llu bytes directly received in process context from prequeue"), -+ opt_number }, -+ { "TCPPrequeueDropped", N_("%llu packets dropped from prequeue"), opt_number }, -+ { "TCPHPHits", N_("%llu packet headers predicted"), number }, -+ { "TCPHPHitsToUser", N_("%llu packets header predicted and " - "directly queued to user"), opt_number }, -- { "SockMallocOOM", N_("Ran %u times out of system memory during " -- "packet sending"), opt_number }, -+ { "SockMallocOOM", N_("Ran %llu times out of system memory during " -+ "packet sending"), opt_number }, -+ { "TCPPureAcks", N_("%llu acknowledgments not containing data payload received"), opt_number }, -+ { "TCPHPAcks", N_("%llu predicted acknowledgments"), opt_number }, -+ { "TCPRenoRecovery", N_("%llu times recovered from packet loss due to fast retransmit"), opt_number }, -+ { "TCPSackRecovery", N_("%llu times recovered from packet loss by selective acknowledgements"), opt_number }, -+ { "TCPSACKReneging", N_("%llu bad SACK blocks received"), opt_number }, -+ { "TCPFACKReorder", N_("Detected reordering %llu times using FACK"), opt_number }, -+ { "TCPSACKReorder", N_("Detected reordering %llu times using SACK"), opt_number }, -+ { "TCPTSReorder", N_("Detected reordering %llu times using time stamp"), opt_number }, -+ { "TCPRenoReorder", N_("Detected reordering %llu times using reno fast retransmit"), opt_number }, -+ { "TCPFullUndo", N_("%llu congestion windows fully recovered without slow start"), opt_number }, -+ { "TCPPartialUndo", N_("%llu congestion windows partially recovered using Hoe heuristic"), opt_number }, -+ { "TCPDSackUndo", N_("%llu congestion window recovered without slow start using DSACK"), opt_number }, -+ { "TCPLossUndo", N_("%llu congestion windows recovered without slow start after partial ack"), opt_number }, -+ { "TCPLostRetransmits", N_("%llu retransmits lost"), opt_number }, -+ { "TCPRenoFailures", N_("%llu timeouts after reno fast retransmit"), opt_number }, -+ { "TCPSackFailures", N_("%llu timeouts after SACK recovery"), opt_number }, -+ { "TCPLossFailures", N_("%llu timeouts in loss state"), opt_number }, -+ { "TCPFastRetrans", N_("%llu fast retransmits"), opt_number }, -+ { "TCPForwardRetrans", N_("%llu forward retransmits"), opt_number }, -+ { "TCPSlowStartRetrans", N_("%llu retransmits in slow start"), opt_number }, -+ { "TCPTimeouts", N_("%llu other TCP timeouts"), opt_number }, -+ { "TCPRenoRecoveryFailed", N_("%llu reno fast retransmits failed"), opt_number }, -+ { "TCPSackRecoveryFail", N_("%llu SACK retransmits failed"), opt_number }, -+ { "TCPSchedulerFailed", N_("%llu times receiver scheduled too late for direct processing"), opt_number }, -+ { "TCPRcvCollapsed", N_("%llu packets collapsed in receive queue due to low socket buffer"), opt_number }, -+ { "TCPDSACKOldSent", N_("%llu DSACKs sent for old packets"), opt_number }, -+ { "TCPDSACKOfoSent", N_("%llu DSACKs sent for out of order packets"), opt_number }, -+ { "TCPDSACKRecv", N_("%llu DSACKs received"), opt_number }, -+ { "TCPDSACKOfoRecv", N_("%llu DSACKs for out of order packets received"), opt_number }, -+ { "TCPAbortOnSyn", N_("%llu connections reset due to unexpected SYN"), opt_number }, -+ { "TCPAbortOnData", N_("%llu connections reset due to unexpected data"), opt_number }, -+ { "TCPAbortOnClose", N_("%llu connections reset due to early user close"), opt_number }, -+ { "TCPAbortOnMemory", N_("%llu connections aborted due to memory pressure"), opt_number }, -+ { "TCPAbortOnTimeout", N_("%llu connections aborted due to timeout"), opt_number }, -+ { "TCPAbortOnLinger", N_("%llu connections aborted after user close in linger timeout"), opt_number }, -+ { "TCPAbortFailed", N_("%llu times unable to send RST due to no memory"), opt_number }, -+ { "TCPMemoryPressures", N_("TCP ran low on memory %llu times"), opt_number }, -+ { "TCPLoss", N_("%llu TCP data loss events"), opt_number }, -+ { "TCPDSACKUndo", N_("%llu congestion windows recovered without slow start by DSACK"), -+ opt_number }, -+ { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number }, - }; - - struct tabtab { - char *title; - struct entry *tab; - size_t size; -- int *flag; -+ int *flag; - }; - - struct tabtab snmptabs[] = -@@ -204,6 +316,15 @@ struct tabtab snmptabs[] = - {NULL} - }; - -+struct tabtab snmp6tabs[] = -+{ -+ {"Ip6", Ip6tab, sizeof(Ip6tab), &f_raw}, -+ {"Icmp6", Icmp6tab, sizeof(Icmp6tab), &f_raw}, -+ {"Udp6", Udp6tab, sizeof(Udp6tab), &f_udp}, -+ {"Tcp6", Tcptab, sizeof(Tcptab), &f_tcp}, -+ {NULL} -+}; -+ - /* XXX IGMP */ - - int cmpentries(const void *a, const void *b) -@@ -211,18 +332,19 @@ int cmpentries(const void *a, const void *b) - return strcmp(((struct entry *) a)->title, ((struct entry *) b)->title); - } - --void printval(struct tabtab *tab, char *title, int val) -+void printval(struct tabtab *tab, char *title, unsigned long long val) - { - struct entry *ent = NULL, key; - int type; - char buf[512]; - - key.title = title; -- if (tab->tab) -+ if (tab->tab) - ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry), - sizeof(struct entry), cmpentries); - if (!ent) { /* try our best */ -- printf("%*s%s: %d\n", states[state].indent, "", title, val); -+ if (val) -+ printf("%*s%s: %llu\n", states[state].indent, "", title, val); - return; - } - type = ent->type; -@@ -242,7 +364,7 @@ void printval(struct tabtab *tab, char *title, int val) - buf[0] = '\0'; - switch (type) { - case opt_number: -- if (val == 0) -+ if (val == 0) - break; - /*FALL THOUGH*/ - case number: -@@ -272,7 +394,7 @@ struct tabtab *newtable(struct tabtab *tabs, char *title) - { - struct tabtab *t; - static struct tabtab dummytab; -- -+ - for (t = tabs; t->title; t++) { - if (!strcmp(title, t->title)) { - if (*(t->flag)) -@@ -281,22 +403,25 @@ struct tabtab *newtable(struct tabtab *tabs, char *title) - return t; - } - } -- if (!f_unknown) -- return NULL; -+ if (!f_unknown) -+ return NULL; - printf("%s:\n", _(title)); - dummytab.title = title; -- dummytab.flag = &f_unknown; -+ dummytab.flag = &f_unknown; - return &dummytab; - } - --void process_fd(FILE *f) -+int process_fd(FILE *f, int all, char *filter) - { -- char buf1[1024], buf2[1024]; -+ char buf1[2048], buf2[2048]; - char *sp, *np, *p; - while (fgets(buf1, sizeof buf1, f)) { - int endflag; - struct tabtab *tab; - -+ if (buf1[0] == '\n') // skip empty first line in 2.6 kernels -+ continue; -+ - if (!fgets(buf2, sizeof buf2, f)) - break; - sp = strchr(buf1, ':'); -@@ -305,6 +430,10 @@ void process_fd(FILE *f) - goto formaterr; - *sp = '\0'; - -+ if (!all) -+ if (strncmp(buf1, filter, strlen(filter))) -+ continue; -+ - tab = newtable(snmptabs, buf1); - if (tab == NULL) { - printf("unknown %s\n", buf1); -@@ -315,8 +444,8 @@ void process_fd(FILE *f) - - endflag = 0; - while (!endflag) { -- sp += strspn(sp, " \t\n"); -- np += strspn(np, " \t\n"); -+ sp += strspn(sp, " \t\n"); -+ np += strspn(np, " \t\n"); - /*if (*np == '\0') goto formaterr; */ - - p = sp+strcspn(sp, " \t\n"); -@@ -324,51 +453,116 @@ void process_fd(FILE *f) - endflag = 1; - *p = '\0'; - -- if (*sp != '\0' && *(tab->flag)) -- printval(tab, sp, strtoul(np, &np, 10)); -+ if (*sp != '\0' && *(tab->flag)) -+ printval(tab, sp, strtoull(np, &np, 10)); - - sp = p + 1; - } - } -- return; -- -+ return 0; -+ - formaterr: -- perror(_("error parsing /proc/net/snmp")); -- return; -+ return -1; - } - -+void cpytitle(char *original, char *new) -+{ -+ char *ptr = original; -+ while(*ptr != '6' && *ptr != '\0') { -+ *new = *ptr; -+ new++; -+ ptr++; -+ } -+ *new = *ptr; -+ new++; -+ *new = '\0'; -+} -+ -+void process6_fd(FILE *f) -+{ -+ char buf1[1024],buf2[50],buf3[1024]; -+ unsigned long long val; -+ struct tabtab *tab = NULL; -+ int cpflg = 0; -+ -+ while (fgets(buf1, sizeof buf1, f)) { -+ sscanf(buf1, "%s %llu", buf2, &val); -+ if(!cpflg) { -+ cpytitle(buf2, buf3); -+ tab = newtable(snmp6tabs, buf3); -+ cpflg = 1; -+ } -+ if(!strstr(buf2, buf3)) { -+ cpytitle(buf2, buf3); -+ tab = newtable(snmp6tabs, buf3); -+ } -+ if (*(tab->flag)) -+ printval(tab, buf2, val); -+ } -+ -+} - - void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) - { - FILE *f; - - f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; -- -- f = fopen("/proc/net/snmp", "r"); -+ -+ f = proc_fopen("/proc/net/snmp"); - if (!f) { - perror(_("cannot open /proc/net/snmp")); - return; - } -- process_fd(f); -+ -+ if (process_fd(f, 1, NULL) < 0) -+ fprintf(stderr, _("Problem while parsing /proc/net/snmp\n")); - - if (ferror(f)) - perror("/proc/net/snmp"); - - fclose(f); - -- f = fopen("/proc/net/netstat", "r"); -+ f = proc_fopen("/proc/net/netstat"); - - if (f) { -- process_fd(f); -+ if (process_fd(f, 1, NULL) <0) -+ fprintf(stderr, _("Problem while parsing /proc/net/netstat\n")); - - if (ferror(f)) - perror("/proc/net/netstat"); -- -+ - fclose(f); - } - return; - } -- -+ -+void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp) -+{ -+ FILE *f; -+ -+ f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; -+ -+ f = fopen("/proc/net/snmp6", "r"); -+ if (!f) { -+ perror(_("cannot open /proc/net/snmp6")); -+ return; -+ } -+ process6_fd(f); -+ if (ferror(f)) -+ perror("/proc/net/snmp6"); -+ -+ fclose(f); -+ f = fopen("/proc/net/snmp", "r"); -+ if (!f) { -+ perror(_("cannot open /proc/net/snmp")); -+ return; -+ } -+ process_fd(f, 0, "Tcp"); -+ if (ferror(f)) -+ perror("/proc/net/snmp"); -+ -+ fclose(f); -+} - - void inittab(void) - { -@@ -379,3 +573,13 @@ void inittab(void) - qsort(t->tab, t->size / sizeof(struct entry), - sizeof(struct entry), cmpentries); - } -+ -+void inittab6(void) -+{ -+ struct tabtab *t; -+ -+ for (t = snmp6tabs; t->title; t++) -+ qsort(t->tab, t->size / sizeof(struct entry), -+ sizeof(struct entry), cmpentries); -+} -+ diff --git a/system/net-tools/musl-fixes.patch b/system/net-tools/musl-fixes.patch deleted file mode 100644 index 4d6170ca9..000000000 --- a/system/net-tools/musl-fixes.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/lib/inet6_gr.c b/lib/inet6_gr.c -index 72b4a66..2361809 100644 ---- a/lib/inet6_gr.c -+++ b/lib/inet6_gr.c -@@ -23,7 +23,7 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> --#ifndef __GLIBC__ -+#ifdef HAVE_IPV6_ROUTE_H - #include <netinet6/ipv6_route.h> /* glibc doesn't have this */ - #endif - #include "version.h" -diff --git a/lib/inet6_sr.c b/lib/inet6_sr.c -index 1ad9510..96dbd5f 100644 ---- a/lib/inet6_sr.c -+++ b/lib/inet6_sr.c -@@ -23,10 +23,10 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> --#ifdef __GLIBC__ --#include <net/route.h> --#else -+#ifdef HAVE_IPV6_ROUTE_H - #include <netinet6/ipv6_route.h> /* glibc does not have this */ -+#else -+#include <net/route.h> - #endif - #include "version.h" - #include "net-support.h" -diff --git a/lib/inet_sr.c b/lib/inet_sr.c -index 1a876ae..6a26a76 100644 ---- a/lib/inet_sr.c -+++ b/lib/inet_sr.c -@@ -26,6 +26,7 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> -+#include <asm-generic/param.h> - #include "version.h" - #include "net-support.h" - #include "pathnames.h" -diff --git a/lib/util-ank.c b/lib/util-ank.c -index b077f35..4ee59f6 100644 ---- a/lib/util-ank.c -+++ b/lib/util-ank.c -@@ -14,6 +14,7 @@ - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses - */ - -+#include <limits.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -diff --git a/mii-tool.c b/mii-tool.c -index 1cfecc2..fbc3b34 100644 ---- a/mii-tool.c -+++ b/mii-tool.c -@@ -46,10 +46,6 @@ - #include <net/if.h> - #include <linux/sockios.h> - --#ifndef __GLIBC__ --#include <linux/if_arp.h> --#include <linux/if_ether.h> --#endif - #include <linux/mii.h> - #include <linux/sockios.h> - #include "version.h" -diff --git a/netstat.c b/netstat.c -index d0c364f..8453f18 100644 ---- a/netstat.c -+++ b/netstat.c -@@ -88,6 +88,7 @@ - #include <sys/stat.h> - #include <net/if.h> - #include <dirent.h> -+#include <asm-generic/param.h> - - #include "net-support.h" - #include "pathnames.h" -diff --git a/slattach.c b/slattach.c -index 5c81584..3ccde28 100644 ---- a/slattach.c -+++ b/slattach.c -@@ -44,6 +44,7 @@ - #include <string.h> - #include <unistd.h> - #include <getopt.h> -+#include <termios.h> - #include <linux/if_slip.h> - - #if defined(__GLIBC__) diff --git a/system/pax-utils/APKBUILD b/system/pax-utils/APKBUILD index 481a7077e..86ad26f44 100644 --- a/system/pax-utils/APKBUILD +++ b/system/pax-utils/APKBUILD @@ -12,7 +12,7 @@ depends="scanelf" makedepends_build="" makedepends_host="linux-headers libcap-dev" makedepends="$makedepends_build $makedepends_host" -source="https://mirrormaster.adelielinux.org/source/upstream/pax-utils-$pkgver.tar.xz +source="https://distfiles.adelielinux.org/source/upstream/pax-utils-$pkgver.tar.xz fix-eitype.patch" subpackages="$pkgname-doc scanelf:_scanelf" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index e7c6c86ce..10a138ef7 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.6.1 +pkgver=1.0.6.4 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.10.0.0 -_s6_version=2.10.0.0 +_skalibs_version=2.11 +_s6_version=2.11 depends="execline s6>=$_s6_version s6-linux-init-common" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev" subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -51,7 +51,6 @@ package() { -m 022 \ -s /run/kernel_env \ -f "$pkgdir/etc/s6-linux-init/skel" \ - -U "" \ "$pkgdir/etc/s6-linux-init/current" mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" for i in init halt poweroff reboot shutdown telinit ; do @@ -120,7 +119,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="0d18b96a70ef39e06e164bb391e22d7b1cce54f941c5526e6a107c7af5b6801b1dd257ba255bc07eff240d48f8ef7f096e180bade25490a86b6326290448d45c s6-linux-init-1.0.6.1.tar.gz +sha512sums="810e0df76e3d661efc0e12b58cb52e8a8c78024a9bec430b1b283006a629e836d5d113282ddcafa7654737003f20779b474b770d791e2844573bb6838ff866ae s6-linux-init-1.0.6.4.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index bb11c9844..3dc050190 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc -pkgver=0.5.2.1 +pkgver=0.5.2.3 pkgrel=0 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.10.0.0 -_s6_version=2.10.0.0 +_skalibs_version=2.11 +_s6_version=2.11 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -66,4 +66,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="0cbd48e79b7f0e24528b6dda1df6980ca3dcebca7aecf408ad69490aacced4a425b5bcdb1a68b5bfa46199b7a05364a80158db5722cd6506d8d833da125c1fec s6-rc-0.5.2.1.tar.gz" +sha512sums="99f0b2801218425a6241692af641de7a8fc5420e7aed402cc6eef3b51287f50094ac5085028853ef8580157d6bb7f95b31878701780ebbb9fa2cc83d3800ebef s6-rc-0.5.2.3.tar.gz" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 489a8ef22..1ba685820 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.10.0.2 +pkgver=2.11.0.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -67,4 +67,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.tar.gz" +sha512sums="5421b01de6d4f75e80056d3335cef409b3eb1330f1585c8b303228a36e60537056bed130f3f375f3f02f9063be04fc8776c4687cb0ec23e969960ad3fb5141e3 s6-2.11.0.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 3188f031d..54144895b 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,28 +1,3 @@ #!/bin/sh -e -newv="$1" -oldv="$2" - rm -f /etc/runlevels/default/s6 - -if test `apk version -t "$oldv" 2.9` = "<" ; then - - cat <<EOF - -* -* The s6 package has been upgraded. To complete the upgrade, you need to -* restart the supervision tree. If you are using sysvinit, please use the -* following command, run as root: -* -* s6-svscanctl -t /run/service -* -* Running this command will instantly log everyone out of all the -* terminals that are listed in the GETTYS variable in /etc/conf.d/gettys -* - so please save your work first. -* -* If you are using s6-linux-init, which is the default, please just -* reboot your machine as soon as is convenient for you. -* - -EOF -fi diff --git a/system/s6/s6.trigger b/system/s6/s6.trigger index 8db8d9a5a..36aa83841 100644 --- a/system/s6/s6.trigger +++ b/system/s6/s6.trigger @@ -1,3 +1,3 @@ #!/bin/execlineb -P -s6-svscanctl -aN /run/service +s6-svscanctl -an /run/service diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index ee8b7c95d..3f26a54a6 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.10.0.2 +pkgver=2.11.0.0 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -57,4 +57,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="b36b7fefb9df63093f1bd775fe9d2bf7ed588404a99a55b1ecabfc0e3b6eac49989dfb736f7f69a9508e4dfeeb669d48e639964aef5c65c330043c543cd38801 skalibs-2.10.0.2.tar.gz" +sha512sums="14e62e9e63735184d54497295b0d3d97bee393d1dc09af9542f17c6083c2a6b310e6f15275d96819f14cb2e033baa264c6b3a4c680eb0c83edf84932b8df87f2 skalibs-2.11.0.0.tar.gz" diff --git a/system/unzip/APKBUILD b/system/unzip/APKBUILD index 9b3f696f3..7bc998390 100644 --- a/system/unzip/APKBUILD +++ b/system/unzip/APKBUILD @@ -12,8 +12,9 @@ arch="all" license="Info-ZIP" subpackages="$pkgname-doc" # normally ftp://ftp.info-zip.org/pub/infozip/src/$pkgname$_pkgver.zip +# find timestamp here: https://snapshot.debian.org/package/unzip/ source="$pkgname-$pkgver.tgz::https://distfiles.adelielinux.org/source/$pkgname$_pkgver.tgz - http://deb.debian.org/debian/pool/main/u/unzip/unzip_$pkgver-$_debver.debian.tar.xz + https://snapshot.debian.org/archive/debian-debug/20190928T162431Z/pool/main/u/${pkgname}/${pkgname}_${pkgver}-${_debver}.debian.tar.xz cflags.patch format-secure.patch unzipsfx-bomb-32bit.patch diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index cd7040973..a2e528db5 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.1.0.0 +pkgver=0.1.0.3 pkgrel=0 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" @@ -9,7 +9,7 @@ arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" @@ -76,6 +76,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="f8d246897690829fccc6e4a4e1bfbbbacd10d337863dacb6966f62cffc166d61c49db1ac83d51aa023e571a5d62f81cf030fa439eb8e3fe742e427764f18adcf utmps-0.1.0.0.tar.gz +sha512sums="37daf1c94640f2576795ff5e274b09b95d05d5a42711914e65688493c31efa8cbdaf8698f43af1d90dc28a0ea42695cc1a69e326621f50e6470708853596ae88 utmps-0.1.0.3.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" diff --git a/user/ant/APKBUILD b/user/ant/APKBUILD index bb36e3fbb..5590248d9 100644 --- a/user/ant/APKBUILD +++ b/user/ant/APKBUILD @@ -13,7 +13,7 @@ license="Apache-2.0" depends="openjdk8" makedepends="" subpackages="" -source="https://www-eu.apache.org/dist/ant/source/apache-$pkgname-$pkgver-src.tar.gz +source="https://archive.apache.org/dist/ant/source/apache-$pkgname-$pkgver-src.tar.gz ant.sh imageio_fix_java_test.patch imageio_fix_test.patch diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index 0c106a7ea..70ba79205 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -21,7 +21,7 @@ subpackages="$pkgname-dev $pkgname-ldap $pkgname-openrc" provides="apache2 apache2-ssl" -source="https://www-us.apache.org/dist//httpd/httpd-$pkgver.tar.gz +source="https://www.apache.org/dist/httpd/httpd-$pkgver.tar.gz adelie.layout apache-httpd.confd apache-httpd.initd diff --git a/user/aspell/APKBUILD b/user/aspell/APKBUILD index 16a53c7e7..474a4d635 100644 --- a/user/aspell/APKBUILD +++ b/user/aspell/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell pkgver=0.60.8 pkgrel=0 diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD index 0c7fa9cb1..7fde0c679 100644 --- a/user/bcnm/APKBUILD +++ b/user/bcnm/APKBUILD @@ -1,17 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bcnm -pkgver=0.0.1.2 +pkgver=0.0.1.4 pkgrel=0 pkgdesc="Client network manager" -url="https://www.skarnet.org/software/bcnm/" +url="https://skarnet.org/software/bcnm/" arch="all" options="!check" # No test suite. license="ISC" depends="" -makedepends="skalibs-dev>=2.10" +makedepends="skalibs-dev>=2.11" subpackages="$pkgname-dev" -source="https://www.skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" +source="https://skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" build() { ./configure \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="41c69b4800dc347f12b06010fe6a64391ad18fc35f0171fdcedb7843725dc6308c1d1f0486b10618938f6f98c8ca63eb15567af64e271efffcf255a8b96c3add bcnm-0.0.1.2.tar.gz" +sha512sums="40d6e7fac1a633ff2a2acfe6ec5d9b926d31784f02156e837afa92086267bb88dfabc70216d3f255e59c9dacee393d680ff7ea7ce714da3c8a05b2f0c972d65e bcnm-0.0.1.4.tar.gz" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 44cd5cf30..5faa93b71 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.16.8 +pkgver=9.16.21 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -41,6 +41,10 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.xz builddir="$srcdir/$pkgname-$_ver" # secfixes: +# 9.16.21-r0: +# - CVE-2021-25214 +# - CVE-2021-25215 +# - CVE-2021-25216 # 9.16.8-r0: # - CVE-2020-8620 # - CVE-2020-8621 @@ -110,7 +114,6 @@ build() { --with-libjson \ --enable-linux-caps \ --enable-shared \ - --enable-static \ --with-libtool make } @@ -145,6 +148,17 @@ package() { ln -s named.ca root.cache } +libs() { + default_libs + for dir in lib usr/lib; do + for file in "$pkgdir"/$dir/lib*-"$pkgver".so; do + [ -f "$file" ] || continue + mkdir -p "$subpkgdir"/$dir + mv "$file" "$subpkgdir"/$dir/ + done + done +} + tools() { pkgdesc="The ISC DNS tools" install="" @@ -161,7 +175,7 @@ tools() { done } -sha512sums="803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7 bind-9.16.8.tar.xz +sha512sums="2cb71e50600fd7409ca7b7e2e9cf4ef6668b07faad7980ac8060e6a76f30a315182d75534ad1dcfb740c225cdf727b2bd6aa9ceb24ab77ffff09b7b5d6eaca2d bind-9.16.21.tar.xz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD index 2ab70e6f1..ab799c36b 100644 --- a/user/bzflag/APKBUILD +++ b/user/bzflag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bzflag -pkgver=2.4.20 +pkgver=2.4.22 pkgrel=0 pkgdesc="3D networked multi-player multi-platform tank battle game" url="https://www.bzflag.org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6140123d37065bead3021ef9c36db1210ad2c71a4a7deb6894bb3f856a571197a7eac37d16b8e3b587549dc201c4ac8d7bbe03d1a05d067dc452861924005169 bzflag-2.4.20.tar.bz2" +sha512sums="c78ad0e9e861d0c922ef73dd1e040d998836efaab3a48d5a3cd8392835ce37392b1b9438aed7483ea48c6bce672bb937aeba40553553dce0c0fd3cce38bf10cf bzflag-2.4.22.tar.bz2" diff --git a/user/catcodec/APKBUILD b/user/catcodec/APKBUILD index 2f098cba8..379839c19 100644 --- a/user/catcodec/APKBUILD +++ b/user/catcodec/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="" subpackages="$pkgname-doc" -source="https://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-$pkgver-source.tar.xz" +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz" build() { make diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index 735afa9e2..594e91897 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -11,7 +11,8 @@ depends="perl" checkdepends="shunit2" makedepends="" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" -source="https://cdn-aws.deb.debian.org/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz" +# find timestamp here: https://snapshot.debian.org/package/devscripts/ +source="https://snapshot.debian.org/archive/debian/20200628T204444Z/pool/main/d/devscripts/devscripts_${pkgver}.tar.xz" builddir="$srcdir/devscripts-$pkgver" prepare() { diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index f5d4f3619..70620a520 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=chrony -pkgver=3.5.1 +pkgver=4.1 pkgrel=0 pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" @@ -85,7 +85,7 @@ package() { chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/chrony } -sha512sums="489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 chrony-3.5.1.tar.gz +sha512sums="5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f chrony-4.1.tar.gz 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch 1ebb72341b4421060a43d6db164d743de9144f1c23370e052f0db92a17e5e34f24ac98baddeb5dbfef27f67479142d448c4401d927394e55024760730a27e8de chronyd.confd diff --git a/user/ckbcomp/APKBUILD b/user/ckbcomp/APKBUILD index 8f025d141..57701b38a 100644 --- a/user/ckbcomp/APKBUILD +++ b/user/ckbcomp/APKBUILD @@ -11,7 +11,8 @@ license="GPL-2.0+" depends="perl" makedepends="" subpackages="$pkgname-doc" -source="http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz" +# find timestamp here: https://snapshot.debian.org/package/console-setup/ +source="https://snapshot.debian.org/archive/debian/20200712T205255Z/pool/main/c/console-setup/console-setup_$pkgver.tar.xz" builddir="$srcdir"/console-setup-$pkgver package() { diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index d8c3e6a1e..d009af3a5 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=8.1.9 +pkgver=9.4.0 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -42,6 +42,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a dhcpcd-8.1.9.tar.xz +sha512sums="e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f dhcpcd-9.4.0.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/felinks/APKBUILD b/user/felinks/APKBUILD index bc263b9df..3b9e18055 100644 --- a/user/felinks/APKBUILD +++ b/user/felinks/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Nathan <ndowens@artixlinux.org> # Maintainer: Zach van Rijn <me@zv.io> +# Maintainer: ZZZ pkgname=felinks pkgver=0.13.5 pkgrel=0 @@ -10,7 +11,8 @@ license="GPL-2.0+" depends="" makedepends="autoconf automake bzip2-dev gettext-tiny openssl-dev zlib-dev" subpackages="$pkgname-doc $pkgname-lang" -source="$pkgname-$pkgver.tar.gz::https://github.com/rkd77/felinks/archive/v$pkgver.tar.gz +#source="$pkgname-$pkgver.tar.gz::https://github.com/rkd77/felinks/archive/v$pkgver.tar.gz +source="https://distfiles.adelielinux.org/source/upstream/$pkgname-$pkgver.tar.gz gettext-tiny.patch " diff --git a/user/gamin/APKBUILD b/user/gamin/APKBUILD index 140e44fc7..8fa896a58 100644 --- a/user/gamin/APKBUILD +++ b/user/gamin/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=gamin pkgver=0.1.10 pkgrel=13 @@ -9,7 +9,7 @@ license="LGPL-2.0+" depends="" makedepends="glib-dev" subpackages="$pkgname-dev" -source="https://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz +source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz fix-deprecated-const.patch fix-pthread-mutex.patch deadlock.patch diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD index 76d95fce0..c367f4063 100644 --- a/user/gc/APKBUILD +++ b/user/gc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gc -pkgver=8.0.4 +pkgver=8.0.6 pkgrel=0 pkgdesc="A garbage collector for C and C++" url="https://hboehm.info/gc/" @@ -41,4 +41,4 @@ libgccpp() { mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ } -sha512sums="57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e gc-8.0.4.tar.gz" +sha512sums="2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e gc-8.0.6.tar.gz" diff --git a/user/gconf/APKBUILD b/user/gconf/APKBUILD index ce91ec018..871bab85f 100644 --- a/user/gconf/APKBUILD +++ b/user/gconf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: +# Contributor: Ariadne Conill <ariadne@dereferenced.org> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gconf pkgver=3.2.6 pkgrel=5 diff --git a/user/gnucobol/APKBUILD b/user/gnucobol/APKBUILD index 1173da988..2b144db19 100644 --- a/user/gnucobol/APKBUILD +++ b/user/gnucobol/APKBUILD @@ -13,7 +13,7 @@ license="GPL-3.0+ AND LGPL-3.0+ AND GFDL-1.3" depends="db-dev gmp-dev ncurses-dev" makedepends="autoconf automake help2man libtool texinfo" subpackages="$pkgname-doc $pkgname-lang" -source="https://downloads.sourceforge.net/project/open-cobol/gnu-cobol/3.0/$pkgname-$_pkgver.tar.xz +source="https://downloads.sourceforge.net/project/gnucobol/gnucobol/3.0/$pkgname-$_pkgver.tar.xz https://dev.sick.bike/dist/newcob.val.Z keep-debug-flags.patch big-endian.patch diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD index b80f73c3d..c240a647a 100644 --- a/user/grfcodec/APKBUILD +++ b/user/grfcodec/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="boost-dev" subpackages="$pkgname-doc" -source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz va_copy.patch " diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 3388b82d1..64d7a093a 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gsettings-desktop-schemas pkgver=3.38.0 pkgrel=0 diff --git a/user/hdparm/APKBUILD b/user/hdparm/APKBUILD index f1ab5fe96..423948de0 100644 --- a/user/hdparm/APKBUILD +++ b/user/hdparm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=hdparm -pkgver=9.58 +pkgver=9.62 pkgrel=0 pkgdesc="Utility for manipulating IDE device parameters" url="https://sourceforge.net/projects/hdparm" @@ -30,4 +30,4 @@ package() { install -D -m644 LICENSE.TXT "$pkgdir"/usr/share/licenses/hdparm/LICENSE.TXT } -sha512sums="42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea hdparm-9.58.tar.gz" +sha512sums="ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369 hdparm-9.62.tar.gz" diff --git a/user/hiredis/APKBUILD b/user/hiredis/APKBUILD new file mode 100644 index 000000000..1ce1505c5 --- /dev/null +++ b/user/hiredis/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=hiredis +pkgver=1.0.0 +pkgrel=0 +pkgdesc="A minimalistic C client library for the Redis database" +url="https://github.com/redis/hiredis" +arch="all" +license="BSD-3-Clause" +options="!check" # tests require a real redis server running +depends="" +makedepends="openssl-dev" +subpackages="$pkgname-dev" +source="hiredis-$pkgver.tar.gz::https://github.com/redis/hiredis/archive/refs/tags/v$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69 hiredis-1.0.0.tar.gz" diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 875d58a01..1f6414355 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=i3wm -pkgver=4.18.2 +pkgver=4.19.2 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" @@ -12,36 +12,33 @@ license="BSD-3-Clause" depends="" checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr" -makedepends="bison flex libxcb-dev xcb-util-cursor-dev xcb-util-keysyms-dev - xcb-util-wm-dev libev-dev pango-dev cairo-dev yajl-dev - startup-notification-dev pcre-dev libxkbcommon-dev xcb-util-xrm-dev" +makedepends="meson ninja bison flex libxcb-dev xcb-util-cursor-dev + xcb-util-keysyms-dev xcb-util-wm-dev libev-dev pango-dev cairo-dev + yajl-dev startup-notification-dev pcre-dev libxkbcommon-dev + xcb-util-xrm-dev" subpackages="$pkgname-doc" -source="https://i3wm.org/downloads/i3-$pkgver.tar.bz2 +source="https://i3wm.org/downloads/i3-$pkgver.tar.xz i3wm-musl-glob-tilde.patch - i3wm-test-fix-off_t.patch - i3wm-test-disable-branch-check.patch" + i3wm-test-fix-off_t.patch" builddir="$srcdir/i3-$pkgver" build() { - ./configure \ - --prefix=/usr \ - --disable-builddir \ - --sysconfdir=/etc - make + # docs require asciidoc + meson -Dprefix=/usr -Ddocs=false -Dmans=false build + ninja -C build } check() { - make check + ninja -C build test } package() { - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir" ninja -C build install install -d "$pkgdir/usr/share/man/man1" install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ } -sha512sums="997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc i3-4.18.2.tar.bz2 +sha512sums="58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d i3-4.19.2.tar.xz 6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa i3wm-musl-glob-tilde.patch -77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch -a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f i3wm-test-disable-branch-check.patch" +77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch" diff --git a/user/i3wm/i3wm-test-disable-branch-check.patch b/user/i3wm/i3wm-test-disable-branch-check.patch deleted file mode 100644 index ac3572e9b..000000000 --- a/user/i3wm/i3wm-test-disable-branch-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- i3-4.15/testcases/t/193-ipc-version.t.old 2018-03-10 09:29:14.000000000 -0800 -+++ i3-4.15/testcases/t/193-ipc-version.t 2018-09-27 16:49:56.599257224 -0700 -@@ -32,6 +32,6 @@ - - is(int($version->{minor}), $version->{minor}, 'minor version is an integer'); - is(int($version->{patch}), $version->{patch}, 'patch version is an integer'); --like($version->{human_readable}, qr/branch/, 'human readable version contains branch name'); -+#like($version->{human_readable}, qr/branch/, 'human readable version contains branch name'); - - done_testing; diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index b93c8a259..5af02b212 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iperf3 _pkgname=iperf -pkgver=3.9 +pkgver=3.10.1 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://software.es.net/iperf/" @@ -17,7 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgnam $_pkgname.confd build-fixes.patch - time64.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -46,8 +45,7 @@ package() { "$pkgdir"/etc/conf.d/$_pkgname } -sha512sums="4a2af8a6028b0f6bded9b3ac51c5463bc7595c9a2d2ac13f28b0e2e8dee0ac0a299e7817125e23e409f12e8e80862ed28d5541eef3cda7cd9f7104bb720165ce iperf3-3.9.tar.gz +sha512sums="127a5276bad07401cafb43093f8677c5b4672aae9b4ab4fab5e2987b9f2e664b7370a39d260a4da572aeb318f02df9c491f1214602e5e3bde617127d1f049243 iperf3-3.10.1.tar.gz 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd -126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch -5686858a8a220834e01ace8dd934f347c1fff952d1e30985cfb13eabef1eba82e467871323a9c544925230c4b7d7e67c71a2add59e85d30adcb3208e10e2df46 time64.patch" +126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch" diff --git a/user/iperf3/time64.patch b/user/iperf3/time64.patch deleted file mode 100644 index 84806dc20..000000000 --- a/user/iperf3/time64.patch +++ /dev/null @@ -1,75 +0,0 @@ -From f19d964fd91a6f2b26aa70b6caa1290c3f6fdbc7 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sun, 27 Sep 2020 19:56:15 -0500 -Subject: [PATCH] auth: Ensure 64-bit time_t works on 32-bit systems - -On a 32-bit PowerPC Linux system using musl libc (with 64-bit time_t), -the t_auth test fails because `long` is not the same type as `time_t`. - -This patch uses an int64_t temporary value, which can be truncated to -32-bit if necessary. ---- - src/iperf_auth.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/iperf_auth.c b/src/iperf_auth.c -index eb4610f..a824deb 100644 ---- a/src/iperf_auth.c -+++ b/src/iperf_auth.c -@@ -35,6 +35,8 @@ - #define _WITH_GETLINE - #include <stdio.h> - #include <termios.h> -+#include <inttypes.h> -+#include <stdint.h> - - #if defined(HAVE_SSL) - -@@ -45,7 +47,7 @@ - #include <openssl/buffer.h> - #include <openssl/err.h> - --const char *auth_text_format = "user: %s\npwd: %s\nts: %ld"; -+const char *auth_text_format = "user: %s\npwd: %s\nts: %"PRId64; - - void sha256(const char *string, char outputBuffer[65]) - { -@@ -291,7 +293,7 @@ int encode_auth_setting(const char *username, const char *password, EVP_PKEY *pu - if (text == NULL) { - return -1; - } -- snprintf(text, text_len, auth_text_format, username, password, utc_seconds); -+ snprintf(text, text_len, auth_text_format, username, password, (int64_t)utc_seconds); - - unsigned char *encrypted = NULL; - int encrypted_len; -@@ -309,7 +311,8 @@ int encode_auth_setting(const char *username, const char *password, EVP_PKEY *pu - int decode_auth_setting(int enable_debug, const char *authtoken, EVP_PKEY *private_key, char **username, char **password, time_t *ts){ - unsigned char *encrypted_b64 = NULL; - size_t encrypted_len_b64; -- Base64Decode(authtoken, &encrypted_b64, &encrypted_len_b64); -+ int64_t utc_seconds; -+ Base64Decode(authtoken, &encrypted_b64, &encrypted_len_b64); - - unsigned char *plaintext = NULL; - int plaintext_len; -@@ -331,7 +334,7 @@ int decode_auth_setting(int enable_debug, const char *authtoken, EVP_PKEY *priva - return -1; - } - -- int rc = sscanf((char *) plaintext, auth_text_format, s_username, s_password, ts); -+ int rc = sscanf((char *) plaintext, auth_text_format, s_username, s_password, &utc_seconds); - if (rc != 3) { - free(s_password); - free(s_username); -@@ -344,6 +347,7 @@ int decode_auth_setting(int enable_debug, const char *authtoken, EVP_PKEY *priva - } - *username = s_username; - *password = s_password; -+ *ts = (time_t)utc_seconds; - OPENSSL_free(plaintext); - return (0); - } --- -2.25.4 - diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD index 1d625f8f7..b6ce3bad0 100644 --- a/user/iputils/APKBUILD +++ b/user/iputils/APKBUILD @@ -1,24 +1,29 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iputils -pkgver=20190709 +pkgver=20210722 pkgrel=0 pkgdesc="IP Configuration Utilities (and Ping)" url="https://github.com/iputils/iputils/" arch="all" -options="suid" +options="!check suid" # tests require binaries with suid/capabilities license="BSD-3-Clause AND GPL-2.0-or-later" depends="" makedepends="docbook-xsl docbook-xsl-ns libcap-dev libgcrypt-dev libxslt meson openssl-dev" subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc" -source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz" -builddir="$srcdir/$pkgname-s$pkgver" +source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" build() { # we're waiting for idn support in musl so that we can enable it here # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Name-Resolver/DNS - meson --prefix /usr --buildtype=plain builddir -DUSE_IDN=false + meson --prefix /usr \ + --buildtype=plain \ + -DBUILD_ARPING=true \ + -DUSE_IDN=false \ + -DNO_SETCAP_OR_SUID=false \ + builddir ninja -v -C builddir } @@ -33,4 +38,4 @@ package() { ln -s ping "$pkgdir"/usr/bin/ping6 } -sha512sums="5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5 iputils-20190709.tgz" +sha512sums="8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328 iputils-20210722.tgz" diff --git a/user/lcms2/APKBUILD b/user/lcms2/APKBUILD index d096b78cc..ee783e642 100644 --- a/user/lcms2/APKBUILD +++ b/user/lcms2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lcms2 -pkgver=2.11 +pkgver=2.12 pkgrel=0 pkgdesc="Colour management engine using ICC standard" url="http://www.littlecms.com/" @@ -11,7 +11,7 @@ depends="" depends_dev="libjpeg-turbo-dev tiff-dev zlib-dev" makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -source="http://www.littlecms.com/lcms2-$pkgver.tar.gz" +source="https://github.com/mm2/Little-CMS/releases/download/lcms$pkgver/$pkgname-$pkgver.tar.gz" # secfixes: # 2.11-r0: @@ -50,4 +50,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e lcms2-2.11.tar.gz" +sha512sums="967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed lcms2-2.12.tar.gz" diff --git a/user/libatomic_ops/APKBUILD b/user/libatomic_ops/APKBUILD index b22941f3e..f12a1f61a 100644 --- a/user/libatomic_ops/APKBUILD +++ b/user/libatomic_ops/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libatomic_ops -pkgver=7.6.10 +pkgver=7.6.12 pkgrel=0 pkgdesc="Provides semi-portable access to hardware provided atomic memory operations" arch="all" @@ -38,4 +38,4 @@ package() { install -Dm644 doc/LICENSING.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9 libatomic_ops-7.6.10.tar.gz" +sha512sums="bbf98a38a80c8fe6b7eab773967edc55b8d48be32b36ed827fb835ee3dcd96d5ec1dc97149714e015e93a0a5b9fc03595797663fdb5a0f673869ea8bfe640df5 libatomic_ops-7.6.12.tar.gz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index 6e2ebd8d6..c830355a3 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> -# Maintainer: +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libevent pkgver=2.1.12 pkgrel=0 diff --git a/user/libguess/APKBUILD b/user/libguess/APKBUILD index 6e8d0b273..97c4b59e7 100644 --- a/user/libguess/APKBUILD +++ b/user/libguess/APKBUILD @@ -12,7 +12,8 @@ license="ISC" depends="" makedepends="libmowgli-dev autoconf" subpackages="$pkgname-dev" -source="http://rabbit.dereferenced.org/~nenolod/distfiles/$pkgname-$pkgver.tar.bz2" +#source="http://rabbit.dereferenced.org/~nenolod/distfiles/$pkgname-$pkgver.tar.bz2" +source="https://distfiles.adelielinux.org/source/upstream/$pkgname-$pkgver.tar.bz2" prepare() { update_config_sub diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD index b52ec8ad9..28a56be44 100644 --- a/user/libidn2/APKBUILD +++ b/user/libidn2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libidn2 -pkgver=2.3.0 +pkgver=2.3.2 pkgrel=0 pkgdesc="Free implementation of IDNA2008, Punycode, and TR46" url="https://gitlab.com/libidn/libidn2" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+ OR LGPL-3.0+" depends="" makedepends="libunistring-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc" source="https://ftp.gnu.org/gnu/libidn/libidn2-$pkgver.tar.gz" build() { @@ -19,7 +19,9 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --disable-nls \ + --disable-valgrind-tests make } @@ -31,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 libidn2-2.3.0.tar.gz" +sha512sums="958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1 libidn2-2.3.2.tar.gz" diff --git a/user/libnatpmp/APKBUILD b/user/libnatpmp/APKBUILD new file mode 100644 index 000000000..bd2facd27 --- /dev/null +++ b/user/libnatpmp/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=libnatpmp +pkgver=20150609 +pkgrel=0 +pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" +url="https://miniupnp.tuxfamily.org/libnatpmp.html" +arch="all" +options="!check" +license="BSD-3-Clause" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz" + +build() { + make +} + +package() { + make PREFIX="$pkgdir" install +} + +sha512sums="e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09 libnatpmp-20150609.tar.gz" diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD index acfc75c69..e66a37c91 100644 --- a/user/libxdg-basedir/APKBUILD +++ b/user/libxdg-basedir/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libxdg-basedir -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="library for XDG base dir specification" url=" " # No URL. @@ -11,7 +11,8 @@ license="MIT" depends="" makedepends="autoconf automake libtool" subpackages="$pkgname-dev" -source="https://github.com/davmac314/libxdg-basedir/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" +source="https://github.com/devnev/libxdg-basedir/archive/refs/tags/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/libxdg-basedir-$pkgname-$pkgver" prepare() { default_prepare @@ -35,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5817aea613be592d3d392401702ecd40ec949ee170365d720085919d773dc998daff65bde53d36429453dfe3944ff8666729553381c7b9ce410b009e7a5d5af5 libxdg-basedir-1.2.2.tar.xz" +sha512sums="e672da0d9cd3c27c9113f6053b79127e615e5d84bde81305242f506e930869d8492304aac26a0296528d5a32530e4a743acecb6a25f58372ac597af284429f7c libxdg-basedir-1.2.3.tar.gz" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 224755425..bb7054d24 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=live-media pkgver=2020.07.31 pkgrel=0 @@ -10,7 +10,7 @@ license="LGPL-3.0+" depends="" makedepends="openssl-dev" subpackages="$pkgname-dev $pkgname-utils" -source="http://live555.com/liveMedia/public/live.$pkgver.tar.gz" +source="https://download.videolan.org/contrib/live555/live.$pkgver.tar.gz" builddir="$srcdir"/live prepare() { diff --git a/user/mactel-boot/APKBUILD b/user/mactel-boot/APKBUILD index e0e1bf16e..1eff3f666 100644 --- a/user/mactel-boot/APKBUILD +++ b/user/mactel-boot/APKBUILD @@ -11,7 +11,8 @@ license="GPL-2.0+" depends="" makedepends="" subpackages="$pkgname-doc" -source="http://www.codon.org.uk/~mjg59/mactel-boot/mactel-boot-$pkgver.tar.bz2" +#source="http://www.codon.org.uk/~mjg59/$pkgname/$pkgname-$pkgver.tar.bz2" +source="https://distfiles.adelielinux.org/source/upstream/$pkgname-$pkgver.tar.bz2" build() { make hfs-bless diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 5deb6eb83..1ba1ef5c6 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.13 +pkgver=10.6.4 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -18,14 +18,13 @@ depends="$pkgname-common" depends_dev="openssl-dev zlib-dev" makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libedit-dev libevent-dev libexecinfo-dev libxml2-dev ncurses-dev - linux-pam-dev pcre-dev xz-dev" + linux-pam-dev pcre2-dev xz-dev" _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey" subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded $pkgname-common $pkgname-backup mytop::noarch $pkgname-openrc $pkgname-doc $pkgname-dev" -source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz - crc32-power.patch +source="https://archive.mariadb.org/$pkgname-$pkgver/source/$pkgname-$pkgver.tar.gz gcc_builtins_ppc.h ppchax.patch mariadb.initd @@ -33,6 +32,22 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad " # secfixes: +# 10.6.4-r0: +# - CVE-2020-13249 +# - CVE-2020-2814 +# - CVE-2020-2812 +# - CVE-2020-2760 +# - CVE-2020-2752 +# - CVE-2020-28912 +# - CVE-2020-14812 +# - CVE-2020-14789 +# - CVE-2020-14776 +# - CVE-2020-14765 +# - CVE-2021-27928 +# - CVE-2021-2166 +# - CVE-2021-2154 +# - CVE-2021-2389 +# - CVE-2021-2389 # 10.4.12-r0: # - CVE-2020-7221 @@ -251,11 +266,6 @@ dev() { provides="mysql-dev=$pkgver-r$pkgrel" depends="$pkgname-libs" _install_component Development - - # move symlinks for static libs from libs subpackage to dev - LIB_PATH=${pkgdir}-libs/usr/lib - mv $LIB_PATH/libmysqlclient.a ${subpkgdir}/usr/lib/ - mv $LIB_PATH/libmysqlclient_r.a ${subpkgdir}/usr/lib/ } doc() { @@ -265,8 +275,7 @@ doc() { default_doc } -sha512sums="68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566 mariadb-10.4.13.tar.gz -03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch +sha512sums="c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071 mariadb-10.6.4.tar.gz 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h 0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd diff --git a/user/mariadb/crc32-power.patch b/user/mariadb/crc32-power.patch deleted file mode 100644 index aa269a599..000000000 --- a/user/mariadb/crc32-power.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- mariadb-10.4.6/cmake/crc32.cmake.old 2019-06-17 22:00:31.000000000 +0000 -+++ mariadb-10.4.6/cmake/crc32.cmake 2019-07-06 22:02:39.704198796 +0000 -@@ -1,4 +1,4 @@ --IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -+IF(FALSE) - SET(HAVE_CRC32_VPMSUM 1) - SET(CRC32_LIBRARY crc32-vpmsum) - ADD_SUBDIRECTORY(extra/crc32-vpmsum) diff --git a/user/minicom/APKBUILD b/user/minicom/APKBUILD index 7ff093995..a7ebc7b94 100644 --- a/user/minicom/APKBUILD +++ b/user/minicom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=minicom -pkgver=2.7.1 +pkgver=2.8 pkgrel=0 pkgdesc="Menu-driven communications program for terminals" url="https://fossies.org/linux/minicom/" @@ -10,9 +10,7 @@ license="GPL-2.0+" depends="" makedepends="ncurses-dev gettext-tiny-dev linux-headers" subpackages="$pkgname-doc $pkgname-lang" -source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.gz - fix-includes.patch - " +source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.bz2" build() { ./configure \ @@ -33,5 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b429b32d187c3ee915c5074a0d0f08b7e3951cb8528ecbdd889837ff301662c16740ad77bd2bf3baf759c0a84e779a8dc8fd888a4260a0ace15ebc4c2f697c82 minicom-2.7.1.tar.gz -5acff3efb0b8b02333291722044d7c473bf19eec8a26e66c0e0f41895f3e3f071dff13515ec20f7ce17368732e3674f0a42b38602e61b04e9cd70e61012641ff fix-includes.patch" +sha512sums="535e0df37d8679ff08959b14f1f494a4d632af5a481e49873dd33a6c601de3ce20193ee6314d6c3282775f5adb906521a237bf8ac4b32e2751c754a91d99853f minicom-2.8.tar.bz2" diff --git a/user/minicom/fix-includes.patch b/user/minicom/fix-includes.patch deleted file mode 100644 index 19a18dcdb..000000000 --- a/user/minicom/fix-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- minicom-2.6.2.orig/src/dial.c -+++ minicom-2.6.2/src/dial.c -@@ -39,11 +39,9 @@ - #include "intl.h" - - #ifdef VC_MUSIC --# if defined(__GLIBC__) - # include <sys/ioctl.h> - # include <sys/kd.h> - # include <sys/time.h> --# endif - #endif - - enum { CURRENT_VERSION = 6 }; ---- minicom-2.6.2.orig/src/getsdir.h -+++ minicom-2.6.2/src/getsdir.h -@@ -22,6 +22,7 @@ - * and licensing conditions. See the source, Luke. - */ - -+#include <sys/param.h> - #include <dirent.h> - - typedef struct dirEntry { /* structure of data item */ diff --git a/user/miniupnpc/APKBUILD b/user/miniupnpc/APKBUILD new file mode 100644 index 000000000..c1445066a --- /dev/null +++ b/user/miniupnpc/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=miniupnpc +pkgver=2.2.3 +pkgrel=0 +pkgdesc="A lightweight UPNP client enabling applications to control UPnP gateways" +url="https://miniupnp.tuxfamily.org/" +arch="all" +options="!check" # no tests +license="BSD-3-Clause" +depends="" +makedepends="cmake" +subpackages="$pkgname-dev $pkgname-doc" +source="http://miniupnp.tuxfamily.org/files/miniupnpc-$pkgver.tar.gz + fix-cmake-include-install.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +package() { + make DESTDIR="$pkgdir" install + install -m644 -Dt "$pkgdir"/usr/share/man/man3 man3/miniupnpc.3 +} + + +sha512sums="8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee miniupnpc-2.2.3.tar.gz +426fb6a67f6114e49eef59d7e87a68a749341707eca58699fbe530a49e08c66435e9bd05d8e4ddd30ad1d48d193203cd16f34754bfbe0ac3f68c28f130e41b3d fix-cmake-include-install.patch" diff --git a/user/miniupnpc/fix-cmake-include-install.patch b/user/miniupnpc/fix-cmake-include-install.patch new file mode 100644 index 000000000..0ed4455b1 --- /dev/null +++ b/user/miniupnpc/fix-cmake-include-install.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt 2021-10-06 13:27:48.242245444 +0000 ++++ b/CMakeLists.txt 2021-10-06 13:28:05.140476639 +0000 +@@ -221,16 +221,16 @@ + + if (NOT UPNPC_NO_INSTALL) + install (FILES +- miniupnpc.h +- miniwget.h +- upnpcommands.h +- igd_desc_parse.h +- upnpreplyparse.h +- upnperrors.h +- upnpdev.h +- miniupnpctypes.h +- portlistingparse.h +- miniupnpc_declspec.h ++ include/miniupnpc.h ++ include/miniwget.h ++ include/upnpcommands.h ++ include/igd_desc_parse.h ++ include/upnpreplyparse.h ++ include/upnperrors.h ++ include/upnpdev.h ++ include/miniupnpctypes.h ++ include/portlistingparse.h ++ include/miniupnpc_declspec.h + DESTINATION include/miniupnpc + ) + diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index c88b4cf0a..c5cca6ad2 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.9.3 +pkgver=5.8 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -10,7 +10,7 @@ license="GPL-3.0+" depends="" makedepends="file-dev ncurses-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.nano-editor.org/dist/v${pkgver%.*.*}/$pkgname-$pkgver.tar.xz" +source="https://nano-editor.org/dist/v5/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -40,4 +40,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="eefb88d7141f0c542a2d9b34fc8a079a92e512df0e9dbadcb3d780008ae19faf10296213ecdbf370fa8b81f5f3e81e2d419f5f76e62d669e61997d199a96ba18 nano-4.9.3.tar.xz" +sha512sums="ac614587f1a76c5ccb425fc8b4c6d4f7748dda89b863b2b8c6937b31e837edca5c83e3c13f53c9f5da5a9e24a1d8093c19dd0e8a85723f0bbae57fdab155e15c nano-5.8.tar.xz" diff --git a/user/nmap/APKBUILD b/user/nmap/APKBUILD index 304c94cae..2743df7ae 100644 --- a/user/nmap/APKBUILD +++ b/user/nmap/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nmap -pkgver=7.80 +pkgver=7.92 pkgrel=0 pkgdesc="A network exploration tool and security/port scanner" url="https://nmap.org/" @@ -17,18 +17,12 @@ subpackages=" $pkgname-ncat $pkgname-ncat-doc:ncat_doc netcat::noarch" -source="https://nmap.org/dist/$pkgname-$pkgver.tar.bz2 - nmap-7.80-fix_addrset.patch" +source="https://nmap.org/dist/$pkgname-$pkgver.tar.bz2" # secfixes: # 7.80-r0: # - CVE-2018-15173 -prepare() { - default_prepare - update_config_sub -} - build() { # zenmap and ndiff require python 2 export CFLAGS=-g3 @@ -58,7 +52,7 @@ check() { package() { make DESTDIR="$pkgdir" install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } scripts() { @@ -107,5 +101,4 @@ netcat() { ln -s ncat "$subpkgdir"/usr/bin/nc } -sha512sums="d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b nmap-7.80.tar.bz2 -e079c07716bc847b44cb5ba0c1f71fe7d95e786c7a18dad7927ca29e6f2e20fce3674d939335db038e509755945d1db05a1746b508ada3df011fafb890ab9033 nmap-7.80-fix_addrset.patch" +sha512sums="7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59 nmap-7.92.tar.bz2" diff --git a/user/nmap/nmap-7.80-fix_addrset.patch b/user/nmap/nmap-7.80-fix_addrset.patch deleted file mode 100644 index 3fa009c84..000000000 --- a/user/nmap/nmap-7.80-fix_addrset.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/nbase/nbase_addrset.c b/nbase/nbase_addrset.c -index 6f91bc1b2a..849044e4e3 100644 ---- a/nbase/nbase_addrset.c -+++ b/nbase/nbase_addrset.c -@@ -477,30 +477,32 @@ static int sockaddr_to_addr(const struct sockaddr *sa, u32 *addr) - - static int sockaddr_to_mask (const struct sockaddr *sa, int bits, u32 *mask) - { -- s8 i; -- int unmasked_bits = 0; -+ int i, k; - if (bits >= 0) { - if (sa->sa_family == AF_INET) { -- unmasked_bits = 32 - bits; -+ bits += 96; - } - #ifdef HAVE_IPV6 - else if (sa->sa_family == AF_INET6) { -- unmasked_bits = 128 - bits; -+ ; /* do nothing */ - } - #endif - else { - return 0; - } - } -+ else -+ bits = 128; -+ k = bits / 32; - for (i=0; i < 4; i++) { -- if (unmasked_bits <= 32 * (3 - i)) { -+ if (i < k) { - mask[i] = 0xffffffff; - } -- else if (unmasked_bits >= 32 * (4 - i)) { -+ else if (i > k) { - mask[i] = 0; - } - else { -- mask[i] = ~((1 << (unmasked_bits - (32 * (4 - i)))) - 1); -+ mask[i] = 0xfffffffe << (31 - bits % 32); - } - } - return 1; -diff --git a/ncat/test/test-addrset.sh b/ncat/test/test-addrset.sh -index 7f54023c52..285c7b675a 100755 ---- a/ncat/test/test-addrset.sh -+++ b/ncat/test/test-addrset.sh -@@ -208,6 +208,25 @@ test_addrset "1:2::0003/120" "1:2::3 1:2::0 1:2::ff" <<EOF - 1:3::3 - EOF - -+# IPv6 CIDR netmask. -+test_addrset "1:2::3:4:5/95" "1:2::3:4:5 1:2::2:0:0 1:2::3:ffff:ffff" <<EOF -+1:2::3:4:5 -+1:2::1:ffff:ffff -+1:2::2:0:0 -+1:2::3:ffff:ffff -+1:2::4:0:0 -+1:3::3 -+EOF -+ -+# IPv6 CIDR netmask. -+test_addrset "11::2/15" "11::2:3:4:5 10::1 11:ffff:ffff:ffff:ffff:ffff:ffff:ffff" <<EOF -+11::2:3:4:5 -+9:ffff:ffff:ffff:ffff:ffff:ffff:ffff -+10::1 -+11:ffff:ffff:ffff:ffff:ffff:ffff:ffff -+12::0 -+EOF -+ - # /128 netmask. - test_addrset "1:2::0003/128" "1:2::3" <<EOF - 1:2::3 diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD index 98aa4a16d..b8880a511 100644 --- a/user/numactl/APKBUILD +++ b/user/numactl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Daniel Sabogal <dsabogalcc@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=numactl -pkgver=2.0.13 +pkgver=2.0.14 pkgrel=0 pkgdesc="Simple NUMA policy support" url="https://github.com/numactl/numactl" @@ -45,5 +45,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="328e2c9ff102f3402f02aac0c94a06c3d352a026ffb6dc31edb4dca029a530719f6dd9903163f6c2eef1a24f6aac10c2a6a52cefcdf7cf0bd9e3844ac85096d8 numactl-2.0.13.tar.gz +sha512sums="adaf405f092fd9653f26d00f8c80cb83852c56ebd5d00e714e20d505008e74aa7105b0fb7aa55a605deac0d1491ceff57de931037d33e7944fca105bc6510ed4 numactl-2.0.14.tar.gz c24affa5a8a8ea83d7f0ee384dc0629e17a5c4201357132f770f894ad4236772116d96d8389d54fb99095af40d1ccbffc3170b5fb9cc88cfca39179f50bee9c9 musl.patch" diff --git a/user/olm/APKBUILD b/user/olm/APKBUILD index f38004886..335484639 100644 --- a/user/olm/APKBUILD +++ b/user/olm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=olm -pkgver=3.2.1 +pkgver=3.2.6 pkgrel=0 pkgdesc="Implementation of the olm and megolm cryptographic ratchets" url="https://gitlab.matrix.org/matrix-org/olm/" @@ -12,6 +12,10 @@ makedepends="cmake" subpackages="$pkgname-dev" source="https://gitlab.matrix.org/matrix-org/olm/-/archive/$pkgver/olm-$pkgver.tar.bz2" +# secfixes: +# 3.2.6-r0: +# - CVE-2021-34813 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -36,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="adb9cff6148d19df4b83a287723219d4da9efd162f7a2824bee63d824d22c20a10fd2c2d8ce74aff5ec006c6dc8828bd6851cc82be93bc6c4524cf7067080412 olm-3.2.1.tar.bz2" +sha512sums="e22af4e7791962978ea4c39b9bebf807a864ca52b329f032e5e398864cd142c1f166aadbce74cb85f776cb0b8352754151f64c60dac2ce1858def73d684fd44a olm-3.2.6.tar.bz2" diff --git a/user/openal-soft/APKBUILD b/user/openal-soft/APKBUILD index 3f5f9c29d..0522aaa9c 100644 --- a/user/openal-soft/APKBUILD +++ b/user/openal-soft/APKBUILD @@ -1,5 +1,5 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=openal-soft pkgver=1.19.1 pkgrel=0 @@ -12,7 +12,7 @@ depends="" depends_dev="alsa-lib-dev" makedepends="$depends_dev cmake linux-headers pulseaudio-dev" subpackages="$pkgname-dev" -source="https://kcat.strangesoft.net/openal-releases/${pkgname}-${pkgver}.tar.bz2" +source="https://openal-soft.org/openal-releases/${pkgname}-${pkgver}.tar.bz2" build() { local _cpuext_neon="" diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD index 0e79f2369..24e0e621e 100644 --- a/user/opengfx/APKBUILD +++ b/user/opengfx/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="grfcodec nml cmd:unix2dos cmd:which" subpackages="" -source="https://cdn.openttd.org/opengfx-releases/$pkgver/$pkgname-$pkgver-source.tar.xz" +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz" builddir="$srcdir/$pkgname-$pkgver-source" build() { diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD index 04782e944..c3aedd777 100644 --- a/user/openmsx/APKBUILD +++ b/user/openmsx/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="python3" subpackages="" -source="https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-$pkgver-source.tar.gz +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.gz python3.patch python3-bang.patch " diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD index 130747b3b..08a453d65 100644 --- a/user/opensfx/APKBUILD +++ b/user/opensfx/APKBUILD @@ -10,7 +10,7 @@ license="CC-Sampling-Plus-1.0" depends="" makedepends="catcodec" subpackages="" -source="https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-$pkgver-source.tar.gz" +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.gz" builddir="$srcdir/$pkgname-$pkgver-source" build() { diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD index 4bde85eb7..079b4bbdb 100644 --- a/user/otf-exo/APKBUILD +++ b/user/otf-exo/APKBUILD @@ -10,7 +10,7 @@ options="!check" # No tests license="OFL-1.1" depends="fontconfig" makedepends="" -source="http://ndiscovered.com/archives/exo-$pkgver.zip" +source="https://web.archive.org/web/20190802223635/http://ndiscovered.com/archives/exo-2.zip" package() { mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} diff --git a/user/password-store/APKBUILD b/user/password-store/APKBUILD index 972bdb26a..292b9a6e8 100644 --- a/user/password-store/APKBUILD +++ b/user/password-store/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=password-store -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=0 pkgdesc="Stores, retrieves, generates, and synchronizes passwords securely" url="https://www.passwordstore.org" @@ -18,6 +18,10 @@ subpackages="$pkgname-doc $pkgname-zsh-completion:zshcomp" source="https://git.zx2c4.com/password-store/snapshot/$pkgname-$pkgver.tar.xz" +# secfixes: +# 1.7.4-r0: +# - CVE-2020-28086 + package() { make DESTDIR="$pkgdir" \ WITH_ALLCOMP=yes install @@ -59,4 +63,4 @@ zshcomp() { "$subpkgdir"/usr/share/zsh/site-functions } -sha512sums="89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7 password-store-1.7.3.tar.xz" +sha512sums="1fe108895b224451b54e545d399b6a97040e094049448509f92ae33164a5cf9044a91f52edfc705fcf333f6526df1a478deeebc4df109764d58100f9e3e22681 password-store-1.7.4.tar.xz" diff --git a/user/pigz/APKBUILD b/user/pigz/APKBUILD index 0f8ea3a0b..aa203992d 100644 --- a/user/pigz/APKBUILD +++ b/user/pigz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pigz -pkgver=2.4 +pkgver=2.6 pkgrel=0 pkgdesc="Parallel implementation of gzip" url="http://zlib.net/pigz/" @@ -30,4 +30,4 @@ package() { install -m644 pigz.1 "$pkgdir"/usr/share/man/man1 } -sha512sums="79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba pigz-2.4.tar.gz" +sha512sums="04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2 pigz-2.6.tar.gz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index bc48295b7..07d74b492 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.4.14 +pkgver=3.6.2 pkgrel=0 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" @@ -18,7 +18,7 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc install="$pkgname.pre-install" provider_priority=1 provides="sendmail" -source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz +source="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/$pkgname-$pkgver.tar.gz honour-config-directory.patch postfix.initd " @@ -92,6 +92,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="520ec509dbf83390b480e4db5320b78162bb4d16e58b8a63de08c8012555150145ac3630931ab6bfd36e7ff82e75749ead8e0dce3fe645bc58ac1ec709e7dfd3 postfix-3.4.14.tar.gz +sha512sums="464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9 postfix-3.6.2.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index fcaba3da2..1ef7ec988 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.11.4 -_tstver=1.8.1 +pkgver=3.18.1 +_tstver=1.11.0 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" url="https://github.com/google/protobuf" @@ -13,16 +13,15 @@ options="!check" # Broken everywhere. license="BSD-3-Clause" depends_dev="zlib-dev" makedepends="$depends_dev autoconf automake libtool ruby ruby-dev ruby-rake - ruby-rake-compiler python3 python3-dev" + ruby-rake-compiler ruby-io-console ruby-irb ruby-power_assert + ruby-rake-compiler ruby-test-unit ruby-reline ruby-rubygems-tasks + python3 python3-dev" checkdepends="ruby-json ruby-test-unit" subpackages="ruby-$_gemname:_ruby py3-$pkgname:_python $pkgname-dev $pkgname-vim::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pkgver.tar.gz googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/release-$_tstver.tar.gz" prepare() { - default_prepare - ./autogen.sh - # symlink tests to the test directory rm -rf third_party/* ln -sf "$srcdir"/googletest-release-$_tstver \ @@ -31,18 +30,26 @@ prepare() { build() { # Build Protobuf - CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" LDFLAGS="$LDFLAGS -latomic" \ - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} cmake make # Build for Ruby cd "$builddir"/ruby # Generate proto files for built-in protocols. - rake genproto + export LD_LIBRARY_PATH=${builddir} + export CPPFLAGS="-L${builddir}" + export PATH="${builddir}:$PATH" + rake gem build $_gemname.gemspec gem install --local \ --install-dir dist \ @@ -53,16 +60,12 @@ build() { # Build for Python 3 cd "$builddir"/python - export LD_LIBRARY_PATH=${builddir}/src/.libs python3 setup.py build --cpp_implementation # Build test-suite - local test; for test in googletest googlemock; do - cd "$builddir/third_party/googletest/$test" - autoreconf -vfi - ./configure - make - done + cd "$builddir"/third_party/googletest/ + cmake . + make } check() { @@ -111,5 +114,5 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 protobuf-3.11.4.tar.gz -e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" +sha512sums="d8ee0ae70ca4920787fca0e7d3053281754123a54280ce678d6ccaf294949959719a882c9e07300ab94e666ceb800967bcd549fa603d89b73f91e9368bd8f119 protobuf-3.18.1.tar.gz +6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 googletest-1.11.0.tar.gz" diff --git a/user/purple-plugin-pack/APKBUILD b/user/purple-plugin-pack/APKBUILD index 1cbf72a67..c49bf6e7d 100644 --- a/user/purple-plugin-pack/APKBUILD +++ b/user/purple-plugin-pack/APKBUILD @@ -10,7 +10,7 @@ license="GPL-2.0-only" depends="" makedepends="gtkspell-dev intltool pidgin-dev" subpackages="$pkgname-lang" -source="https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-$pkgver.tar.bz2 +source="https://master.dl.sourceforge.net/project/pidgin/purple%20plugin%20pack/$pkgver/$pkgname-$pkgver.tar.bz2 python.patch " diff --git a/user/rc/APKBUILD b/user/rc/APKBUILD index aef05b35a..0211e3fed 100644 --- a/user/rc/APKBUILD +++ b/user/rc/APKBUILD @@ -10,7 +10,8 @@ license="Zlib" depends="" makedepends="libedit-dev" subpackages="$pkgname-doc" -source="http://static.tobold.org/$pkgname/$pkgname-$pkgver.tar.gz" +#source="http://static.tobold.org/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://distfiles.adelielinux.org/source/upstream/$pkgname-$pkgver.tar.gz" build() { ./configure \ diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD index 383e98045..8737dcbcf 100644 --- a/user/rpcbind/APKBUILD +++ b/user/rpcbind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=rpcbind -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc="portmap replacement which supports RPC over various protocols" url="http://rpcbind.sourceforge.net" @@ -38,6 +38,6 @@ package() { install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING } -sha512sums="e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4 rpcbind-1.2.5.tar.bz2 +sha512sums="fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7 rpcbind-1.2.6.tar.bz2 1cd655d86226a45fa3e927f8ac2bb580537644d2fb3684e0f4a956bf3721c95d95b8b8c1d9a2a742fb714eeba9277e0400a7493bf1bf676466d70adb2b35a88e rpcbind.initd 0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3 rpcbind.confd" diff --git a/user/ruby-reline/APKBUILD b/user/ruby-reline/APKBUILD new file mode 100644 index 000000000..0230e3c67 --- /dev/null +++ b/user/ruby-reline/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=ruby-reline +_gemname=${pkgname#ruby-} +pkgver=0.2.7 +pkgrel=0 +pkgdesc="Reline is compatible with the API of Ruby's stdlib 'readline', GNU Readline and Editline" +url="https://github.com/ruby/reline" +arch="all" +license="BSD-2-Clause" +depends="ruby" +checkdepends="ruby-rspec" +makedepends="ruby-rake" +source="ruby-reline-$pkgver.tar.gz::https://github.com/ruby/$_gemname/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_gemname-$pkgver" + +build() { + gem build $_gemname.gemspec +} + +check() { + rspec spec +} + +package() { + gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" + + gem install --local \ + --install-dir "$gemdir" \ + --bindir "$pkgdir/usr/bin" \ + --ignore-dependencies \ + --no-document \ + --verbose \ + $_gemname + + # Remove unnecessary files and empty directories. + cd "$gemdir" + rm -r cache build_info doc +} + +sha512sums="3543207d79a9cb5293cefb4771a5d30bfa158915f2ba84db1cd04b1c89b21288542e52a2e43e2ca057bad91c926052dc3ba404319a5eb4044ab054b6c3cab465 ruby-reline-0.2.7.tar.gz" diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 33fb1a78a..5ae38e03f 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.9.2 +pkgver=3.10.1 pkgrel=0 pkgdesc="RSpec runner and formatters" url="https://relishapp.com/rspec/rspec-core" @@ -37,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="19c88cc73bcdd5be1136cc2d9e0fdb665c5b1c0a2ed92feb2c225264816387d2cbef2ff3555aab90a3921e39b05f30619acdcf20f92f4abf8e4eccd7fcb329f5 ruby-rspec-core-3.9.2.tar.gz +sha512sums="2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5 ruby-rspec-core-3.10.1.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index 68c6dc95e..6a50d98c0 100644 --- a/user/ruby-rspec-expectations/APKBUILD +++ b/user/ruby-rspec-expectations/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-expectations _gemname=${pkgname#ruby-} -pkgver=3.9.2 +pkgver=3.10.1 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="d3ae1c93e936acc2278b5beaded9255ef78e3e9d0fed1cc9a14010930a396841bf4937cade164d0c9f4f2e4cafad86ab511309156e45387b624907365e7e611a ruby-rspec-expectations-3.9.2.tar.gz +sha512sums="35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4 ruby-rspec-expectations-3.10.1.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD index f84c951d9..6766925b7 100644 --- a/user/ruby-rspec-mocks/APKBUILD +++ b/user/ruby-rspec-mocks/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-mocks _gemname=${pkgname#ruby-} -pkgver=3.9.1 -pkgrel=1 +pkgver=3.10.2 +pkgrel=0 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking" url="https://relishapp.com/rspec/rspec-mocks/" arch="noarch" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f ruby-rspec-mocks-3.9.1.tar.gz +sha512sums="ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb ruby-rspec-mocks-3.10.2.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index 929134ede..1bcdea473 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.9.3 +pkgver=3.10.2 pkgrel=0 pkgdesc="Support utilities for RSpec gems" url="https://rubygems.org/gems/rspec-support" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="ae66620f0a62bd0c0feea33ec45a0dc1029fa75efd399fe4fb10e53bea6652b93b84beb60e44003eeea9c8e374b403c39233842e55d6a3685347f740b9734481 ruby-rspec-support-3.9.3.tar.gz +sha512sums="bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be ruby-rspec-support-3.10.2.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/ruby-rspec/APKBUILD b/user/ruby-rspec/APKBUILD index a3055f056..62b1ee331 100644 --- a/user/ruby-rspec/APKBUILD +++ b/user/ruby-rspec/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec _gemname=${pkgname#ruby-} -pkgver=3.9.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Behaviour Driven Development for Ruby" url="http://rspec.info/" @@ -38,5 +38,5 @@ package() { "$gemdir"/doc } -sha512sums="f6869ca17252ad27de1307b9c75f7184e4b397000fdabe9ab9bcd02805981549831c82f5d5c07838315da2c3a1e004431e02714291bb9da3bd83ac0ee56c170c ruby-rspec-3.9.0.tar.gz +sha512sums="afc2b04d0cfbe26d5f485c3d22e68a95394d5f0e3be44849562d565bd87eba9157f8ee9e1faee9ad22b7572906d17db242913036b9960f5d3871c7df5140629c ruby-rspec-3.10.0.tar.gz f554eef881574e68532dd6c9edeb6b8ad172ac707f7518134378e1099a40ada959c6c770514aab13a6345343113594208be0e42044803c0c2cde3adde00c5520 gemspec.patch" diff --git a/user/ruby-rubygems-tasks/APKBUILD b/user/ruby-rubygems-tasks/APKBUILD new file mode 100644 index 000000000..14dcc9bc5 --- /dev/null +++ b/user/ruby-rubygems-tasks/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=ruby-rubygems-tasks +_gemname=${pkgname#ruby-} +pkgver=0.2.5 +pkgrel=0 +pkgdesc="Provides agnostic and unobtrusive Rake tasks for maintaining Ruby Gems" +url="https://github.com/postmodern/rubygems-tasks" +arch="all" +license="MIT" +depends="ruby ruby-irb" +checkdepends="ruby-rspec" +makedepends="ruby-rake" +source="ruby-reline-$pkgver.tar.gz::https://github.com/postmodern/$_gemname/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_gemname-$pkgver" + +build() { + gem build $_gemname.gemspec +} + +check() { + rspec spec +} + +package() { + gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" + + gem install --local \ + --install-dir "$gemdir" \ + --bindir "$pkgdir/usr/bin" \ + --ignore-dependencies \ + --no-document \ + --verbose \ + $_gemname + + # Remove unnecessary files and empty directories. + cd "$gemdir" + rm -r cache build_info doc +} + +sha512sums="518c1a4ccf3720ac16278359ebacf25fee298989ccc672bffc94119b005cbaffe668652c5081de3e6e0c321bfeeca61c6b93ba5d0741d5fa9a8ced34f5e5e889 ruby-reline-0.2.5.tar.gz" diff --git a/user/rxvt-unicode/APKBUILD b/user/rxvt-unicode/APKBUILD index b9802516b..baefb8e4b 100644 --- a/user/rxvt-unicode/APKBUILD +++ b/user/rxvt-unicode/APKBUILD @@ -15,7 +15,7 @@ depends="$pkgname-terminfo" makedepends="libx11-dev libxft-dev ncurses fontconfig-dev utmps-dev gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev" subpackages="$pkgname-doc $pkgname-terminfo::noarch" -source="http://dist.schmorp.de/$pkgname/$pkgname-$pkgver.tar.bz2 +source="http://dist.schmorp.de/$pkgname/Attic/$pkgname-$pkgver.tar.bz2 gentables.patch kerning.patch " diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index 2adad7910..09bcb261b 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.3.5.0 +pkgver=2.3.5.2 pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -59,4 +59,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="994a786b8d725cc98640be102e05a25f033624fbf8762fc53361555f4a721f5be819e282b907ceedaa0c1adbd670c80e1819096dc2ff7e2a2e476098bded3ade s6-dns-2.3.5.0.tar.gz" +sha512sums="a2b88ea70b183128ba3959e7ea00ef96c0aa7c0533d69bbd0a1050aa0272e129571135ae6939b0079f353c4c723652c9205e7ec8ed6ab785320ce46c250d8340 s6-dns-2.3.5.2.tar.gz" diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index 2a4e8e8d6..9910e8b61 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.5.1.4 +pkgver=2.5.1.6 pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.10 +_skalibs_version=2.11 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -34,4 +34,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="e88ba46b63fc2823e4721c2d87bca128df5a7d44769c09fee19b5cc25bb9be334241262aba13c421c3211dc4dc47ec919f504af81a6f3ccfb80efa357b8b7549 s6-linux-utils-2.5.1.4.tar.gz" +sha512sums="792b300bae78f48a1d79d59368c9510d313dce259cb88a9bd8a83d8b841969654b4ef50e4f3133efb9263c2d11f3cac469aa123e2d9d5ad8536f04d89004abf0 s6-linux-utils-2.5.1.6.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 6683aecdd..3e3b201e7 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.4.1.0 +pkgver=2.5.0.0 pkgrel=0 -pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities." +pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities." url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 depends="execline" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -62,4 +62,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22 s6-networking-2.4.1.0.tar.gz" +sha512sums="f6ddd5a2310721b58325ff79eebc5f397c33280e25010f489c4ab53beba89ae5c060d6b6576c26e4f6a43dc217a7d1bbb2d4b47db8cecf0687276dcb236a4a61 s6-networking-2.5.0.0.tar.gz" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 6ee77bb99..3943de926 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.3.1 +pkgver=2.2.3.3 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.10 +_skalibs_version=2.11 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="76c464b90b5c67f87bec053cadb5dac1b5928df7f373b7a0b6700e8ab684fb8c5354788720e216f1fb9e332a0a5dec92618aee3e0f6ff578c8aa42f2aa787549 s6-portable-utils-2.2.3.1.tar.gz" +sha512sums="f3f2e2f47ac61bad23e04a7e27cb833c21be610d54b50fc0f69d7a4d8f19e435a97bd1d570eb2b159d3e0a8b135aaa04cf02bd0a8dc216e0f6872af9c7649461 s6-portable-utils-2.2.3.3.tar.gz" diff --git a/user/smartmontools/APKBUILD b/user/smartmontools/APKBUILD index e035c815d..a306f9bfe 100644 --- a/user/smartmontools/APKBUILD +++ b/user/smartmontools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=smartmontools -pkgver=7.1 +pkgver=7.2 pkgrel=0 pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives" url="https://www.smartmontools.org/" @@ -35,6 +35,6 @@ package() { install -Dm644 "$srcdir"/smartd.confd "$pkgdir"/etc/conf.d/smartd } -sha512sums="440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295 smartmontools-7.1.tar.gz +sha512sums="d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea smartmontools-7.2.tar.gz 61cae548fc9f3a9fbea20d684502d3816e7b0b60fcf533ae4e1ab850725c208eb6ba5012ae154a46f0b7bb7285a9e63cbdecafed8db7fd63fda0ba59081260cc smartd.initd ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 smartd.confd" diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD index d2d2ec909..81b99632b 100644 --- a/user/tcpdump/APKBUILD +++ b/user/tcpdump/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcpdump -pkgver=4.9.3 -pkgrel=1 +pkgver=4.99.1 +pkgrel=0 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -10,9 +10,12 @@ license="BSD-3-Clause" depends="" makedepends="libpcap-dev openssl-dev perl" subpackages="$pkgname-doc" -source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz" +source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz + rm-vendor-specific-tests.patch" # secfixes: +# 4.99.1-r0: +# - CVE-2020-8037 # 4.9.2-r1: # - CVE-2018-19519 # 4.9.2-r2: @@ -65,4 +68,5 @@ package() { rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 tcpdump-4.9.3.tar.gz" +sha512sums="53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7 tcpdump-4.99.1.tar.gz +83e731c2c253e69a9fb5d2d42abbe8cc6439d3d9dadd2e412ed0e2a83d820228a1f4018fa1627568c723d376562a85bd099dd2738fd79dcc63abcfc8306fece3 rm-vendor-specific-tests.patch" diff --git a/user/tcpdump/rm-vendor-specific-tests.patch b/user/tcpdump/rm-vendor-specific-tests.patch new file mode 100644 index 000000000..234124b00 --- /dev/null +++ b/user/tcpdump/rm-vendor-specific-tests.patch @@ -0,0 +1,34 @@ +--- ./tests/TESTLIST 2021-10-04 13:24:39.359685770 +0000 ++++ ./tests/TESTLIST 2021-10-04 13:26:27.408368225 +0000 +@@ -36,24 +36,24 @@ + bgp-rt-prefix bgp-rt-prefix.pcap bgp-rt-prefix.out -v + + # Broadcom tag tests +-brcmtag brcm-tag.pcap brcm-tag.out +-brcmtag-e brcm-tag.pcap brcm-tag-e.out -e +-brcmtagprepend brcm-tag-prepend.pcap brcm-tag-prepend.out -e ++#brcmtag brcm-tag.pcap brcm-tag.out ++#brcmtag-e brcm-tag.pcap brcm-tag-e.out -e ++#brcmtagprepend brcm-tag-prepend.pcap brcm-tag-prepend.out -e + + # Broadcom LI + bcm-li bcm-li.pcap bcm-li.out + bcm-li-v bcm-li.pcap bcm-li-v.out -v + + # Marvell DSA tag tests +-dsa dsa.pcap dsa.out +-dsa-e dsa.pcap dsa-e.out -e ++#dsa dsa.pcap dsa.out ++#dsa-e dsa.pcap dsa-e.out -e + + # EAP tests + # now in smb.tests + + # Marvell DSA tag tests +-edsa edsa.pcap edsa.out +-edsa-e edsa.pcap edsa-e.out -e ++#edsa edsa.pcap edsa.out ++#edsa-e edsa.pcap edsa-e.out -e + + # ESP tests + esp0 02-sunrise-sunset-esp.pcap esp0.out diff --git a/user/tcsh/APKBUILD b/user/tcsh/APKBUILD index 41b8a2e25..2a926d652 100644 --- a/user/tcsh/APKBUILD +++ b/user/tcsh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcsh -pkgver=6.22.02 +pkgver=6.22.04 _pkgver=${pkgver%.*.*}_${pkgver#*.} _pkgver=${_pkgver%.*}_${_pkgver#*.} pkgrel=0 @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8b0bd11c8c297d155ed386fd9552d4d4da79375b1d7801edf20a8cdc8ad797f10e1c28b3f6527a657dc2f38704ba4cea51612aefa0987ee968b385ad8dea5199 tcsh-6.22.02.tar.gz +sha512sums="0f4b70c1c5bb29fb56a2eacac5c766914cb5042a9cf94e92735ef5ff2ca1162b345cf21b6b645020a5122b820a92678109bb1072b0c73c89fa70bd710aa1dd5f tcsh-6.22.04.tar.gz 40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch" diff --git a/user/tmux-bash-completion/APKBUILD b/user/tmux-bash-completion/APKBUILD index fe35c7d11..a147f5a59 100644 --- a/user/tmux-bash-completion/APKBUILD +++ b/user/tmux-bash-completion/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=tmux-bash-completion pkgver=1.0.0_git20170805 _commit=847eda60c4664bfca833a086a3e2167957c26be0 diff --git a/user/transmission/APKBUILD b/user/transmission/APKBUILD index 9f2a97963..a5ac0589b 100644 --- a/user/transmission/APKBUILD +++ b/user/transmission/APKBUILD @@ -1,59 +1,53 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=transmission -pkgver=2.94 +pkgver=3.00 pkgrel=0 pkgdesc="Lightweight GTK BitTorrent client" url="https://transmissionbt.com/" arch="all" license="GPL-2.0+ AND MIT" -depends="" +depends="" makedepends="bsd-compat-headers curl-dev dbus-glib-dev gtk+3.0-dev intltool - libevent-dev libnotify-dev openssl-dev qt5-qtbase-dev" + libevent-dev libnotify-dev openssl-dev qt5-qtbase-dev glib-dev + miniupnpc-dev libnatpmp-dev wayland-protocols qdbus qt5-qttools-dev" install="transmission.post-install transmission-daemon.pre-install transmission-daemon.post-upgrade" pkgusers="transmission" pkggroups="transmission" source="https://github.com/transmission/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz transmission-daemon.initd transmission-daemon.confd + fix-release-tarball.patch " subpackages="$pkgname-qt $pkgname-gtk $pkgname-cli $pkgname-daemon $pkgname-doc $pkgname-lang" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-utp \ - --with-inotify \ - --enable-cli + mkdir build && cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -DWITH_LIBAPPINDICATOR=NO \ + -DENABLE_QT=ON \ + -DENABLE_GTK=ON \ + -DENABLE_CLI=ON \ + -DINSTALL_LIB=ON \ + .. make - - # build for Qt - cd qt - qmake qtr.pro - make - } check() { - msg "Checking for Transmission Core and GTK" - make check - - # check for Qt - this historically has no tests - msg "Checking for Transmission Qt" - make -C qt check + cd build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { + cd build make DESTDIR="$pkgdir" install - - # install for Qt - make INSTALL_ROOT="$pkgdir/usr" -C qt install } qt() { @@ -102,6 +96,7 @@ cli() { "$subpkgdir"/usr/bin/ } -sha512sums="ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7 transmission-2.94.tar.xz +sha512sums="eeaf7fe46797326190008776a7fa641b6341c806b0f1684c2e7326c1284832a320440013e42a37acda9fd0ee5dca695f215d6263c8acb39188c5d9a836104a61 transmission-3.00.tar.xz d31275fba7eb322510f9667e66a186d626889a6e3143be2923aae87b9c35c5cf0c508639f1cb8c1b88b1e465bc082d80bb1101385ebde736a34d4eeeae0f6e15 transmission-daemon.initd -a3b9ac2b7bbe30e33060c8b6a693dc7072d3c6ac44f92ddd567969d8f57a0bfc1a561e781ae167703ccb4b2fd5b0e6d8f8a66c5ba14fe01d8d89a501d4501474 transmission-daemon.confd" +a3b9ac2b7bbe30e33060c8b6a693dc7072d3c6ac44f92ddd567969d8f57a0bfc1a561e781ae167703ccb4b2fd5b0e6d8f8a66c5ba14fe01d8d89a501d4501474 transmission-daemon.confd +4d6a9fa4dc49ff785847c20097e1968373b4636da7c70e17912aadff31ff182a8fb31a81e278531296040cf2de6077c6a446a54146c9a92571f6a9d9b4aed661 fix-release-tarball.patch" diff --git a/user/transmission/fix-release-tarball.patch b/user/transmission/fix-release-tarball.patch new file mode 100644 index 000000000..b4629345f --- /dev/null +++ b/user/transmission/fix-release-tarball.patch @@ -0,0 +1,2511 @@ +diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am +index 0885fab0d2..d9a61c12f1 100644 +--- a/libtransmission/Makefile.am ++++ b/libtransmission/Makefile.am +@@ -316,3 +316,6 @@ watchdir_generic_test_CPPFLAGS = -DWATCHDIR_TEST_FORCE_GENERIC $(AM_CPPFLAGS) + rename_test_SOURCES = rename-test.c $(TEST_SOURCES) + rename_test_LDADD = ${apps_ldadd} + rename_test_LDFLAGS = ${apps_ldflags} ++ ++EXTRA_DIST = \ ++ subprocess-test.cmd +diff --git a/macosx/Makefile.am b/macosx/Makefile.am +index 27abb77b66..5a6fec9ef8 100644 +--- a/macosx/Makefile.am ++++ b/macosx/Makefile.am +@@ -95,6 +95,8 @@ EXTRA_DIST = \ + InfoTabButtonBack.m \ + InfoTabButtonCell.h \ + InfoTabButtonCell.m \ ++ InfoTabMatrix.h \ ++ InfoTabMatrix.m \ + InfoTextField.h \ + InfoTextField.m \ + InfoActivityViewController.h \ +diff --git a/po/LINGUAS b/po/LINGUAS +index 08629cd1b2..6b3145a37a 100644 +--- a/po/LINGUAS ++++ b/po/LINGUAS +@@ -68,6 +68,7 @@ pa + pl + pt + pt_BR ++pt_PT + ro + ru + si +diff --git a/third-party/Makefile.am b/third-party/Makefile.am +index 9f66878d90..33df96d42d 100644 +--- a/third-party/Makefile.am ++++ b/third-party/Makefile.am +@@ -22,5 +22,8 @@ SUBDIRS = \ + $(UTP_DIR) + + EXTRA_DIST = \ ++ curl \ ++ libevent \ ++ openssl \ + macosx-libevent-config.h \ + macosx-libevent-event-config.h +diff --git a/libtransmission/subprocess-test.cmd b/libtransmission/subprocess-test.cmd +new file mode 100644 +index 0000000..4d08d06 +--- /dev/null ++++ b/libtransmission/subprocess-test.cmd +@@ -0,0 +1,48 @@ ++@echo off ++setlocal EnableExtensions EnableDelayedExpansion ++ ++set __argc=0 ++for %%i in (%*) do ( ++ set /a __argc+=1 ++ set "__argv[!__argc!]=%%~i" ++) ++ ++set "result_path=!__argv[1]!" ++set "test_action=!__argv[2]!" ++ ++set "temp_result_path=%result_path%.tmp" ++>"%temp_result_path%" <nul set /p= ++ ++if "%test_action%" == "--dump-args" goto dump_args ++if "%test_action%" == "--dump-env" goto dump_env ++if "%test_action%" == "--dump-cwd" goto dump_cwd ++ ++exit /b 1 ++ ++:dump_args ++ for /l %%i in (3,1,%__argc%) do ( ++ >>"%temp_result_path%" echo.!__argv[%%i]! ++ ) ++ goto finish ++ ++:dump_env ++ for /l %%i in (3,1,%__argc%) do ( ++ >>"%temp_result_path%" call :dump_env_var "!__argv[%%i]!" ++ ) ++ goto finish ++ ++:dump_env_var ++ if defined %~1 ( ++ echo.!%~1! ++ ) else ( ++ echo.^<null^> ++ ) ++ exit /b 0 ++ ++:dump_cwd ++ >>"%temp_result_path%" echo.%CD% ++ goto finish ++ ++:finish ++ >nul move /y "%temp_result_path%" "%result_path%" ++ exit /b 0 +diff --git a/po/pt_PT.po b/po/pt_PT.po +new file mode 100644 +index 0000000..d9346f8 +--- /dev/null ++++ b/po/pt_PT.po +@@ -0,0 +1,2402 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ++# ++# Translators: ++# Gonçalo Matos , 2017 ++# String YM <inactive+StringYM@transifex.com>, 2017 ++# Rui <xymarior@yandex.com>, 2019 ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2020-05-14 18:55+0300\n" ++"PO-Revision-Date: 2017-01-26 19:47+0000\n" ++"Last-Translator: Rui <xymarior@yandex.com>, 2019\n" ++"Language-Team: Portuguese (Portugal) (https://www.transifex.com/transmissionbt/teams/33778/pt_PT/)\n" ++"Language: pt_PT\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: ../cli/cli.c:114 ../gtk/util.c:92 ../libtransmission/utils.c:1694 ++msgid "None" ++msgstr "Nenhum" ++ ++#: ../gtk/actions.c:31 ++msgid "Sort by _Activity" ++msgstr "Ordernar por: _Atividade" ++ ++#: ../gtk/actions.c:32 ++msgid "Sort by _Name" ++msgstr "Ordenar por: _Nome" ++ ++#: ../gtk/actions.c:33 ++msgid "Sort by _Progress" ++msgstr "Ordenar por: _Progresso" ++ ++#: ../gtk/actions.c:34 ++msgid "Sort by _Queue" ++msgstr "Ordenar por: _Data" ++ ++#: ../gtk/actions.c:35 ++msgid "Sort by Rati_o" ++msgstr "Ordenar por: Percent_agem" ++ ++#: ../gtk/actions.c:36 ++msgid "Sort by Stat_e" ++msgstr "Ordenar por: _Estado" ++ ++#: ../gtk/actions.c:37 ++msgid "Sort by A_ge" ++msgstr "Ordenar por: A_ge" ++ ++#: ../gtk/actions.c:38 ++msgid "Sort by Time _Left" ++msgstr "Ordenar por: Time_Left" ++ ++#: ../gtk/actions.c:39 ++msgid "Sort by Si_ze" ++msgstr "Ordenar por: Si:ze" ++ ++#: ../gtk/actions.c:53 ++msgid "_Show Transmission" ++msgstr "_Mostrar o Transmission" ++ ++#: ../gtk/actions.c:54 ++msgid "Message _Log" ++msgstr "_Registo de Mensagens" ++ ++#: ../gtk/actions.c:67 ++msgid "Enable Alternative Speed _Limits" ++msgstr "Ativar _Limites de Velocidade Alternativos" ++ ++#: ../gtk/actions.c:68 ++msgid "_Compact View" ++msgstr "Vista _Compacta" ++ ++#: ../gtk/actions.c:69 ++msgid "Re_verse Sort Order" ++msgstr "In_verter Ordenação" ++ ++#: ../gtk/actions.c:70 ++msgid "_Filterbar" ++msgstr "Barra de _Filtros" ++ ++#: ../gtk/actions.c:71 ++msgid "_Statusbar" ++msgstr "Barra de E_stado" ++ ++#: ../gtk/actions.c:72 ++msgid "_Toolbar" ++msgstr "Barra de Ferramen_tas" ++ ++#: ../gtk/actions.c:77 ++msgid "_File" ++msgstr "_Ficheiro" ++ ++#: ../gtk/actions.c:78 ++msgid "_Torrent" ++msgstr "_Torrent" ++ ++#: ../gtk/actions.c:79 ++msgid "_View" ++msgstr "_Vista" ++ ++#: ../gtk/actions.c:80 ++msgid "_Sort Torrents By" ++msgstr "_Ordenar Torrents por:" ++ ++#: ../gtk/actions.c:81 ++msgid "_Queue" ++msgstr "F_ila" ++ ++#: ../gtk/actions.c:82 ../gtk/details.c:2839 ++msgid "_Edit" ++msgstr "_Editar" ++ ++#: ../gtk/actions.c:83 ++msgid "_Help" ++msgstr "_Ajuda" ++ ++#: ../gtk/actions.c:84 ++msgid "Copy _Magnet Link to Clipboard" ++msgstr "Copiar Link _Magnético" ++ ++#: ../gtk/actions.c:85 ++msgid "Open URL…" ++msgstr "Abrir URL…" ++ ++#: ../gtk/actions.c:85 ++msgid "Open _URL…" ++msgstr "Abrir _URL…" ++ ++#: ../gtk/actions.c:86 ../gtk/actions.c:87 ++msgid "Open a torrent" ++msgstr "Abrir um torrent" ++ ++#: ../gtk/actions.c:88 ++msgid "Start torrent" ++msgstr "_Iniciar Torrent" ++ ++#: ../gtk/actions.c:88 ++msgid "_Start" ++msgstr "_Iniciar" ++ ++#: ../gtk/actions.c:89 ++msgid "Start _Now" ++msgstr "Iniciar _Agora" ++ ++#: ../gtk/actions.c:89 ++msgid "Start torrent now" ++msgstr "Iniciar o torrent agora" ++ ++#: ../gtk/actions.c:91 ++msgid "_Statistics" ++msgstr "E_statísticas" ++ ++#: ../gtk/actions.c:92 ++msgid "_Donate" ++msgstr "_Doar" ++ ++#: ../gtk/actions.c:93 ++msgid "_Verify Local Data" ++msgstr "_Verificar Dados Locais" ++ ++#: ../gtk/actions.c:94 ++msgid "Pause torrent" ++msgstr "Pausar o Torrent" ++ ++#: ../gtk/actions.c:94 ++msgid "_Pause" ++msgstr "_Pausar" ++ ++#: ../gtk/actions.c:95 ++msgid "Pause all torrents" ++msgstr "Pausar todos os torrents" ++ ++#: ../gtk/actions.c:95 ++msgid "_Pause All" ++msgstr "Pausar tudo" ++ ++#: ../gtk/actions.c:96 ++msgid "Start all torrents" ++msgstr "Iniciar todos os Torrents" ++ ++#: ../gtk/actions.c:96 ++msgid "_Start All" ++msgstr "_Iniciar tudo" ++ ++#: ../gtk/actions.c:97 ++msgid "Set _Location…" ++msgstr "Definir _Localização…" ++ ++#: ../gtk/actions.c:98 ++msgid "Remove torrent" ++msgstr "Remover torrent" ++ ++#: ../gtk/actions.c:99 ++msgid "_Delete Files and Remove" ++msgstr "_Eliminar Ficheiros e Remover" ++ ++#: ../gtk/actions.c:100 ++msgid "Create a torrent" ++msgstr "Criar torrent" ++ ++#: ../gtk/actions.c:100 ++msgid "_New…" ++msgstr "_Novo" ++ ++#: ../gtk/actions.c:101 ++msgid "_Quit" ++msgstr "_Sair" ++ ++#: ../gtk/actions.c:102 ++msgid "Select _All" ++msgstr "Selecion_ar Tudo" ++ ++#: ../gtk/actions.c:103 ++msgid "Dese_lect All" ++msgstr "Desce_lecionar Tudo" ++ ++#: ../gtk/actions.c:105 ++msgid "Torrent properties" ++msgstr "Propriedades do torrent" ++ ++#: ../gtk/actions.c:106 ++msgid "Open Fold_er" ++msgstr "Abrir _Pasta" ++ ++#: ../gtk/actions.c:108 ++msgid "_Contents" ++msgstr "_Conteúdos" ++ ++#: ../gtk/actions.c:109 ++msgid "Ask Tracker for _More Peers" ++msgstr "Pedir ao rastreador _mais pares" ++ ++#: ../gtk/actions.c:110 ++msgid "Move to _Top" ++msgstr "Mover para o _Topo" ++ ++#: ../gtk/actions.c:111 ++msgid "Move _Up" ++msgstr "Mover para _Cima" ++ ++#: ../gtk/actions.c:112 ++msgid "Move _Down" ++msgstr "Mover para _Baixo" ++ ++#: ../gtk/actions.c:113 ++msgid "Move to _Bottom" ++msgstr "Mover para o _Fundo" ++ ++#: ../gtk/actions.c:114 ++msgid "Present Main Window" ++msgstr "Mostrar janela principal" ++ ++#: ../gtk/details.c:486 ../gtk/details.c:497 ++msgid "Use global settings" ++msgstr "Usar definições globais" ++ ++#: ../gtk/details.c:487 ++msgid "Seed regardless of ratio" ++msgstr "Semear independentemente do rácio" ++ ++#: ../gtk/details.c:488 ++msgid "Stop seeding at ratio:" ++msgstr "Parar de semear no rácio:" ++ ++#: ../gtk/details.c:498 ++msgid "Seed regardless of activity" ++msgstr "Semear independentemente da atividade" ++ ++#: ../gtk/details.c:499 ++msgid "Stop seeding if idle for N minutes:" ++msgstr "Parar de semear se inativo por N minutos:" ++ ++#: ../gtk/details.c:517 ../gtk/tr-prefs.c:1253 ++msgid "Speed" ++msgstr "Velocidade" ++ ++#: ../gtk/details.c:519 ++msgid "Honor global _limits" ++msgstr "Respeitar _limites globais" ++ ++#: ../gtk/details.c:524 ++#, c-format ++msgid "Limit _download speed (%s):" ++msgstr "Limitar velocidade de _descarregamento (%s):" ++ ++#: ../gtk/details.c:537 ++#, c-format ++msgid "Limit _upload speed (%s):" ++msgstr "Limitar velocidade de _envio (%s):" ++ ++#: ../gtk/details.c:550 ../gtk/open-dialog.c:368 ++msgid "Torrent _priority:" ++msgstr "_Prioridade do torrent:" ++ ++#: ../gtk/details.c:554 ++msgid "Seeding Limits" ++msgstr "Limites de Velocidade" ++ ++#: ../gtk/details.c:564 ++msgid "_Ratio:" ++msgstr "_Rácio:" ++ ++#: ../gtk/details.c:573 ++msgid "_Idle:" ++msgstr "_Inativo:" ++ ++#: ../gtk/details.c:576 ++msgid "Peer Connections" ++msgstr "Ligações a pares" ++ ++#: ../gtk/details.c:579 ++msgid "_Maximum peers:" ++msgstr "_Máximo de pares:" ++ ++#: ../gtk/details.c:598 ../gtk/torrent-cell-renderer.c:195 ../libtransmission/verify.c:272 ++msgid "Queued for verification" ++msgstr "Na fila para verificação" ++ ++#: ../gtk/details.c:601 ++msgid "Verifying local data" ++msgstr "A verificar dados locais" ++ ++#: ../gtk/details.c:604 ../gtk/torrent-cell-renderer.c:199 ++msgid "Queued for download" ++msgstr "Na fila para descarregar" ++ ++#: ../gtk/details.c:607 ../gtk/filter.c:586 ++msgctxt "Verb" ++msgid "Downloading" ++msgstr "A descarregar" ++ ++#: ../gtk/details.c:610 ../gtk/torrent-cell-renderer.c:203 ++msgid "Queued for seeding" ++msgstr "Na fila para semear" ++ ++#: ../gtk/details.c:613 ../gtk/filter.c:587 ++msgctxt "Verb" ++msgid "Seeding" ++msgstr "A semear" ++ ++#: ../gtk/details.c:616 ../gtk/filter.c:589 ../gtk/torrent-cell-renderer.c:191 ++msgid "Finished" ++msgstr "Terminado" ++ ++#: ../gtk/details.c:616 ../gtk/filter.c:588 ../gtk/torrent-cell-renderer.c:191 ++msgid "Paused" ++msgstr "Pausado" ++ ++#: ../gtk/details.c:653 ../gtk/details.c:733 ++msgid "N/A" ++msgstr "N/A" ++ ++#: ../gtk/details.c:664 ../gtk/file-list.c:636 ++msgid "Mixed" ++msgstr "Misturado" ++ ++#: ../gtk/details.c:665 ++msgid "No Torrents Selected" ++msgstr "Sem Torrents Selecionados" ++ ++#: ../gtk/details.c:695 ++msgid "Private to this tracker -- DHT and PEX disabled" ++msgstr "Privado para este rastreador - DHT e PEX desativados" ++ ++#: ../gtk/details.c:695 ++msgid "Public torrent" ++msgstr "Torrent público" ++ ++#: ../gtk/details.c:739 ++#, c-format ++msgid "Created by %1$s" ++msgstr "Criado por %1$s" ++ ++#: ../gtk/details.c:743 ++#, c-format ++msgid "Created on %1$s" ++msgstr "Criado em %1$s" ++ ++#: ../gtk/details.c:747 ++#, c-format ++msgid "Created by %1$s on %2$s" ++msgstr "Criado por %1$s em %2$s" ++ ++#: ../gtk/details.c:877 ++msgid "Unknown" ++msgstr "Desconhecido" ++ ++#: ../gtk/details.c:919 ++#, c-format ++msgid "%1$s (%2$'d piece @ %3$s)" ++msgid_plural "%1$s (%2$'d pieces @ %3$s)" ++msgstr[0] "%1$s (%2$'d pedaço @ %3$s)" ++msgstr[1] "%1$s (%2$'d pedaços @ %3$s)" ++ ++#: ../gtk/details.c:925 ++#, c-format ++msgid "%1$s (%2$'d piece)" ++msgid_plural "%1$s (%2$'d pieces)" ++msgstr[0] "%1$s (%2$'d pedaço)" ++msgstr[1] "%1$s (%2$'d pedaços)" ++ ++#: ../gtk/details.c:969 ++#, c-format ++msgid "%1$s (%2$s%%)" ++msgstr "%1$s (%2$s%%)" ++ ++#: ../gtk/details.c:973 ++#, c-format ++msgid "%1$s (%2$s%% of %3$s%% Available)" ++msgstr "%1$s (%2$s%% de %3$s%% Disponível)" ++ ++#: ../gtk/details.c:977 ++#, c-format ++msgid "%1$s (%2$s%% of %3$s%% Available); %4$s Unverified" ++msgstr "%1$s (%2$s%% de %3$s%% Disponível); %4$s Por verificar" ++ ++#: ../gtk/details.c:1010 ++#, c-format ++msgid "%1$s (+%2$s corrupt)" ++msgstr "%1$s (+%2$s corrompido)" ++ ++#: ../gtk/details.c:1042 ++#, c-format ++msgid "%s (Ratio: %s)" ++msgstr "%s (Rácio: %s)" ++ ++#: ../gtk/details.c:1084 ++msgid "No errors" ++msgstr "Sem erros" ++ ++#: ../gtk/details.c:1108 ++msgid "Never" ++msgstr "Nunca" ++ ++#: ../gtk/details.c:1116 ++msgid "Active now" ++msgstr "Ativo agora" ++ ++#: ../gtk/details.c:1122 ++#, c-format ++msgid "%1$s ago" ++msgstr "%1$s atrás" ++ ++#: ../gtk/details.c:1145 ++msgid "Activity" ++msgstr "Atividade" ++ ++#: ../gtk/details.c:1150 ++msgid "Torrent size:" ++msgstr "Tamanho do torrent:" ++ ++#: ../gtk/details.c:1155 ++msgid "Have:" ++msgstr "Tenho:" ++ ++#: ../gtk/details.c:1160 ../gtk/stats.c:133 ../gtk/stats.c:158 ++msgid "Uploaded:" ++msgstr "Enviado:" ++ ++#: ../gtk/details.c:1165 ../gtk/stats.c:137 ../gtk/stats.c:162 ++msgid "Downloaded:" ++msgstr "Descarregado:" ++ ++#: ../gtk/details.c:1170 ++msgid "State:" ++msgstr "Estado:" ++ ++#: ../gtk/details.c:1175 ++msgid "Running time:" ++msgstr "Tempo em execução:" ++ ++#: ../gtk/details.c:1180 ++msgid "Remaining time:" ++msgstr "Tempo restante:" ++ ++#: ../gtk/details.c:1185 ++msgid "Last activity:" ++msgstr "Última atividade:" ++ ++#: ../gtk/details.c:1189 ++msgid "Error:" ++msgstr "Erro:" ++ ++#: ../gtk/details.c:1193 ++msgid "Details" ++msgstr "Detalhes" ++ ++#: ../gtk/details.c:1197 ++msgid "Location:" ++msgstr "Localização:" ++ ++#: ../gtk/details.c:1202 ++msgid "Hash:" ++msgstr "Hash:" ++ ++#: ../gtk/details.c:1208 ++msgid "Privacy:" ++msgstr "Privacidade:" ++ ++#: ../gtk/details.c:1213 ++msgid "Origin:" ++msgstr "Origem:" ++ ++#: ../gtk/details.c:1228 ++msgid "Comment:" ++msgstr "Comentário:" ++ ++#: ../gtk/details.c:1256 ++msgid "Web Seeds" ++msgstr "Semeares da web" ++ ++#: ../gtk/details.c:1260 ../gtk/details.c:1316 ++msgid "Down" ++msgstr "Baixo" ++ ++#: ../gtk/details.c:1312 ++msgid "Address" ++msgstr "Endereço" ++ ++#: ../gtk/details.c:1320 ++msgid "Up" ++msgstr "Cima" ++ ++#: ../gtk/details.c:1323 ++msgid "Client" ++msgstr "Cliente" ++ ++#: ../gtk/details.c:1326 ++msgid "%" ++msgstr "%" ++ ++#: ../gtk/details.c:1330 ++msgid "Up Reqs" ++msgstr "Pedid. Env." ++ ++#: ../gtk/details.c:1334 ++msgid "Dn Reqs" ++msgstr "Pedid. Receb." ++ ++#: ../gtk/details.c:1338 ++msgid "Dn Blocks" ++msgstr "Blocos Receb." ++ ++#: ../gtk/details.c:1342 ++msgid "Up Blocks" ++msgstr "Blocos Env." ++ ++#: ../gtk/details.c:1346 ++msgid "We Cancelled" ++msgstr "Nós Concelamos" ++ ++#: ../gtk/details.c:1350 ++msgid "They Cancelled" ++msgstr "Eles Cancelaram" ++ ++#: ../gtk/details.c:1353 ++msgid "Flags" ++msgstr "Bandeiras" ++ ++#: ../gtk/details.c:1770 ++msgid "Optimistic unchoke" ++msgstr "Desestrangulamento otimista" ++ ++#: ../gtk/details.c:1774 ++msgid "Downloading from this peer" ++msgstr "A descarregar deste par" ++ ++#: ../gtk/details.c:1778 ++msgid "We would download from this peer if they would let us" ++msgstr "Descarregaríamos deste pare se ele permitisse" ++ ++#: ../gtk/details.c:1782 ++msgid "Uploading to peer" ++msgstr "A enviar para o par" ++ ++#: ../gtk/details.c:1786 ++msgid "We would upload to this peer if they asked" ++msgstr "Enviaríamos para este par se ele pedisse" ++ ++#: ../gtk/details.c:1790 ++msgid "Peer has unchoked us, but we're not interested" ++msgstr "O par destrangulou-nos, mas não estamos interessados" ++ ++#: ../gtk/details.c:1794 ++msgid "We unchoked this peer, but they're not interested" ++msgstr "Desestrangulamos este par, mas ele não está interessado" ++ ++#: ../gtk/details.c:1798 ++msgid "Encrypted connection" ++msgstr "Ligação encriptada" ++ ++#: ../gtk/details.c:1802 ++msgid "Peer was found through Peer Exchange (PEX)" ++msgstr "O par foi descoberto através da Trocar de Pares (PEX)" ++ ++#: ../gtk/details.c:1806 ++msgid "Peer was found through DHT" ++msgstr "O par foi encontrado através da Tabela Hash Distribuída (DHT)" ++ ++#: ../gtk/details.c:1810 ++msgid "Peer is an incoming connection" ++msgstr "O par é uma ligação a dar entrada" ++ ++#: ../gtk/details.c:1814 ++msgid "Peer is connected over µTP" ++msgstr "O par está ligado através de µTP" ++ ++#: ../gtk/details.c:2082 ../gtk/details.c:2854 ++msgid "Show _more details" ++msgstr "Mostrar _mais detalhes" ++ ++#: ../gtk/details.c:2156 ++#, c-format ++msgid "Got a list of %1$s%2$'d peers%3$s %4$s ago" ++msgstr "Obtida uma lista de %1$s%2$'d pares%3$s %4$s atrás" ++ ++#: ../gtk/details.c:2161 ++#, c-format ++msgid "Peer list request %1$stimed out%2$s %3$s ago; will retry" ++msgstr "O pedido de lista de pares %1$sexcedeu o tempo limite%2$s %3$s atrás; a tentar novamente" ++ ++#: ../gtk/details.c:2166 ++#, c-format ++msgid "Got an error %1$s\"%2$s\"%3$s %4$s ago" ++msgstr "Obtido um erro %1$s\"%2$s\"%3$s %4$s atrás" ++ ++#: ../gtk/details.c:2175 ++msgid "No updates scheduled" ++msgstr "Não há atualizações programadas" ++ ++#: ../gtk/details.c:2181 ++#, c-format ++msgid "Asking for more peers in %s" ++msgstr "A pedir mais pares em %s" ++ ++#: ../gtk/details.c:2186 ++msgid "Queued to ask for more peers" ++msgstr "Na fila para pedir por mais pares" ++ ++#: ../gtk/details.c:2192 ++#, c-format ++msgid "Asking for more peers now… <small>%s</small>" ++msgstr "A pedir agora por mais pares… <small>%s</small>" ++ ++#: ../gtk/details.c:2205 ++#, c-format ++msgid "Tracker had %s%'d seeders and %'d leechers%s %s ago" ++msgstr "O rastreador teve %s%'d semeadores e %'d sanguesugas%s %s atrás" ++ ++#: ../gtk/details.c:2210 ++#, c-format ++msgid "Got a scrape error \"%s%s%s\" %s ago" ++msgstr "Obtido um erro scrape \"%s%s%s\" %s atrás" ++ ++#: ../gtk/details.c:2223 ++#, c-format ++msgid "Asking for peer counts in %s" ++msgstr "A pedir a contagem de pares em %s" ++ ++#: ../gtk/details.c:2228 ++msgid "Queued to ask for peer counts" ++msgstr "Na fila para pedir a contagem de pares" ++ ++#: ../gtk/details.c:2234 ++#, c-format ++msgid "Asking for peer counts now… <small>%s</small>" ++msgstr "A pedir agora a contagem de pares… <small>%s</small>" ++ ++#: ../gtk/details.c:2537 ++msgid "List contains invalid URLs" ++msgstr "A lista contém URLs inválidos" ++ ++#: ../gtk/details.c:2541 ../gtk/file-list.c:847 ++msgid "Please correct the errors and try again." ++msgstr "Por favor corrija os erros e tente novamente." ++ ++#: ../gtk/details.c:2603 ++#, c-format ++msgid "%s - Edit Trackers" ++msgstr "%s - Editar Rastreadores" ++ ++#: ../gtk/details.c:2610 ++msgid "Tracker Announce URLs" ++msgstr "URLs de anúncios do rastreador" ++ ++#: ../gtk/details.c:2613 ../gtk/makemeta-ui.c:493 ++msgid "" ++"To add a backup URL, add it on the line after the primary URL.\n" ++"To add another primary URL, add it after a blank line." ++msgstr "" ++"Para adicionar um URL de cópia de segurança, aadicione-o à linha após o URL principal.\n" ++"Para adicionar outro URL principal, adicione-o após uma linha vazia." ++ ++#: ../gtk/details.c:2713 ++#, c-format ++msgid "%s - Add Tracker" ++msgstr "%s - Adicionar Rastreador" ++ ++#: ../gtk/details.c:2720 ++msgid "Tracker" ++msgstr "Rastreador" ++ ++#: ../gtk/details.c:2726 ++msgid "_Announce URL:" ++msgstr "URL de _anúncios:" ++ ++#: ../gtk/details.c:2810 ../gtk/details.c:2967 ++msgid "Trackers" ++msgstr "Rastreadores" ++ ++#: ../gtk/details.c:2834 ++msgid "_Add" ++msgstr "_Adicionar" ++ ++#: ../gtk/details.c:2845 ++msgid "_Remove" ++msgstr "_Remover" ++ ++#: ../gtk/details.c:2861 ++msgid "Show _backup trackers" ++msgstr "Mostrar rastreadores na cópia de segurança" ++ ++#: ../gtk/details.c:2959 ../gtk/msgwin.c:431 ++msgid "Information" ++msgstr "Informação" ++ ++#: ../gtk/details.c:2963 ++msgid "Peers" ++msgstr "Pares" ++ ++#: ../gtk/details.c:2972 ++msgid "File listing not available for combined torrent properties" ++msgstr "Listagem de ficheiros não disponível para propriedades de torrents combinadas" ++ ++#: ../gtk/details.c:2976 ../gtk/makemeta-ui.c:442 ++msgid "Files" ++msgstr "Ficheiros" ++ ++#: ../gtk/details.c:2980 ../gtk/tr-prefs.c:1164 ../gtk/tr-window.c:646 ++msgid "Options" ++msgstr "Opções" ++ ++#: ../gtk/details.c:3002 ++#, c-format ++msgid "%s Properties" ++msgstr "%s Propriedades" ++ ++#: ../gtk/details.c:3013 ++#, c-format ++msgid "%'d Torrent Properties" ++msgstr "%'d Propriedades do Torrent" ++ ++#: ../gtk/dialogs.c:100 ++#, c-format ++msgid "Remove torrent?" ++msgid_plural "Remove %d torrents?" ++msgstr[0] "Remover torrent?" ++msgstr[1] "Remover %d torrents?" ++ ++#: ../gtk/dialogs.c:104 ++#, c-format ++msgid "Delete this torrent's downloaded files?" ++msgid_plural "Delete these %d torrents' downloaded files?" ++msgstr[0] "Eliminar este ficheiro torrent descarregado?" ++msgstr[1] "Eliminar estes %d ficheiros torrent descarregados?" ++ ++#: ../gtk/dialogs.c:113 ++msgid "Once removed, continuing the transfer will require the torrent file or magnet link." ++msgid_plural "Once removed, continuing the transfers will require the torrent files or magnet links." ++msgstr[0] "Após sere eliminado, para continuar o descarregamento será necessário o ficheiro torrent ou o link magnético." ++msgstr[1] "Após serem eliminados, para continuar o descarregamento serão necessários os ficheiros torrent ou os links magnéticos." ++ ++#: ../gtk/dialogs.c:118 ++msgid "This torrent has not finished downloading." ++msgid_plural "These torrents have not finished downloading." ++msgstr[0] "O descarregamento deste torrent ainda não terminou." ++msgstr[1] "O descarregamento destes torrents ainda não terminou." ++ ++#: ../gtk/dialogs.c:123 ++msgid "This torrent is connected to peers." ++msgid_plural "These torrents are connected to peers." ++msgstr[0] "Este torrent está conectado aos outros pares." ++msgstr[1] "Estes torrents estão conectados aos outros pares." ++ ++#: ../gtk/dialogs.c:130 ++msgid "One of these torrents is connected to peers." ++msgid_plural "Some of these torrents are connected to peers." ++msgstr[0] "Um destes torrents está conectado a outros pares." ++msgstr[1] "Alguns destes torrents estão conectados a outros pares." ++ ++#: ../gtk/dialogs.c:141 ++msgid "One of these torrents has not finished downloading." ++msgid_plural "Some of these torrents have not finished downloading." ++msgstr[0] "Um destes torrents ainda não terminou." ++msgstr[1] "Alguns destes torrents ainda não terminaram." ++ ++#: ../gtk/file-list.c:624 ../gtk/util.c:520 ++msgid "High" ++msgstr "Alta" ++ ++#: ../gtk/file-list.c:628 ../gtk/util.c:521 ++msgid "Normal" ++msgstr "Normal" ++ ++#: ../gtk/file-list.c:632 ../gtk/util.c:522 ++msgid "Low" ++msgstr "Baixa" ++ ++#: ../gtk/file-list.c:845 ++#, c-format ++msgid "Unable to rename file as \"%s\": %s" ++msgstr "Não foi possível alterar o nome do ficheiro para \"%s\": %s" ++ ++#. add file column ++#: ../gtk/file-list.c:957 ../gtk/msgwin.c:289 ++msgid "Name" ++msgstr "Nome" ++ ++#. add "size" column ++#: ../gtk/file-list.c:973 ++msgid "Size" ++msgstr "Tamanho" ++ ++#. add "progress" column ++#: ../gtk/file-list.c:984 ++msgid "Have" ++msgstr "Tenho" ++ ++#. add "enabled" column ++#: ../gtk/file-list.c:997 ++msgid "Download" ++msgstr "Descarregar" ++ ++#. add priority column ++#: ../gtk/file-list.c:1012 ++msgid "Priority" ++msgstr "Prioridade" ++ ++#: ../gtk/filter.c:299 ../gtk/filter.c:583 ++msgid "All" ++msgstr "Tudo" ++ ++#: ../gtk/filter.c:585 ++msgid "Active" ++msgstr "Ativo" ++ ++#: ../gtk/filter.c:590 ++msgctxt "Verb" ++msgid "Verifying" ++msgstr "A verificar" ++ ++#: ../gtk/filter.c:591 ../gtk/msgwin.c:430 ../gtk/util.c:717 ++msgid "Error" ++msgstr "Erro" ++ ++#: ../gtk/filter.c:880 ++msgid "_Show:" ++msgstr "_Mostrar:" ++ ++#: ../gtk/filter.c:884 ++#, c-format ++msgid "_Show %'d of:" ++msgstr "_Mostrar %'d de:" ++ ++#: ../gtk/main.c:314 ++#, c-format ++msgid "Error registering Transmission as a %s handler: %s" ++msgstr "Erro ao registar o Transmission como um manipulador de %s: %s" ++ ++#: ../gtk/main.c:480 ++#, c-format ++msgid "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck." ++msgstr "Foi obtido o sinal de %d; a tentar desligar corretamente. Faça-o de novo caso fique bloqueado." ++ ++#: ../gtk/main.c:616 ++msgid "Where to look for configuration files" ++msgstr "Onde procurar por ficheiros de configuração" ++ ++#: ../gtk/main.c:617 ++msgid "Start with all torrents paused" ++msgstr "Iniciar com todos os torrents em pausa" ++ ++#: ../gtk/main.c:618 ++msgid "Start minimized in notification area" ++msgstr "Iniciar minimizado na área de notificações" ++ ++#: ../gtk/main.c:619 ++msgid "Show version number and exit" ++msgstr "Mostrar número da versão e sair" ++ ++#: ../gtk/main.c:637 ../gtk/transmission-gtk.appdata.xml.in:11 ../gtk/transmission-gtk.desktop.in:3 ++msgid "Transmission" ++msgstr "Transmission" ++ ++#. parse the command line ++#: ../gtk/main.c:640 ++msgid "[torrent files or urls]" ++msgstr "[ficheiros torrent ou urls]" ++ ++#: ../gtk/main.c:647 ++#, c-format ++msgid "" ++"%s\n" ++"Run '%s --help' to see a full list of available command line options.\n" ++msgstr "" ++"%s\n" ++"Execute '%s --help' para ver uma lista completa de opções de linha de comandos disponíveis.\n" ++ ++#: ../gtk/main.c:746 ++msgid "Transmission is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility." ++msgstr "O Transmission é um programa de partilha de ficheiros. Quando abre um torrent, os dados deste serão partilhados com outros utilizadores. Qualquer conteúdo que partilhe será de sua inteira responsabilidade." ++ ++#: ../gtk/main.c:749 ++msgid "I _Agree" ++msgstr "Eu _Concordo" ++ ++#: ../gtk/main.c:980 ++msgid "<b>Closing Connections</b>" ++msgstr "<b>A fechar ligações</b>" ++ ++#: ../gtk/main.c:984 ++msgid "Sending upload/download totals to tracker…" ++msgstr "A enviar o total de enviado/descarregado ao rastreador…" ++ ++#: ../gtk/main.c:988 ++msgid "_Quit Now" ++msgstr "_Sair Agora" ++ ++#: ../gtk/main.c:1038 ++msgid "Couldn't add corrupt torrent" ++msgid_plural "Couldn't add corrupt torrents" ++msgstr[0] "Não foi possível adicionar o torrent corrompido" ++msgstr[1] "Não foi possível adicionar torrents corrompidos" ++ ++#: ../gtk/main.c:1044 ++msgid "Couldn't add duplicate torrent" ++msgid_plural "Couldn't add duplicate torrents" ++msgstr[0] "Não foi possível adicionar o torrent duplicado" ++msgstr[1] "Não foi possível adicionar torrents duplicados" ++ ++#: ../gtk/main.c:1363 ++msgid "A fast and easy BitTorrent client" ++msgstr "Um cliente BitTorrent rápido e fácil de usar" ++ ++#: ../gtk/main.c:1364 ++msgid "Copyright (c) The Transmission Project" ++msgstr "Direitos de Autor (c) The Transmission Project" ++ ++#. Translators: translate "translator-credits" as your name ++#. to have it appear in the credits in the "About" ++#. dialog ++#: ../gtk/main.c:1370 ++msgid "translator-credits" ++msgstr "" ++"Gonçalo Matos (goncalomatos);\n" ++"Rui (xendez);\n" ++"StringYM;" ++ ++#: ../gtk/makemeta-ui.c:70 ++#, c-format ++msgid "Creating \"%s\"" ++msgstr "A criar \"%s\"" ++ ++#: ../gtk/makemeta-ui.c:74 ++#, c-format ++msgid "Created \"%s\"!" ++msgstr "Criado \"%s\"!" ++ ++#: ../gtk/makemeta-ui.c:78 ++#, c-format ++msgid "Error: invalid announce URL \"%s\"" ++msgstr "Erro: URL de anúncio inválido \"%s\"" ++ ++#: ../gtk/makemeta-ui.c:82 ++msgid "Cancelled" ++msgstr "Cancelado" ++ ++#: ../gtk/makemeta-ui.c:86 ++#, c-format ++msgid "Error reading \"%s\": %s" ++msgstr "Erro ao ler \"%s\": %s" ++ ++#: ../gtk/makemeta-ui.c:90 ++#, c-format ++msgid "Error writing \"%s\": %s" ++msgstr "Erro ao gravar \"%s\": %s" ++ ++#. how much data we've scanned through to generate checksums ++#: ../gtk/makemeta-ui.c:113 ++#, c-format ++msgid "Scanned %s" ++msgstr "%s processado" ++ ++#: ../gtk/makemeta-ui.c:183 ../gtk/makemeta-ui.c:434 ++msgid "New Torrent" ++msgstr "Novo Torrent" ++ ++#: ../gtk/makemeta-ui.c:194 ++msgid "Creating torrent…" ++msgstr "A criar o torrent…" ++ ++#: ../gtk/makemeta-ui.c:304 ++msgid "No source selected" ++msgstr "Nenhuma fonte selecionada" ++ ++#: ../gtk/makemeta-ui.c:310 ++#, c-format ++msgid "%1$s; %2$'d File" ++msgid_plural "%1$s; %2$'d Files" ++msgstr[0] "%1$s; %2$'d Ficheiro" ++msgstr[1] "%1$s; %2$'d Ficheiros" ++ ++#: ../gtk/makemeta-ui.c:315 ++#, c-format ++msgid "%1$'d Piece @ %2$s" ++msgid_plural "%1$'d Pieces @ %2$s" ++msgstr[0] "%1$'d Peça @ %2$s" ++msgstr[1] "%1$'d Peças @ %2$s" ++ ++#: ../gtk/makemeta-ui.c:444 ++msgid "Sa_ve to:" ++msgstr "Gra_var para:" ++ ++#: ../gtk/makemeta-ui.c:450 ++msgid "Source F_older:" ++msgstr "Pasta da f_onte:" ++ ++#: ../gtk/makemeta-ui.c:462 ++msgid "Source _File:" ++msgstr "_Ficheiro da fonte:" ++ ++#: ../gtk/makemeta-ui.c:474 ++msgid "<i>No source selected</i>" ++msgstr "<i>Nenhuma fonte selecionada</i>" ++ ++#: ../gtk/makemeta-ui.c:478 ++msgid "Properties" ++msgstr "Propriedades" ++ ++#: ../gtk/makemeta-ui.c:480 ++msgid "_Trackers:" ++msgstr "_Rastreadores:" ++ ++#: ../gtk/makemeta-ui.c:500 ++msgid "Co_mment:" ++msgstr "Co_mentário:" ++ ++#: ../gtk/makemeta-ui.c:509 ++msgid "_Private torrent" ++msgstr "Torrent _privado" ++ ++#: ../gtk/msgwin.c:146 ++#, c-format ++msgid "Couldn't save \"%s\"" ++msgstr "Não foi possível gravar \"%s\"" ++ ++#: ../gtk/msgwin.c:209 ++msgid "Save Log" ++msgstr "Gravar registo" ++ ++#: ../gtk/msgwin.c:284 ++msgid "Time" ++msgstr "Hora" ++ ++#: ../gtk/msgwin.c:294 ++msgid "Message" ++msgstr "Mensagem" ++ ++#: ../gtk/msgwin.c:432 ++msgid "Debug" ++msgstr "Depuração de erros" ++ ++#: ../gtk/msgwin.c:457 ++msgid "Message Log" ++msgstr "Registo de mensagens" ++ ++#: ../gtk/msgwin.c:491 ++msgid "Level" ++msgstr "Nível" ++ ++#: ../gtk/notify.c:207 ++msgid "Open File" ++msgstr "Abrir ficheiro" ++ ++#: ../gtk/notify.c:212 ++msgid "Open Folder" ++msgstr "Abrir pasta" ++ ++#: ../gtk/notify.c:217 ++msgid "Torrent Complete" ++msgstr "Torrent terminado" ++ ++#: ../gtk/notify.c:233 ++msgid "Torrent Added" ++msgstr "Torrent adicionado" ++ ++#: ../gtk/open-dialog.c:256 ++msgid "Torrent files" ++msgstr "Ficheiros de torrents" ++ ++#: ../gtk/open-dialog.c:261 ++msgid "All files" ++msgstr "Todos os ficheiros" ++ ++#. make the dialog ++#: ../gtk/open-dialog.c:284 ++msgid "Torrent Options" ++msgstr "Opções de torrents" ++ ++#: ../gtk/open-dialog.c:301 ../gtk/tr-prefs.c:275 ++msgid "Mo_ve .torrent file to the trash" ++msgstr "Mo_ver o ficheiro .torrent para o lixo" ++ ++#: ../gtk/open-dialog.c:303 ++msgid "_Start when added" ++msgstr "_Começar logo ao adicionar" ++ ++#. "torrent file" row ++#: ../gtk/open-dialog.c:318 ++msgid "_Torrent file:" ++msgstr "Ficheiro _torrent:" ++ ++#: ../gtk/open-dialog.c:321 ++msgid "Select Source File" ++msgstr "Selecionar ficheiro da fonte" ++ ++#: ../gtk/open-dialog.c:331 ++msgid "_Destination folder:" ++msgstr "Pasta de _destino:" ++ ++#: ../gtk/open-dialog.c:334 ++msgid "Select Destination Folder" ++msgstr "Selecione a pasta de destino" ++ ++#: ../gtk/open-dialog.c:455 ++msgid "Open a Torrent" ++msgstr "Abrir um torrent" ++ ++#: ../gtk/open-dialog.c:466 ++msgid "Show _options dialog" ++msgstr "Mostrar janela de _opções" ++ ++#: ../gtk/open-dialog.c:518 ++msgid "Open URL" ++msgstr "Abrir URL" ++ ++#: ../gtk/open-dialog.c:524 ++msgid "Open torrent from URL" ++msgstr "Abrir um torrent por URL" ++ ++#: ../gtk/open-dialog.c:529 ++msgid "_URL" ++msgstr "_URL" ++ ++#: ../gtk/relocate.c:60 ++#, c-format ++msgid "Moving \"%s\"" ++msgstr "A mover \"1%s\"" ++ ++#: ../gtk/relocate.c:76 ++msgid "Couldn't move torrent" ++msgstr "Não foi possível mover o torrent" ++ ++#: ../gtk/relocate.c:111 ++msgid "This may take a moment…" ++msgstr "Isto pode demorar um pouco…" ++ ++#: ../gtk/relocate.c:139 ../gtk/relocate.c:153 ++msgid "Set Torrent Location" ++msgstr "Definir a localização do torrent" ++ ++#: ../gtk/relocate.c:146 ++msgid "Location" ++msgstr "Localização" ++ ++#: ../gtk/relocate.c:156 ++msgid "Torrent _location:" ++msgstr "_Localização do torrent:" ++ ++#: ../gtk/relocate.c:157 ++msgid "_Move from the current folder" ++msgstr "_Mover da pasta atual" ++ ++#: ../gtk/relocate.c:160 ++msgid "Local data is _already there" ++msgstr "Os d_ados locais já estão lá" ++ ++#: ../gtk/stats.c:69 ../gtk/stats.c:150 ++#, c-format ++msgid "Started %'d time" ++msgid_plural "Started %'d times" ++msgstr[0] "Iniciado %'d vez" ++msgstr[1] "Iniciado %'d vezess" ++ ++#: ../gtk/stats.c:91 ++msgid "Reset your statistics?" ++msgstr "Limpar as suas estatísticas?" ++ ++#: ../gtk/stats.c:92 ++msgid "These statistics are for your information only. Resetting them doesn't affect the statistics logged by your BitTorrent trackers." ++msgstr "Estas estatísticas existem apenas para informação. Se as limpar isso não afetará as estatísticas registadas pelos rastreadores BitTorrent." ++ ++#: ../gtk/stats.c:96 ../gtk/stats.c:123 ++msgid "_Reset" ++msgstr "_Limpar" ++ ++#: ../gtk/stats.c:123 ../gtk/tr-window.c:687 ++msgid "Statistics" ++msgstr "Estatísticas" ++ ++#: ../gtk/stats.c:129 ++msgid "Current Session" ++msgstr "Sessão Atual" ++ ++#: ../gtk/stats.c:141 ../gtk/stats.c:166 ++msgid "Ratio:" ++msgstr "Rácio:" ++ ++#: ../gtk/stats.c:145 ../gtk/stats.c:170 ++msgid "Duration:" ++msgstr "Duração:" ++ ++#: ../gtk/stats.c:149 ++msgid "Total" ++msgstr "Total" ++ ++#. %1$s is how much we've got, ++#. %2$s is how much we'll have when done, ++#. %3$s%% is a percentage of the two ++#: ../gtk/torrent-cell-renderer.c:59 ++#, c-format ++msgid "%1$s of %2$s (%3$s%%)" ++msgstr "%1$s de %2$s (%3$s%%)" ++ ++#. %1$s is how much we've got, ++#. %2$s is the torrent's total size, ++#. %3$s%% is a percentage of the two, ++#. %4$s is how much we've uploaded, ++#. %5$s is our upload-to-download ratio, ++#. %6$s is the ratio we want to reach before we stop uploading ++#: ../gtk/torrent-cell-renderer.c:75 ++#, c-format ++msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s Goal: %6$s)" ++msgstr "%1$s de %2$s (%3$s%%), enviado %4$s (Rácio: %5$s Objetivo: %6$s)" ++ ++#. %1$s is how much we've got, ++#. %2$s is the torrent's total size, ++#. %3$s%% is a percentage of the two, ++#. %4$s is how much we've uploaded, ++#. %5$s is our upload-to-download ratio ++#: ../gtk/torrent-cell-renderer.c:91 ++#, c-format ++msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s)" ++msgstr "%1$s de %2$s (%3$s%%), enviado %4$s (Rácio: %5$s)" ++ ++#. %1$s is the torrent's total size, ++#. %2$s is how much we've uploaded, ++#. %3$s is our upload-to-download ratio, ++#. %4$s is the ratio we want to reach before we stop uploading ++#: ../gtk/torrent-cell-renderer.c:108 ++#, c-format ++msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)" ++msgstr "%1$s, enviado %2$s (Rácio: %3$s Objetivo: %4$s)" ++ ++#. %1$s is the torrent's total size, ++#. %2$s is how much we've uploaded, ++#. %3$s is our upload-to-download ratio ++#: ../gtk/torrent-cell-renderer.c:120 ++#, c-format ++msgid "%1$s, uploaded %2$s (Ratio: %3$s)" ++msgstr "%1$s, enviado %2$s (Rácio: %3$s)" ++ ++#: ../gtk/torrent-cell-renderer.c:135 ++msgid "Remaining time unknown" ++msgstr "Tempo restante desconhecido" ++ ++#. time remaining ++#: ../gtk/torrent-cell-renderer.c:142 ++#, c-format ++msgid "%s remaining" ++msgstr "%s restante" ++ ++#. down speed, down symbol, up speed, up symbol ++#: ../gtk/torrent-cell-renderer.c:162 ++#, c-format ++msgid "%1$s %2$s %3$s %4$s" ++msgstr "%1$s %2$s %3$s %4$s" ++ ++#. up speed, up symbol ++#: ../gtk/torrent-cell-renderer.c:171 ++#, c-format ++msgid "%1$s %2$s" ++msgstr "%1$s %2$s" ++ ++#: ../gtk/torrent-cell-renderer.c:175 ++msgid "Stalled" ++msgstr "Paralisado" ++ ++#: ../gtk/torrent-cell-renderer.c:207 ++#, c-format ++msgid "Verifying local data (%.1f%% tested)" ++msgstr "A verificar dados locais (%.1f%% testados)" ++ ++#: ../gtk/torrent-cell-renderer.c:236 ++#, c-format ++msgid "Tracker gave a warning: \"%s\"" ++msgstr "O rastreador forneceu um aviso: \"%s\"" ++ ++#: ../gtk/torrent-cell-renderer.c:237 ++#, c-format ++msgid "Tracker gave an error: \"%s\"" ++msgstr "O rastreador forneceu um erro: \"%s\"" ++ ++#: ../gtk/torrent-cell-renderer.c:238 ++#, c-format ++msgid "Error: %s" ++msgstr "Erro: %s" ++ ++#. Downloading metadata from 2 peer (s)(50% done) ++#: ../gtk/torrent-cell-renderer.c:262 ++#, c-format ++msgid "Downloading metadata from %1$'d %2$s (%3$d%% done)" ++msgstr "A descarregar metadados de %1$'d %2$s (%3$d%% feito)" ++ ++#: ../gtk/torrent-cell-renderer.c:263 ../gtk/torrent-cell-renderer.c:269 ../gtk/torrent-cell-renderer.c:282 ++msgid "peer" ++msgid_plural "peers" ++msgstr[0] "par" ++msgstr[1] "pares" ++ ++#. Downloading from 2 of 3 peer (s) and 2 webseed (s) ++#: ../gtk/torrent-cell-renderer.c:268 ++#, c-format ++msgid "Downloading from %1$'d of %2$'d %3$s and %4$'d %5$s" ++msgstr "A descarregar de %1$'d de %2$'d %3$s e %4$'d %5$s" ++ ++#: ../gtk/torrent-cell-renderer.c:270 ../gtk/torrent-cell-renderer.c:276 ++msgid "web seed" ++msgid_plural "web seeds" ++msgstr[0] "semear da web" ++msgstr[1] "semeares da web" ++ ++#. Downloading from 3 web seed (s) ++#: ../gtk/torrent-cell-renderer.c:275 ++#, c-format ++msgid "Downloading from %1$'d %2$s" ++msgstr "A descarregar de %1$'d %2$s" ++ ++#. Downloading from 2 of 3 peer (s) ++#: ../gtk/torrent-cell-renderer.c:281 ++#, c-format ++msgid "Downloading from %1$'d of %2$'d %3$s" ++msgstr "A descarregar de %1$'d de %2$'d %3$s" ++ ++#: ../gtk/torrent-cell-renderer.c:289 ++#, c-format ++msgid "Seeding to %1$'d of %2$'d connected peer" ++msgid_plural "Seeding to %1$'d of %2$'d connected peers" ++msgstr[0] "A semear para %1$'d de %2$'d par conectado" ++msgstr[1] "A semear para %1$'d de %2$'d pares conectados" ++ ++#: ../gtk/tr-core.c:1241 ++#, c-format ++msgid "Couldn't read \"%s\": %s" ++msgstr "Não foi possível ler \"%s\": %s" ++ ++#: ../gtk/tr-core.c:1337 ++#, c-format ++msgid "Skipping unknown torrent \"%s\"" ++msgstr "A ignorar o torrent desconhecido \"%s\"" ++ ++#: ../gtk/tr-core.c:1612 ++msgid "Inhibiting desktop hibernation" ++msgstr "Impedir a hibernação" ++ ++#: ../gtk/tr-core.c:1616 ++#, c-format ++msgid "Couldn't inhibit desktop hibernation: %s" ++msgstr "Não foi possível impedir a hibernação: %s" ++ ++#: ../gtk/tr-core.c:1649 ++msgid "Allowing desktop hibernation" ++msgstr "Permitir hibernação" ++ ++#: ../gtk/tr-icon.c:57 ++msgid "Idle" ++msgstr "Inativo" ++ ++#: ../gtk/tr-icon.c:80 ../gtk/tr-icon.c:102 ++#, c-format ++msgid " (Limit: %s)" ++msgstr " (Limite: %s)" ++ ++#. %1$s: current upload speed ++#. * %2$s: current upload limit, if any ++#. * %3$s: current download speed ++#. * %4$s: current download limit, if any ++#: ../gtk/tr-icon.c:109 ++#, c-format ++msgid "" ++"Transmission\n" ++"Up: %1$s %2$s\n" ++"Down: %3$s %4$s" ++msgstr "" ++"Transmission\n" ++"Env: %1$s %2$s\n" ++"Rec: %3$s %4$s" ++ ++#: ../gtk/tr-prefs.c:258 ++msgctxt "Gerund" ++msgid "Adding" ++msgstr "A adicionar" ++ ++#: ../gtk/tr-prefs.c:260 ++msgid "Automatically add .torrent files _from:" ++msgstr "Adicionar automaticamente ficheiros .torrent _de:" ++ ++#: ../gtk/tr-prefs.c:267 ++msgid "Show the Torrent Options _dialog" ++msgstr "Mostrar a _janela de opções do torrent" ++ ++#: ../gtk/tr-prefs.c:271 ++msgid "_Start added torrents" ++msgstr "_Iniciar torrents adicionados" ++ ++#: ../gtk/tr-prefs.c:280 ++msgid "Save to _Location:" ++msgstr "Gravar na _localização:" ++ ++#: ../gtk/tr-prefs.c:287 ++msgid "Download Queue" ++msgstr "Fila de descarregamento" ++ ++#: ../gtk/tr-prefs.c:289 ++msgid "Ma_ximum active downloads:" ++msgstr "Número má_ximo de descarregamentos:" ++ ++#: ../gtk/tr-prefs.c:293 ++msgid "Downloads sharing data in the last _N minutes are active:" ++msgstr "Descarregamentos a partilharem dados nos últimos _X minutos estão ativos:" ++ ++#: ../gtk/tr-prefs.c:298 ../libtransmission/torrent.c:2170 ++msgid "Incomplete" ++msgstr "Imcompleto" ++ ++#: ../gtk/tr-prefs.c:300 ++msgid "Append \"._part\" to incomplete files' names" ++msgstr "Anexar \"._part\" ao nome dos ficheiros incompletos" ++ ++#: ../gtk/tr-prefs.c:304 ++msgid "Keep _incomplete torrents in:" ++msgstr "Manter os torrents incompletos em:" ++ ++#: ../gtk/tr-prefs.c:311 ++msgid "Call scrip_t when torrent is completed:" ++msgstr "Executar scrip_t quando um torrent terminar:" ++ ++#: ../gtk/tr-prefs.c:334 ++msgid "Limits" ++msgstr "Limites" ++ ++#: ../gtk/tr-prefs.c:336 ++msgid "Stop seeding at _ratio:" ++msgstr "Parar de semear no _rácio:" ++ ++#: ../gtk/tr-prefs.c:343 ++msgid "Stop seeding if idle for _N minutes:" ++msgstr "Parar de semear se estiver inativo por _X minutos:" ++ ++#: ../gtk/tr-prefs.c:365 ../gtk/tr-prefs.c:1258 ++msgid "Desktop" ++msgstr "Secretária" ++ ++#: ../gtk/tr-prefs.c:367 ++msgid "_Inhibit hibernation when torrents are active" ++msgstr "_Impedir a hibernação quando os torrents estão ativos" ++ ++#: ../gtk/tr-prefs.c:371 ++msgid "Show Transmission icon in the _notification area" ++msgstr "Mostrar o ícone do Transmission na área de notificações" ++ ++#: ../gtk/tr-prefs.c:376 ++msgid "Notification" ++msgstr "Notificação" ++ ++#: ../gtk/tr-prefs.c:378 ++msgid "Show a notification when torrents are a_dded" ++msgstr "Mostrar uma notificação quando são a_dicionados torrents" ++ ++#: ../gtk/tr-prefs.c:382 ++msgid "Show a notification when torrents _finish" ++msgstr "Mostrar uma notificação quando os torrents terminam" ++ ++#: ../gtk/tr-prefs.c:386 ++msgid "Play a _sound when torrents finish" ++msgstr "Reproduzir um _som quando os torrents terminam" ++ ++#: ../gtk/tr-prefs.c:412 ++#, c-format ++msgid "Blocklist contains %'d rule" ++msgid_plural "Blocklist contains %'d rules" ++msgstr[0] "A lista de bloqueios contém %'d regra" ++msgstr[1] "A lista de bloqueios contém %'d regras" ++ ++#: ../gtk/tr-prefs.c:446 ++#, c-format ++msgid "Blocklist has %'d rule." ++msgid_plural "Blocklist has %'d rules." ++msgstr[0] "A lista de bloqueios tem %'d regra." ++msgstr[1] "A lista de bloqueios tem %'d regras." ++ ++#: ../gtk/tr-prefs.c:450 ++msgid "<b>Unable to update.</b>" ++msgstr "<b>Não foi possível atualizar.</b>" ++ ++#: ../gtk/tr-prefs.c:450 ++msgid "<b>Update succeeded!</b>" ++msgstr "<b>Atualização bem sucedida!</b>" ++ ++#: ../gtk/tr-prefs.c:461 ++msgid "Update Blocklist" ++msgstr "Atualizar Lista de Bloqueios" ++ ++#: ../gtk/tr-prefs.c:463 ++msgid "Getting new blocklist…" ++msgstr "A obter a nova lista de bloqueios…" ++ ++#: ../gtk/tr-prefs.c:488 ++msgid "Allow encryption" ++msgstr "Permitir encriptação" ++ ++#: ../gtk/tr-prefs.c:488 ++msgid "Prefer encryption" ++msgstr "Preferir encriptação" ++ ++#: ../gtk/tr-prefs.c:489 ++msgid "Require encryption" ++msgstr "Usar apenas encriptação" ++ ++#: ../gtk/tr-prefs.c:511 ../gtk/tr-prefs.c:1256 ++msgid "Privacy" ++msgstr "Privacidade" ++ ++#: ../gtk/tr-prefs.c:513 ++msgid "_Encryption mode:" ++msgstr "Modo de _Encriptação:" ++ ++#: ../gtk/tr-prefs.c:518 ++msgid "Blocklist" ++msgstr "Lista de bloqueio" ++ ++#: ../gtk/tr-prefs.c:520 ++msgid "Enable _blocklist:" ++msgstr "Ativar lista de _bloqueio" ++ ++#: ../gtk/tr-prefs.c:534 ++msgid "_Update" ++msgstr "_Atualizar" ++ ++#: ../gtk/tr-prefs.c:546 ++msgid "Enable _automatic updates" ++msgstr "Ativar _atualizações automáticas" ++ ++#: ../gtk/tr-prefs.c:747 ++msgid "Remote Control" ++msgstr "Controlo Remoto" ++ ++#. "enabled" checkbutton ++#: ../gtk/tr-prefs.c:750 ++msgid "Allow _remote access" ++msgstr "Permitir acesso _remoto" ++ ++#: ../gtk/tr-prefs.c:756 ++msgid "_Open web client" ++msgstr "_Abrir cliente web" ++ ++#: ../gtk/tr-prefs.c:765 ++msgid "HTTP _port:" ++msgstr "_Porta HTTP:" ++ ++#. require authentication ++#: ../gtk/tr-prefs.c:769 ++msgid "Use _authentication" ++msgstr "Usar _autenticação" ++ ++#. username ++#: ../gtk/tr-prefs.c:777 ++msgid "_Username:" ++msgstr "_Nome de utilizador:" ++ ++#. password ++#: ../gtk/tr-prefs.c:784 ++msgid "Pass_word:" ++msgstr "Palavra-passe:" ++ ++#. require authentication ++#: ../gtk/tr-prefs.c:792 ++msgid "Only allow these IP a_ddresses:" ++msgstr "Permitir apenas estes en_dereços IP:" ++ ++#: ../gtk/tr-prefs.c:816 ++msgid "IP addresses may use wildcards, such as 192.168.*.*" ++msgstr "Os endereços IP podem ter caracteres-curinga, como por ex: 192.168.*.*" ++ ++#: ../gtk/tr-prefs.c:835 ++msgid "Addresses:" ++msgstr "Endereços:" ++ ++#: ../gtk/tr-prefs.c:935 ++msgid "Every Day" ++msgstr "Todos os dias" ++ ++#: ../gtk/tr-prefs.c:936 ++msgid "Weekdays" ++msgstr "Dias da semana" ++ ++#: ../gtk/tr-prefs.c:937 ++msgid "Weekends" ++msgstr "Fins de semana" ++ ++#: ../gtk/tr-prefs.c:938 ++msgid "Sunday" ++msgstr "Domingo" ++ ++#: ../gtk/tr-prefs.c:939 ++msgid "Monday" ++msgstr "Segunda-Feira" ++ ++#: ../gtk/tr-prefs.c:940 ++msgid "Tuesday" ++msgstr "Terça-Feira" ++ ++#: ../gtk/tr-prefs.c:941 ++msgid "Wednesday" ++msgstr "Quarta-Feira" ++ ++#: ../gtk/tr-prefs.c:942 ++msgid "Thursday" ++msgstr "Quinta-Feira" ++ ++#: ../gtk/tr-prefs.c:943 ++msgid "Friday" ++msgstr "Sexta-Feira" ++ ++#: ../gtk/tr-prefs.c:944 ++msgid "Saturday" ++msgstr "Sábado" ++ ++#: ../gtk/tr-prefs.c:975 ++msgid "Speed Limits" ++msgstr "Limites de Velocidade" ++ ++#: ../gtk/tr-prefs.c:977 ++#, c-format ++msgid "_Upload (%s):" ++msgstr "_Enviar (%s):" ++ ++#: ../gtk/tr-prefs.c:984 ++#, c-format ++msgid "_Download (%s):" ++msgstr "_Descarregar (%s):" ++ ++#: ../gtk/tr-prefs.c:993 ++msgid "Alternative Speed Limits" ++msgstr "Limites de velocidade alternativos" ++ ++#: ../gtk/tr-prefs.c:1002 ++msgid "Override normal speed limits manually or at scheduled times" ++msgstr "Ignorar limites de velocidade normal manualmente ou em horas programadas" ++ ++#: ../gtk/tr-prefs.c:1009 ++#, c-format ++msgid "U_pload (%s):" ++msgstr "_Enviar (%s):" ++ ++#: ../gtk/tr-prefs.c:1013 ++#, c-format ++msgid "Do_wnload (%s):" ++msgstr "_Descarregar (%s):" ++ ++#: ../gtk/tr-prefs.c:1017 ++msgid "_Scheduled times:" ++msgstr "_Horas programadas:" ++ ++#: ../gtk/tr-prefs.c:1022 ++msgid " _to " ++msgstr "_a" ++ ++#: ../gtk/tr-prefs.c:1033 ++msgid "_On days:" ++msgstr "_nos dias:" ++ ++#: ../gtk/tr-prefs.c:1064 ../gtk/tr-prefs.c:1137 ../gtk/tr-prefs.c:1219 ++msgid "Status unknown" ++msgstr "Estado desconhecido" ++ ++#: ../gtk/tr-prefs.c:1090 ++msgid "Port is <b>closed</b>" ++msgstr "A porta está <b>fechada</b>" ++ ++#: ../gtk/tr-prefs.c:1090 ++msgid "Port is <b>open</b>" ++msgstr "A porta está <b>aberta</b>" ++ ++#: ../gtk/tr-prefs.c:1104 ++msgid "<i>Testing TCP port…</i>" ++msgstr "<i>A testar a porta TCP…</i>" ++ ++#: ../gtk/tr-prefs.c:1130 ++msgid "Listening Port" ++msgstr "Porta de escuta" ++ ++#: ../gtk/tr-prefs.c:1132 ++msgid "_Port used for incoming connections:" ++msgstr "_Porta utilizada para entrada de ligações:" ++ ++#: ../gtk/tr-prefs.c:1140 ++msgid "Te_st Port" ++msgstr "Te_star Porta" ++ ++#: ../gtk/tr-prefs.c:1147 ++msgid "Pick a _random port every time Transmission is started" ++msgstr "Escolher uma porta _aleatória sempre que o Transmission for iniciado" ++ ++#: ../gtk/tr-prefs.c:1151 ++msgid "Use UPnP or NAT-PMP port _forwarding from my router" ++msgstr "Usar redirecionamento de portas UPnP ou NAT-PMP no meu router" ++ ++#: ../gtk/tr-prefs.c:1156 ++msgid "Peer Limits" ++msgstr "Limites de pares" ++ ++#: ../gtk/tr-prefs.c:1159 ++msgid "Maximum peers per _torrent:" ++msgstr "Máximo de pares por _torrent:" ++ ++#: ../gtk/tr-prefs.c:1161 ++msgid "Maximum peers _overall:" ++msgstr "Máximo _total de pares:" ++ ++#: ../gtk/tr-prefs.c:1167 ++msgid "Enable _uTP for peer communication" ++msgstr "Ativar _uTP para comunicação de pares" ++ ++#: ../gtk/tr-prefs.c:1169 ++msgid "uTP is a tool for reducing network congestion." ++msgstr "O uTP é uma ferramenta para reduzir o congestionamento na rede." ++ ++#: ../gtk/tr-prefs.c:1174 ++msgid "Use PE_X to find more peers" ++msgstr "Usar PE_X para encontrar mais pares" ++ ++#: ../gtk/tr-prefs.c:1176 ++msgid "PEX is a tool for exchanging peer lists with the peers you're connected to." ++msgstr "O PEX é uma ferramenta para trocar listas de pares com os pares aos quais está conectado." ++ ++#: ../gtk/tr-prefs.c:1180 ++msgid "Use _DHT to find more peers" ++msgstr "Usar o _DHT para encontrar mais pares" ++ ++#: ../gtk/tr-prefs.c:1182 ++msgid "DHT is a tool for finding peers without a tracker." ++msgstr "O DHT é uma ferramenta para encontrar pares sem um rastreador (tracker)." ++ ++#: ../gtk/tr-prefs.c:1186 ++msgid "Use _Local Peer Discovery to find more peers" ++msgstr "Usar _LPD para descobrir mais pares" ++ ++#: ../gtk/tr-prefs.c:1188 ++msgid "LPD is a tool for finding peers on your local network." ++msgstr "O LPD (descoberta local de pares) é uma ferramenta para encontrar pares na sua rede local." ++ ++#: ../gtk/tr-prefs.c:1244 ++msgid "Transmission Preferences" ++msgstr "Preferências do Transmission" ++ ++#: ../gtk/tr-prefs.c:1254 ++msgctxt "Gerund" ++msgid "Downloading" ++msgstr "Descarregar" ++ ++#: ../gtk/tr-prefs.c:1255 ++msgctxt "Gerund" ++msgid "Seeding" ++msgstr "Semear" ++ ++#: ../gtk/tr-prefs.c:1257 ++msgid "Network" ++msgstr "Rede" ++ ++#: ../gtk/tr-prefs.c:1259 ++msgid "Remote" ++msgstr "Remoto" ++ ++#: ../gtk/tr-window.c:127 ++msgid "Torrent" ++msgstr "Torrent" ++ ++#: ../gtk/tr-window.c:227 ++msgid "Total Ratio" ++msgstr "Rácio Total" ++ ++#: ../gtk/tr-window.c:228 ++msgid "Session Ratio" ++msgstr "Rácio da Sessão" ++ ++#: ../gtk/tr-window.c:229 ++msgid "Total Transfer" ++msgstr "Transferência Total" ++ ++#: ../gtk/tr-window.c:230 ++msgid "Session Transfer" ++msgstr "Transferência na Sessão" ++ ++#: ../gtk/tr-window.c:255 ++#, c-format ++msgid "" ++"Click to disable Alternative Speed Limits\n" ++" (%1$s down, %2$s up)" ++msgstr "" ++"Clique para desativar os limites de velocidade alternativos\n" ++" (%1$s rec, %2$s env)" ++ ++#: ../gtk/tr-window.c:256 ++#, c-format ++msgid "" ++"Click to enable Alternative Speed Limits\n" ++" (%1$s down, %2$s up)" ++msgstr "" ++"Clique para ativar os limites de velocidade alternativos\n" ++" (%1$s rec, %2$s env)" ++ ++#: ../gtk/tr-window.c:310 ++#, c-format ++msgid "Tracker will allow requests in %s" ++msgstr "O rastreador irá permitir pedidos dentro de %s" ++ ++#: ../gtk/tr-window.c:380 ++msgid "Unlimited" ++msgstr "Ilimitado" ++ ++#: ../gtk/tr-window.c:451 ++msgid "Seed Forever" ++msgstr "Semear para sempre" ++ ++#: ../gtk/tr-window.c:489 ++msgid "Limit Download Speed" ++msgstr "Limitar velocidade de descarregamento" ++ ++#: ../gtk/tr-window.c:493 ++msgid "Limit Upload Speed" ++msgstr "Limitar velocidade de envio" ++ ++#: ../gtk/tr-window.c:500 ++msgid "Stop Seeding at Ratio" ++msgstr "Parar de semear no rácio" ++ ++#: ../gtk/tr-window.c:533 ++#, c-format ++msgid "Stop at Ratio (%s)" ++msgstr "Parar no rácio (%s)" ++ ++#: ../gtk/tr-window.c:761 ../gtk/tr-window.c:787 ++#, c-format ++msgid "Ratio: %s" ++msgstr "Rácio: %s" ++ ++#. Translators: "size|" is here for disambiguation. Please remove it from your translation. ++#. %1$s is the size of the data we've downloaded ++#. %2$s is the size of the data we've uploaded ++#: ../gtk/tr-window.c:771 ++#, c-format ++msgid "Down: %1$s, Up: %2$s" ++msgstr "Receb: %1$s, Env: %2$s" ++ ++#. Translators: "size|" is here for disambiguation. Please remove it from your translation. ++#. %1$s is the size of the data we've downloaded ++#. %2$s is the size of the data we've uploaded ++#: ../gtk/tr-window.c:781 ++#, c-format ++msgid "size|Down: %1$s, Up: %2$s" ++msgstr "Receb: %1$s, Env: %2$s" ++ ++#: ../gtk/transmission-gtk.appdata.xml.in:12 ../gtk/transmission-gtk.desktop.in:5 ++msgid "Download and share files over BitTorrent" ++msgstr "Descarregar e partilhar ficheiros pelo BitTorrent" ++ ++#. Translators: these are the application description paragraphs in the AppData file. ++#: ../gtk/transmission-gtk.appdata.xml.in:16 ++msgid "BitTorrent is a peer-to-peer file-sharing protocol that is commonly used to distribute large amounts of data between multiple users." ++msgstr "O BitTorrent é um protocolo de partilha de ficheiros ponto-a-ponto que é comum utilizar para distribuir grandes quantidades de dados entre vários utilizadores." ++ ++#: ../gtk/transmission-gtk.appdata.xml.in:20 ++msgid "Transmission is a BitTorrent client with an easy-to-use frontend on top a cross-platform backend. Native frontends are available for OS X and Windows, as well as command line and web frontends." ++msgstr "O Transmission é um cliente BitTorrent com uma interface fácil de utilizar sobre um código multi-plataforma. Existem várias interfaces nativas para OS X e Windows, assim como em linha de comandos e baseado na web." ++ ++#: ../gtk/transmission-gtk.appdata.xml.in:26 ++msgid "Notable features of Transmission include support for Local Peer Discovery, encryption, DHT, µTP, PEX and Magnet Link." ++msgstr "O Transmission tem funcionalidaes notáveis como , descoberta de pares locais (LPD), encriptação, tabelas de hash distribuídas (DHT), protocolo de transporte micro (µTP), troca de pares (PEX) e links magnéticos." ++ ++#: ../gtk/transmission-gtk.desktop.in:4 ++msgid "BitTorrent Client" ++msgstr "Cliente BitTorrent" ++ ++#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! ++#: ../gtk/transmission-gtk.desktop.in:7 ++msgid "torrents;downloading;uploading;share;sharing;" ++msgstr "torrents;descarregar;baixar;transferir;transferência;enviar;partilhar;partilha;" ++ ++#: ../gtk/transmission-gtk.desktop.in:21 ++msgid "Start Transmission with All Torrents Paused" ++msgstr "Iniciar o Transmission com todos os torrents em pausa" ++ ++#: ../gtk/transmission-gtk.desktop.in:25 ++msgid "Start Transmission Minimized" ++msgstr "Iniciar o Transmission minimizado" ++ ++#: ../gtk/util.c:36 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../gtk/util.c:37 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../gtk/util.c:38 ++msgid "GiB" ++msgstr "GiB" ++ ++#: ../gtk/util.c:39 ++msgid "TiB" ++msgstr "TiB" ++ ++#: ../gtk/util.c:42 ++msgid "kB" ++msgstr "kB" ++ ++#: ../gtk/util.c:43 ++msgid "MB" ++msgstr "MB" ++ ++#: ../gtk/util.c:44 ++msgid "GB" ++msgstr "GB" ++ ++#: ../gtk/util.c:45 ++msgid "TB" ++msgstr "TB" ++ ++#: ../gtk/util.c:48 ++msgid "kB/s" ++msgstr "kB/s" ++ ++#: ../gtk/util.c:49 ++msgid "MB/s" ++msgstr "MB/s" ++ ++#: ../gtk/util.c:50 ++msgid "GB/s" ++msgstr "GB/s" ++ ++#: ../gtk/util.c:51 ++msgid "TB/s" ++msgstr "TB/s" ++ ++#: ../gtk/util.c:122 ++#, c-format ++msgid "%'d day" ++msgid_plural "%'d days" ++msgstr[0] "%'d dia" ++msgstr[1] "%'d dias" ++ ++#: ../gtk/util.c:123 ++#, c-format ++msgid "%'d hour" ++msgid_plural "%'d hours" ++msgstr[0] "%'d hora" ++msgstr[1] "%'d horas" ++ ++#: ../gtk/util.c:124 ++#, c-format ++msgid "%'d minute" ++msgid_plural "%'d minutes" ++msgstr[0] "%'d minuto" ++msgstr[1] "%'d minutos" ++ ++#: ../gtk/util.c:125 ++#, c-format ++msgid "%'d second" ++msgid_plural "%'d seconds" ++msgstr[0] "%'d segundo" ++msgstr[1] "%'d segundos" ++ ++#: ../gtk/util.c:258 ++#, c-format ++msgid "The torrent file \"%s\" contains invalid data." ++msgstr "O ficheiro torrent \"%s\" contém dados inválidos." ++ ++#: ../gtk/util.c:262 ++#, c-format ++msgid "The torrent file \"%s\" is already in use by \"%s.\"" ++msgstr "O ficheiro torrent \"%s\" está a ser utilizador pelo \"%s.\"" ++ ++#: ../gtk/util.c:267 ++#, c-format ++msgid "The torrent file \"%s\" encountered an unknown error." ++msgstr "O ficheiro torrent \"%s\" encontrou um erro desconhecido." ++ ++#: ../gtk/util.c:271 ++msgid "Error opening torrent" ++msgstr "Erro ao abrir o torrent" ++ ++#: ../gtk/util.c:594 ++msgid "Unrecognized URL" ++msgstr "URL irreconhecido" ++ ++#: ../gtk/util.c:596 ++#, c-format ++msgid "Transmission doesn't know how to use \"%s\"" ++msgstr "O Transmission não sabe como utilizar \"%s\"" ++ ++#: ../gtk/util.c:601 ++#, c-format ++msgid "This magnet link appears to be intended for something other than BitTorrent. BitTorrent magnet links have a section containing \"%s\"." ++msgstr "Este link magnético parece ser para outra coisa que não o BitTorrent. Os links magnéticos BitTorrent têm uma secção com \"%s\"." ++ ++#: ../gtk/util.c:723 ++#, c-format ++msgid "%s free" ++msgstr "%s livre" ++ ++#: ../libtransmission/announcer-http.c:221 ../libtransmission/announcer-http.c:389 ++#, c-format ++msgid "Tracker gave HTTP response code %1$ld (%2$s)" ++msgstr "O rastreador forneceu o código HTTP de resposta %1$ld (%2$s)" ++ ++#: ../libtransmission/announcer-udp.c:273 ../libtransmission/announcer-udp.c:423 ++msgid "Unknown error" ++msgstr "Erro desconhecido" ++ ++#: ../libtransmission/announcer-udp.c:513 ++#, c-format ++msgid "DNS Lookup failed: %s" ++msgstr "Falhou a consulta de DNS: %s" ++ ++#: ../libtransmission/announcer-udp.c:616 ++msgid "Connection failed" ++msgstr "A ligação falhou" ++ ++#: ../libtransmission/announcer.c:1150 ../libtransmission/announcer.c:1469 ++msgid "Could not connect to tracker" ++msgstr "Não foi possível conectar ao rastreador" ++ ++#: ../libtransmission/announcer.c:1154 ../libtransmission/announcer.c:1473 ++msgid "Tracker did not respond" ++msgstr "O rastreador não respondeu" ++ ++#: ../libtransmission/announcer.c:1218 ++msgid "Success" ++msgstr "Sucesso" ++ ++#: ../libtransmission/blocklist.c:63 ../libtransmission/blocklist.c:360 ../libtransmission/utils.c:258 ++#, c-format ++msgid "Couldn't read \"%1$s\": %2$s" ++msgstr "Não foi possível ler \"%1$s\": %2$s" ++ ++#: ../libtransmission/blocklist.c:103 ++#, c-format ++msgid "Blocklist \"%s\" contains %zu entries" ++msgstr "A lista de bloqueios \"%s\" contém %zu entradas" ++ ++#. don't try to display the actual lines - it causes issues ++#: ../libtransmission/blocklist.c:403 ++#, c-format ++msgid "blocklist skipped invalid address at line %d" ++msgstr "a lista de bloqueios ignorou endereços inválidos na linha %d" ++ ++#: ../libtransmission/blocklist.c:460 ../libtransmission/rpcimpl.c:1650 ../libtransmission/rpcimpl.c:1664 ../libtransmission/rpcimpl.c:1687 ../libtransmission/variant.c:1226 ++#, c-format ++msgid "Couldn't save file \"%1$s\": %2$s" ++msgstr "Não foi possível gravar o ficheiro \"%1$s\": %2$s" ++ ++#: ../libtransmission/blocklist.c:466 ++#, c-format ++msgid "Blocklist \"%s\" updated with %zu entries" ++msgstr "A lista de bloqueios \"%s\" foi atualizada com %zu entradas" ++ ++#: ../libtransmission/fdlimit.c:168 ++#, c-format ++msgid "Couldn't get directory for \"%1$s\": %2$s" ++msgstr "Não foi possível obter o diretório de \"%1$s\": %2$s" ++ ++#: ../libtransmission/fdlimit.c:174 ../libtransmission/file-posix.c:243 ++#, c-format ++msgid "Couldn't create \"%1$s\": %2$s" ++msgstr "Não foi possível criar \"%1$s\": %2$s" ++ ++#: ../libtransmission/fdlimit.c:195 ++#, c-format ++msgid "Couldn't open \"%1$s\": %2$s" ++msgstr "Não foi possível abrir \"%1$s\": %2$s" ++ ++#: ../libtransmission/fdlimit.c:207 ++msgid "full" ++msgstr "cheio" ++ ++#: ../libtransmission/fdlimit.c:212 ++msgid "sparse" ++msgstr "escasso" ++ ++#: ../libtransmission/fdlimit.c:219 ++#, c-format ++msgid "Couldn't preallocate file \"%1$s\" (%2$s, size: %3$<PRIu64>): %4$s" ++msgstr "Não foi possível pré-alocar o ficheiro \"%1$s\" (%2$s, tamanho: %3$<PRIu64>): %4$s" ++ ++#: ../libtransmission/fdlimit.c:224 ++#, c-format ++msgid "Preallocated file \"%1$s\" (%2$s, size: %3$<PRIu64>)" ++msgstr "Ficheiro pré-alocado \"%1$s\" (%2$s, tamanho: %3$<PRIu64>)" ++ ++#: ../libtransmission/fdlimit.c:235 ++#, c-format ++msgid "Couldn't truncate \"%1$s\": %2$s" ++msgstr "Não foi possível truncar \"%1$s\": %2$s" ++ ++#: ../libtransmission/fdlimit.c:553 ++#, c-format ++msgid "Couldn't create socket: %s" ++msgstr "Não foi possível criar o socket: %s" ++ ++#: ../libtransmission/file-posix.c:153 ++#, c-format ++msgid "File \"%s\" is in the way" ++msgstr "O ficheiro \"%s\" está no caminho" ++ ++#: ../libtransmission/makemeta.c:54 ++#, c-format ++msgid "Torrent Creator is skipping file \"%s\": %s" ++msgstr "O criador de torrents está a ignorar o ficheiro \"%s\": %s" ++ ++#: ../libtransmission/makemeta.c:209 ++#, c-format ++msgid "Failed to set piece size to %s, leaving it at %s" ++msgstr "Não foi possível definir o tamanho das peças em %s, a utilizar %s" ++ ++#: ../libtransmission/metainfo.c:759 ++#, c-format ++msgid "Invalid metadata entry \"%s\"" ++msgstr "Entrada de metadados inválidos \"%s\"" ++ ++#: ../libtransmission/natpmp.c:30 ++msgid "Port Forwarding (NAT-PMP)" ++msgstr "Redirecionamento de portas (NAT-PMP)" ++ ++#: ../libtransmission/natpmp.c:73 ++#, c-format ++msgid "%s succeeded (%d)" ++msgstr "%s bem sucedido (%d)" ++ ++#: ../libtransmission/natpmp.c:138 ++#, c-format ++msgid "Found public address \"%s\"" ++msgstr "Endereço público encontrado \"%s\"" ++ ++#: ../libtransmission/natpmp.c:173 ++#, c-format ++msgid "no longer forwarding port %d" ++msgstr "já não está a redirecionar a porta %d" ++ ++#: ../libtransmission/natpmp.c:222 ++#, c-format ++msgid "Port %d forwarded successfully" ++msgstr "Porta %d redirecionada com sucesso" ++ ++#: ../libtransmission/net.c:323 ++#, c-format ++msgid "Couldn't set source address %s on %<PRIdMAX>: %s" ++msgstr "Não foi possível definir o endereço da fonte %s em %<PRIdMAX>: %s" ++ ++#: ../libtransmission/net.c:339 ++#, c-format ++msgid "Couldn't connect socket %<PRIdMAX> to %s, port %d (errno %d - %s)" ++msgstr "Não foi possível conectar o socket %<PRIdMAX> a %s, porta %d (errno %d - %s)" ++ ++#: ../libtransmission/net.c:436 ++msgid "Is another copy of Transmission already running?" ++msgstr "Está a ser executada outra instância do Transmission?" ++ ++#: ../libtransmission/net.c:445 ++#, c-format ++msgid "Couldn't bind port %d on %s: %s" ++msgstr "Não foi possível vincular a porta %d em %s: %s" ++ ++#: ../libtransmission/net.c:449 ++#, c-format ++msgid "Couldn't bind port %d on %s: %s (%s)" ++msgstr "Não foi possível vincular a porta %d em %s: %s (%s)" ++ ++#: ../libtransmission/peer-msgs.c:2134 ++#, c-format ++msgid "Please Verify Local Data! Piece #%zu is corrupt." ++msgstr "Por favor verifique os dados locais! A peça #%zu está corrompida." ++ ++#: ../libtransmission/platform.c:472 ++#, c-format ++msgid "Searching for web interface file \"%s\"" ++msgstr "A procurar pelo ficheiro de interface web \"%s\"" ++ ++#: ../libtransmission/port-forwarding.c:29 ++msgid "Port Forwarding" ++msgstr "Redirecionamento de portas" ++ ++#: ../libtransmission/port-forwarding.c:57 ++msgid "Starting" ++msgstr "A iniciar" ++ ++#: ../libtransmission/port-forwarding.c:60 ++msgid "Forwarded" ++msgstr "Redirecionado" ++ ++#: ../libtransmission/port-forwarding.c:63 ++msgid "Stopping" ++msgstr "A parar" ++ ++#: ../libtransmission/port-forwarding.c:66 ++msgid "Not forwarded" ++msgstr "Não redirecionado" ++ ++#: ../libtransmission/port-forwarding.c:106 ../libtransmission/torrent.c:2302 ++#, c-format ++msgid "State changed from \"%1$s\" to \"%2$s\"" ++msgstr "Estado alterado de \"%1$s\" para \"%2$s\"" ++ ++#: ../libtransmission/port-forwarding.c:196 ++msgid "Stopped" ++msgstr "Parado" ++ ++#: ../libtransmission/rpc-server.c:1096 ++#, c-format ++msgid "Couldn't find settings key \"%s\"" ++msgstr "Não foi possível encontrar a chave de configurações \"%s\"" ++ ++#: ../libtransmission/rpc-server.c:1230 ++#, c-format ++msgid "%s is not a valid address" ++msgstr "%s não é um endereço válido" ++ ++#: ../libtransmission/rpc-server.c:1235 ++#, c-format ++msgid "%s is not an IPv4 or IPv6 address. RPC listeners must be IPv4 or IPv6" ++msgstr "%s não é um endereço IPv4 nem IPv6. Os RPC listeners têm de ser IPv4 ou IPv6" ++ ++#: ../libtransmission/rpc-server.c:1243 ++#, c-format ++msgid "Serving RPC and Web requests on %s:%d%s" ++msgstr "A servir pedidos RPC e Web em %s:%d%s" ++ ++#: ../libtransmission/rpc-server.c:1249 ++msgid "Whitelist enabled" ++msgstr "Lista branca ativada" ++ ++#: ../libtransmission/rpc-server.c:1254 ++msgid "Password required" ++msgstr "Necessária palavra-passe" ++ ++#: ../libtransmission/rpcimpl.c:1674 ++#, c-format ++msgid "Error uncompressing blocklist: %s (%d)" ++msgstr "Erro ao descomprimir a lista de bloqueios: %s (%d)" ++ ++#. first %s is the application name ++#. second %s is the version number ++#: ../libtransmission/session.c:769 ++#, c-format ++msgid "%s %s started" ++msgstr "1%s 1%s iniciado" ++ ++#: ../libtransmission/session.c:2170 ++#, c-format ++msgid "Loaded %d torrents" ++msgstr "%d torrents carregados" ++ ++#: ../libtransmission/torrent-magnet.c:310 ++msgid "Magnet torrent's metadata is not usable" ++msgstr "Os metadados do torrent magnético não são utilizáveis" ++ ++#: ../libtransmission/torrent.c:616 ++#, c-format ++msgid "Tracker warning: \"%s\"" ++msgstr "Aviso do rastreador: \"%s\"" ++ ++#: ../libtransmission/torrent.c:623 ++#, c-format ++msgid "Tracker error: \"%s\"" ++msgstr "Erro do rastreador: \"%s\"" ++ ++#: ../libtransmission/torrent.c:916 ++msgid "No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it." ++msgstr "Não foram encontrados dados. Certifique-se que as suas drives estão ligadas ou utiliza \"Definir Localização\". Para tornar a descarregar, remova o torrent e torne a adicioná-lo." ++ ++#: ../libtransmission/torrent.c:1868 ++msgid "Restarted manually -- disabling its seed ratio" ++msgstr "Reiniciado manualmente - a desativar o rácio de semear" ++ ++#: ../libtransmission/torrent.c:2078 ++msgid "Removing torrent" ++msgstr "A remover o torrent" ++ ++#. Translators: this is a minor point that's safe to skip over, but FYI: ++#. "Complete" and "Done" are specific, different terms in Transmission: ++#. "Complete" means we've downloaded every file in the torrent. ++#. "Done" means we're done downloading the files we wanted, but NOT all ++#. that exist ++#: ../libtransmission/torrent.c:2164 ++msgid "Done" ++msgstr "Feito" ++ ++#: ../libtransmission/torrent.c:2167 ++msgid "Complete" ++msgstr "Completo" ++ ++#: ../libtransmission/torrent.c:3466 ++#, c-format ++msgid "Piece %<PRIu32>, which was just downloaded, failed its checksum test" ++msgstr "A peça %<PRIu32>, que acabou de ser descarregada, falhou no teste de soma de verificação (checksum)" ++ ++#: ../libtransmission/upnp.c:29 ++msgid "Port Forwarding (UPnP)" ++msgstr "Redirecionamento de portas (UPnP)" ++ ++#: ../libtransmission/upnp.c:200 ++#, c-format ++msgid "Found Internet Gateway Device \"%s\"" ++msgstr "Foi encontrado o Internet Gateway Device \"%s\"" ++ ++#: ../libtransmission/upnp.c:201 ++#, c-format ++msgid "Local Address is \"%s\"" ++msgstr "O endereço local é \"%s\"" ++ ++#: ../libtransmission/upnp.c:228 ++#, c-format ++msgid "Port %d isn't forwarded" ++msgstr "A porta %d não está a ser redirecionada" ++ ++#: ../libtransmission/upnp.c:238 ++#, c-format ++msgid "Stopping port forwarding through \"%s\", service \"%s\"" ++msgstr "A parar o redirecionamento de portas por \"%s\", serviço \"%s\"" ++ ++#: ../libtransmission/upnp.c:275 ++#, c-format ++msgid "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)" ++msgstr "A redirecionar portas por \"%s\", serviço \"%s\". (endereço local: %s:%d)" ++ ++#: ../libtransmission/upnp.c:280 ++msgid "Port forwarding successful!" ++msgstr "Redirecionamento de portas bem sucedido!" ++ ++#: ../libtransmission/utils.c:270 ../libtransmission/utils.c:271 ++msgid "Not a regular file" ++msgstr "Não é um ficheiro normal" ++ ++#. did caller give us an uninitialized val? ++#: ../libtransmission/variant.c:926 ++msgid "Invalid metadata" ++msgstr "metadados inválidos" ++ ++#: ../libtransmission/variant.c:1211 ../libtransmission/variant.c:1235 ++#, c-format ++msgid "Couldn't save temporary file \"%1$s\": %2$s" ++msgstr "Não foi possível gravar o ficheiro temporário \"%1$s\": %2$s" ++ ++#: ../libtransmission/variant.c:1221 ++#, c-format ++msgid "Saved \"%s\"" ++msgstr "\"%s\" gravado" ++ ++#: ../libtransmission/variant.c:1264 ++msgid "Unable to parse file content" ++msgstr "Não foi possível processar o conteúdo do ficheiro" ++ ++#: ../libtransmission/verify.c:220 ++msgid "Verifying torrent" ++msgstr "A verificar o torrent" ++ ++#, c-format ++#~ msgid "Server returned \"%1$ld %2$s\"" ++#~ msgstr "O servidor devolveu \"%1$ld %2$s\"" ++ ++#, c-format ++#~ msgid "Error opening \"%s\"" ++#~ msgstr "Erro ao abrir \"%s\"" diff --git a/user/ttf-dejavu/APKBUILD b/user/ttf-dejavu/APKBUILD index b69fefb4e..9a7c7d20f 100644 --- a/user/ttf-dejavu/APKBUILD +++ b/user/ttf-dejavu/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ttf-dejavu pkgver=2.37 pkgrel=0 diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD index e6251fcda..1dffb5f81 100644 --- a/user/ttf-freefont/APKBUILD +++ b/user/ttf-freefont/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ttf-freefont pkgver=20120503 pkgrel=1 diff --git a/user/x265/APKBUILD b/user/x265/APKBUILD index 0ca89487e..685f75ea8 100644 --- a/user/x265/APKBUILD +++ b/user/x265/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="cmake yasm" # 2.6+ will use nasm instead of yasm subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://bitbucket.org/multicoreware/$pkgname/downloads/${pkgname}_${pkgver}.tar.gz +source="$pkgname-$pkgver.tar.gz::https://download.videolan.org/pub/videolan/${pkgname}/${pkgname}_${pkgver}.tar.gz x265-unbreak-my-arm.patch" builddir="$srcdir/${pkgname}_$pkgver" diff --git a/user/xorg-cf-files/APKBUILD b/user/xorg-cf-files/APKBUILD index f3270a4db..81f83d774 100644 --- a/user/xorg-cf-files/APKBUILD +++ b/user/xorg-cf-files/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xorg-cf-files -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Data files for the imake utility" url="https://www.X.Org/" @@ -30,4 +30,4 @@ package() { install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ } -sha512sums="1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa xorg-cf-files-1.0.6.tar.bz2" +sha512sums="0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e xorg-cf-files-1.0.7.tar.bz2" diff --git a/user/xorriso/APKBUILD b/user/xorriso/APKBUILD index 438d19a60..7839a47fc 100644 --- a/user/xorriso/APKBUILD +++ b/user/xorriso/APKBUILD @@ -10,7 +10,7 @@ license="GPL-3.0+" depends="" makedepends="acl-dev bzip2-dev zlib-dev" subpackages="$pkgname-doc" -source="https://www.gnu.org/software/xorriso/xorriso-$pkgver.tar.gz" +source="https://www.gnu.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7c0076449a54880e3988879f9c5689d1a0b8edd8b15e037c510aa960f25fba4d27b9fc2fdc0c5d959b7d46fb09ec861f33cf0fa2766aa0b93712ac6663cfa1e1 xorriso-1.5.3.tar.gz" +sha512sums="7a0b74c608a9693f1ee72c3444d0798918dd0b851a9c77a1185f306cb76f36a6b1b014c915cb3f38885d709026db69da5ed0f11583cbef82b56aad629c01802f xorriso-1.5.3.tar.gz" |