diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2012-09-26 01:10:42 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:51:55 +0200 |
| commit | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch) | |
| tree | b428a16618e36ed864a8d76ea3435e19a452bf90 /source/a | |
| parent | 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff) | |
| download | current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz | |
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!
We're perfectionists here at Slackware, so this release has been a long
time a-brewing. But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Thanks to everyone who helped make this happen. The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.
Have fun! :-)
Diffstat (limited to 'source/a')
236 files changed, 15233 insertions, 36229 deletions
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild index 297591448..b41e95454 100755 --- a/source/a/aaa_base/aaa_base.SlackBuild +++ b/source/a/aaa_base/aaa_base.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.37 -BUILD=${BUILD:-3} +VERSION=14.0 +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -37,6 +37,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-aaa_base +rm -rf $PKG mkdir -p $TMP $PKG # Explode the package framework: @@ -51,6 +52,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cp -a $CWD/slackware-version $PKG/etc/slackware-version chown root:root $PKG/etc/slackware-version chmod 644 $PKG/etc/slackware-version +cp -a $CWD/os-release $PKG/etc/os-release +chown root:root $PKG/etc/os-release +chmod 644 $PKG/etc/os-release # Add lib64 directories on x86_64: if [ "$ARCH" = "x86_64" ]; then diff --git a/source/a/aaa_base/os-release b/source/a/aaa_base/os-release new file mode 100644 index 000000000..717dbbf8c --- /dev/null +++ b/source/a/aaa_base/os-release @@ -0,0 +1,10 @@ +NAME=Slackware +VERSION="14.0" +ID=slackware +VERSION_ID=14.0 +PRETTY_NAME="Slackware 14.0" +ANSI_COLOR="0;34" +CPE_NAME="cpe:/o:slackware:slackware_linux:14.0" +HOME_URL="http://slackware.com/" +SUPPORT_URL="http://www.linuxquestions.org/questions/slackware-14/" +BUG_REPORT_URL="http://www.linuxquestions.org/questions/slackware-14/" diff --git a/source/a/aaa_base/slackware-version b/source/a/aaa_base/slackware-version index 9f526a9a3..bd93610e1 100644 --- a/source/a/aaa_base/slackware-version +++ b/source/a/aaa_base/slackware-version @@ -1 +1 @@ -Slackware 13.37.0 +Slackware 14.0 diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index 09c181ef2..20a343d2d 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ PKGNAM=aaa_elflibs -VERSION=${VERSION:-13.37} -BUILD=${BUILD:-7} +VERSION=${VERSION:-14.0} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index ab5ec3d7a..38a44e9e9 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -6,12 +6,13 @@ /lib/libdm.so.0 /lib/libfuse.so.2 /lib/libgpm.so.1 -/lib/liblzma.so.0 +/lib/liblzma.so.5 /lib/libncurses.so.5 /lib/libncursesw.so.5 /lib/libpopt.so.0 /lib/libsysfs.so.2 /lib/libtermcap.so.2 +/lib/libz.so.1 /usr/lib/libasound.so.2 /usr/lib/libcurl.so.2 /usr/lib/libcurl.so.3 @@ -32,14 +33,11 @@ /usr/lib/libgmpxx.so.4 /usr/lib/libgobject-2.0.so.0 /usr/lib/libgthread-2.0.so.0 -/usr/lib/libhistory.so.4 /usr/lib/libhistory.so.5 /usr/lib/libidn.so.11 /usr/lib/libjpeg.so.62 /usr/lib/libjpeg.so.8 -/usr/lib/liblber-2.3.so.0 /usr/lib/liblber-2.4.so.2 -/usr/lib/libldap-2.3.so.0 /usr/lib/libldap-2.4.so.2 /usr/lib/libltdl.so.3 /usr/lib/libltdl.so.7 @@ -56,7 +54,6 @@ /usr/lib/libpng.so.14 /usr/lib/libpng12.so.0 /usr/lib/libpng14.so.14 -/usr/lib/libreadline.so.4 /usr/lib/libreadline.so.5 /usr/lib/libslang.so.1 /usr/lib/libslang.so.2 @@ -65,4 +62,3 @@ /usr/lib/libusb-1.0.so.0 /usr/lib/libvga.so.1 /usr/lib/libvgagl.so.1 -/usr/lib/libz.so.1 diff --git a/source/a/acl/acl.SlackBuild b/source/a/acl/acl.SlackBuild index a97bf27d1..a74fb355c 100755 --- a/source/a/acl/acl.SlackBuild +++ b/source/a/acl/acl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=acl -VERSION=2.2.50 +VERSION=2.2.51 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -50,7 +50,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf acl-$(echo $VERSION | cut -f 1 -d '-') -tar xzvf $CWD/acl-$VERSION.src.tar.gz || exit 1 +tar xvf $CWD/acl-$VERSION.src.tar.?z || exit 1 cd acl-$(echo $VERSION | cut -f 1 -d '-') || exit 1 chown -R root:root . diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild index bd96d8b11..0b761d78d 100755 --- a/source/a/acpid/acpid.SlackBuild +++ b/source/a/acpid/acpid.SlackBuild @@ -25,12 +25,14 @@ VERSION=${VERSION:-$(echo acpid-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -40,9 +42,22 @@ PKG=$TMP/package-acpid NUMJOBS=${NUMJOBS:--j8} +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP rm -rf acpid-$VERSION tar xvf $CWD/acpid-$VERSION.tar.?z* || exit 1 @@ -54,15 +69,29 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make install \ - OPT="-O2" \ - PREFIX=/usr \ - MANDIR=/usr/man \ - DOCDIR=/usr/doc/acpid-$VERSION \ - DESTDIR=$PKG \ - || exit 1 +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/acpid-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -strip --strip-unneeded $PKG/usr/bin/acpi_listen $PKG/usr/sbin/acpid +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/a/attr/attr.SlackBuild b/source/a/attr/attr.SlackBuild index 1b6fe70b4..892961cff 100755 --- a/source/a/attr/attr.SlackBuild +++ b/source/a/attr/attr.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=attr -VERSION=2.4.45 +VERSION=2.4.46 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -49,7 +49,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf attr-$(echo $VERSION | cut -f 1 -d '-') -tar xvf $CWD/attr-$VERSION.src.tar.gz || exit 1 +tar xvf $CWD/attr-$VERSION.src.tar.?z || exit 1 cd attr-$(echo $VERSION | cut -f 1 -d '-') || exit 1 chown -R root:root . find . \ diff --git a/source/a/bash/bash-4.1-patches/bash41-001 b/source/a/bash/bash-4.1-patches/bash41-001 deleted file mode 100644 index 758e1fa40..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-001 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-001 - -Bug-Reported-by: Yann Rouillard <yann@pleiades.fr.eu.org> -Bug-Reference-ID: <4B44A410.4070107@pleiades.fr.eu.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html - -Bug-Description: - -A prototype for vsnprintf was incorrect, and caused compilation failures -on systems that did not have a suitable vsnprintf, but had a declaration in -one of the system header files. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 ---- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 -*************** -*** 173,177 **** - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); - #endif - ---- 173,177 ---- - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-002 b/source/a/bash/bash-4.1-patches/bash41-002 deleted file mode 100644 index a1151985c..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-002 +++ /dev/null @@ -1,65 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-002 - -Bug-Reported-by: guillaume.outters@free.fr -Bug-Reference-ID: <20100105230441.70D171AA7F52@asterix.local> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html - -Bug-Description: - -Bash-4.1/Readline-6.1 introduced a hook function that allows applications -to rewrite or modify filenames read from the file system before comparing -them with a word to be completed. The converted filename, if it matches, -needs to be inserted into the line buffer, replacing the original contents. - -This fixes a completion bug on Mac OS X involving filenames containing -UTF-8 characters. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/lib/readline/complete.c 2009-11-29 18:39:30.000000000 -0500 ---- lib/readline/complete.c 2010-01-06 08:30:23.000000000 -0500 -*************** -*** 2139,2143 **** - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name)) - continue; - ---- 2139,2143 ---- - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn)) - continue; - -*************** -*** 2220,2224 **** - } - -! strcpy (temp + dirlen, entry->d_name); - } - else ---- 2220,2224 ---- - } - -! strcpy (temp + dirlen, convfn); - } - else -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-003 b/source/a/bash/bash-4.1-patches/bash41-003 deleted file mode 100644 index 479fdcd9d..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-003 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-003 - -Bug-Reported-by: coyote@wariat.org.pl -Bug-Reference-ID: <4b64a1f8.06e2660a.60af.4bfb@mx.google.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html - -Bug-Description: - -If command completion is attempted on a word with a quoted globbing -character (e.g., `*' or `?'), bash can reference a NULL pointer and -dump core. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/bashline.c 2009-10-24 14:10:19.000000000 -0400 ---- bashline.c 2010-01-30 21:53:49.000000000 -0500 -*************** -*** 1681,1685 **** - characters in the common prefix are bad) will ever be returned on - regular completion. */ -! if (glob_pattern_p (hint)) - { - if (state == 0) ---- 1681,1685 ---- - characters in the common prefix are bad) will ever be returned on - regular completion. */ -! if (globpat) - { - if (state == 0) -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-004 b/source/a/bash/bash-4.1-patches/bash41-004 deleted file mode 100644 index 33f79bb7c..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-004 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-004 - -Bug-Reported-by: Crestez Dan Leonard <cdleonard@gmail.com> -Bug-Reference-ID: <1265592839.30682.21.camel@deskbox> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html - -Bug-Description: - -When running in Posix mode and executing a shell function without local -variables, bash will not propagate a variable in a special builtin's temporary -environment to have global scope. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/variables.c 2009-11-03 14:13:58.000000000 -0500 ---- variables.c 2010-02-08 17:36:18.000000000 -0500 -*************** -*** 3809,3812 **** ---- 3809,3817 ---- - if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate))) - { -+ /* Make sure we have a hash table to store the variable in while it is -+ being propagated down to the global variables table. Create one if -+ we have to */ -+ if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0) -+ shell_variables->table = hash_create (0); - /* XXX - should we set v->context here? */ - v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-005 b/source/a/bash/bash-4.1-patches/bash41-005 deleted file mode 100644 index 8a2fec8a3..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-005 +++ /dev/null @@ -1,56 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-005 - -Bug-Reported-by: werner@suse.de -Bug-Reference-ID: <201002251238.o1PCcYcg016893@boole.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html - -Bug-Description: - -When the `read' builtin times out after the timeout specified with -t is -exceeded, it does not reset the flags that tell signal handlers to process -signals immediately instead of deferring their handling. This can result -in unsafe functions being called from signal handlers, which can cause bash -to hang or dump core. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/read.def 2009-10-08 11:35:46.000000000 -0400 ---- builtins/read.def 2010-03-17 17:35:39.000000000 -0400 -*************** -*** 616,621 **** - zsyncfd (fd); - -- interrupt_immediately--; -- terminate_immediately--; - discard_unwind_frame ("read_builtin"); - ---- 616,619 ---- -*************** -*** 624,627 **** ---- 622,628 ---- - assign_vars: - -+ interrupt_immediately--; -+ terminate_immediately--; -+ - #if defined (ARRAY_VARS) - /* If -a was given, take the string read, break it into a list of words, -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-006 b/source/a/bash/bash-4.1-patches/bash41-006 deleted file mode 100644 index d6553b8bb..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-006 +++ /dev/null @@ -1,76 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-006 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <201003210155.56618.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html - -Bug-Description: - -Bash did not correctly print/reproduce here documents attached to commands -inside compound commands such as for and while. This affected the -execution of such commands inside a shell function when the function -definition is saved and later restored using `.' or `eval'. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 ---- print_cmd.c 2010-03-22 21:15:30.000000000 -0400 -*************** -*** 114,117 **** ---- 114,123 ---- - #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) - -+ #define PRINT_DEFERRED_HEREDOCS(x) \ -+ do { \ -+ if (deferred_heredocs) \ -+ print_deferred_heredocs (x); \ -+ } while (0) -+ - /* Non-zero means the stuff being printed is inside of a function def. */ - static int inside_function_def; -*************** -*** 561,571 **** - { - print_for_command_head (for_command); -- - cprintf (";"); - newline ("do\n"); - indentation += indentation_amount; - make_command_string_internal (for_command->action); - semicolon (); - indentation -= indentation_amount; - newline ("done"); - } ---- 566,578 ---- - { - print_for_command_head (for_command); - cprintf (";"); - newline ("do\n"); -+ - indentation += indentation_amount; - make_command_string_internal (for_command->action); -+ PRINT_DEFERRED_HEREDOCS (""); - semicolon (); - indentation -= indentation_amount; -+ - newline ("done"); - } -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-007 b/source/a/bash/bash-4.1-patches/bash41-007 deleted file mode 100644 index 07b4796c4..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-007 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-007 - -Bug-Reported-by: Rob Robason <rob@robason.net> -Bug-Reference-ID: <1269513145.22336.9.camel@home.robason.homelinux.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html - -Bug-Description: - -A typo caused bash to not honor a precision specification in a printf -format. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/printf.def 2010-01-18 10:50:22.000000000 -0500 ---- builtins/printf.def 2010-03-25 09:40:56.000000000 -0400 -*************** -*** 118,122 **** - nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ - else if (have_precision) \ -! nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \ - else \ - nw = vflag ? vbprintf (f, func) : printf (f, func); \ ---- 118,122 ---- - nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ - else if (have_precision) \ -! nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \ - else \ - nw = vflag ? vbprintf (f, func) : printf (f, func); \ -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-008 b/source/a/bash/bash-4.1-patches/bash41-008 deleted file mode 100644 index 2bec4de4f..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-008 +++ /dev/null @@ -1,49 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-008 - -Bug-Reported-by: Dennis van Dok <dvandok@gmail.com> -Bug-Reference-ID: <4BBF2501.5050703@gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html - -Bug-Description: - -When declaring an associative array and implicitly assigning a value -to element "0", bash does not correctly allocate memory, leading to -a segmentation violation when that element or the array itself is -unset. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/declare.def 2009-11-25 19:42:00.000000000 -0500 ---- builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 -*************** -*** 513,517 **** - /* let bind_{array,assoc}_variable take care of this. */ - if (assoc_p (var)) -! bind_assoc_variable (var, name, "0", value, aflags); - else - bind_array_variable (name, 0, value, aflags); ---- 519,523 ---- - /* let bind_{array,assoc}_variable take care of this. */ - if (assoc_p (var)) -! bind_assoc_variable (var, name, savestring ("0"), value, aflags); - else - bind_array_variable (name, 0, value, aflags); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-009 b/source/a/bash/bash-4.1-patches/bash41-009 deleted file mode 100644 index ae0f1e3e0..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-009 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-009 - -Bug-Reported-by: Tomas Trnka <tomastrnka@gmx.com> -Bug-Reference-ID: <201003242030.02166.tomastrnka@gmx.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html - -Bug-Description: - -An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to -or read(2) from a terminal. This results in an error message and truncated -input or output. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/sig.c Fri Aug 14 16:31:52 2009 ---- sig.c Fri Mar 26 22:34:11 2010 -*************** -*** 655,660 **** ---- 655,663 ---- - act.sa_flags |= SA_INTERRUPT; /* XXX */ - else - act.sa_flags |= SA_RESTART; /* XXX */ -+ #else -+ if (sig == SIGCHLD) -+ act.sa_flags |= SA_RESTART; - #endif - sigemptyset (&act.sa_mask); - sigemptyset (&oact.sa_mask); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ - diff --git a/source/a/bash/bash-4.1-patches/bash41-010 b/source/a/bash/bash-4.1-patches/bash41-010 deleted file mode 100644 index b5a4b615a..000000000 --- a/source/a/bash/bash-4.1-patches/bash41-010 +++ /dev/null @@ -1,68 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-010 - -Bug-Reported-by: Stephane Jourdois <sjourdois@gmail.com> -Bug-Reference-ID: <AANLkTimbh1t2BmCjnCgACpEidArJMBIEtr30Vv3VzHxf@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-05/msg00165.html - -Bug-Description: - -The expansion of the \W prompt string escape sequence incorrectly used -strcpy to copy overlapping strings. Only memmove works in this case. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/parse.y 2009-12-30 12:51:42.000000000 -0500 ---- parse.y 2011-02-24 16:40:48.000000000 -0500 -*************** -*** 5153,5157 **** - t = strrchr (t_string, '/'); - if (t) -! strcpy (t_string, t + 1); - } - } ---- 5153,5157 ---- - t = strrchr (t_string, '/'); - if (t) -! memmove (t_string, t + 1, strlen (t)); - } - } -*** ../bash-4.1-patched/y.tab.c 2009-12-30 12:52:02.000000000 -0500 ---- y.tab.c 2011-02-24 16:50:27.000000000 -0500 -*************** -*** 7482,7486 **** - t = strrchr (t_string, '/'); - if (t) -! strcpy (t_string, t + 1); - } - } ---- 7482,7486 ---- - t = strrchr (t_string, '/'); - if (t) -! memmove (t_string, t + 1, strlen (t)); - } - } -*************** -*** 8244,8246 **** - } - #endif /* HANDLE_MULTIBYTE */ -- ---- 8244,8245 ---- -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-001 b/source/a/bash/bash-4.2-patches/bash42-001 new file mode 100644 index 000000000..547aaa06f --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-001 @@ -0,0 +1,78 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-001 + +Bug-Reported-by: Juergen Daubert <jue@jue.li> +Bug-Reference-ID: <20110214175132.GA19813@jue.netz> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html + +Bug-Description: + +When running in Posix mode, bash does not correctly expand the right-hand +side of a double-quoted word expansion containing single quotes. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 +--- subst.c 2011-02-19 00:00:00.000000000 -0500 +*************** +*** 1380,1387 **** + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +! parse_matched_pair() */ +! dolbrace_state = 0; +! if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +! dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; + + i = *sindex; +--- 1380,1389 ---- + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +! parse_matched_pair(). The different initial value is to handle the +! case where this function is called to parse the word in +! ${param op word} (SX_WORD). */ +! dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; +! if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) +! dolbrace_state = DOLBRACE_QUOTE; + + i = *sindex; +*************** +*** 7177,7181 **** + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); + if (string[sindex] == RBRACE) + sindex++; +--- 7181,7185 ---- + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); + if (string[sindex] == RBRACE) + sindex++; +*** ../bash-4.2-patched/subst.h 2010-12-02 20:21:29.000000000 -0500 +--- subst.h 2011-02-16 21:12:09.000000000 -0500 +*************** +*** 57,60 **** +--- 57,61 ---- + #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ + #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ ++ #define SX_WORD 0x0200 /* extracting word in ${param op word} */ + + /* Remove backslashes which are quoting backquotes from STRING. Modifies +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 0 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-002 b/source/a/bash/bash-4.2-patches/bash42-002 new file mode 100644 index 000000000..077c7e0f8 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-002 @@ -0,0 +1,60 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-002 + +Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com> +Bug-Reference-ID: <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html + +Bug-Description: + +The readline vi-mode `cc', `dd', and `yy' commands failed to modify the +entire line. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/vi_mode.c 2010-11-20 19:51:39.000000000 -0500 +--- lib/readline/vi_mode.c 2011-02-17 20:24:25.000000000 -0500 +*************** +*** 1115,1119 **** + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +! return (0); + } + #if defined (READLINE_CALLBACKS) +--- 1115,1119 ---- + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +! return (vidomove_dispatch (m)); + } + #if defined (READLINE_CALLBACKS) +*** ../bash-4.2-patched/lib/readline/callback.c 2010-06-06 12:18:58.000000000 -0400 +--- lib/readline/callback.c 2011-02-17 20:43:28.000000000 -0500 +*************** +*** 149,152 **** +--- 149,155 ---- + /* Should handle everything, including cleanup, numeric arguments, + and turning off RL_STATE_VIMOTION */ ++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) ++ _rl_internal_char_cleanup (); ++ + return; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ + diff --git a/source/a/bash/bash-4.2-patches/bash42-003 b/source/a/bash/bash-4.2-patches/bash42-003 new file mode 100644 index 000000000..c488e96b2 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-003 @@ -0,0 +1,318 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-003 + +Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com> +Bug-Reference-ID: <AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html + +Bug-Description: + +When using the pattern replacement and pattern removal word expansions, bash +miscalculates the possible match length in the presence of an unescaped left +bracket without a closing right bracket, resulting in a failure to match +the pattern. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -0500 +--- lib/glob/gmisc.c 2011-02-18 23:53:42.000000000 -0500 +*************** +*** 78,83 **** + size_t wmax; + { +! wchar_t wc, *wbrack; +! int matlen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) +--- 78,83 ---- + size_t wmax; + { +! wchar_t wc; +! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) +*************** +*** 119,123 **** + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +! wbrack = wpat; + wc = *wpat++; + do +--- 119,123 ---- + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +! bracklen = 1; + wc = *wpat++; + do +*************** +*** 125,140 **** + if (wc == 0) + { +! matlen += wpat - wbrack - 1; /* incremented below */ +! break; + } + else if (wc == L'\\') + { +! wc = *wpat++; +! if (*wpat == 0) +! break; + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; + in_cclass = 1; + } +--- 125,148 ---- + if (wc == 0) + { +! wpat--; /* back up to NUL */ +! matlen += bracklen; +! goto bad_bracket; + } + else if (wc == L'\\') + { +! /* *wpat == backslash-escaped character */ +! bracklen++; +! /* If the backslash or backslash-escape ends the string, +! bail. The ++wpat skips over the backslash escape */ +! if (*wpat == 0 || *++wpat == 0) +! { +! matlen += bracklen; +! goto bad_bracket; +! } + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; ++ bracklen++; + in_cclass = 1; + } +*************** +*** 142,145 **** +--- 150,154 ---- + { + wpat++; ++ bracklen++; + in_cclass = 0; + } +*************** +*** 147,152 **** + { + wpat++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +! wpat++; + in_collsym = 1; + } +--- 156,165 ---- + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +! { +! wpat++; +! bracklen++; +! } + in_collsym = 1; + } +*************** +*** 154,157 **** +--- 167,171 ---- + { + wpat++; ++ bracklen++; + in_collsym = 0; + } +*************** +*** 159,164 **** + { + wpat++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +! wpat++; + in_equiv = 1; + } +--- 173,182 ---- + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +! { +! wpat++; +! bracklen++; +! } + in_equiv = 1; + } +*************** +*** 166,174 **** +--- 184,196 ---- + { + wpat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((wc = *wpat++) != L']'); + matlen++; /* bracket expression can only match one char */ ++ bad_bracket: + break; + } +*************** +*** 214,219 **** + size_t max; + { +! char c, *brack; +! int matlen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) +--- 236,241 ---- + size_t max; + { +! char c; +! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) +*************** +*** 255,259 **** + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +! brack = pat; + c = *pat++; + do +--- 277,281 ---- + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +! bracklen = 1; + c = *pat++; + do +*************** +*** 261,276 **** + if (c == 0) + { +! matlen += pat - brack - 1; /* incremented below */ +! break; + } + else if (c == '\\') + { +! c = *pat++; +! if (*pat == 0) +! break; + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; + in_cclass = 1; + } +--- 283,306 ---- + if (c == 0) + { +! pat--; /* back up to NUL */ +! matlen += bracklen; +! goto bad_bracket; + } + else if (c == '\\') + { +! /* *pat == backslash-escaped character */ +! bracklen++; +! /* If the backslash or backslash-escape ends the string, +! bail. The ++pat skips over the backslash escape */ +! if (*pat == 0 || *++pat == 0) +! { +! matlen += bracklen; +! goto bad_bracket; +! } + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; ++ bracklen++; + in_cclass = 1; + } +*************** +*** 278,281 **** +--- 308,312 ---- + { + pat++; ++ bracklen++; + in_cclass = 0; + } +*************** +*** 283,288 **** + { + pat++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +! pat++; + in_collsym = 1; + } +--- 314,323 ---- + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +! { +! pat++; +! bracklen++; +! } + in_collsym = 1; + } +*************** +*** 290,293 **** +--- 325,329 ---- + { + pat++; ++ bracklen++; + in_collsym = 0; + } +*************** +*** 295,300 **** + { + pat++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +! pat++; + in_equiv = 1; + } +--- 331,340 ---- + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +! { +! pat++; +! bracklen++; +! } + in_equiv = 1; + } +*************** +*** 302,310 **** +--- 342,354 ---- + { + pat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((c = *pat++) != ']'); + matlen++; /* bracket expression can only match one char */ ++ bad_bracket: + break; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-004 b/source/a/bash/bash-4.2-patches/bash42-004 new file mode 100644 index 000000000..fe29f82c7 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-004 @@ -0,0 +1,53 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-004 + +Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> +Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as pattern removal or pattern substitution, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not matched correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 +--- subst.c 2011-02-18 22:30:13.000000000 -0500 +*************** +*** 3373,3379 **** + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +! td.flags = 0; + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +--- 3373,3379 ---- + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +! td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-005 b/source/a/bash/bash-4.2-patches/bash42-005 new file mode 100644 index 000000000..3ca9fc1da --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-005 @@ -0,0 +1,131 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-005 + +Bug-Reported-by: Dennis Williamson <dennistwilliamson@gmail.com> +Bug-Reference-ID: <AANLkTikDbEV5rnbPc0zOfmZfBcg0xGetzLLzK+KjRiNa@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html + +Bug-Description: + +Systems that use tzset() to set the local timezone require the TZ variable +to be in the environment. Bash must make sure the environment has been +modified with any updated value for TZ before calling tzset(). This +affects prompt string expansions and the `%T' printf conversion specification +on systems that do not allow bash to supply a replacement for getenv(3). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.h 2010-12-02 20:22:01.000000000 -0500 +--- variables.h 2011-02-19 19:57:12.000000000 -0500 +*************** +*** 314,317 **** +--- 314,318 ---- + extern void sort_variables __P((SHELL_VAR **)); + ++ extern int chkexport __P((char *)); + extern void maybe_make_export_env __P((void)); + extern void update_export_env_inplace __P((char *, int, char *)); +*** ../bash-4.2-patched/variables.c 2011-01-24 20:07:48.000000000 -0500 +--- variables.c 2011-02-19 20:04:50.000000000 -0500 +*************** +*** 3654,3657 **** +--- 3654,3673 ---- + } + ++ int ++ chkexport (name) ++ char *name; ++ { ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++ if (exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_env (); ++ return 1; ++ } ++ return 0; ++ } ++ + void + maybe_make_export_env () +*************** +*** 4215,4219 **** + { "TEXTDOMAINDIR", sv_locale }, + +! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) + { "TZ", sv_tz }, + #endif +--- 4231,4235 ---- + { "TEXTDOMAINDIR", sv_locale }, + +! #if defined (HAVE_TZSET) + { "TZ", sv_tz }, + #endif +*************** +*** 4559,4568 **** + #endif /* HISTORY */ + +! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) + void + sv_tz (name) + char *name; + { +! tzset (); + } + #endif +--- 4575,4585 ---- + #endif /* HISTORY */ + +! #if defined (HAVE_TZSET) + void + sv_tz (name) + char *name; + { +! if (chkexport (name)) +! tzset (); + } + #endif +*** ../bash-4.2-patched/parse.y 2011-01-02 15:48:11.000000000 -0500 +--- parse.y 2011-02-19 20:05:00.000000000 -0500 +*************** +*** 5136,5139 **** +--- 5136,5142 ---- + /* Make the current time/date into a string. */ + (void) time (&the_time); ++ #if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++ #endif + tm = localtime (&the_time); + +*** ../bash-4.2-patched/builtins/printf.def 2010-11-23 10:02:55.000000000 -0500 +--- builtins/printf.def 2011-02-19 20:05:04.000000000 -0500 +*************** +*** 466,469 **** +--- 466,472 ---- + else + secs = arg; ++ #if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++ #endif + tm = localtime (&secs); + n = strftime (timebuf, sizeof (timebuf), timefmt, tm); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-006 b/source/a/bash/bash-4.2-patches/bash42-006 new file mode 100644 index 000000000..be6e49c72 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-006 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-006 + +Bug-Reported-by: Allan McRae <allan@archlinux.org> +Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html + +Bug-Description: + +A problem with bash42-005 caused it to dump core if TZ was unset. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500 +--- variables.c 2011-03-01 10:13:04.000000000 -0500 +*************** +*** 3661,3665 **** + + v = find_variable (name); +! if (exported_p (v)) + { + array_needs_making = 1; +--- 3661,3665 ---- + + v = find_variable (name); +! if (v && exported_p (v)) + { + array_needs_making = 1; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-007 b/source/a/bash/bash-4.2-patches/bash42-007 new file mode 100644 index 000000000..d16156e27 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-007 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-007 + +Bug-Reported-by: Matthias Klose <doko@debian.org> +Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as case statement word expansion, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not expanded correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-02-25 12:03:58.000000000 -0500 +--- subst.c 2011-03-03 14:08:23.000000000 -0500 +*************** +*** 4609,4614 **** +--- 4611,4617 ---- + if (ifs_firstc == 0) + #endif + word->flags |= W_NOSPLIT; ++ word->flags |= W_NOSPLIT2; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-008 b/source/a/bash/bash-4.2-patches/bash42-008 new file mode 100644 index 000000000..631abbdf7 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-008 @@ -0,0 +1,74 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-008 + +Bug-Reported-by: Doug McMahon <mc2man@optonline.net> +Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html + +Bug-Description: + +Bash-4.2 does not attempt to save the shell history on receipt of a +terminating signal that is handled synchronously. Unfortunately, the +`close' button on most X11 terminal emulators sends SIGHUP, which +kills the shell. + +This is a very small patch to save the history in the case that an +interactive shell receives a SIGHUP or SIGTERM while in readline and +reading a command. + +The next version of bash will do this differently. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010 +--- sig.c Tue Mar 8 21:28:32 2011 +*************** +*** 47,50 **** +--- 47,51 ---- + #if defined (READLINE) + # include "bashline.h" ++ # include <readline/readline.h> + #endif + +*************** +*** 63,66 **** +--- 64,68 ---- + extern int history_lines_this_session; + #endif ++ extern int no_line_editing; + + extern void initialize_siglist (); +*************** +*** 506,510 **** + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +! history_lines_this_session = 0; + #endif + terminate_immediately = 0; +--- 508,515 ---- + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +! # if defined (READLINE) +! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) +! # endif +! history_lines_this_session = 0; + #endif + terminate_immediately = 0; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-009 b/source/a/bash/bash-4.2-patches/bash42-009 new file mode 100644 index 000000000..83a7e2c74 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-009 @@ -0,0 +1,82 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-009 + +Bug-Reported-by: <piuma@piumalab.org> +Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html + +Bug-Description: + +Under certain circumstances, running `fc -l' two times in succession with a +relative history offset at the end of the history will result in an incorrect +calculation of the last history entry and a seg fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000 -0400 +--- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400 +*************** +*** 305,309 **** + + /* XXX */ +! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +--- 305,309 ---- + + /* XXX */ +! if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +*************** +*** 476,480 **** + { + int sign, n, clen, rh; +! register int i, j; + register char *s; + +--- 476,480 ---- + { + int sign, n, clen, rh; +! register int i, j, last_hist; + register char *s; + +*************** +*** 496,500 **** + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! i -= rh + hist_last_line_added; + + /* No specification defaults to most recent command. */ +--- 496,508 ---- + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! last_hist = i - rh - hist_last_line_added; +! +! if (i == last_hist && hlist[last_hist] == 0) +! while (last_hist >= 0 && hlist[last_hist] == 0) +! last_hist--; +! if (last_hist < 0) +! return (-1); +! +! i = last_hist; + + /* No specification defaults to most recent command. */ +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-010 b/source/a/bash/bash-4.2-patches/bash42-010 new file mode 100644 index 000000000..e408abd61 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-010 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-010 + +Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> +Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html + +Bug-Description: + +Bash did not correctly print/reproduce here documents attached to commands +inside compound commands such as arithmetic for loops and user-specified +subshells. This affected the execution of such commands inside a shell +function when the function definition is saved and later restored using +`.' or `eval'. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400 +--- print_cmd.c 2011-04-14 10:43:18.000000000 -0400 +*************** +*** 316,319 **** +--- 317,321 ---- + skip_this_indent++; + make_command_string_internal (command->value.Subshell->command); ++ PRINT_DEFERRED_HEREDOCS (""); + cprintf (" )"); + break; +*************** +*** 593,596 **** +--- 606,610 ---- + indentation += indentation_amount; + make_command_string_internal (arith_for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; +*************** +*** 654,657 **** +--- 668,672 ---- + + make_command_string_internal (group_command->command); ++ PRINT_DEFERRED_HEREDOCS (""); + + if (inside_function_def) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-011 b/source/a/bash/bash-4.2-patches/bash42-011 new file mode 100644 index 000000000..26fdf65f6 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-011 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-011 + +Bug-Reported-by: "David Parks" <davidparks21@yahoo.com> +Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html + +Bug-Description: + +Overwriting a value in an associative array causes the memory allocated to +store the key on the second and subsequent assignments to leak. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/assoc.c 2009-08-05 20:19:40.000000000 -0400 +--- assoc.c 2011-10-04 20:23:07.000000000 -0400 +*************** +*** 78,81 **** +--- 78,86 ---- + if (b == 0) + return -1; ++ /* If we are overwriting an existing element's value, we're not going to ++ use the key. Nothing in the array assignment code path frees the key ++ string, so we can free it here to avoid a memory leak. */ ++ if (b->key != key) ++ free (key); + FREE (b->data); + b->data = value ? savestring (value) : (char *)0; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-012 b/source/a/bash/bash-4.2-patches/bash42-012 new file mode 100644 index 000000000..70f0a56b6 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-012 @@ -0,0 +1,151 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-012 + +Bug-Reported-by: Rui Santos <rsantos@grupopie.com> +Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html + +Bug-Description: + +When calling the parser to recursively parse a command substitution within +an arithmetic expansion, the shell overwrote the saved shell input line and +associated state, resulting in a garbled command. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y 2011-02-26 19:19:05.000000000 -0500 +--- parse.y 2011-06-24 20:08:22.000000000 -0400 +*************** +*** 3843,3846 **** +--- 3849,3853 ---- + { + sh_parser_state_t ps; ++ sh_input_line_state_t ls; + int orig_ind, nc, sflags; + char *ret, *s, *ep, *ostring; +*************** +*** 3850,3857 **** +--- 3857,3866 ---- + ostring = string; + ++ /*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ + sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; + if (flags & SX_NOLONGJMP) + sflags |= SEVAL_NOLONGJMP; + save_parser_state (&ps); ++ save_input_line_state (&ls); + + /*(*/ +*************** +*** 3862,3865 **** +--- 3871,3876 ---- + restore_parser_state (&ps); + reset_parser (); ++ /* reset_parser clears shell_input_line and associated variables */ ++ restore_input_line_state (&ls); + if (interactive) + token_to_read = 0; +*************** +*** 5909,5912 **** +--- 5920,5929 ---- + ps->echo_input_at_read = echo_input_at_read; + ++ ps->token = token; ++ ps->token_buffer_size = token_buffer_size; ++ /* Force reallocation on next call to read_token_word */ ++ token = 0; ++ token_buffer_size = 0; ++ + return (ps); + } +*************** +*** 5950,5953 **** +--- 5967,6006 ---- + expand_aliases = ps->expand_aliases; + echo_input_at_read = ps->echo_input_at_read; ++ ++ FREE (token); ++ token = ps->token; ++ token_buffer_size = ps->token_buffer_size; ++ } ++ ++ sh_input_line_state_t * ++ save_input_line_state (ls) ++ sh_input_line_state_t *ls; ++ { ++ if (ls == 0) ++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); ++ if (ls == 0) ++ return ((sh_input_line_state_t *)NULL); ++ ++ ls->input_line = shell_input_line; ++ ls->input_line_size = shell_input_line_size; ++ ls->input_line_len = shell_input_line_len; ++ ls->input_line_index = shell_input_line_index; ++ ++ /* force reallocation */ ++ shell_input_line = 0; ++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; ++ } ++ ++ void ++ restore_input_line_state (ls) ++ sh_input_line_state_t *ls; ++ { ++ FREE (shell_input_line); ++ shell_input_line = ls->input_line; ++ shell_input_line_size = ls->input_line_size; ++ shell_input_line_len = ls->input_line_len; ++ shell_input_line_index = ls->input_line_index; ++ ++ set_line_mbstate (); + } + +*** ../bash-4.2-patched/shell.h 2011-01-06 22:16:55.000000000 -0500 +--- shell.h 2011-06-24 19:12:25.000000000 -0400 +*************** +*** 137,140 **** +--- 139,145 ---- + int *token_state; + ++ char *token; ++ int token_buffer_size; ++ + /* input line state -- line number saved elsewhere */ + int input_line_terminator; +*************** +*** 167,171 **** +--- 172,186 ---- + } sh_parser_state_t; + ++ typedef struct _sh_input_line_state_t { ++ char *input_line; ++ int input_line_index; ++ int input_line_size; ++ int input_line_len; ++ } sh_input_line_state_t; ++ + /* Let's try declaring these here. */ + extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); + extern void restore_parser_state __P((sh_parser_state_t *)); ++ ++ extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); ++ extern void restore_input_line_state __P((sh_input_line_state_t *)); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-013 b/source/a/bash/bash-4.2-patches/bash42-013 new file mode 100644 index 000000000..5bb186b3a --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-013 @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-013 + +Bug-Reported-by: Marten Wikstrom <marten.wikstrom@keystream.se> +Bug-Reference-ID: <BANLkTikKECAh94ZEX68iQvxYuPeEM_xoSQ@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html + +Bug-Description: + +An off-by-one error caused the shell to skip over CTLNUL characters, +which are used internally to mark quoted null strings. The effect +was to have stray 0x7f characters left after expanding words like +""""""""aa. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-03-06 14:11:11.000000000 -0500 +--- subst.c 2011-05-11 11:23:33.000000000 -0400 +*************** +*** 3707,3711 **** + } + else if (string[i] == CTLNUL) +! i++; + + prev_i = i; +--- 3710,3717 ---- + } + else if (string[i] == CTLNUL) +! { +! i++; +! continue; +! } + + prev_i = i; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-014 b/source/a/bash/bash-4.2-patches/bash42-014 new file mode 100644 index 000000000..a43271c34 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-014 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-014 + +Bug-Reported-by: Shawn Bohrer <sbohrer@rgmadvisors.com> +Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html + +Bug-Description: + +The regular expression matching operator did not correctly match +expressions with an embedded ^A. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/pathexp.c 2010-08-13 23:21:57.000000000 -0400 +--- pathexp.c 2011-05-05 16:40:58.000000000 -0400 +*************** +*** 197,201 **** + if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') + continue; +! if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + continue; + temp[j++] = '\\'; +--- 197,201 ---- + if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') + continue; +! if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + continue; + temp[j++] = '\\'; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-015 b/source/a/bash/bash-4.2-patches/bash42-015 new file mode 100644 index 000000000..865587385 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-015 @@ -0,0 +1,81 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-015 + +Bug-Reported-by: <dnade.ext@orange-ftgroup.com> +Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html + +Bug-Description: + +When in a context where arithmetic evaluation is not taking place, the +evaluator should not check for division by 0. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/expr.c 2010-12-21 11:12:13.000000000 -0500 +--- expr.c 2011-08-02 20:58:28.000000000 -0400 +*************** +*** 477,480 **** +--- 481,492 ---- + if (special) + { ++ if ((op == DIV || op == MOD) && value == 0) ++ { ++ if (noeval == 0) ++ evalerror (_("division by 0")); ++ else ++ value = 1; ++ } ++ + switch (op) + { +*************** +*** 483,493 **** + break; + case DIV: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue /= value; + break; + case MOD: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue %= value; + break; +--- 495,501 ---- +*************** +*** 805,809 **** + + if (((op == DIV) || (op == MOD)) && (val2 == 0)) +! evalerror (_("division by 0")); + + if (op == MUL) +--- 813,822 ---- + + if (((op == DIV) || (op == MOD)) && (val2 == 0)) +! { +! if (noeval == 0) +! evalerror (_("division by 0")); +! else +! val2 = 1; +! } + + if (op == MUL) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-016 b/source/a/bash/bash-4.2-patches/bash42-016 new file mode 100644 index 000000000..46025888b --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-016 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-016 + +Bug-Reported-by: Martin von Gagern <Martin.vGagern@gmx.net> +Bug-Reference-ID: <4E43AD9E.8060501@gmx.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html + +Bug-Description: + +Bash should not check for mail while executing the `eval' builtin. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y Fri Feb 25 12:07:41 2011 +--- parse.y Thu Aug 11 19:02:26 2011 +*************** +*** 2500,2504 **** + is the mail alarm reset; nothing takes place in check_mail () + except the checking of mail. Please don't change this. */ +! if (prompt_is_ps1 && time_to_check_mail ()) + { + check_mail (); +--- 2498,2502 ---- + is the mail alarm reset; nothing takes place in check_mail () + except the checking of mail. Please don't change this. */ +! if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) + { + check_mail (); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-017 b/source/a/bash/bash-4.2-patches/bash42-017 new file mode 100644 index 000000000..010ed1e50 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-017 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-017 + +Bug-Reported-by: Curtis Doty <Curtis@GreenKey.net> +Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html + +Bug-Description: + +Using `read -a foo' where foo was an already-declared associative array +caused the shell to die with a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/read.def 2011-01-04 11:43:36.000000000 -0500 +--- builtins/read.def 2011-06-21 10:31:02.000000000 -0400 +*************** +*** 643,646 **** +--- 642,651 ---- + return EXECUTION_FAILURE; /* readonly or noassign */ + } ++ if (assoc_p (var)) ++ { ++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* existing associative array */ ++ } + array_flush (array_cell (var)); + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-018 b/source/a/bash/bash-4.2-patches/bash42-018 new file mode 100644 index 000000000..5d11dce16 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-018 @@ -0,0 +1,74 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-018 + +Bug-Reported-by: Thomas Cort <tcort@minix3.org> +Bug-Reference-ID: <BANLkTik-ebGGw3k_1YtB=RyfV1bsqdxC_g@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html + +Bug-Description: + +Bash fails to compile unless JOB_CONTROL is defined. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/execute_cmd.c 2011-02-09 17:32:25.000000000 -0500 +--- execute_cmd.c 2011-11-06 15:12:48.000000000 -0500 +*************** +*** 2197,2200 **** +--- 2315,2319 ---- + cmd->flags |= CMD_IGNORE_RETURN; + ++ #if defined (JOB_CONTROL) + lastpipe_flag = 0; + begin_unwind_frame ("lastpipe-exec"); +*************** +*** 2216,2228 **** + add_unwind_protect (lastpipe_cleanup, lastpipe_jid); + } +! cmd->flags |= CMD_LASTPIPE; + } + if (prev >= 0) + add_unwind_protect (close, prev); + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + + if (lstdin > 0) + restore_stdin (lstdin); + + if (prev >= 0) +--- 2335,2351 ---- + add_unwind_protect (lastpipe_cleanup, lastpipe_jid); + } +! if (cmd) +! cmd->flags |= CMD_LASTPIPE; + } + if (prev >= 0) + add_unwind_protect (close, prev); ++ #endif + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + ++ #if defined (JOB_CONTROL) + if (lstdin > 0) + restore_stdin (lstdin); ++ #endif + + if (prev >= 0) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-019 b/source/a/bash/bash-4.2-patches/bash42-019 new file mode 100644 index 000000000..5fce40ae5 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-019 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-019 + +Bug-Reported-by: Diego Augusto Molina <diegoaugustomolina@gmail.com> +Bug-Reference-ID: <CAGOxLdHcSQu3ck9Qy3pRjj_NBU5tAPSAvNm-95-nLQ9Szwb6aA@mail.gmail.com> +Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html + +Bug-Description: + +Using `declare' with attributes and an invalid array variable name or +assignment reference resulted in a segmentation fault instead of a +declaration error. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 +--- builtins/declare.def 2011-09-15 15:20:20.000000000 -0400 +*************** +*** 514,517 **** +--- 514,522 ---- + var = assign_array_element (name, value, 0); /* XXX - not aflags */ + *subscript_start = '\0'; ++ if (var == 0) /* some kind of assignment error */ ++ { ++ assign_error++; ++ NEXT_VARIABLE (); ++ } + } + else if (simple_array_assign) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-020 b/source/a/bash/bash-4.2-patches/bash42-020 new file mode 100644 index 000000000..a1dd0443e --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-020 @@ -0,0 +1,60 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-020 + +Bug-Reported-by: Vincent Sheffer <vince.sheffer@apisphere.com> +Bug-Reference-ID: <F13C1C4F-C44C-4071-BFED-4BB6D13CF92F@apisphere.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html + +Bug-Description: + +The shared object helper script needs to be updated for Mac OS X 10.7 +(Lion, darwin11). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/support/shobj-conf 2009-10-28 09:20:21.000000000 -0400 +--- support/shobj-conf 2011-08-27 13:25:23.000000000 -0400 +*************** +*** 158,162 **** + + # Darwin/MacOS X +! darwin[89]*|darwin10*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported +--- 172,176 ---- + + # Darwin/MacOS X +! darwin[89]*|darwin1[012]*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported +*************** +*** 187,191 **** + + case "${host_os}" in +! darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; +--- 201,205 ---- + + case "${host_os}" in +! darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-021 b/source/a/bash/bash-4.2-patches/bash42-021 new file mode 100644 index 000000000..b6153c784 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-021 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-021 + +Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> +Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html + +Bug-Description: + +Using `read -N' to assign values to an array can result in NUL values being +assigned to some array elements. These values cause seg faults when referenced +later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000 -0500 +--- builtins/read.def 2011-12-19 19:52:12.000000000 -0500 +*************** +*** 738,742 **** + } + else +! var = bind_read_variable (varname, t); + } + else +--- 775,779 ---- + } + else +! var = bind_read_variable (varname, t ? t : ""); + } + else +*************** +*** 799,803 **** + } + else +! var = bind_read_variable (list->word->word, input_string); + + if (var) +--- 836,840 ---- + } + else +! var = bind_read_variable (list->word->word, input_string ? input_string : ""); + + if (var) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-022 b/source/a/bash/bash-4.2-patches/bash42-022 new file mode 100644 index 000000000..0067b1335 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-022 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-022 + +Bug-Reported-by: Gregory Margo <gmargo@pacbell.net> +Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html + +Bug-Description: + +The return value from lseek is `off_t'. This can cause corrupted return +values when the file offset is greater than 2**31 - 1. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009 +--- lib/sh/zread.c Thu Jul 28 18:16:53 2011 +*************** +*** 161,166 **** + int fd; + { +! off_t off; +! int r; + + off = lused - lind; +--- 161,165 ---- + int fd; + { +! off_t off, r; + + off = lused - lind; +*************** +*** 169,173 **** + r = lseek (fd, -off, SEEK_CUR); + +! if (r >= 0) + lused = lind = 0; + } +--- 168,172 ---- + r = lseek (fd, -off, SEEK_CUR); + +! if (r != -1) + lused = lind = 0; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-023 b/source/a/bash/bash-4.2-patches/bash42-023 new file mode 100644 index 000000000..4f204efb0 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-023 @@ -0,0 +1,62 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-023 + +Bug-Reported-by: Ewan Mellor <Ewan.Mellor@eu.citrix.com> +Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> +Bug-Reference-URL: + +Bug-Description: + +Under some circumstances, an exit trap triggered by a bad substitution +error when errexit is enabled will cause the shell to exit with an +incorrect exit status (0). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500 +--- subst.c 2012-02-08 13:36:28.000000000 -0500 +*************** +*** 7275,7278 **** +--- 7281,7285 ---- + case '\0': + bad_substitution: ++ last_command_exit_value = EXECUTION_FAILURE; + report_error (_("%s: bad substitution"), string ? string : "??"); + FREE (value); +*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400 +--- error.c 2012-02-25 15:54:40.000000000 -0500 +*************** +*** 201,205 **** + va_end (args); + if (exit_immediately_on_error) +! exit_shell (1); + } + +--- 201,209 ---- + va_end (args); + if (exit_immediately_on_error) +! { +! if (last_command_exit_value == 0) +! last_command_exit_value = 1; +! exit_shell (last_command_exit_value); +! } + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-024 b/source/a/bash/bash-4.2-patches/bash42-024 new file mode 100644 index 000000000..b7b1158b8 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-024 @@ -0,0 +1,45 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-024 + +Bug-Reported-by: Jim Avera <james_avera@yahoo.com> +Bug-Reference-ID: <4F29E07A.80405@yahoo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html + +Bug-Description: + +When `printf -v' is used to set an array element, the format string contains +`%b', and the corresponding argument is the empty string, the buffer used +to store the value to be assigned can be NULL, which results in NUL being +assigned to the array element. This causes a seg fault when it's used later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000 -0500 +--- builtins/printf.def 2012-02-02 08:37:12.000000000 -0500 +*************** +*** 256,259 **** +--- 257,262 ---- + { + vflag = 1; ++ if (vbsize == 0) ++ vbuf = xmalloc (vbsize = 16); + vblen = 0; + if (vbuf) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-025 b/source/a/bash/bash-4.2-patches/bash42-025 new file mode 100644 index 000000000..34ac34300 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-025 @@ -0,0 +1,143 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-025 + +Bug-Reported-by: Bill Gradwohl <bill@ycc.com> +Bug-Reference-ID: <CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html + +Bug-Description: + +When used in a shell function, `declare -g -a array=(compound assignment)' +creates a local variable instead of a global one. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/command.h 2010-08-02 19:36:51.000000000 -0400 +--- command.h 2012-04-01 12:38:35.000000000 -0400 +*************** +*** 98,101 **** +--- 98,102 ---- + #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ + #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ ++ #define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ + + /* Possible values for subshell_environment */ +*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 18:03:41.000000000 -0500 +--- execute_cmd.c 2012-04-01 12:42:03.000000000 -0400 +*************** +*** 3581,3585 **** + WORD_LIST *w; + struct builtin *b; +! int assoc; + + if (words == 0) +--- 3581,3585 ---- + WORD_LIST *w; + struct builtin *b; +! int assoc, global; + + if (words == 0) +*************** +*** 3587,3591 **** + + b = 0; +! assoc = 0; + + for (w = words; w; w = w->next) +--- 3587,3591 ---- + + b = 0; +! assoc = global = 0; + + for (w = words; w; w = w->next) +*************** +*** 3604,3607 **** +--- 3604,3609 ---- + if (assoc) + w->word->flags |= W_ASSIGNASSOC; ++ if (global) ++ w->word->flags |= W_ASSNGLOBAL; + #endif + } +*************** +*** 3609,3613 **** + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +! else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) + { + if (b == 0) +--- 3611,3618 ---- + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +! else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) +! #else +! else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) +! #endif + { + if (b == 0) +*************** +*** 3619,3626 **** + words->word->flags |= W_ASSNBLTIN; + } +! if (words->word->flags & W_ASSNBLTIN) + assoc = 1; + } +- #endif + } + +--- 3624,3632 ---- + words->word->flags |= W_ASSNBLTIN; + } +! if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) + assoc = 1; ++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) ++ global = 1; + } + } + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 +--- subst.c 2012-04-01 12:38:35.000000000 -0400 +*************** +*** 367,370 **** +--- 367,375 ---- + fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); + } ++ if (f & W_ASSNGLOBAL) ++ { ++ f &= ~W_ASSNGLOBAL; ++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); ++ } + if (f & W_COMPASSIGN) + { +*************** +*** 2804,2808 **** + else if (assign_list) + { +! if (word->flags & W_ASSIGNARG) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) +--- 2809,2813 ---- + else if (assign_list) + { +! if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-026 b/source/a/bash/bash-4.2-patches/bash42-026 new file mode 100644 index 000000000..e15d74807 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-026 @@ -0,0 +1,58 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-026 + +Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org> +Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html + +Bug-Description: + +The `lastpipe' option does not behave correctly on machines where the +open file limit is less than 256. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 12:04:47.000000000 -0500 +--- execute_cmd.c 2012-04-26 11:09:30.000000000 -0400 +*************** +*** 2206,2210 **** + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +! lstdin = move_to_high_fd (0, 0, 255); + if (lstdin > 0) + { +--- 2325,2329 ---- + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +! lstdin = move_to_high_fd (0, 1, -1); + if (lstdin > 0) + { +*************** +*** 2252,2256 **** +--- 2371,2377 ---- + } + ++ #if defined (JOB_CONTROL) + discard_unwind_frame ("lastpipe-exec"); ++ #endif + + return (exec_result); + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-027 b/source/a/bash/bash-4.2-patches/bash42-027 new file mode 100644 index 000000000..c0c5d3f80 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-027 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-027 + +Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> +Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html + +Bug-Description: + +When the `extglob' shell option is enabled, pattern substitution does not +work correctly in the presence of multibyte characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:52:57.000000000 -0400 +--- subst.c 2012-04-22 16:19:10.000000000 -0400 +*************** +*** 4167,4171 **** + #if defined (EXTENDED_GLOB) + if (extended_glob) +! simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + +--- 4167,4171 ---- + #if defined (EXTENDED_GLOB) + if (extended_glob) +! simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-028 b/source/a/bash/bash-4.2-patches/bash42-028 new file mode 100644 index 000000000..fa3be3b48 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-028 @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-028 + +Bug-Reported-by: Mark Edgar <medgar123@gmail.com> +Bug-Reference-ID: <CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html + +Bug-Description: + +When using a word expansion for which the right hand side is evaluated, +certain expansions of quoted null strings include spurious ^? characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 +--- subst.c 2012-03-20 19:30:13.000000000 -0400 +*************** +*** 5810,5813 **** +--- 5810,5823 ---- + if (qdollaratp && ((hasdol && quoted) || l->next)) + *qdollaratp = 1; ++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is ++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the ++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the ++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ++ (which is more paranoia than anything else), we need to return the ++ quoted null string and set the flags to indicate it. */ ++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) ++ { ++ w->flags |= W_HASQUOTEDNULL; ++ } + dispose_words (l); + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-029 b/source/a/bash/bash-4.2-patches/bash42-029 new file mode 100644 index 000000000..c51704ca7 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-029 @@ -0,0 +1,524 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-029 + +Bug-Reported-by: "Michael Kalisz" <michael@kalisz.homelinux.net> +Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html + +Bug-Description: + +Bash-4.2 tries to leave completed directory names as the user typed them, +without expanding them to a full pathname. One effect of this is that +shell variables used in pathnames being completed (e.g., $HOME) are left +unchanged, but the `$' is quoted by readline because it is a special +character to the shell. + +This patch introduces two things: + +1. A new shell option, `direxpand', which, if set, attempts to emulate the + bash-4.1 behavior of expanding words to full pathnames during + completion; +2. A set of heuristics that reduce the number of times special characters + such as `$' are quoted when the directory name is not expanded. + +Patch (apply with `patch -p0'): + +diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c +*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500 +--- ./bashline.c 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 122,125 **** +--- 122,128 ---- + static int bash_push_line __P((void)); + ++ static rl_icppfunc_t *save_directory_hook __P((void)); ++ static void reset_directory_hook __P((rl_icppfunc_t *)); ++ + static void cleanup_expansion_error __P((void)); + static void maybe_make_readline_line __P((char *)); +*************** +*** 244,251 **** +--- 247,261 ---- + int dircomplete_spelling = 0; + ++ /* Expand directory names during word/filename completion. */ ++ int dircomplete_expand = 0; ++ int dircomplete_expand_relpath = 0; ++ + static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:"; + static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:"; + /* )) */ + ++ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ ++ static char *custom_filename_quote_characters = 0; ++ + static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL; + +*************** +*** 502,506 **** + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +! rl_directory_rewrite_hook = bash_directory_completion_hook; + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; +--- 512,516 ---- + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +! set_directory_hook (); + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; +*************** +*** 530,534 **** + + /* characters that need to be quoted when appearing in filenames. */ +! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ + + rl_filename_quoting_function = bash_quote_filename; +--- 540,544 ---- + + /* characters that need to be quoted when appearing in filenames. */ +! rl_filename_quote_characters = default_filename_quote_characters; + + rl_filename_quoting_function = bash_quote_filename; +*************** +*** 565,570 **** + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; +- rl_directory_rewrite_hook = bash_directory_completion_hook; + rl_ignore_some_completions_function = filename_completion_ignore; + } + +--- 575,582 ---- + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; + rl_ignore_some_completions_function = filename_completion_ignore; ++ rl_filename_quote_characters = default_filename_quote_characters; ++ ++ set_directory_hook (); + } + +*************** +*** 1280,1283 **** +--- 1292,1298 ---- + rl_ignore_some_completions_function = filename_completion_ignore; + ++ rl_filename_quote_characters = default_filename_quote_characters; ++ set_directory_hook (); ++ + /* Determine if this could be a command word. It is if it appears at + the start of the line (ignoring preceding whitespace), or if it +*************** +*** 1592,1595 **** +--- 1607,1616 ---- + else + { ++ if (dircomplete_expand && dot_or_dotdot (filename_hint)) ++ { ++ dircomplete_expand = 0; ++ set_directory_hook (); ++ dircomplete_expand = 1; ++ } + mapping_over = 4; + goto inner; +*************** +*** 1792,1795 **** +--- 1813,1819 ---- + inner: + val = rl_filename_completion_function (filename_hint, istate); ++ if (mapping_over == 4 && dircomplete_expand) ++ set_directory_hook (); ++ + istate = 1; + +*************** +*** 2694,2697 **** +--- 2718,2767 ---- + } + ++ /* Functions to save and restore the appropriate directory hook */ ++ /* This is not static so the shopt code can call it */ ++ void ++ set_directory_hook () ++ { ++ if (dircomplete_expand) ++ { ++ rl_directory_completion_hook = bash_directory_completion_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)0; ++ } ++ else ++ { ++ rl_directory_rewrite_hook = bash_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)0; ++ } ++ } ++ ++ static rl_icppfunc_t * ++ save_directory_hook () ++ { ++ rl_icppfunc_t *ret; ++ ++ if (dircomplete_expand) ++ { ++ ret = rl_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)NULL; ++ } ++ else ++ { ++ ret = rl_directory_rewrite_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; ++ } ++ ++ return ret; ++ } ++ ++ static void ++ restore_directory_hook (hookf) ++ rl_icppfunc_t *hookf; ++ { ++ if (dircomplete_expand) ++ rl_directory_completion_hook = hookf; ++ else ++ rl_directory_rewrite_hook = hookf; ++ } ++ + /* Handle symbolic link references and other directory name + expansions while hacking completion. This should return 1 if it modifies +*************** +*** 2703,2720 **** + { + char *local_dirname, *new_dirname, *t; +! int return_value, should_expand_dirname; + WORD_LIST *wl; + struct stat sb; + +! return_value = should_expand_dirname = 0; + local_dirname = *dirname; + +! if (mbschr (local_dirname, '$')) +! should_expand_dirname = 1; + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +! should_expand_dirname = 1; + } + +--- 2773,2801 ---- + { + char *local_dirname, *new_dirname, *t; +! int return_value, should_expand_dirname, nextch, closer; + WORD_LIST *wl; + struct stat sb; + +! return_value = should_expand_dirname = nextch = closer = 0; + local_dirname = *dirname; + +! if (t = mbschr (local_dirname, '$')) +! { +! should_expand_dirname = '$'; +! nextch = t[1]; +! /* Deliberately does not handle the deprecated $[...] arithmetic +! expansion syntax */ +! if (nextch == '(') +! closer = ')'; +! else if (nextch == '{') +! closer = '}'; +! else +! nextch = 0; +! } + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +! should_expand_dirname = '`'; + } + +*************** +*** 2740,2743 **** +--- 2821,2841 ---- + dispose_words (wl); + local_dirname = *dirname; ++ /* XXX - change rl_filename_quote_characters here based on ++ should_expand_dirname/nextch/closer. This is the only place ++ custom_filename_quote_characters is modified. */ ++ if (rl_filename_quote_characters && *rl_filename_quote_characters) ++ { ++ int i, j, c; ++ i = strlen (default_filename_quote_characters); ++ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1); ++ for (i = j = 0; c = default_filename_quote_characters[i]; i++) ++ { ++ if (c == should_expand_dirname || c == nextch || c == closer) ++ continue; ++ custom_filename_quote_characters[j++] = c; ++ } ++ custom_filename_quote_characters[j] = '\0'; ++ rl_filename_quote_characters = custom_filename_quote_characters; ++ } + } + else +*************** +*** 2759,2762 **** +--- 2857,2871 ---- + } + ++ /* no_symbolic_links == 0 -> use (default) logical view of the file system. ++ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the ++ current directory (./). ++ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames ++ in the current directory (e.g., lib/sh). ++ XXX - should we do spelling correction on these? */ ++ ++ /* This is test as it was in bash-4.2: skip relative pathnames in current ++ directory. Change test to ++ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/')) ++ if we want to skip paths beginning with ./ also. */ + if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1])) + { +*************** +*** 2764,2767 **** +--- 2873,2885 ---- + int len1, len2; + ++ /* If we have a relative path ++ (local_dirname[0] != '/' && local_dirname[0] != '.') ++ that is canonical after appending it to the current directory, then ++ temp1 = temp2+'/' ++ That is, ++ strcmp (temp1, temp2) == 0 ++ after adding a slash to temp2 below. It should be safe to not ++ change those. ++ */ + t = get_working_directory ("symlink-hook"); + temp1 = make_absolute (local_dirname, t); +*************** +*** 2798,2802 **** + } + } +! return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; +--- 2916,2928 ---- + } + } +! +! /* dircomplete_expand_relpath == 0 means we want to leave relative +! pathnames that are unchanged by canonicalization alone. +! *local_dirname != '/' && *local_dirname != '.' == relative pathname +! (consistent with general.c:absolute_pathname()) +! temp1 == temp2 (after appending a slash to temp2) means the pathname +! is not changed by canonicalization as described above. */ +! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0)) +! return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; +*************** +*** 3003,3012 **** + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; +- orig_dir_func = rl_directory_rewrite_hook; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; +- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; +--- 3129,3139 ---- + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; ++ ++ orig_dir_func = save_directory_hook (); ++ + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; +*************** +*** 3016,3023 **** + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; +- rl_directory_rewrite_hook = orig_dir_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + + return r; + } +--- 3143,3151 ---- + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + ++ restore_directory_hook (orig_dir_func); ++ + return r; + } +diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h +*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500 +--- ./bashline.h 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 34,41 **** +--- 34,46 ---- + extern int bash_re_edit __P((char *)); + ++ extern void bashline_set_event_hook __P((void)); ++ extern void bashline_reset_event_hook __P((void)); ++ + extern int bind_keyseq_to_unix_command __P((char *)); + + extern char **bash_default_completion __P((const char *, int, int, int, int)); + ++ void set_directory_hook __P((void)); ++ + /* Used by programmable completion code. */ + extern char *command_word_completion_function __P((const char *, int)); +diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def +*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000 -0400 +--- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 62,65 **** +--- 62,69 ---- + #include "bashgetopt.h" + ++ #if defined (READLINE) ++ # include "../bashline.h" ++ #endif ++ + #if defined (HISTORY) + # include "../bashhist.h" +*************** +*** 95,99 **** + extern int no_empty_command_completion; + extern int force_fignore; +! extern int dircomplete_spelling; + + extern int enable_hostname_completion __P((int)); +--- 99,103 ---- + extern int no_empty_command_completion; + extern int force_fignore; +! extern int dircomplete_spelling, dircomplete_expand; + + extern int enable_hostname_completion __P((int)); +*************** +*** 122,125 **** +--- 126,133 ---- + #endif + ++ #if defined (READLINE) ++ static int shopt_set_complete_direxpand __P((char *, int)); ++ #endif ++ + static int shopt_login_shell; + static int shopt_compat31; +*************** +*** 151,154 **** +--- 159,163 ---- + { "compat41", &shopt_compat41, set_compatibility_level }, + #if defined (READLINE) ++ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, + { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, + #endif +*************** +*** 536,539 **** +--- 545,559 ---- + } + ++ #if defined (READLINE) ++ static int ++ shopt_set_complete_direxpand (option_name, mode) ++ char *option_name; ++ int mode; ++ { ++ set_directory_hook (); ++ return 0; ++ } ++ #endif ++ + #if defined (RESTRICTED_SHELL) + /* Don't allow the value of restricted_shell to be modified. */ +Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ +diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1 +*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500 +--- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 8949,8952 **** +--- 8949,8962 ---- + The default bash behavior remains as in previous versions. + .TP 8 ++ .B direxpand ++ If set, ++ .B bash ++ replaces directory names with the results of word expansion when performing ++ filename completion. This changes the contents of the readline editing ++ buffer. ++ If not set, ++ .B bash ++ attempts to preserve what the user typed. ++ .TP 8 + .B dirspell + If set, +diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi +*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000 -0500 +--- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 4536,4539 **** +--- 4536,4546 ---- + The default Bash behavior remains as in previous versions. + ++ @item direxpand ++ If set, Bash ++ replaces directory names with the results of word expansion when performing ++ filename completion. This changes the contents of the readline editing ++ buffer. ++ If not set, Bash attempts to preserve what the user typed. ++ + @item dirspell + If set, Bash +diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right +*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000 -0400 +--- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 13,16 **** +--- 13,17 ---- + shopt -u compat40 + shopt -u compat41 ++ shopt -u direxpand + shopt -u dirspell + shopt -u dotglob +*************** +*** 69,72 **** +--- 70,74 ---- + shopt -u compat40 + shopt -u compat41 ++ shopt -u direxpand + shopt -u dirspell + shopt -u dotglob +*************** +*** 102,105 **** +--- 104,108 ---- + compat40 off + compat41 off ++ direxpand off + dirspell off + dotglob off +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 29 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-030 b/source/a/bash/bash-4.2-patches/bash42-030 new file mode 100644 index 000000000..261a619bb --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-030 @@ -0,0 +1,178 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-030 + +Bug-Reported-by: Roman Rakus <rrakus@redhat.com> +Bug-Reference-ID: <4D7DD91E.7040808@redhat.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html + +Bug-Description: + +When attempting to glob strings in a multibyte locale, and those strings +contain invalid multibyte characters that cause mbsnrtowcs to return 0, +the globbing code loops infinitely. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400 +--- lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400 +*************** +*** 36,39 **** +--- 36,41 ---- + #if HANDLE_MULTIBYTE + ++ #define WSBUF_INC 32 ++ + #ifndef FREE + # define FREE(x) do { if (x) free (x); } while (0) +*************** +*** 149,153 **** + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +! size_t wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ +--- 151,155 ---- + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +! size_t n, wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ +*************** +*** 172,176 **** + tmp_p = p; + tmp_state = state; +! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); + + /* Conversion failed. */ +--- 174,189 ---- + tmp_p = p; + tmp_state = state; +! +! if (nms == 0 && *p == '\\') /* special initial case */ +! nms = wcslength = 1; +! else +! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state); +! +! if (wcslength == 0) +! { +! tmp_p = p; /* will need below */ +! tmp_state = state; +! wcslength = 1; /* take a single byte */ +! } + + /* Conversion failed. */ +*************** +*** 187,191 **** + wchar_t *wstmp; + +! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */ + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); +--- 200,205 ---- + wchar_t *wstmp; + +! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */ +! wsbuf_size += WSBUF_INC; + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); +*************** +*** 200,207 **** + + /* Perform the conversion. This is assumed to return 'wcslength'. +! * It may set 'p' to NULL. */ +! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +! wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) +--- 214,229 ---- + + /* Perform the conversion. This is assumed to return 'wcslength'. +! It may set 'p' to NULL. */ +! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +! /* Compensate for taking single byte on wcs conversion failure above. */ +! if (wcslength == 1 && (n == 0 || n == (size_t)-1)) +! { +! state = tmp_state; +! p = tmp_p; +! wsbuf[wcnum++] = *p++; +! } +! else +! wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) +*************** +*** 231,236 **** + of DESTP and INDICESP are NULL. */ + +- #define WSBUF_INC 32 +- + size_t + xdupmbstowcs (destp, indicesp, src) +--- 253,256 ---- +*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000 -0500 +--- lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400 +*************** +*** 201,206 **** + size_t pat_n, dn_n; + + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; +--- 201,209 ---- + size_t pat_n, dn_n; + ++ pat_wc = dn_wc = (wchar_t *)NULL; ++ + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +! if (pat_n != (size_t)-1) +! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; +*************** +*** 222,225 **** +--- 225,230 ---- + ret = 1; + } ++ else ++ ret = skipname (pat, dname, flags); + + FREE (pat_wc); +*************** +*** 267,272 **** + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +! /* Something wrong. */ +! return; + orig_wpathname = wpathname; + +--- 272,280 ---- + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +! { +! /* Something wrong. Fall back to single-byte */ +! udequote_pathname (pathname); +! return; +! } + orig_wpathname = wpathname; + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 29 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 30 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-031 b/source/a/bash/bash-4.2-patches/bash42-031 new file mode 100644 index 000000000..419d4478e --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-031 @@ -0,0 +1,80 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-031 + +Bug-Reported-by: Max Horn <max@quendi.de> +Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html + +Bug-Description: + +A change between bash-4.1 and bash-4.2 to prevent the readline input hook +from being called too frequently had the side effect of causing delays +when reading pasted input on systems such as Mac OS X. This patch fixes +those delays while retaining the bash-4.2 behavior. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000 -0400 +--- lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400 +*************** +*** 410,414 **** + rl_read_key () + { +! int c; + + rl_key_sequence_length++; +--- 412,416 ---- + rl_read_key () + { +! int c, r; + + rl_key_sequence_length++; +*************** +*** 430,441 **** + while (rl_event_hook) + { +! if (rl_gather_tyi () < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } + RL_CHECK_SIGNALS (); +- if (rl_get_char (&c) != 0) +- break; + if (rl_done) /* XXX - experimental */ + return ('\n'); +--- 432,447 ---- + while (rl_event_hook) + { +! if (rl_get_char (&c) != 0) +! break; +! +! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } ++ else if (r == 1) /* read something */ ++ continue; ++ + RL_CHECK_SIGNALS (); + if (rl_done) /* XXX - experimental */ + return ('\n'); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 30 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 31 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-032 b/source/a/bash/bash-4.2-patches/bash42-032 new file mode 100644 index 000000000..d4f25ca03 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-032 @@ -0,0 +1,75 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-032 + +Bug-Reported-by: Ruediger Kuhlmann <RKuhlmann@orga-systems.com> +Bug-Reference-ID: <OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39@orga-systems.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html + +Bug-Description: + +Bash-4.2 has problems with DEL characters in the expanded value of variables +used in the same quoted string as variables that expand to nothing. + +Patch (apply with `patch -p0'): + +*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400 +--- subst.c 2012-05-07 16:06:35.000000000 -0400 +*************** +*** 8152,8155 **** +--- 8152,8163 ---- + dispose_word_desc (tword); + ++ /* Kill quoted nulls; we will add them back at the end of ++ expand_word_internal if nothing else in the string */ ++ if (had_quoted_null && temp && QUOTED_NULL (temp)) ++ { ++ FREE (temp); ++ temp = (char *)NULL; ++ } ++ + goto add_string; + break; +*************** +*** 8556,8560 **** + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +! if (had_quoted_null) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); +--- 8564,8568 ---- + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +! if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); +*************** +*** 8587,8591 **** + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +! if (had_quoted_null) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); +--- 8595,8599 ---- + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +! if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 31 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 32 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-033 b/source/a/bash/bash-4.2-patches/bash42-033 new file mode 100644 index 000000000..e58d7286e --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-033 @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-033 + +Bug-Reported-by: David Leverton <levertond@googlemail.com> +Bug-Reference-ID: <4FCCE737.1060603@googlemail.com> +Bug-Reference-URL: + +Bug-Description: + +Bash uses a static buffer when expanding the /dev/fd prefix for the test +and conditional commands, among other uses, when it should use a dynamic +buffer to avoid buffer overflow. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500 +--- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400 +*************** +*** 83,86 **** +--- 83,88 ---- + struct stat *finfo; + { ++ static char *pbuf = 0; ++ + if (*path == '\0') + { +*************** +*** 107,111 **** + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! char pbuf[32]; + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +--- 109,113 ---- + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 32 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-034 b/source/a/bash/bash-4.2-patches/bash42-034 new file mode 100644 index 000000000..e4f05e103 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-034 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-034 + +Bug-Reported-by: "Davide Brini" <dave_br@gmx.com> +Bug-Reference-ID: <20120604164154.69781EC04B@imaps.oficinas.atrapalo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html + +Bug-Description: + +In bash-4.2, the history code would inappropriately add a semicolon to +multi-line compound array assignments when adding them to the history. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500 +--- parse.y 2012-06-07 12:48:47.000000000 -0400 +*************** +*** 4900,4905 **** +--- 4916,4924 ---- + return (current_command_line_count == 2 ? "\n" : ""); + } + ++ if (parser_state & PST_COMPASSIGN) ++ return (" "); ++ + /* First, handle some special cases. */ + /*(*/ + /* If we just read `()', assume it's a function definition, and don't +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-035 b/source/a/bash/bash-4.2-patches/bash42-035 new file mode 100644 index 000000000..6f0be6f90 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-035 @@ -0,0 +1,66 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-035 + +Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> +Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html + +Bug-Description: + +When given a number of lines to read, `mapfile -n lines' reads one too many. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000 -0400 +--- builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400 +*************** +*** 196,206 **** + interrupt_immediately++; + for (array_index = origin, line_count = 1; +! zgetline (fd, &line, &line_length, unbuffered_read) != -1; +! array_index++, line_count++) + { +- /* Have we exceeded # of lines to store? */ +- if (line_count_goal != 0 && line_count > line_count_goal) +- break; +- + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) +--- 196,202 ---- + interrupt_immediately++; + for (array_index = origin, line_count = 1; +! zgetline (fd, &line, &line_length, unbuffered_read) != -1; +! array_index++) + { + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) +*************** +*** 218,221 **** +--- 214,222 ---- + + bind_array_element (entry, array_index, line, 0); ++ ++ /* Have we exceeded # of lines to store? */ ++ line_count++; ++ if (line_count_goal != 0 && line_count > line_count_goal) ++ break; + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-036 b/source/a/bash/bash-4.2-patches/bash42-036 new file mode 100644 index 000000000..73fac408a --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-036 @@ -0,0 +1,92 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-036 + +Bug-Reported-by: gregrwm <backuppc-users@whitleymott.net> +Bug-Reference-ID: <CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html + +Bug-Description: + +Bash-4.2 produces incorrect word splitting results when expanding +double-quoted $@ in the same string as and adjacent to other variable +expansions. The $@ should be split, the other expansions should not. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400 +--- subst.c 2012-07-08 21:19:32.000000000 -0400 +*************** +*** 7923,7927 **** + /* State flags */ + int had_quoted_null; +! int has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ +--- 7923,7927 ---- + /* State flags */ + int had_quoted_null; +! int has_dollar_at, temp_has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ +*************** +*** 8128,8138 **** + *expanded_something = 1; + +! has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +! &has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) +--- 8128,8139 ---- + *expanded_something = 1; + +! temp_has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +! &temp_has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); ++ has_dollar_at += temp_has_dollar_at; + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) +*************** +*** 8275,8281 **** + temp = (char *)NULL; + +! has_dollar_at = 0; + /* Need to get W_HASQUOTEDNULL flag through this function. */ +! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL); + + if (list == &expand_word_error || list == &expand_word_fatal) +--- 8276,8283 ---- + temp = (char *)NULL; + +! temp_has_dollar_at = 0; /* XXX */ + /* Need to get W_HASQUOTEDNULL flag through this function. */ +! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL); +! has_dollar_at += temp_has_dollar_at; + + if (list == &expand_word_error || list == &expand_word_fatal) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 36 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-037 b/source/a/bash/bash-4.2-patches/bash42-037 new file mode 100644 index 000000000..a12b8a7ee --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-037 @@ -0,0 +1,112 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-037 + +Bug-Reported-by: Jakub Filak +Bug-Reference-ID: +Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289 + +Bug-Description: + +Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy' +commands leads to an infinite loop. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000 -0500 +--- lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400 +*************** +*** 1235,1243 **** + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing) + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +--- 1297,1313 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `dd' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*************** +*** 1317,1325 **** + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing) + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +--- 1387,1403 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `cc' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*************** +*** 1378,1381 **** +--- 1456,1472 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ r = rl_domove_motion_callback (_rl_vimvcxt); ++ } ++ else if (vi_redoing) /* handle redoing `yy' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 36 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 37 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild index 32ce9a40d..ecd37b3c1 100755 --- a/source/a/bash/bash.SlackBuild +++ b/source/a/bash/bash.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2011, 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + + # Set initial variables: CWD=`pwd` if [ "$TMP" = "" ]; then @@ -31,12 +34,14 @@ VERSION=${VERSION:-$(echo bash-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -48,10 +53,17 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else SLKCFLAGS="-O2" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source fi @@ -76,12 +88,18 @@ if [ -d $CWD/bash-${VERSION}-patches ]; then ( cd $CWD/bash-${VERSION}-patches ; cat bash4?-??? ) | patch -p0 --verbose || exit 1 fi +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ --infodir=/usr/info \ - --build=$ARCH-slackware-linux + --build=$TARGET + make -j4 || make || exit 1 make install DESTDIR=$PKG mv $PKG/usr/share/doc $PKG/usr diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild index ebbd9a536..99dd753d8 100755 --- a/source/a/btrfs-progs/btrfs-progs.SlackBuild +++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild @@ -27,13 +27,13 @@ BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} -# Download the btrfs-progs-unstable Git head if there's no tarball: +# Download the btrfs-progs Git head if there's no tarball: if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then - git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git - rm -r btrfs-progs-unstable/.git - tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs-unstable + git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git + rm -r btrfs-progs/.git + tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs xz -9 btrfs-progs-$(date +%Y%m%d).tar - rm -r $CWD/btrfs-progs-unstable + rm -r $CWD/btrfs-progs fi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -f 3 -d - | cut -f 1 -d .)} @@ -56,9 +56,9 @@ rm -rf $PKG mkdir -p $PKG cd $TMP -rm -rf btrfs-progs-unstable +rm -rf btrfs-progs tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd btrfs-progs-unstable +cd btrfs-progs # Make sure ownerships and permissions are sane: chown -R root:root . @@ -77,9 +77,6 @@ find . -perm 555 -exec chmod 755 {} \; # Build: make $NUMJOBS || make || exit 1 -# Build ext* conversion utility: -make $NUMJOBS convert || make convert || exit 1 - # Install: make install DESTDIR=$PKG || exit 1 diff --git a/source/a/btrfs-progs/slack-desc b/source/a/btrfs-progs/slack-desc index e9088d053..d53953c80 100644 --- a/source/a/btrfs-progs/slack-desc +++ b/source/a/btrfs-progs/slack-desc @@ -11,9 +11,9 @@ btrfs-progs: btrfs-progs: Btrfs is a new copy on write filesystem for Linux aimed at implementing btrfs-progs: advanced features while focusing on fault tolerance, repair and easy btrfs-progs: administration. Initially developed by Oracle, Btrfs is licensed under -btrfs-progs: the GPL and open for contribution from anyone. Btrfs is under heavy -btrfs-progs: development, and is not suitable for any uses other than benchmarking -btrfs-progs: and review. The Btrfs disk format is not yet finalized. +btrfs-progs: the GPL and open for contribution from anyone. +btrfs-progs: +btrfs-progs: btrfs-progs: btrfs-progs: Btrfs homepage: http://btrfs.wiki.kernel.org btrfs-progs: diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index 860199847..3bd8e5211 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -90,12 +90,13 @@ zcat $CWD/$PKGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || # Compilation with glibc version later than 2.3.2 needs the environment # variable DEFAULT_POSIX2_VERSION set to 199209. -# Without the next line, the coreutils will start complaining about 'obsolete' +# Without that line, the coreutils will start complaining about 'obsolete' # command switches, like "tail -20" will be considered obsolete. # This behaviour breaks many other packages... the 'obsolete' parameters are # too commonly used to disregard them. Better to stick with the older more # widely accepted standards until things begin to demand the new way. +FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$SLKCFLAGS" \ DEFAULT_POSIX2_VERSION=199209 \ ./configure \ @@ -164,10 +165,20 @@ done ( cd $PKG/usr/bin ; ln -sf ../../bin/ginstall ginstall ) ( cd $PKG/usr/man/man1 ; ln -sf install.1 ginstall.1 ) -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* diff --git a/source/a/cpio/cpio.32bit.crc.diff b/source/a/cpio/cpio.32bit.crc.diff new file mode 100644 index 000000000..8ae94e983 --- /dev/null +++ b/source/a/cpio/cpio.32bit.crc.diff @@ -0,0 +1,111 @@ +From ccec71ec318fdf739f55858d5bffaf4fd6520036 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org.ua> +Date: Mon, 20 Feb 2012 17:51:27 +0000 +Subject: Always use 32 bit CRC + +* src/cpiohdr.h (cpio_file_stat) <c_chksum>: Change type to +uint32_t. +* src/extern.h (crc): Change type to uint32_t. +* src/global.c: Likewise. +* src/copyout.c (read_for_checksum): Return uint32_t. +* src/copyin.c: Fix printf formats. +--- +diff --git a/src/copyin.c b/src/copyin.c +index 3ab5dac..3282816 100644 +--- a/src/copyin.c ++++ b/src/copyin.c +@@ -178,7 +178,7 @@ list_file(struct cpio_file_stat* file_hdr, int in_file_des) + #endif + if (crc != file_hdr->c_chksum) + { +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr->c_name, crc, file_hdr->c_chksum); + } + } +@@ -525,7 +525,7 @@ copyin_regular_file (struct cpio_file_stat* file_hdr, int in_file_des) + if (archive_format == arf_crcascii) + { + if (crc != file_hdr->c_chksum) +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr->c_name, crc, file_hdr->c_chksum); + } + tape_skip_padding (in_file_des, file_hdr->c_filesize); +@@ -540,7 +540,7 @@ copyin_regular_file (struct cpio_file_stat* file_hdr, int in_file_des) + if (archive_format == arf_crcascii) + { + if (crc != file_hdr->c_chksum) +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr->c_name, crc, file_hdr->c_chksum); + } + +@@ -1436,7 +1436,7 @@ process_copy_in () + tape_skip_padding (in_file_des, file_hdr.c_filesize); + if (crc != file_hdr.c_chksum) + { +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr.c_name, crc, file_hdr.c_chksum); + } + /* Debian hack: -v and -V now work with --only-verify-crc. +diff --git a/src/copyout.c b/src/copyout.c +index ab6a243..a5a8931 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -33,10 +33,10 @@ + /* Read FILE_SIZE bytes of FILE_NAME from IN_FILE_DES and + compute and return a checksum for them. */ + +-static unsigned long ++static uint32_t + read_for_checksum (int in_file_des, int file_size, char *file_name) + { +- unsigned long crc; ++ uint32_t crc; + char buf[BUFSIZ]; + int bytes_left; + int bytes_read; +diff --git a/src/cpiohdr.h b/src/cpiohdr.h +index 86ec988..9aa8ed9 100644 +--- a/src/cpiohdr.h ++++ b/src/cpiohdr.h +@@ -123,7 +123,7 @@ struct cpio_file_stat /* Internal representation of a CPIO header */ + long c_rdev_maj; + long c_rdev_min; + size_t c_namesize; +- unsigned long c_chksum; ++ uint32_t c_chksum; + char *c_name; + char *c_tar_linkname; + }; +diff --git a/src/extern.h b/src/extern.h +index be329ae..ef00242 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -75,7 +75,7 @@ extern char *new_media_message_after_number; + extern int archive_des; + extern char *archive_name; + extern char *rsh_command_option; +-extern unsigned long crc; ++extern uint32_t crc; + #ifdef DEBUG_CPIO + extern int debug_flag; + #endif +diff --git a/src/global.c b/src/global.c +index 29e7afc..e08e188 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -144,7 +144,7 @@ char *archive_name = NULL; + char *rsh_command_option = NULL; + + /* CRC checksum. */ +-unsigned long crc; ++uint32_t crc; + + /* Input and output buffers. */ + char *input_buffer, *output_buffer; +-- +cgit v0.9.0.2 + diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild index b078d0677..5e3eea05a 100755 --- a/source/a/cpio/cpio.SlackBuild +++ b/source/a/cpio/cpio.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=cpio VERSION=$(ls $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,7 +62,7 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -#zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/cpio.32bit.crc.diff.gz | patch -p1 -F 3 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild index 11370fc64..9b874e2a4 100755 --- a/source/a/cryptsetup/cryptsetup.SlackBuild +++ b/source/a/cryptsetup/cryptsetup.SlackBuild @@ -33,7 +33,7 @@ # ----------------------------------------------------------------------------- PKGNAM=cryptsetup -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -121,7 +121,20 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $DOCSDIR/ChangeLog fi -find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; || true +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild index 7af4bd818..afac91324 100755 --- a/source/a/cups/cups.SlackBuild +++ b/source/a/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # CUPS build script by volkerdi@slackware.com. -VERSION=1.4.6 -BUILD=${BUILD:-1} +VERSION=1.5.4 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -53,13 +53,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf cups-$VERSION tar xvf $CWD/cups-$VERSION-source.tar.?z* || exit 1 -cd cups-$VERSION +cd cups-$VERSION || exit 1 -# Fix the USB backend to use either usblp or libusb: -zcat $CWD/usb-backend-both-usblp-and-libusb.dpatch.gz | patch -p1 --verbose || exit 1 - -# Fix locking to avoid crashes with OpenSSL: -zcat $CWD/cups.fix_broken_locking.diff.gz | patch -p1 --verbose || exit 1 +# Fix for CUPS 1.5.4. Don't reload the obsolete usblp module, as this +# can cause partial printing with certain printers. +zcat $CWD/usb-backend-reset-after-job-only-for-specific-devices.patch.gz | patch -p0 --verbose || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure ./configure \ @@ -78,6 +76,9 @@ mkdir -p $PKG/etc/cups mkdir -p $PKG/var/spool make BUILDROOT=$PKG install || exit 1 +# Hey, what's with the gigantic test files? Bloat is bad. +rm -f $PKG/usr/share/cups/ipptool/*.{pdf,ps,jpg} + # I've added so many things like /etc/init.d/ to Slackware that CUPS # is now installing init scripts to the Red Hat locations. We'll move # them to the usual locations: @@ -88,17 +89,6 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new # Clear out the additions: rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d -### OBSOLETE. The USB backend is patched to support usblp again. ### -## From 1.4.x, CUPS no longer uses usblp, and having the module loaded -## will interfere with USB printers. So, we will add a blacklist rule -## so that the module is not loaded: -#mkdir -p $PKG/etc/modprobe.d -#cat << EOF > $PKG/etc/modprobe.d/cups.blacklist.usblp.conf.new -## Do not load the kernel usblp module, since it interferes with -## versions of CUPS 1.4.0 and newer: -#blacklist usblp -#EOF - # I'm not sure if overwriting this blindly could have ill effects, # but it never hurts to play it safe. According to the dbus-daemon # manpage, only files ending in .conf will be used, so there won't diff --git a/source/a/cups/cups.fix_broken_locking.diff b/source/a/cups/cups.fix_broken_locking.diff deleted file mode 100644 index 44f97533f..000000000 --- a/source/a/cups/cups.fix_broken_locking.diff +++ /dev/null @@ -1,256 +0,0 @@ -Submitted By: DJ Lucas <robert AT linuxfromscratch DOT org> -Date: 2010-09-13 -Initial Package Version: 1.4.4 -Upstream Status: Unknown -Origin: https://bugzilla.redhat.com/show_bug.cgi?id=553834 -Description: Bug fix for invalid locking with GCrypt. - -diff -Naurp cups-1.4.4-orig/cups/http.c cups-1.4.4/cups/http.c ---- cups-1.4.4-orig/cups/http.c 2010-06-16 00:27:41.000000000 -0500 -+++ cups-1.4.4/cups/http.c 2010-09-13 01:27:03.000000000 -0500 -@@ -83,12 +83,10 @@ - * http_debug_hex() - Do a hex dump of a buffer. - * http_field() - Return the field index for a field name. - * http_read_ssl() - Read from a SSL/TLS connection. -- * http_locking_cb() - Lock/unlock a thread's mutex. - * http_send() - Send a request with all fields and the trailing - * blank line. - * http_setup_ssl() - Set up SSL/TLS support on a connection. - * http_shutdown_ssl() - Shut down SSL/TLS on a connection. -- * http_threadid_cb() - Return the current thread ID. - * http_upgrade() - Force upgrade to TLS encryption. - * http_write() - Write a buffer to a HTTP connection. - * http_write_chunk() - Write a chunked buffer. -@@ -146,19 +144,6 @@ static int http_setup_ssl(http_t *http) - static void http_shutdown_ssl(http_t *http); - static int http_upgrade(http_t *http); - static int http_write_ssl(http_t *http, const char *buf, int len); -- --# ifdef HAVE_GNUTLS --# ifdef HAVE_PTHREAD_H --GCRY_THREAD_OPTION_PTHREAD_IMPL; --# endif /* HAVE_PTHREAD_H */ -- --# elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) --static pthread_mutex_t *http_locks; /* OpenSSL lock mutexes */ -- --static void http_locking_cb(int mode, int type, const char *file, -- int line); --static unsigned long http_threadid_cb(void); --# endif /* HAVE_GNUTLS */ - #endif /* HAVE_SSL */ - - -@@ -1188,22 +1173,21 @@ httpHead(http_t *http, /* I - Conne - void - httpInitialize(void) - { -- static int initialized = 0; /* Have we been called before? */ --#ifdef WIN32 -- WSADATA winsockdata; /* WinSock data */ --#endif /* WIN32 */ - #ifdef HAVE_LIBSSL -- int i; /* Looping var */ -- unsigned char data[1024]; /* Seed data */ -+# ifndef WIN32 -+ struct timeval curtime; /* Current time in microseconds */ -+# endif /* !WIN32 */ -+ int i; /* Looping var */ -+ unsigned char data[1024]; /* Seed data */ - #endif /* HAVE_LIBSSL */ - -- -- if (initialized) -- return; -- - #ifdef WIN32 -- WSAStartup(MAKEWORD(2,2), &winsockdata); -+ WSADATA winsockdata; /* WinSock data */ -+ - -+ static int initialized = 0; /* Has WinSock been initialized? */ -+ if (!initialized) -+ WSAStartup(MAKEWORD(1,1), &winsockdata); - #elif !defined(SO_NOSIGPIPE) - /* - * Ignore SIGPIPE signals... -@@ -1226,21 +1210,15 @@ httpInitialize(void) - #endif /* WIN32 */ - - #ifdef HAVE_GNUTLS -- /* -- * Make sure we handle threading properly... -- */ -- --# ifdef HAVE_PTHREAD_H -- gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); --# endif /* HAVE_PTHREAD_H */ - - /* - * Initialize GNU TLS... - */ - - gnutls_global_init(); -+#endif /* HAVE_GNUTLS */ - --#elif defined(HAVE_LIBSSL) -+#ifdef HAVE_LIBSSL - /* - * Initialize OpenSSL... - */ -@@ -1249,33 +1227,21 @@ httpInitialize(void) - SSL_library_init(); - - /* -- * Set the threading callbacks... -- */ -- --# ifdef HAVE_PTHREAD_H -- http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t)); -- -- for (i = 0; i < CRYPTO_num_locks(); i ++) -- pthread_mutex_init(http_locks + i, NULL); -- -- CRYPTO_set_id_callback(http_threadid_cb); -- CRYPTO_set_locking_callback(http_locking_cb); --# endif /* HAVE_PTHREAD_H */ -- -- /* - * Using the current time is a dubious random seed, but on some systems - * it is the best we can do (on others, this seed isn't even used...) - */ - -- CUPS_SRAND(time(NULL)); -+# ifdef WIN32 -+# else -+ gettimeofday(&curtime, NULL); -+ srand(curtime.tv_sec + curtime.tv_usec); -+# endif /* WIN32 */ - - for (i = 0; i < sizeof(data); i ++) -- data[i] = CUPS_RAND(); -+ data[i] = rand(); - - RAND_seed(data, sizeof(data)); --#endif /* HAVE_GNUTLS */ -- -- initialized = 1; -+#endif /* HAVE_LIBSSL */ - } - - -@@ -2834,25 +2800,6 @@ http_read_ssl(http_t *http, /* I - Conn - #endif /* HAVE_SSL */ - - --#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) --/* -- * 'http_locking_cb()' - Lock/unlock a thread's mutex. -- */ -- --static void --http_locking_cb(int mode, /* I - Lock mode */ -- int type, /* I - Lock type */ -- const char *file, /* I - Source file */ -- int line) /* I - Line number */ --{ -- if (mode & CRYPTO_LOCK) -- pthread_mutex_lock(http_locks + type); -- else -- pthread_mutex_unlock(http_locks + type); --} --#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */ -- -- - /* - * 'http_send()' - Send a request with all fields and the trailing blank line. - */ -@@ -3224,19 +3171,6 @@ http_shutdown_ssl(http_t *http) /* I - - #endif /* HAVE_SSL */ - - --#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) --/* -- * 'http_threadid_cb()' - Return the current thread ID. -- */ -- --static unsigned long /* O - Thread ID */ --http_threadid_cb(void) --{ -- return ((unsigned long)pthread_self()); --} --#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */ -- -- - #ifdef HAVE_SSL - /* - * 'http_upgrade()' - Force upgrade to TLS encryption. -diff -Naurp cups-1.4.4-orig/cups/http-private.h cups-1.4.4/cups/http-private.h ---- cups-1.4.4-orig/cups/http-private.h 2010-04-11 23:03:53.000000000 -0500 -+++ cups-1.4.4/cups/http-private.h 2010-09-13 01:27:24.000000000 -0500 -@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void) - * The GNU TLS library is more of a "bare metal" SSL/TLS library... - */ - # include <gnutls/gnutls.h> --# include <gcrypt.h> - - typedef struct - { -diff -Naurp cups-1.4.4-orig/scheduler/main.c cups-1.4.4/scheduler/main.c ---- cups-1.4.4-orig/scheduler/main.c 2010-04-23 13:56:34.000000000 -0500 -+++ cups-1.4.4/scheduler/main.c 2010-09-13 01:27:36.000000000 -0500 -@@ -549,8 +549,6 @@ main(int argc, /* I - Number of comm - * Startup the server... - */ - -- httpInitialize(); -- - cupsdStartServer(); - - /* -diff -Naurp cups-1.4.4-orig/scheduler/server.c cups-1.4.4/scheduler/server.c ---- cups-1.4.4-orig/scheduler/server.c 2010-04-11 23:03:53.000000000 -0500 -+++ cups-1.4.4/scheduler/server.c 2010-09-13 01:27:49.000000000 -0500 -@@ -44,6 +44,42 @@ static int started = 0; - void - cupsdStartServer(void) - { -+#ifdef HAVE_LIBSSL -+ int i; /* Looping var */ -+ struct timeval curtime; /* Current time in microseconds */ -+ unsigned char data[1024]; /* Seed data */ -+#endif /* HAVE_LIBSSL */ -+ -+ -+#ifdef HAVE_LIBSSL -+ /* -+ * Initialize the encryption libraries... -+ */ -+ -+ SSL_library_init(); -+ SSL_load_error_strings(); -+ -+ /* -+ * Using the current time is a dubious random seed, but on some systems -+ * it is the best we can do (on others, this seed isn't even used...) -+ */ -+ -+ gettimeofday(&curtime, NULL); -+ srand(curtime.tv_sec + curtime.tv_usec); -+ -+ for (i = 0; i < sizeof(data); i ++) -+ data[i] = rand(); /* Yes, this is a poor source of random data... */ -+ -+ RAND_seed(&data, sizeof(data)); -+#elif defined(HAVE_GNUTLS) -+ /* -+ * Initialize the encryption libraries... -+ */ -+ -+ gnutls_global_init(); -+#endif /* HAVE_LIBSSL */ -+ -+ - /* - * Create the default security profile... - */ diff --git a/source/a/cups/cups.url b/source/a/cups/cups.url new file mode 100644 index 000000000..fc83aeb6b --- /dev/null +++ b/source/a/cups/cups.url @@ -0,0 +1 @@ +http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2 diff --git a/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch b/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch deleted file mode 100644 index 88ae9d077..000000000 --- a/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch +++ /dev/null @@ -1,574 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter@gmail.com> -## -## DP: http://www.cups.org/str.php?L3357 - -@DPATCH@ -diff -urNad cups-1.4.3~/backend/Makefile cups-1.4.3/backend/Makefile ---- cups-1.4.3~/backend/Makefile 2010-04-09 15:56:03.735720821 +0200 -+++ cups-1.4.3/backend/Makefile 2010-04-09 15:56:04.335705387 +0200 -@@ -267,7 +267,7 @@ - echo Linking $@... - $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ - $(BACKLIBS) $(LIBS) --usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c -+usb.o: usb.c usb-darwin.c usb-hybrid.c usb-libusb.c usb-unix.c - - - # -diff -urNad cups-1.4.3~/backend/ieee1284.c cups-1.4.3/backend/ieee1284.c ---- cups-1.4.3~/backend/ieee1284.c 2009-12-08 03:13:42.000000000 +0100 -+++ cups-1.4.3/backend/ieee1284.c 2010-04-09 15:56:04.335705387 +0200 -@@ -255,6 +255,7 @@ - cups_option_t *values; /* Keys and values in device ID */ - const char *mfg, /* Manufacturer */ - *mdl, /* Model */ -+ *des, /* Description */ - *sern; /* Serial number */ - char temp[256], /* Temporary manufacturer string */ - *tempptr; /* Pointer into temp string */ -@@ -285,10 +286,20 @@ - } - else - { -- strlcpy(temp, make_model, sizeof(temp)); -+ /* -+ * No manufacturer? Use the model string or description... -+ */ -+ -+ if (mdl) -+ _ppdNormalizeMakeAndModel(mdl, temp, sizeof(temp)); -+ else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL || -+ (des = cupsGetOption("DES", num_values, values)) != NULL) -+ _ppdNormalizeMakeAndModel(des, temp, sizeof(temp)); -+ else -+ strlcpy(temp, "Unknown", sizeof(temp)); - - if ((tempptr = strchr(temp, ' ')) != NULL) -- *tempptr = '\0'; -+ *tempptr = '\0'; - - mfg = temp; - } -diff -urNad cups-1.4.3~/backend/usb-hybrid.c cups-1.4.3/backend/usb-hybrid.c ---- cups-1.4.3~/backend/usb-hybrid.c 1970-01-01 01:00:00.000000000 +0100 -+++ cups-1.4.3/backend/usb-hybrid.c 2010-04-09 15:56:04.345707078 +0200 -@@ -0,0 +1,87 @@ -+/* -+ * "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $" -+ * -+ * USB port backend for the Common UNIX Printing System (CUPS). -+ * -+ * This file is included from "usb.c" when compiled on Linux. -+ * -+ * Copyright 2007-2008 by Apple Inc. -+ * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * -+ * These coded instructions, statements, and computer programs are the -+ * property of Apple Inc. and are protected by Federal copyright -+ * law. Distribution and use rights are outlined in the file "LICENSE.txt" -+ * "LICENSE" which should have been included with this file. If this -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * This file is subject to the Apple OS-Developed Software exception. -+ * -+ * Contents: -+ * -+ * print_device() - Print a file to a USB device. -+ * list_devices() - List all USB devices. -+ */ -+ -+/* -+ * Include necessary headers. -+ */ -+ -+#include <sys/select.h> -+ -+/* -+ * Include the two USB implementations used under Linux ... -+ */ -+ -+#include "usb-libusb.c" -+#include "usb-unix.c" -+ -+/* -+ * 'print_device()' - Print a file to a USB device. -+ */ -+ -+int /* O - Exit status */ -+print_device(const char *uri, /* I - Device URI */ -+ const char *hostname, /* I - Hostname/manufacturer */ -+ const char *resource, /* I - Resource/modelname */ -+ char *options, /* I - Device options/serial number */ -+ int print_fd, /* I - File descriptor to print */ -+ int copies, /* I - Copies to print */ -+ int argc, /* I - Number of command-line arguments (6 or 7) */ -+ char *argv[]) /* I - Command-line arguments */ -+{ -+ int result; -+ for(;;) -+ { -+ result = print_device_unix(uri, hostname, resource, options, print_fd, -+ copies, argc, argv); -+ if (result == -1) -+ { -+ result = print_device_libusb(uri, hostname, resource, options, print_fd, -+ copies, argc, argv); -+ if (result == -1) -+ sleep(5); -+ else -+ return(result); -+ } -+ else -+ return(result); -+ } -+} -+ -+/* -+ * 'list_devices()' - List all USB devices. -+ */ -+ -+void -+list_devices(void) -+{ -+ /* Try both discovery methods, each device will appear only under one -+ of them */ -+ list_devices_libusb(); -+ list_devices_unix(); -+} -+ -+ -+/* -+ * End of "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $". -+ */ -diff -urNad cups-1.4.3~/backend/usb-libusb.c cups-1.4.3/backend/usb-libusb.c ---- cups-1.4.3~/backend/usb-libusb.c 2009-09-11 22:03:31.000000000 +0200 -+++ cups-1.4.3/backend/usb-libusb.c 2010-04-09 15:56:04.345707078 +0200 -@@ -13,16 +13,16 @@ - * - * Contents: - * -- * list_devices() - List the available printers. -- * print_device() - Print a file to a USB device. -+ * list_devices_libusb() - List the available printers. -+ * print_device_libusb() - Print a file to a USB device. - * close_device() - Close the connection to the USB printer. - * find_device() - Find or enumerate USB printers. - * get_device_id() - Get the IEEE-1284 device ID for the printer. - * list_cb() - List USB printers for discovery. - * make_device_uri() - Create a device URI for a USB printer. -- * open_device() - Open a connection to the USB printer. -+ * open_device_libusb() - Open a connection to the USB printer. - * print_cb() - Find a USB printer for printing. -- * side_cb() - Handle side-channel requests. -+ * side_cb_libusb() - Handle side-channel requests. - */ - - /* -@@ -65,30 +65,30 @@ - static char *make_device_uri(usb_printer_t *printer, - const char *device_id, - char *uri, size_t uri_size); --static int open_device(usb_printer_t *printer, int verbose); -+static int open_device_libusb(usb_printer_t *printer, int verbose); - static int print_cb(usb_printer_t *printer, const char *device_uri, - const char *device_id, const void *data); --static ssize_t side_cb(usb_printer_t *printer, int print_fd); -+static ssize_t side_cb_libusb(usb_printer_t *printer, int print_fd); - - - /* -- * 'list_devices()' - List the available printers. -+ * 'list_devices_libusb()' - List the available printers. - */ - - void --list_devices(void) -+list_devices_libusb(void) - { -- fputs("DEBUG: list_devices\n", stderr); -+ fputs("DEBUG: list_devices_libusb\n", stderr); - find_device(list_cb, NULL); - } - - - /* -- * 'print_device()' - Print a file to a USB device. -+ * 'print_device_libusb()' - Print a file to a USB device. - */ - - int /* O - Exit status */ --print_device(const char *uri, /* I - Device URI */ -+print_device_libusb(const char *uri, /* I - Device URI */ - const char *hostname, /* I - Hostname/manufacturer */ - const char *resource, /* I - Resource/modelname */ - char *options, /* I - Device options/serial number */ -@@ -105,19 +105,23 @@ - struct pollfd pfds[2]; /* Poll descriptors */ - - -- fputs("DEBUG: print_device\n", stderr); -+ fputs("DEBUG: print_device_libusb\n", stderr); - - /* - * Connect to the printer... - */ - -+#if defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) -+ if ((printer = find_device(print_cb, uri)) == NULL) -+ return(-1); -+#else - while ((printer = find_device(print_cb, uri)) == NULL) - { - _cupsLangPuts(stderr, - _("INFO: Waiting for printer to become available...\n")); - sleep(5); - } -- -+#endif - - /* - * If we are printing data from a print driver on stdin, ignore SIGTERM -@@ -189,7 +193,7 @@ - - if (pfds[1].revents & (POLLIN | POLLHUP)) - { -- if ((bytes = side_cb(printer, print_fd)) < 0) -+ if ((bytes = side_cb_libusb(printer, print_fd)) < 0) - pfds[1].events = 0; /* Filter has gone away... */ - else - tbytes += bytes; -@@ -359,7 +363,7 @@ - printer.iface = iface; - printer.handle = NULL; - -- if (!open_device(&printer, data != NULL)) -+ if (!open_device_libusb(&printer, data != NULL)) - { - if (!get_device_id(&printer, device_id, sizeof(device_id))) - { -@@ -583,6 +587,14 @@ - mfg = tempmfg; - } - -+ if (!strncasecmp(mdl, mfg, strlen(mfg))) -+ { -+ mdl += strlen(mfg); -+ -+ while (isspace(*mdl & 255)) -+ mdl ++; -+ } -+ - /* - * Generate the device URI from the manufacturer, model, serial number, - * and interface number... -@@ -611,11 +623,11 @@ - - - /* -- * 'open_device()' - Open a connection to the USB printer. -+ * 'open_device_libusb()' - Open a connection to the USB printer. - */ - - static int /* O - 0 on success, -1 on error */ --open_device(usb_printer_t *printer, /* I - Printer */ -+open_device_libusb(usb_printer_t *printer, /* I - Printer */ - int verbose) /* I - Update connecting-to-device state? */ - { - int number; /* Configuration/interface/altset numbers */ -@@ -733,16 +745,73 @@ - const char *device_id, /* I - IEEE-1284 device ID */ - const void *data) /* I - User data (make, model, S/N) */ - { -- return (!strcmp((char *)data, device_uri)); -+ char *uri = (char *)data, -+ *str1, -+ *str2, -+ buf[255], -+ requested_uri[1024]; -+ -+ /* Work on a copy of uri */ -+ strncpy(requested_uri, uri, sizeof(requested_uri)); -+ requested_uri[sizeof(requested_uri) - 1] = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have an "interface" specification and this -+ * never happens for usblp-discovered URIs, so remove the "interface" -+ * specification from the URI which we are checking currently. This way a -+ * queue for a usblp-discovered printer can now be accessed via libusb -+ */ -+ if (((str1 = strstr(requested_uri, "interface=")) == NULL) && -+ ((str2 = strstr(device_uri, "interface=")) != NULL)) -+ { -+ *(str2 - 1) = '\0'; -+ } -+ -+ /* -+ * Old URI with "serial=?". Cut this part off and consider this as -+ * an URI without serial number -+ */ -+ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI without serial number. Match it also with URIs with serial -+ * number -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ *(str2 - 1) = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have a "serial" specification when the -+ * usblp-discovered URI for the same printer does not have one, as -+ * with libusb we can discover serial numbers also with other methods -+ * than only via the device ID. Therefore we accept also a -+ * usblp-discovered printer without serial number as a match. This we -+ * do by removing the serial number from the queue's (libusb-discovered) -+ * URI before comparing. Also warn the user because of the incapability -+ * of the usblp-based access to distinguish printers by the serial -+ * number. -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ { -+ *(str2 - 1) = '\0'; -+ if (backendGetMakeModel(device_id, buf, sizeof(buf)) == 0) -+ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please make sure that the \"usblp\" kernel module is always unloaded (and blacklisted) and re-create the queues for these printers. Otherwise CUPS will not be able to distinguish them.\n", -+ buf); -+ } -+ -+ return (!strcmp(requested_uri, device_uri)); - } - - - /* -- * 'side_cb()' - Handle side-channel requests. -+ * 'side_cb_libusb()' - Handle side-channel requests. - */ - - static ssize_t /* O - Number of bytes written */ --side_cb(usb_printer_t *printer, /* I - Printer */ -+side_cb_libusb(usb_printer_t *printer, /* I - Printer */ - int print_fd) /* I - File to print */ - { - ssize_t bytes, /* Bytes read/written */ -diff -urNad cups-1.4.3~/backend/usb-unix.c cups-1.4.3/backend/usb-unix.c ---- cups-1.4.3~/backend/usb-unix.c 2009-12-08 03:13:42.000000000 +0100 -+++ cups-1.4.3/backend/usb-unix.c 2010-04-09 15:56:30.799666933 +0200 -@@ -18,10 +18,10 @@ - * - * Contents: - * -- * print_device() - Print a file to a USB device. -- * list_devices() - List all USB devices. -- * open_device() - Open a USB device... -- * side_cb() - Handle side-channel requests... -+ * print_device_unix() - Print a file to a USB device. -+ * list_devices_unix() - List all USB devices. -+ * open_device_unix() - Open a USB device... -+ * side_cb_unix() - Handle side-channel requests... - */ - - /* -@@ -35,17 +35,17 @@ - * Local functions... - */ - --static int open_device(const char *uri, int *use_bc); --static int side_cb(int print_fd, int device_fd, int snmp_fd, -+static int open_device_unix(const char *uri, int *use_bc); -+static int side_cb_unix(int print_fd, int device_fd, int snmp_fd, - http_addr_t *addr, int use_bc); - - - /* -- * 'print_device()' - Print a file to a USB device. -+ * 'print_device_unix()' - Print a file to a USB device. - */ - - int /* O - Exit status */ --print_device(const char *uri, /* I - Device URI */ -+print_device_unix(const char *uri, /* I - Device URI */ - const char *hostname, /* I - Hostname/manufacturer */ - const char *resource, /* I - Resource/modelname */ - char *options, /* I - Device options/serial number */ -@@ -102,7 +102,7 @@ - strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -- if ((device_fd = open_device(uri, &use_bc)) == -1) -+ if ((device_fd = open_device_unix(uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) - { -@@ -132,6 +132,10 @@ - _("INFO: Printer busy; will retry in 10 seconds...\n")); - sleep(10); - } -+#ifdef HAVE_USB_H -+ else -+ return (-1); -+#else - else if (errno == ENXIO || errno == EIO || errno == ENOENT || - errno == ENODEV) - { -@@ -147,6 +151,7 @@ - resource, strerror(errno)); - return (CUPS_BACKEND_FAILED); - } -+#endif - } - } - while (device_fd < 0); -@@ -190,7 +195,7 @@ - tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL); - - #else -- tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb); -+ tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb_unix); - #endif /* __sun */ - - if (print_fd != 0 && tbytes >= 0) -@@ -214,11 +219,11 @@ - - - /* -- * 'list_devices()' - List all USB devices. -+ * 'list_devices_unix()' - List all USB devices. - */ - - void --list_devices(void) -+list_devices_unix(void) - { - #ifdef __linux - int i; /* Looping var */ -@@ -320,11 +325,11 @@ - - - /* -- * 'open_device()' - Open a USB device... -+ * 'open_device_unix()' - Open a USB device... - */ - - static int /* O - File descriptor or -1 on error */ --open_device(const char *uri, /* I - Device URI */ -+open_device_unix(const char *uri, /* I - Device URI */ - int *use_bc) /* O - Set to 0 for unidirectional */ - { - int fd; /* File descriptor */ -@@ -357,9 +362,12 @@ - char device[255], /* Device filename */ - device_id[1024], /* Device ID string */ - make_model[1024], /* Make and model */ -- device_uri[1024]; /* Device URI string */ -- -+ device_uri[1024], /* Device URI string */ -+ requested_uri[1024], /* Device URI string */ -+ *str1, -+ *str2; - -+ - /* - * Find the correct USB device... - */ -@@ -407,7 +415,55 @@ - device_uri[0] = '\0'; - } - -- if (!strcmp(uri, device_uri)) -+ /* Work on a copy of uri */ -+ strncpy(requested_uri, uri, sizeof(requested_uri)); -+ requested_uri[sizeof(requested_uri) - 1] = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have an "interface" specification and this -+ * never happens for usblp-discovered URIs, so remove the "interface" -+ * specification from the URI of the print queue. This way a queue for -+ * a libusb-discovered printer can now be accessed via the usblip kernel -+ * module -+ */ -+ if ((str1 = strstr(requested_uri, "interface=")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI with "serial=?". Cut this part off and consider this as -+ * an URI without serial number -+ */ -+ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI without serial number. Match it also with URIs with serial -+ * number -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ *(str2 - 1) = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have a "serial" specification when the -+ * usblp-discovered URI for the same printer does not have one, as -+ * with libusb we can discover serial numbers also with other methods -+ * than only via the device ID. Therefore we accept also a -+ * usblp-discovered printer without serial number as a match. This we -+ * do by removing the serial number from the queue's (libusb-discovered) -+ * URI before comparing. Also warn the user because of the incapability -+ * of the usblp-based access to distinguish printers by the serial -+ * number. -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) != NULL) && -+ ((str2 = strstr(device_uri, "serial=")) == NULL)) -+ { -+ *(str1 - 1) = '\0'; -+ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please unload (and blacklist) the \"usblp\" kernel module as otherwise CUPS will not be able to distinguish your printers.\n", -+ make_model); -+ } -+ -+ if (!strcmp(requested_uri, device_uri)) - { - /* - * Yes, return this file descriptor... -@@ -433,10 +489,14 @@ - */ - - if (busy) -+ { - _cupsLangPuts(stderr, - _("INFO: Printer busy; will retry in 5 seconds...\n")); - -- sleep(5); -+ sleep(5); -+ } -+ else -+ return -1; - } - } - #elif defined(__sun) && defined(ECPPIOC_GETDEVID) -@@ -557,11 +617,11 @@ - - - /* -- * 'side_cb()' - Handle side-channel requests... -+ * 'side_cb_unix()' - Handle side-channel requests... - */ - - static int /* O - 0 on success, -1 on error */ --side_cb(int print_fd, /* I - Print file */ -+side_cb_unix(int print_fd, /* I - Print file */ - int device_fd, /* I - Device file */ - int snmp_fd, /* I - SNMP socket (unused) */ - http_addr_t *addr, /* I - Device address (unused) */ -diff -urNad cups-1.4.3~/backend/usb.c cups-1.4.3/backend/usb.c ---- cups-1.4.3~/backend/usb.c 2008-06-24 03:28:36.000000000 +0200 -+++ cups-1.4.3/backend/usb.c 2010-04-09 15:56:04.345707078 +0200 -@@ -56,7 +56,7 @@ - */ - - #ifdef HAVE_USB_H --# include "usb-libusb.c" -+# include "usb-hybrid.c" - #elif defined(__APPLE__) - # include "usb-darwin.c" - #elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) diff --git a/source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch new file mode 100644 index 000000000..dcf91c833 --- /dev/null +++ b/source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch @@ -0,0 +1,74 @@ +--- backend/usb-libusb.c.orig 2012-07-16 19:10:55.000000000 +0200 ++++ backend/usb-libusb.c 2012-08-06 11:01:58.034150159 +0200 +@@ -70,7 +70,7 @@ + read_endp, /* Read endpoint */ + protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */ + usblp_attached, /* "usblp" kernel module attached? */ +- opened_for_job; /* Set to 1 by print_device() */ ++ reset_after_job; /* Set to 1 by print_device() */ + unsigned int quirks; /* Quirks flags */ + struct libusb_device_handle *handle; /* Open handle to device */ + } usb_printer_t; +@@ -122,6 +122,8 @@ + #define USBLP_QUIRK_USB_INIT 0x2 /* needs vendor USB init string */ + #define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific + Class or SubClass */ ++#define USBLP_QUIRK_RESET 0x4000 /* After printing do a reset ++ for clean-up */ + #define USBLP_QUIRK_NO_REATTACH 0x8000 /* After printing we cannot re-attach + the usblp kernel module */ + +@@ -147,9 +149,11 @@ + { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt + Printer M129C */ + { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | +- USBLP_QUIRK_NO_REATTACH }, ++ USBLP_QUIRK_NO_REATTACH | ++ USBLP_QUIRK_RESET }, + /* Prolific Technology, Inc. PL2305 Parallel Port + (USB -> Parallel adapter) */ ++ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */ + { 0, 0 } + }; + +@@ -256,7 +260,12 @@ + } + + g.print_fd = print_fd; +- g.printer->opened_for_job = 1; ++ ++ /* ++ * Some devices need a reset after finishing a job, these devices are ++ * marked with the USBLP_QUIRK_RESET quirk. ++ */ ++ g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0); + + /* + * If we are printing data from a print driver on stdin, ignore SIGTERM +@@ -772,7 +781,7 @@ + * Reset the device to clean up after the job + */ + +- if (printer->opened_for_job == 1) ++ if (printer->reset_after_job == 1) + { + if ((errcode = libusb_reset_device(printer->handle)) < 0) + fprintf(stderr, +@@ -1288,7 +1297,7 @@ + } + + printer->usblp_attached = 0; +- printer->opened_for_job = 0; ++ printer->reset_after_job = 0; + + if (verbose) + fputs("STATE: +connecting-to-device\n", stderr); +@@ -1586,7 +1595,7 @@ + for (i = 0; quirk_printers[i].vendorId; i++) + { + if (vendor == quirk_printers[i].vendorId && +- product == quirk_printers[i].productId) ++ (product == 0x0000 || product == quirk_printers[i].productId)) + return quirk_printers[i].quirks; + } + return 0; diff --git a/source/a/cxxlibs/cxxlibs.SlackBuild b/source/a/cxxlibs/cxxlibs.SlackBuild index eff5d26c3..b795d2738 100755 --- a/source/a/cxxlibs/cxxlibs.SlackBuild +++ b/source/a/cxxlibs/cxxlibs.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ PKGNAM=cxxlibs -VERSION=${VERSION:-6.0.14} +VERSION=${VERSION:-6.0.17} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/a/cxxlibs/symlinks-to-tracked-libs b/source/a/cxxlibs/symlinks-to-tracked-libs index e4f67cf60..39ff58e36 100644 --- a/source/a/cxxlibs/symlinks-to-tracked-libs +++ b/source/a/cxxlibs/symlinks-to-tracked-libs @@ -1,5 +1,2 @@ -/usr/i486-slackware-linux/lib/libstdc++-libc6.1-2.so.3 -/usr/i486-slackware-linux/lib/libstdc++-libc6.2-2.so.3 -/usr/i486-slackware-linux/lib/libstdc++.so.4 -/usr/i486-slackware-linux/lib/libstdc++.so.5 +/usr/lib/libstdc++.so.5 /usr/lib/libstdc++.so.6 diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild index b11340cd9..bd6acd99a 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007-2010 Robby Workman, Northport, Alabama, USA -# Copyright 2007-2010 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007-2012 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=dbus VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -69,6 +69,7 @@ find . \ -exec chmod 644 {} \; zcat $CWD/dbus-1.4.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/dbus.set.home.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -80,9 +81,11 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-doxygen-docs \ --enable-shared=yes \ --enable-static=no \ --enable-inotify \ + --enable-x11-autolaunch \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-init-scripts=slackware \ @@ -94,8 +97,20 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi # Install a custom init script for dbus - the included one is not good for us rm $PKG/etc/rc.d/* @@ -112,6 +127,14 @@ cp -a \ $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \; +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/dbus/dbus.set.home.diff b/source/a/dbus/dbus.set.home.diff new file mode 100644 index 000000000..5c0f7976a --- /dev/null +++ b/source/a/dbus/dbus.set.home.diff @@ -0,0 +1,22 @@ +Set HOME environment variable when switching user. + +2011-08-05 Egor Y. Egorov + +References: +https://bugs.freedesktop.org/show_bug.cgi?id=39857 +https://bugs.kde.org/show_bug.cgi?id=249217#c27 + +diff --git a/bus/activation-helper.c b/bus/activation-helper.c +index baba8f0..b75ea7c 100644 +--- a/bus/activation-helper.c ++++ b/bus/activation-helper.c +@@ -344,6 +344,8 @@ switch_user (char *user, DBusError *error) + "cannot setuid user %i", pw->pw_uid); + return FALSE; + } ++ ++ _dbus_setenv ("HOME", pw->pw_dir); + #endif + return TRUE; + } + diff --git a/source/a/dbus/rc.messagebus b/source/a/dbus/rc.messagebus index 7b27eb599..fb035af54 100644 --- a/source/a/dbus/rc.messagebus +++ b/source/a/dbus/rc.messagebus @@ -16,7 +16,8 @@ PIDFILE=/var/run/dbus/dbus.pid start() { - if ! ps axc | grep -w dbus-daemon ; then + mkdir -p $(dirname $PIDFILE) + if ! ps -u messagebus -c | grep -wq dbus-daemon; then rm -f $(dirname $PIDFILE)/* if [ -x /usr/bin/dbus-uuidgen -a -x /usr/bin/dbus-daemon ] ; then echo "Starting system message bus: /usr/bin/dbus-uuidgen --ensure ; /usr/bin/dbus-daemon --system" @@ -48,10 +49,10 @@ reload() { } status() { - if ps axc | grep -wq dbus-daemon 2>/dev/null ; then - echo "dbus-daemon is running." + if ps -u messagebus -c | grep -wq dbus-daemon; then + echo "System dbus-daemon is running." else - echo "dbus is stopped." + echo "System dbus-daemon is stopped." fi } @@ -66,6 +67,7 @@ case "$1" in restart) stop start + echo "You may need to restart your Window Manager to reconnect to the system dbus." ;; reload) reload diff --git a/source/a/dcron/crontab.c.O_EXCL.diff b/source/a/dcron/crontab.c.O_EXCL.diff index 7acd5ce29..f705487ec 100644 --- a/source/a/dcron/crontab.c.O_EXCL.diff +++ b/source/a/dcron/crontab.c.O_EXCL.diff @@ -1,5 +1,6 @@ ---- ./crontab.c.orig 2010-01-18 09:27:31.000000000 -0600 -+++ ./crontab.c 2010-02-11 16:38:03.000000000 -0600 +diff -Nur dcron-4.5.orig//crontab.c dcron-4.5/crontab.c +--- dcron-4.5.orig//crontab.c 2011-05-01 07:22:09.000000000 -0500 ++++ dcron-4.5/crontab.c 2011-08-22 16:26:46.778225447 -0500 @@ -199,7 +199,7 @@ * Read from repFd, write to fd for "$CDir/$USER.new" */ diff --git a/source/a/dcron/crontab.root b/source/a/dcron/crontab.root index b5b425628..5b0ce8cbf 100644 --- a/source/a/dcron/crontab.root +++ b/source/a/dcron/crontab.root @@ -1,7 +1,7 @@ # If you don't want the output of a cron job mailed to you, you have to direct # any output to /dev/null. We'll do this here since these jobs should run -# properly on a newly installed system, but if they don't the average newbie -# might get quite perplexed about getting strange mail every 5 minutes. :^) +# properly on a newly installed system. If a script fails, run-parts will +# mail a notice to root. # # Run the hourly, daily, weekly, and monthly cron jobs. # Jobs that need different timing may be entered into the crontab as before, diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild index f67f869ff..243c0cc80 100755 --- a/source/a/dcron/dcron.SlackBuild +++ b/source/a/dcron/dcron.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo dcron-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,10 +70,7 @@ zcat $CWD/defs.h.TMPDIR.diff.gz | patch -p1 || exit 1 # using 'crontab -', exits with control-c, and then crontab refuses to # overwrite the junk file. It would be better if dcron would wipe # the junk file in the event it were not closed correctly, but oh well. -zcat $CWD/patches/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1 - -# Get the directory names under /var/spool/ right in the manpages: -zcat $CWD/dcron.manpage.paths.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1 CFLAGS+="$SLKCFLAGS" make || exit 1 strip --strip-unneeded crond crontab diff --git a/source/a/dcron/dcron.manpage.paths.diff b/source/a/dcron/dcron.manpage.paths.diff deleted file mode 100644 index afd9c3d16..000000000 --- a/source/a/dcron/dcron.manpage.paths.diff +++ /dev/null @@ -1,65 +0,0 @@ ---- ./crond.8.orig 2010-01-18 09:29:25.000000000 -0600 -+++ ./crond.8 2010-02-11 17:22:36.000000000 -0600 -@@ -17,13 +17,13 @@ - .RE - .TP - .B -c dir --directory of per-user crontabs (defaults to /var/spool/cron) -+directory of per-user crontabs (defaults to /var/spool/cron/crontabs) - .RS - .RE - .TP - .B -t dir - directory of timestamps for \@freq and FREQ=\&... jobs (defaults to --/var/spool/cronstamps) -+/var/spool/cron/cronstamps) - .RS - .RE - .TP -@@ -172,7 +172,7 @@ - \f[B]crontab\f[] notifies \f[B]crond\f[] that a user's crontab file - has been modified (or created or deleted) through the - \[lq]cron.update\[rq] file, which resides in the per-user crontabs --directory (usually /var/spool/cron). -+directory (usually /var/spool/cron/crontabs). - \f[B]crontab\f[] appends the filename of the modified crontab file - to \[lq]cron.update\[rq]; and \f[B]crond\f[] inspects this file to - determine when to reparse or otherwise update its internal list of -@@ -180,7 +180,7 @@ - .PP - Whenever a \[lq]cron.update\[rq] file is seen, \f[B]crond\f[] also - re-reads timestamp files from its timestamp directory (usually --/var/spool/cronstamps). -+/var/spool/cron/cronstamps). - Normally these will just mirror \f[B]crond\f[]'s own internal - representations, but this mechanism could be used to manually - notify \f[B]crond\f[] that you've externally updated the -@@ -210,7 +210,7 @@ - crontab to /etc/cron.d/foo. - .PP - The superuser has a per-user crontab along with other users. --It usually resides at /var/spool/cron/root. -+It usually resides at /var/spool/cron/crontabs/root. - .PP - Users can only have a crontab if they have an entry in /etc/passwd; - however they do not need to have login shell privileges. ---- ./crontab.1.orig 2010-01-18 09:29:25.000000000 -0600 -+++ ./crontab.1 2010-02-11 17:23:13.000000000 -0600 -@@ -45,7 +45,7 @@ - different user and/or crontab directory. - .PP - The superuser also has his or her own per-user crontab, saved as --/var/spool/cron/root. -+/var/spool/cron/crontabs/root. - .PP - Unlike other cron daemons, this crond/crontab package doesn't try - to do everything under the sun. -@@ -117,7 +117,7 @@ - The formats \@hourly, \@daily, \@weekly, \@monthly, and \@yearly - need to update timestamp files when their jobs have been run. - The timestamp files are saved as --/var/spool/cronstamps/user.jobname. -+/var/spool/cron/cronstamps/user.jobname. - So for all of these formats, the cron command needs a jobname, - given by prefixing the command with \f[B]ID=jobname\f[]. - (This syntax was chosen to maximize the chance that our crontab diff --git a/source/a/dcron/defs.h.TMPDIR.diff b/source/a/dcron/defs.h.TMPDIR.diff index 6263843b2..698f4ebc0 100644 --- a/source/a/dcron/defs.h.TMPDIR.diff +++ b/source/a/dcron/defs.h.TMPDIR.diff @@ -1,5 +1,6 @@ ---- ./defs.h.orig 2010-01-15 20:17:04.000000000 -0600 -+++ ./defs.h 2010-02-11 16:39:33.000000000 -0600 +diff -Nur dcron-4.5.orig//defs.h dcron-4.5/defs.h +--- dcron-4.5.orig//defs.h 2011-05-01 07:22:09.000000000 -0500 ++++ dcron-4.5/defs.h 2011-08-22 16:28:35.343956248 -0500 @@ -73,7 +73,7 @@ #define CRONUPDATE "cron.update" #endif diff --git a/source/a/dcron/run-parts b/source/a/dcron/run-parts index 247d8c6e1..65c778f36 100644 --- a/source/a/dcron/run-parts +++ b/source/a/dcron/run-parts @@ -39,10 +39,7 @@ for SCRIPT in $1/* ; do fi # If we've made it this far, then run the script if it's executable: if [ -x $SCRIPT ]; then - echo "$SCRIPT:" - echo - $SCRIPT 2>&1 - echo + $SCRIPT || echo "$SCRIPT failed." fi done diff --git a/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign Binary files differnew file mode 100644 index 000000000..6558e77e2 --- /dev/null +++ b/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index a14d8e118..3ba78e554 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -20,18 +20,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + + VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -44,11 +49,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-e2fsprogs @@ -81,7 +94,7 @@ CFLAGS="$SLKCFLAGS" \ --disable-libblkid \ --disable-libuuid \ --disable-uuidd \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -125,6 +138,7 @@ EOF chmod 0755 fsck.ext2 # Why won't symlinks work here? --RW # Because $0 will always be "fsck.ext2" in that case. --PJV + # rworkman is correct, so ignore the previous two comments :) --PJV cp -a fsck.ext2 fsck.ext3 cp -a fsck.ext2 fsck.ext4 cp -a fsck.ext2 fsck.ext4dev diff --git a/source/a/eject/eject.SlackBuild b/source/a/eject/eject.SlackBuild index c637ef553..94b0ccf76 100755 --- a/source/a/eject/eject.SlackBuild +++ b/source/a/eject/eject.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=eject VERSION=${VERSION:-2.1.5} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -59,6 +59,9 @@ cd ${PKGNAM} # Patch a problem with spaces in the pathname: zcat $CWD/eject.spaces.diff.gz | patch -p0 --verbose || exit 1 +# Fix "eject -T": +zcat $CWD/eject_for_mac.patch.gz | patch -p4 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/eject/eject_for_mac.patch b/source/a/eject/eject_for_mac.patch new file mode 100644 index 000000000..c86e3c17b --- /dev/null +++ b/source/a/eject/eject_for_mac.patch @@ -0,0 +1,12 @@ +diff -Nru /tmp/6rrvEn4EMT/eject-2.1.4/eject.c /tmp/Jon9ZzjSLN/eject-2.1.4/eject.c +--- /tmp/6rrvEn4EMT/eject-2.1.4/eject.c 2007-03-12 14:15:26.000000000 +0100 ++++ /tmp/Jon9ZzjSLN/eject-2.1.4/eject.c 2007-03-12 14:15:28.000000000 +0100 +@@ -552,7 +552,7 @@ + gettimeofday(&time_start, NULL); + + /* Send the CDROMEJECT command to the device. */ +- if (ioctl(fd, CDROMEJECT, 0) < 0) { ++ if (ioctl(fd, CDROMEJECT, 0) < 0 && errno != EIO) { + perror("ioctl"); + exit(1); + } diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild index d4508f2b5..5db87ea7f 100755 --- a/source/a/etc/etc.SlackBuild +++ b/source/a/etc/etc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.013 +VERSION=14.0 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/a/file/file.short.diff b/source/a/file/file.short.diff index be47218c5..0f6a0e7b6 100644 --- a/source/a/file/file.short.diff +++ b/source/a/file/file.short.diff @@ -1,12 +1,12 @@ -diff -Nur file-5.00.orig/src/readelf.h file-5.00/src/readelf.h ---- file-5.00.orig/src/readelf.h 2008-05-28 15:58:16.000000000 -0500 -+++ file-5.00/src/readelf.h 2009-02-08 22:17:26.681636542 -0600 -@@ -233,7 +233,7 @@ - #define NT_OPENBSD_VERSION 1 - #define NT_DRAGONFLY_VERSION 1 - /* GNU executables (name = "GNU") */ --#define NT_GNU_VERSION 1 -+#define NT_GNU_VERSION 0 +diff -Nur file-5.08.orig//src/readelf.h file-5.08/src/readelf.h +--- file-5.08.orig//src/readelf.h 2011-08-03 09:45:16.000000000 -0500 ++++ file-5.08/src/readelf.h 2011-08-23 21:10:04.228054614 -0500 +@@ -239,7 +239,7 @@ + * word[2]: minor version + * word[3]: tiny version + */ +-#define NT_GNU_VERSION 1 ++#define NT_GNU_VERSION 0 /* GNU OS tags */ - #define GNU_OS_LINUX 0 + #define GNU_OS_LINUX 0 diff --git a/source/a/file/slack-desc b/source/a/file/slack-desc index 96be26176..d405cb865 100644 --- a/source/a/file/slack-desc +++ b/source/a/file/slack-desc @@ -11,7 +11,7 @@ file: file: This is Ian F. Darwin's 'file' utility, used to identify files. file: Christos Zoulas has been file's maintainer since 1994. file: -file: +file: Home FTP site: ftp://ftp.astron.com/pub/file/ file: file: file: diff --git a/source/a/gdisk/slack-desc b/source/a/gdisk/slack-desc deleted file mode 100644 index 492b4460e..000000000 --- a/source/a/gdisk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -gdisk: gdisk (GPT fdisk) -gdisk: -gdisk: GPT fdisk (gdisk) is a partitioning tool for disks using a GPT (GUID -gdisk: Partition Table). It features a command-line interface, fairly direct -gdisk: manipulation of partition table structures, recovery tools to help -gdisk: you deal with corrupt partition tables, and the ability to convert -gdisk: MBR disks to GPT format. -gdisk: -gdisk: -gdisk: gdisk home: http://www.rodsbooks.com/gdisk/ -gdisk: diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild index 0ed840dcc..8b3154b0c 100755 --- a/source/a/gettext/gettext-tools.SlackBuild +++ b/source/a/gettext/gettext-tools.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.18.1.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j6 "} diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild index acaf1df14..cd86bf7eb 100755 --- a/source/a/gettext/gettext.SlackBuild +++ b/source/a/gettext/gettext.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.18.1.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j6 "} diff --git a/source/a/gdisk/gdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild index 841332dd5..6c6f5fc94 100755 --- a/source/a/gdisk/gdisk.SlackBuild +++ b/source/a/gptfdisk/gptfdisk.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (c) 2011 Eric Hameleers, Eindhoven, NL -# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAM=gdisk +PKGNAM=gptfdisk VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,7 +62,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION +cd $PKGNAM-$VERSION || exit 1 + +# Remove dependency on icu4c by switching from the uncommented Makefile +# lines to the commented ones: +zcat $CWD/gptfdisk.remove.icu4c.dep.diff.gz | patch -p1 || exit 1 chown -R root:root . find . \ @@ -77,7 +81,7 @@ export CFLAGS="$SLKCFLAGS" make || exit 1 # Manually install the stuff: -for FILE in gdisk sgdisk ; do +for FILE in cgdisk fixparts gdisk sgdisk ; do install -D $FILE $PKG/sbin/$FILE install -D $FILE.8 $PKG/usr/man/man8/$FILE.8 done @@ -86,6 +90,7 @@ done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ COPYING* NEWS README* \ + gdisk_test.sh \ $PKG/usr/doc/$PKGNAM-$VERSION # Strip binaries: diff --git a/source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff b/source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff new file mode 100644 index 000000000..ce5d7a8af --- /dev/null +++ b/source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff @@ -0,0 +1,36 @@ +--- ./Makefile.orig 2012-05-30 10:38:43.000000000 -0500 ++++ ./Makefile 2012-08-06 16:37:17.256362865 -0500 +@@ -1,8 +1,8 @@ + CC=gcc + CXX=g++ + CFLAGS+=-D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 +-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 ++#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 ++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 + LDFLAGS+= + LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix + MBR_LIBS=support diskio diskio-unix basicmbr mbrpart +@@ -14,16 +14,16 @@ + all: cgdisk gdisk sgdisk fixparts + + gdisk: $(LIB_OBJS) gdisk.o gpttext.o +-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk +- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk ++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk ++# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk + + cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o +-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk +- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk ++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk ++# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk + + sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o +-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk +- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk ++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk ++# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk + + fixparts: $(MBR_LIB_OBJS) fixparts.o + $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts diff --git a/source/a/gptfdisk/slack-desc b/source/a/gptfdisk/slack-desc new file mode 100644 index 000000000..913fd875b --- /dev/null +++ b/source/a/gptfdisk/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gptfdisk: gptfdisk (GPT fdisk utilities) +gptfdisk: +gptfdisk: GPT fdisk (consisting of the gdisk, cgdisk, sgdisk, and fixparts +gptfdisk: programs) is a set of text-mode partitioning tools for using a GPT +gptfdisk: (GUID Partition Table), rather than the traditional MBR (Master Boot +gptfdisk: Record) partition tables. It features several partitioning tools, +gptfdisk: recovery tools to help you deal with corrupt partition tables, and the +gptfdisk: ability to convert MBR disks to GPT format. +gptfdisk: +gptfdisk: gdisk home: http://www.rodsbooks.com/gdisk/ +gptfdisk: diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild index b789bc724..6bdf0d811 100755 --- a/source/a/grep/grep.SlackBuild +++ b/source/a/grep/grep.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -60,6 +60,7 @@ cd $TMP rm -rf grep-$VERSION tar xvf $CWD/grep-$VERSION.tar.xz || exit 1 cd grep-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -90,11 +91,20 @@ mkdir -p $PKG/usr/bin ln -sf ../../bin/fgrep . ) -# Compress man pages -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi # Compress info pages rm -f $PKG/usr/info/dir diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild index d5133fd5b..19ef42fba 100755 --- a/source/a/gzip/gzip.SlackBuild +++ b/source/a/gzip/gzip.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=gzip -VERSION=${VERSION:-1.4} +VERSION=${VERSION:-1.5} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -166,5 +166,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $TMP/package-${PKGNAM} -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.tgz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/isapnptools/isapnptools-1.26.lsm b/source/a/isapnptools/isapnptools-1.26.lsm new file mode 100644 index 000000000..f2c2af404 --- /dev/null +++ b/source/a/isapnptools/isapnptools-1.26.lsm @@ -0,0 +1,25 @@ +Begin3 +Title: isapnptools +Version: 1.26 +Entered-date: 2001-05-08 +Description: ISA plug and play configuration utility + Two programs - one allows the dumping of resource data and generation + of a skeleton configuration file, the other configures ISA PnP hardware + using a configuration file. + See http://www.roestock.demon.co.uk/isapnptools/ for latest information. +Keywords: ISA PnP Configuration Hardware +Author: fox@roestock.demon.co.uk (Peter Fox) +Maintained-by: fox@roestock.demon.co.uk (Peter Fox) +Primary-site: MetaLab.unc.edu /pub/Linux/system/hardware + 227k isapnptools-1.26.tgz + 384k isapnptools-1.26.bin.tgz +Alternate-site: tsx-11.mit.edu /pub/linux/sources/sbin + 227k isapnptools-1.26.src.tar.gz +Alternate-site: tsx-11.mit.edu /pub/linux/binaries/sbin + 384k isapnptools-1.26.bin.tar.gz +Alternate-site: ftp.lmh.ox.ac.uk /pub/linux/pnp + 227k isapnptools-1.26.tgz +Original-site: ftp.demon.co.uk /pub/unix/linux/utils + 227k isapnptools-1.26.tgz +Copying-policy: GNU +End diff --git a/source/a/isapnptools/isapnptools.SlackBuild b/source/a/isapnptools/isapnptools.SlackBuild new file mode 100755 index 000000000..38362878b --- /dev/null +++ b/source/a/isapnptools/isapnptools.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/sh + +# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +CWD=`pwd` +TMP=/tmp +PKG=$TMP/package-isapnptools +rm -rf $PKG +mkdir -p $PKG +cd $TMP + +# sanity check +if [ "$( uname -m )" = "x86_64" ]; then + echo "isapnptools is not supported on x86_64" + exit 1 +fi + +VERSION=${VERSION:-1.26} +ARCH=${ARCH:-i486} +BUILD=${BUILD:-2} + +tar xzvf $CWD/isapnptools-$VERSION.tar.gz || exit 1 +cd isapnptools-$VERSION + +zcat $CWD/isapnptools_1.26-5.diff.xz | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . -perm 666 -exec chmod 644 {} \; +find . -perm 664 -exec chmod 644 {} \; +find . -perm 600 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +find . -perm 400 -exec chmod 644 {} \; +find . -perm 440 -exec chmod 644 {} \; +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 511 -exec chmod 755 {} \; +find . -perm 711 -exec chmod 755 {} \; +find . -perm 555 -exec chmod 755 {} \; + +./configure --prefix=/usr +make -j4 || exit 1 +( cd src + strip isapnp pnpdump + mkdir -p $PKG/sbin + cat isapnp > $PKG/sbin/isapnp + cat pnpdump > $PKG/sbin/pnpdump + chmod 755 $PKG/sbin/* ) +mkdir -p $PKG/etc +( cd etc + mkdir -p $PKG/etc + cat isapnp.conf > $PKG/etc/isapnp.conf.sample + cat isapnp.gone > $PKG/etc/isapnp.gone.sample ) +( cd doc + mkdir -p $PKG/usr/man/man5 + cat isapnp.conf.5 | gzip -9c > $PKG/usr/man/man5/isapnp.conf.5.gz + mkdir -p $PKG/usr/man/man8 + cat isapnp.8 | gzip -9c > $PKG/usr/man/man8/isapnp.8.gz + cat pnpdump.8 | gzip -9c > $PKG/usr/man/man8/pnpdump.8.gz ) +mkdir -p $PKG/usr/doc/isapnptools-$VERSION +cp -a AUTHORS CHANGES COPYING INSTALL README isapnp.lsm doc/isapnpfaq.txt doc/README.ide doc/README.initrd $PKG/usr/doc/isapnptools-$VERSION +chown -R root:root $PKG/usr/doc/isapnptools-$VERSION +chmod 644 $PKG/usr/doc/isapnptools-$VERSION/* +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -c n -l y $TMP/isapnptools-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/isapnptools/isapnptools.url b/source/a/isapnptools/isapnptools.url new file mode 100644 index 000000000..e4a66ad56 --- /dev/null +++ b/source/a/isapnptools/isapnptools.url @@ -0,0 +1 @@ +http://www.roestock.demon.co.uk/isapnptools/ diff --git a/source/a/isapnptools/isapnptools_1.26-5.diff b/source/a/isapnptools/isapnptools_1.26-5.diff new file mode 100644 index 000000000..73bfae9e9 --- /dev/null +++ b/source/a/isapnptools/isapnptools_1.26-5.diff @@ -0,0 +1,597 @@ +--- isapnptools-1.26.orig/doc/man2html ++++ isapnptools-1.26/doc/man2html +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Brute force script to convert isapnptools man pages to html. + # +--- isapnptools-1.26.orig/debian/changelog ++++ isapnptools-1.26/debian/changelog +@@ -0,0 +1,263 @@ ++isapnptools (1.26-5) unstable; urgency=low ++ ++ * src/isapnp_main.l: Don't declare variable serial_identifier as static ++ (thanks Andreas Jochens). Closes: #286477. ++ ++ -- Steve M. Robbins <smr@debian.org> Thu, 23 Dec 2004 00:04:41 -0500 ++ ++isapnptools (1.26-4) unstable; urgency=low ++ ++ * Add amd64 to list of supported arches. Closes: #257455. ++ ++ -- Steve M. Robbins <smr@debian.org> Wed, 7 Jul 2004 21:21:29 -0400 ++ ++isapnptools (1.26-3) unstable; urgency=low ++ ++ * Applied portability fixes from David Weinehall. Closes: #254921. ++ - debian/isapnptools.init: Replace "test EXPR1 -o EXPR2" by ++ "test EXPR1 || test EXPR2". ++ - doc/man2html: Change hash-bang line from /bin/bash to /bin/sh. ++ ++ -- Steve M. Robbins <smr@debian.org> Thu, 24 Jun 2004 20:25:08 -0400 ++ ++isapnptools (1.26-2) unstable; urgency=low ++ ++ * debian/control: ++ Standards-Version updated to 3.5.6.0; no changes required. ++ Build-depend on flex-old rather than flex. ++ Build-depend on linux-kernel-headers, for <linux/pci.h>. ++ Set -dev package section to libdevel. ++ ++ * debian/rules: ++ Suppress accidental execution of auto-* tools. ++ Honour DEB_BUILD_OPTIONS policy. ++ ++ * src/callbacks.c: Include stdlib.h, for declaration of exit(). ++ ++ * src/resource.c: Define __KERNEL__ and include <linux/mod_devicetable.h> ++ to switch on definitions of __u32 et al. Closes: #223166. ++ ++ -- Steve M. Robbins <smr@debian.org> Sat, 6 Dec 2003 22:32:25 -0500 ++ ++isapnptools (1.26-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Revert to explicit list of architectures; does not ++ build on "mipsel". Closes: #97942. ++ * Do not install /etc/isapnp.conf or /etc/isapnp.gone; ++ supply them as examples, instead. ++ * Init script will exit if the kernel has an isa-pnp.o module. ++ * Install doc/README.lib in -dev package; don't install README ++ files for DOS, OS2, or borland. ++ ++ -- Steve M. Robbins <smr@debian.org> Fri, 18 May 2001 20:10:02 -0400 ++ ++isapnptools (1.25-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Change to architecture "any" (Closes: #94091). ++ ++ -- Steve M. Robbins <smr@debian.org> Mon, 16 Apr 2001 19:19:03 -0400 ++ ++isapnptools (1.24-3) unstable; urgency=low ++ ++ * Fix getopt_long() call to avoid coredump (Closes: #93097). ++ ++ -- Steve M. Robbins <smr@debian.org> Sat, 7 Apr 2001 12:40:52 -0400 ++ ++isapnptools (1.24-2) unstable; urgency=low ++ ++ * In version 1.24-1, all the include files were moved to libisapnp-dev, ++ so it must conflict with older isapnptools (closes: #90373). ++ * Set section/priority to base/extra, in agreement with the archive ++ override file. ++ ++ -- Steve M. Robbins <smr@debian.org> Mon, 19 Mar 2001 23:12:31 -0500 ++ ++isapnptools (1.24-1) unstable; urgency=low ++ ++ * New Maintainer (closes: #89719). ++ * New upstream version. ++ - scanner is case insensitive (closes: #74455, #75362, #83251). ++ * Repackaged using debhelper. ++ - correctly generates /usr/doc symlink (closes: #52641) ++ * Past NMU fixes that remain fixed: ++ - ensure isapnp is in /sbin (closes: #74893, #74642, #74349, #74487) ++ - dev package installs lib and headers (closes: #64469) ++ - README.lib was missing (closes: #62343, #53259) ++ - no longer uses awk (closes: #29633, #29862) ++ - updated version long ago (closes: #27784) ++ - upstream changelog correctly named (closes: #9664) ++ * Patch previously incorporated without closing bug: ++ - exit init script if test -e /proc/isapnp (closes: #53057) ++ * Closing lots of obsolete bugs (closes: #46674). ++ ++ -- Steve M. Robbins <smr@debian.org> Sun, 18 Mar 2001 20:11:10 -0500 ++ ++isapnptools (1.23-0.4) unstable; urgency=low ++ ++ * Non-Maintainer upload. ++ * Apply patch-1.23a from ++ http://www.roestock.demon.co.uk/isapnptools/patch-1.23a.gz ++ * Created acconfig.h (build fix). ++ ++ -- Ivo Timmermans <ivo@debian.org> Fri, 23 Feb 2001 19:45:39 +0100 ++ ++isapnptools (1.23-0.3) unstable; urgency=low ++ ++ * Non-Maintainer Upload. ++ * Fixed location of isapnp binary - should have tested this with 2.2 ++ kernel, not just 2.4.. (Closes: #74642, #74349, #74363, #74642) ++ ++ -- Joseph Carter <knghtbrd@debian.org> Sun, 15 Oct 2000 13:20:19 -0500 ++ ++isapnptools (1.23-0.2) unstable; urgency=low ++ ++ * Non-Maintainer Upload ++ * Fixed drain bamage in isapnp/release.h regarding config.h ++ ++ -- Joseph Carter <knghtbrd@debian.org> Wed, 4 Oct 2000 14:36:03 -0500 ++ ++isapnptools (1.23-0.1) unstable; urgency=low ++ ++ * Non-Maintainer Upload. ++ * New upstream version ++ * Modified debian/* for autosomething ++ ++ -- Joseph Carter <knghtbrd@debian.org> Mon, 25 Sep 2000 01:04:14 -0500 ++ ++isapnptools (1.21-2.2) unstable; urgency=low ++ ++ * NMU again. ++ * Put libisapnp-dev in devel, not libs. ++ ++ -- Chris Lawrence <lawrencc@debian.org> Mon, 24 Jul 2000 16:38:05 -0500 ++ ++isapnptools (1.21-2.1) unstable; urgency=low ++ ++ * NMU. ++ * Create a separate libisapnp-dev package. (Closes: #64469) ++ * Update Standards-Version in control file. ++ * Properly include section and priority fields. ++ * README.lib md5sums problem fixed. (Closes: #53259, #62343) ++ ++ -- Chris Lawrence <lawrencc@debian.org> Sat, 1 Jul 2000 14:13:45 -0500 ++ ++isapnptools (1.21-2) unstable; urgency=low ++ ++ * applied patch from Cesar Eduardo Barros to correct the behaviour ++ for IRQ 2. Closes: #50202. ++ * changed the test to not start for 2.3 kernels. Closes: #52818. ++ ++ -- Frederic Lepied <Lepied@debian.org> Thu, 16 Dec 1999 05:56:59 +0100 ++ ++isapnptools (1.21-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied <Lepied@debian.org> Sat, 11 Dec 1999 15:52:40 +0100 ++ ++isapnptools (1.19-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied <Lepied@debian.org> Thu, 21 Oct 1999 05:51:00 +0200 ++ ++isapnptools (1.18-1) unstable; urgency=low ++ ++ * new upstream version. ++ * Don't start isapnp on startup for 2.3 kernels. Closes: Bug#43634. ++ ++ -- Frederic Lepied <Lepied@debian.org> Sat, 4 Sep 1999 07:06:42 +0200 ++ ++isapnptools (1.16-4) frozen unstable; urgency=low ++ ++ * downgrade pciutils dependency from Recommend to Suggest. Closes Bug#29004. ++ ++ -- Frederic Lepied <Lepied@debian.org> Mon, 9 Nov 1998 06:01:16 +0100 ++ ++isapnptools (1.16-3) frozen unstable; urgency=low ++ ++ * oops upload to frozen too. ++ ++ -- Frederic Lepied <Lepied@debian.org> Wed, 4 Nov 1998 04:06:53 +0100 ++ ++isapnptools (1.16-2) unstable; urgency=low ++ ++ * added missing dependency fields. Closes Bug#28136 ++ * (resource.c): use type instead of which to test for ++ the lspci command. Closes Bug#28728. ++ ++ -- Frederic Lepied <Lepied@debian.org> Tue, 27 Oct 1998 09:32:57 +0100 ++ ++isapnptools (1.16-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied <Lepied@debian.org> Fri, 16 Oct 1998 08:53:06 +0200 ++ ++isapnptools (1.13-3.1) unstable; urgency=high ++ ++ * Non-maintainer upload ++ * Fix #23770 (startup link in rcS.d) ++ * Add depend on dpkg >= 1.4.0.21 because of update-rc.d ++ ++ -- Gergely Madarasz <gorgo@caesar.elte.hu> Wed, 24 Jun 1998 00:11:59 +0200 ++ ++isapnptools (1.13-3) unstable; urgency=low ++ ++ * made architecture i386 and alpha. Fix Bug#19704. ++ ++ -- Frederic Lepied <Lepied@debian.org> Sun, 15 Mar 1998 20:53:28 +0100 ++ ++isapnptools (1.13-2) unstable; urgency=low ++ ++ * Fix Bug#19334 (reports from lintian). ++ ++ -- Frederic Lepied <Lepied@debian.org> Sun, 15 Mar 1998 14:44:16 +0100 ++ ++isapnptools (1.13-1) unstable; urgency=low, Closes=15423 ++ ++ * upstream release. ++ * remade architecture 'any' as it works with the alpha architecture now. ++ * install changelog.Debian compressed. Closes Bug#15423. ++ ++ -- Frederic Lepied <Lepied@debian.org> Wed, 7 Jan 1998 06:22:42 +0100 ++ ++isapnptools (1.11-3) unstable; urgency=low ++ ++ * made architecture i386 (bug #12532). ++ ++ -- Frederic Lepied <Lepied@debian.org> Wed, 8 Oct 1997 11:22:26 +0200 ++ ++isapnptools (1.11-2) unstable; urgency=low ++ ++ * test if isapnp.conf is readable before launching isapnp (bug #13688) ++ ++ -- Frederic Lepied <Lepied@debian.org> Wed, 8 Oct 1997 09:40:09 +0200 ++ ++isapnptools (1.11-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied <Lepied@debian.org> Sat, 26 Jul 1997 11:14:14 +0200 ++ ++isapnptools (1.10-2) unstable; urgency=low ++ ++ * compiled with libc6. ++ ++ -- Frederic Lepied <Lepied@debian.org> Sat, 12 Jul 1997 19:48:15 +0200 ++ ++isapnptools (1.10-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Frederic Lepied <Lepied@debian.org> Thu, 12 Jun 1997 08:47:14 +0200 ++ ++isapnptools (1.9-1) unstable; urgency=low ++ ++ * Initial Release. ++ * Need to be integrated with sysvinit. ++ ++ -- Frederic Lepied <Lepied@debian.org> Thu, 13 Feb 1997 10:28:34 +0100 ++ +--- isapnptools-1.26.orig/debian/control ++++ isapnptools-1.26/debian/control +@@ -0,0 +1,26 @@ ++Source: isapnptools ++Section: base ++Priority: extra ++Maintainer: Steve M. Robbins <smr@debian.org> ++Standards-Version: 3.5.8.0 ++Build-Depends: debhelper (>> 3.0.0), flex-old, linux-kernel-headers ++ ++Package: isapnptools ++Architecture: alpha amd64 arm i386 ++Depends: ${shlibs:Depends}, dpkg (>= 1.4.0.21) ++Description: ISA Plug-And-Play configuration utilities. ++ This program is suitable for all systems, whether or not they ++ include a PnP BIOS. In fact, a PnP BIOS adds some complications ++ because it may already activate some cards so that the drivers ++ can find them, and these tools can unconfigure them, or change ++ their settings causing all sorts of nasty effects. ++ ++Package: libisapnp-dev ++Architecture: alpha amd64 arm i386 ++Conflicts: isapnptools (<< 1.24-1) ++Section: libdevel ++Priority: optional ++Description: ISA Plug-And-Play development libraries. ++ This package provides a header file and a static library for ++ development of software that detects and configures ISA Plug-And-Play ++ devices. +--- isapnptools-1.26.orig/debian/copyright ++++ isapnptools-1.26/debian/copyright +@@ -0,0 +1,17 @@ ++This package was debianized by Frederic Lepied <Lepied@debian.org> on ++Thu, 13 Feb 1997 09:10:53 +0100. ++ ++It was downloaded from http://www.roestock.demon.co.uk/isapnptools/index.html ++ ++Copyright: ++ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++On Debian Linux systems, the complete text of the GNU General ++Public License can be found in `/usr/share/common-licenses/GPL'. +--- isapnptools-1.26.orig/debian/isapnptools.README.Debian ++++ isapnptools-1.26/debian/isapnptools.README.Debian +@@ -0,0 +1,38 @@ ++Starting with version 1.26-1 (2001-05-18), the sample configuration ++files are no longer installed in /etc. Look for them in ++/usr/share/doc/isapnptools/examples. ++ ++The example files are not very useful, in fact. Start with ++"pnpdump >isapnp.conf" and then read "man isapnp.conf" to get started. ++ ++ ++The --reset option to pnpdump may be useful to reset some hardware at ++shutdown time. However, the pnpdump manpage suggests this may cause a ++lockup, so this is not done by default. Edit /etc/init.d/isapnp if ++you wish to do so. See bug report #54686. ++ ++ ++ Kernel ISA PnP Support ++ ---------------------- ++ ++The 2.4 linux kernels have built-in support for ISA PnP configuration, ++obviating the need for isapnptools. The init script will silently ++exit if the running kernel has isa-pnp support built-in or compiled as ++a module. ++ ++For many, the kernel PnP configuration will be sufficient (it seems to ++be better than isapnptools). If your card does not get properly ++configured, you will have to peruse the file Documentation/isapnp.txt ++from the kernel sources and come up with the required commands ++to configure it. Put them into a file, e.g. /etc/proc-isapnp.conf, ++and arrange for this to be read during boot. If isa-pnp is compiled ++as a module, you can use a module post-install rule such as ++the following: ++ ++ post-install isa-pnp cat /etc/proc-isapnp.conf > /proc/isapnp ++ ++Install this line into a file in /etc/modutils of your choosing ++(e.g. /etc/modutils/local) then run "update-modules". ++ ++ ++ -- Steve M. Robbins <smr@debian.org>, Sat Dec 6 23:35:46 2003 +--- isapnptools-1.26.orig/debian/isapnptools.docs ++++ isapnptools-1.26/debian/isapnptools.docs +@@ -0,0 +1,8 @@ ++AUTHORS ++NEWS ++README ++doc/README.ide ++doc/README.initrd ++doc/README.modules ++doc/isapnpfaq.txt ++ +--- isapnptools-1.26.orig/debian/isapnptools.examples ++++ isapnptools-1.26/debian/isapnptools.examples +@@ -0,0 +1,2 @@ ++etc/isapnp.gone ++etc/isapnp.conf +--- isapnptools-1.26.orig/debian/isapnptools.files ++++ isapnptools-1.26/debian/isapnptools.files +@@ -0,0 +1,4 @@ ++sbin ++usr/sbin ++usr/share/man ++ +--- isapnptools-1.26.orig/debian/isapnptools.init ++++ isapnptools-1.26/debian/isapnptools.init +@@ -0,0 +1,29 @@ ++#! /bin/sh ++ ++# /etc/init.d/isapnp: configure Plug and Play boards ++ ++test -x /sbin/isapnp || exit 0 ++ ++# kernel 2.3.x and later can handle Pnp directly ++if test -e /proc/isapnp || \ ++ test -e /lib/modules/`/bin/uname -r`/kernel/drivers/pnp/isa-pnp.o ++then ++ exit 0 ++fi ++ ++case "$1" in ++ start) ++ if [ -r /etc/isapnp.conf ]; then ++ /sbin/isapnp /etc/isapnp.conf ++ fi ++ ;; ++ ++ stop|force-reload|restart) ++ ;; ++ ++ *) ++ echo "Usage: $0 {start|stop|restart|force-reload}" ++ exit 1 ++esac ++ ++exit 0 +--- isapnptools-1.26.orig/debian/libisapnp-dev.docs ++++ isapnptools-1.26/debian/libisapnp-dev.docs +@@ -0,0 +1,4 @@ ++AUTHORS ++NEWS ++README ++doc/README.lib +--- isapnptools-1.26.orig/debian/libisapnp-dev.examples ++++ isapnptools-1.26/debian/libisapnp-dev.examples +@@ -0,0 +1,2 @@ ++demos/demo.c ++demos/demo2.c +--- isapnptools-1.26.orig/debian/libisapnp-dev.files ++++ isapnptools-1.26/debian/libisapnp-dev.files +@@ -0,0 +1,2 @@ ++usr/include ++usr/lib +--- isapnptools-1.26.orig/debian/postrm ++++ isapnptools-1.26/debian/postrm +@@ -0,0 +1,7 @@ ++#!/bin/sh -e ++ ++#DEBHELPER# ++ ++if [ "$1" = "purge" ] ; then ++ rm -f /etc/isapnp.conf /etc/isapnp.gone ++fi +--- isapnptools-1.26.orig/debian/rules ++++ isapnptools-1.26/debian/rules +@@ -0,0 +1,115 @@ ++#!/usr/bin/make -f ++# ++# Adapted from /usr/share/doc/debhelper/examples/rules.multi2 ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# This is the debhelper compatibility version to use. ++export DH_COMPAT=3 ++ ++# This has to be exported to make some magic below work. ++export DH_OPTIONS ++ ++# Suppress accidental execution of the auto-* tools; see ++# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html ++no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ ++ AUTOCONF="`pwd`/missing autoconf" \ ++ AUTOMAKE="`pwd`/missing automake" \ ++ AUTOHEADER="`pwd`/missing autoheader" ++ ++# Customization follows Debian policy 11.1. ++# ++# Variable DEB_BUILD_OPTIONS can have "noopt" or "nostrip" ++ ++CFLAGS = -Wall -g ++export CFLAGS ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++CFLAGS += -O0 ++else ++CFLAGS += -O2 ++endif ++ ++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++INSTALL_PROGRAM += -s ++endif ++ ++build: build-stamp ++build-stamp: ++ dh_testdir ++ ++ rm -f config.cache ++ ./configure --prefix=/usr \ ++ --mandir=/usr/share/man --infodir=/usr/share/info ++ $(MAKE) $(no_auto_tools) ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ ++ -cd demos && $(MAKE) distclean ++ -$(MAKE) distclean ++ ++ dh_clean ++ ++install: DH_OPTIONS= ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ $(MAKE) DESTDIR=`pwd`/debian/tmp install ++ # Move isapnp to /sbin ++ mkdir debian/tmp/sbin ++ mv debian/tmp/usr/sbin/isapnp debian/tmp/sbin ++ ++ dh_movefiles ++ ++# This single target is used to build all the packages, all at once, or ++# one at a time. So keep in mind: any options passed to commands here will ++# affect _all_ packages. Anything you want to only affect one package ++# should be put in another target, such as the install target. ++binary-common: ++ dh_testdir ++ dh_testroot ++# dh_installdebconf ++ dh_installdocs ++ dh_installexamples ++ # override init script name, for historical reasons ++ dh_installinit --no-restart-on-upgrade \ ++ --init-script=isapnp \ ++ -- start 15 S . ++# dh_installman ++ dh_installinfo ++ dh_installchangelogs ChangeLog ++# dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++# dh_makeshlibs ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++# Build architecture independant packages using the common target. ++binary-indep: build install ++# (Uncomment this next line if you have such packages.) ++# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common ++ ++# Build architecture dependant packages using the common target. ++binary-arch: build install ++ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common ++ ++# Any other binary targets build just one binary package at a time. ++binary-%: build install ++ make -f debian/rules binary-common DH_OPTIONS=-p$* ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- isapnptools-1.26.orig/src/callbacks.c ++++ isapnptools-1.26/src/callbacks.c +@@ -51,6 +51,7 @@ + #include <stdio.h> + #include <errno.h> + #include <string.h> ++#include <stdlib.h> + + /****************************************************************************/ + +--- isapnptools-1.26.orig/src/isapnp_main.l ++++ isapnptools-1.26/src/isapnp_main.l +@@ -363,7 +363,7 @@ + return 0; + } + +-static unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; ++unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; + static char *boardid[NUM_CARDS+1]; + static unsigned long serno[NUM_CARDS+1]; + +--- isapnptools-1.26.orig/src/resource.c ++++ isapnptools-1.26/src/resource.c +@@ -24,6 +24,9 @@ + #include <string.h> + + #ifdef ENABLE_PCI ++#define __KERNEL__ ++#include <linux/mod_devicetable.h> ++#undef __KERNEL__ + #include <linux/pci.h> + #endif + diff --git a/source/a/isapnptools/slack-desc b/source/a/isapnptools/slack-desc new file mode 100644 index 000000000..8646def6e --- /dev/null +++ b/source/a/isapnptools/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +isapnptools: isapnptools (ISA Plug-And-Play tools) +isapnptools: +isapnptools: These programs allow ISA Plug-And-Play devices to be configured +isapnptools: on a Linux machine. +isapnptools: +isapnptools: +isapnptools: +isapnptools: +isapnptools: +isapnptools: +isapnptools: diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild index ddcd96703..1b2147d0a 100755 --- a/source/a/kbd/kbd.SlackBuild +++ b/source/a/kbd/kbd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=kbd -VERSION=1.15.2 -BUILD=${BUILD:-1} +VERSION=1.15.3 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,7 +34,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:--j4} +NUMJOBS=${NUMJOBS:--j6} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -49,7 +49,7 @@ cd $TMP # Extract source: rm -rf $PKGNAM-$VERSION -tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION # Make sure ownerships and permissions are sane: @@ -69,9 +69,12 @@ find . -perm 555 -exec chmod 755 {} \; # Apply patches: # These are taken from Fedora's SRPM: zcat $CWD/sources/kbd-1.15.2-po.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-keycodes-man.patch | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-unicode_start.patch | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15-keycodes-man.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15-unicode_start.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch.gz | patch -p1 --verbose || exit 1 + +# This is from Mandriva's SRPM: +zcat $CWD/sources/kbd-1.15.3-fix-es-translation.patch.gz | patch -p1 --verbose || exit 1 # This is from Fedora's spec file: # 7-bit maps are obsolete; so are non-euro maps @@ -114,6 +117,12 @@ make install DESTDIR=$PKG || exit 1 mv -fv usr/bin/loadkeys bin/ cd usr/bin ; ln -vsf ../../bin/loadkeys . ) +# Build/install resizecons: +( cd src + make resizecons + cp resizecons $PKG/usr/bin +) + # ro_win.map.gz is useless rm -fv $PKG/usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz @@ -197,10 +206,20 @@ config etc/rc.d/rc.font.new EOF -# Compress man pages: -( cd $PKG/usr/man - find . -name "*.?" -type f | xargs gzip -9 -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi # Install package description: install -vpm644 $CWD/slack-desc $PKG/install/ @@ -212,5 +231,5 @@ install -vpm644 $CWD/slack-desc $PKG/install/ ) cd $PKG -makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz -#EOF +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign deleted file mode 100644 index 39f3c0228..000000000 --- a/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBLwPHZyGugalF9Dw4RAhiyAJ9DdLbizzsoJi87OjQ8VzyNsRnr2QCeJ9zg -MOKY0UbkCZyUALLyzxF2bKE= -=Ou46 ------END PGP SIGNATURE----- diff --git a/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch b/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch new file mode 100644 index 000000000..2d76cd9f3 --- /dev/null +++ b/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch @@ -0,0 +1,12 @@ +diff -Naur kbd-1.15.3//po/es.po kbd-1.15.3.tpg//po/es.po +--- kbd-1.15.3//po/es.po 2011-05-14 21:12:49.000000000 +0000 ++++ kbd-1.15.3.tpg//po/es.po 2011-06-19 12:29:55.000000000 +0000 +@@ -1363,7 +1363,7 @@ + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/source/a/kernel-firmware/kernel-firmware.SlackBuild b/source/a/kernel-firmware/kernel-firmware.SlackBuild new file mode 100755 index 000000000..66445ea83 --- /dev/null +++ b/source/a/kernel-firmware/kernel-firmware.SlackBuild @@ -0,0 +1,54 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=kernel-firmware +VERSION=${VERSION:-$(date +%Y%m%d)git} +ARCH=noarch +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $PKG +git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +find . -name ".git*" -exec rm -rf "{}" \; +chown -R root:root . +mkdir -p lib +mv linux-firmware lib/firmware + +# Install documentation link: +mkdir -p $PKG/usr/doc +( cd $PKG/usr/doc + ln -sf /lib/firmware kernel-firmware-$VERSION +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/kernel-firmware/slack-desc b/source/a/kernel-firmware/slack-desc new file mode 100644 index 000000000..5231a4267 --- /dev/null +++ b/source/a/kernel-firmware/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kernel-firmware: kernel-firmware (Firmware for the kernel) +kernel-firmware: +kernel-firmware: These are firmware files for the Linux kernel. +kernel-firmware: +kernel-firmware: You'll need these to use certain hardware drivers with Linux. +kernel-firmware: +kernel-firmware: Upstream site: +kernel-firmware: +kernel-firmware: git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +kernel-firmware: +kernel-firmware: diff --git a/source/a/kmod/kmod.SlackBuild b/source/a/kmod/kmod.SlackBuild new file mode 100755 index 000000000..0863d0e37 --- /dev/null +++ b/source/a/kmod/kmod.SlackBuild @@ -0,0 +1,147 @@ +#!/bin/sh + +# Slackware build script for kmod + +# Copyright 2011, 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=kmod +VERSION=${VERSION:-9} +BUILD=${BUILD:-3} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Fix paths in manual pages +sed -i "s,/usr/lib,/lib,g" man/* + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/lib${LIBDIRSUFFIX} \ + --bindir=/sbin \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-xz \ + --with-zlib \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Create symlinks for the usual module-init-tools stuff: +( cd $PKG/sbin + for file in depmod insmod lsmod modinfo modprobe rmmod ; do + ln -sf kmod $file + done +) + +# Link lsmod into /bin +mkdir -p $PKG/bin +( cd $PKG/bin ; ln -sf /sbin/lsmod . ) + +mkdir -p $PKG/etc/modprobe.d +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} +mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} +rm -f $PKG/lib${LIBDIRSUFFIX}/{*.so,*.la} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/libkmod.so.? libkmod.so +) + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/kmod/slack-desc b/source/a/kmod/slack-desc new file mode 100644 index 000000000..785073113 --- /dev/null +++ b/source/a/kmod/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +kmod: kmod (kernel module tools and library) +kmod: +kmod: kmod is a set of tools to handle common tasks with Linux kernel +kmod: modules like insert, remove, list, check properties, resolve +kmod: dependencies and aliases. The aim is to be compatible with the tools, +kmod: configurations and indexes from the module-init-tools project. +kmod: +kmod: These tools are designed on top of libkmod, a library that is +kmod: shipped with kmod. +kmod: +kmod: Project home: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/ diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild index 2e7902cde..2df7618d1 100755 --- a/source/a/lilo/lilo.SlackBuild +++ b/source/a/lilo/lilo.SlackBuild @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-22.8} -BUILD=${BUILD:-16} +VERSION=${VERSION:-23.2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -43,15 +43,18 @@ mkdir -p $TMP $PKG cd $TMP rm -rf lilo-$VERSION -tar xvf $CWD/lilo-$VERSION.src.tar.gz || exit 1 +tar xvf $CWD/lilo-$VERSION.tar.gz || exit 1 cd lilo-$VERSION chown -R root:root . -# This is needed for LVM+udev+devtmpfs -zcat $CWD/lilo.use_major_minor_instead_lvm_name.diff.gz | patch -p1 --verbose || exit 1 +# Obsolete patch? +## This is needed for LVM+udev+devtmpfs +#( cd src +# zcat $CWD/lilo.use_major_minor_instead_lvm_name.diff.gz | patch -p1 --verbose || exit 1 +#) make || exit 1 -make install ROOT=$PKG +make -i install DESTDIR=$PKG || exit 1 # Add a Slackware logo boot menu (sorry, couldn't resist): if [ "$ARCH" = "x86_64" -a -f $CWD/slack64.bmp ]; then @@ -61,13 +64,18 @@ else fi chmod 644 $PKG/boot/slack.bmp -# We don't need to add this empty directory: -rmdir $PKG/etc +# Remove non-Slackware litter: +( cd $PKG/boot + rm -f coffee.bmp *debian* +) +rm -r $PKG/etc/{initramfs,kernel} # Add Slackware's 'liloconfig' utility: mkdir -p $PKG/sbin cp -a $CWD/liloconfig $PKG/sbin/liloconfig chmod 755 $PKG/sbin/liloconfig +# Hey, you're stomping on our name! Plus, it doesn't work. +rm -f $PKG/usr/sbin/liloconfig mkdir -p $PKG/var/log/setup cp -a $CWD/setup.liloconfig $PKG/var/log/setup/setup.liloconfig cp -a $CWD/text.lilohelp $PKG/var/log/setup/text.lilohelp diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig index 7dccd3d62..d8bc02dd4 100644 --- a/source/a/lilo/liloconfig +++ b/source/a/lilo/liloconfig @@ -53,7 +53,7 @@ if [ ! -d "$T_PX" ]; then fi # Determine LILO documentation directory: -LILODOCDIR="$(ls -d /usr/doc/lilo-* | tail -n 1)" +LILODOCDIR="$(ls -d $T_PX/usr/doc/lilo-* 2> /dev/null | tail -n 1)" if [ ! -d "$LILODOCDIR" ]; then LILODOCDIR="/usr/doc/lilo/" fi @@ -236,14 +236,12 @@ hit ENTER to continue.\n\ } ask_utf() { - if [ "$(uname -r | cut -f 3 -d .)" -gt "23" ]; then dialog --defaultno --title "USE UTF-8 TEXT CONSOLE?" --yesno \ "Beginning with the 2.6.24 kernel, the text consoles default to UTF-8 mode. \ Unless you are using a UTF-8 locale (\$LANG setting), using the old default \ of a non-UTF text console is safer until some issues with various console \ programs are addressed. This option has no effect on the use of UTF-8 with X. \ \"No\" is the safe choice here." 10 70 - fi } # This function scans for bootable partitions (making some assumptions along @@ -584,12 +582,10 @@ checkbootsplash() cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp fi fi - # Thanks to amrit@slackware.com: - if grep -wq 13.37.0 /etc/slackware-version ; then - if ls -l /etc/lilo.conf | grep -q 13:37 ; then - if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then - cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp - fi + # Mayan calendar easter egg + if [ "$(date "+%Y%m%d")" = "20121221" ]; then + if [ -r $LILODOCDIR/sample/slack14.0.2012.bmp ]; then + cp -a $LILODOCDIR/sample/slack14.0.2012.bmp /boot/slack.bmp fi fi } diff --git a/source/a/lilo/slack14.0.2012.bmp b/source/a/lilo/slack14.0.2012.bmp Binary files differnew file mode 100644 index 000000000..ea2176574 --- /dev/null +++ b/source/a/lilo/slack14.0.2012.bmp diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild index 76cc34abe..e38f27152 100755 --- a/source/a/logrotate/logrotate.SlackBuild +++ b/source/a/logrotate/logrotate.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-3.7.8} +VERSION=${VERSION:-3.8.2} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -68,7 +68,7 @@ find . \ zcat $CWD/logrotate.slackware.diff.gz | patch -p1 || exit 1 make clean -make EXTRA_CFLAGS="$SLKCFLAGS" || exit 1 +make RPM_OPT_FLAGS="$SLKCFLAGS" || exit 1 strip logrotate mkdir -p $PKG/usr/sbin @@ -87,14 +87,19 @@ mkdir -p $PKG/etc/cron.daily zcat $CWD/logrotate.cron.gz > $PKG/etc/cron.daily/logrotate chmod 0755 $PKG/etc/cron.daily/logrotate -# Create the state directory -mkdir -p $PKG/var/lib/logrotate - mkdir -p $PKG/usr/doc/logrotate-$VERSION cp -a \ CHANGES COPYING READM* \ $PKG/usr/doc/logrotate-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/logrotate/logrotate.cron b/source/a/logrotate/logrotate.cron index f91b3adda..acdf65c2d 100644 --- a/source/a/logrotate/logrotate.cron +++ b/source/a/logrotate/logrotate.cron @@ -1,3 +1,3 @@ #!/bin/sh -/usr/sbin/logrotate /etc/logrotate.conf -[ $? != 0 ] && /usr/bin/logger -t logrotate "ALERT - exited abnormally." +/usr/sbin/logrotate /etc/logrotate.conf \ + || { /usr/bin/logger -t logrotate "ALERT - exited abnormally." && false ; } diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff index e9126cee3..6fa0436dc 100644 --- a/source/a/logrotate/logrotate.slackware.diff +++ b/source/a/logrotate/logrotate.slackware.diff @@ -1,60 +1,25 @@ -diff -Nur logrotate-3.7.8.orig/Makefile logrotate-3.7.8/Makefile ---- logrotate-3.7.8.orig/Makefile 2008-05-19 05:25:54.000000000 -0500 -+++ logrotate-3.7.8/Makefile 2009-05-09 23:25:12.060201375 -0500 -@@ -1,7 +1,7 @@ - VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) - OS_NAME = $(shell uname -s) - LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) --CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) -+CFLAGS = -Wall $(EXTRA_CFLAGS) -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) - PROG = logrotate - MAN = logrotate.8 - LOADLIBES = -lpopt -diff -Nur logrotate-3.7.8.orig/config.c logrotate-3.7.8/config.c ---- logrotate-3.7.8.orig/config.c 2008-06-02 05:26:14.000000000 -0500 -+++ logrotate-3.7.8/config.c 2009-05-09 23:53:36.748287318 -0500 -@@ -33,8 +33,9 @@ - #define isblank(c) ( (c) == ' ' || (c) == '\t' ) ? 1 : 0 - #endif - --static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", +diff -Nur logrotate-3.8.0.orig//config.c logrotate-3.8.0/config.c +--- logrotate-3.8.0.orig//config.c 2011-06-21 03:12:02.000000000 -0500 ++++ logrotate-3.8.0/config.c 2011-08-22 15:53:25.199625138 -0500 +@@ -86,7 +86,8 @@ + static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", + ".disabled", ".dpkg-old", ".dpkg-dist", ".dpkg-new", ".cfsaved", + ".ucf-old", ".ucf-dist", ".ucf-new", - ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*" -+static char *defTabooExts[] = { ".new", ".orig", ".old", ".bak", -+ ".rpmsave", ".rpmorig", "~", ",v", ".rpmnew", ".swp", ".cfsaved", -+ ".rhn-cfg-tmp-*" ++ ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*", ++ ".new", ".old", ".orig", ".bak" }; static int defTabooCount = sizeof(defTabooExts) / sizeof(char *); -diff -Nur logrotate-3.7.8.orig/config.h logrotate-3.7.8/config.h ---- logrotate-3.7.8.orig/config.h 2005-11-12 13:07:56.000000000 -0600 -+++ logrotate-3.7.8/config.h 2009-05-09 23:58:17.040241145 -0500 -@@ -13,7 +13,7 @@ - #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx" - #define COMPRESS_COMMAND "/usr/local/bin/gzip" - #define UNCOMPRESS_COMMAND "/usr/local/bin/gunzip" --#define STATEFILE "/var/log/logrotate.status" -+#define STATEFILE "/var/lib/logrotate/status" - #endif - - /* -diff -Nur logrotate-3.7.8.orig/logrotate.8 logrotate-3.7.8/logrotate.8 ---- logrotate-3.7.8.orig/logrotate.8 2008-12-06 08:05:40.000000000 -0600 -+++ logrotate-3.7.8/logrotate.8 2009-05-09 23:56:45.137687740 -0500 -@@ -442,7 +442,7 @@ +diff -Nur logrotate-3.8.0.orig//logrotate.8 logrotate-3.8.0/logrotate.8 +--- logrotate-3.8.0.orig//logrotate.8 2011-06-21 03:12:02.000000000 -0500 ++++ logrotate-3.8.0/logrotate.8 2011-08-22 15:56:12.247672243 -0500 +@@ -472,7 +472,7 @@ for information on the taboo extensions). If a + precedes the list of extensions, the current taboo extension list is augmented, otherwise it is replaced. At startup, the taboo extension list --contains .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*. -+contains .new, .orig, .bak, .old, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*. +-contains .rpmsave, .rpmorig, ~, .disabled, .dpkg-old, .dpkg-dist, .dpkg-new, .cfsaved, .ucf-old, .ucf-dist, .ucf-new, .rpmnew, .swp, .cfsaved, .rhn-cfg-tmp-* ++contains .rpmsave, .rpmorig, ~, .disabled, .dpkg-old, .dpkg-dist, .dpkg-new, .cfsaved, .ucf-old, .ucf-dist, .ucf-new, .rpmnew, .swp, .cfsaved, .rhn-cfg-tmp-*, .new, .old, .orig, .bak .TP \fBweekly\fR -@@ -459,7 +459,7 @@ - .SH FILES - .PD 0 - .TP 27 --\fI/var/lib/logrotate.status\fR -+\fI/var/lib/logrotate/status\fR - Default state file. - .TP 27 - \fI/etc/logrotate.conf\fR diff --git a/source/a/lvm2/build_with_udev_165_and_later.diff b/source/a/lvm2/build_with_udev_165_and_later.diff deleted file mode 100644 index 800e0f9f3..000000000 --- a/source/a/lvm2/build_with_udev_165_and_later.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur LVM2.2.02.84.orig//configure LVM2.2.02.84/configure ---- LVM2.2.02.84.orig//configure 2011-02-04 16:17:54.000000000 -0600 -+++ LVM2.2.02.84/configure 2011-02-09 20:23:11.818797797 -0600 -@@ -8768,7 +8768,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ludev $LIBS" -+LIBS="-ludev -lrt $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -8799,7 +8799,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_udev_udev_queue_get_udev_is_active" >&5 - $as_echo "$ac_cv_lib_udev_udev_queue_get_udev_is_active" >&6; } - if test "x$ac_cv_lib_udev_udev_queue_get_udev_is_active" = x""yes; then : -- UDEV_PC="libudev"; UDEV_LIBS="-ludev" -+ UDEV_PC="libudev"; UDEV_LIBS="-ludev -lrt" - else - as_fn_error $? "bailing out... libudev library is required" "$LINENO" 5 - fi diff --git a/source/a/lvm2/fix-build-with-udev-183.patch b/source/a/lvm2/fix-build-with-udev-183.patch new file mode 100644 index 000000000..747926c44 --- /dev/null +++ b/source/a/lvm2/fix-build-with-udev-183.patch @@ -0,0 +1,44 @@ +From 57f4ebb843195bdd29c0d58e1659eeb0e9700081 Mon Sep 17 00:00:00 2001 +From: "Wulf C. Krueger" <philantrop@exherbo.org> +Date: Sun, 27 May 2012 00:34:55 +0200 +Subject: [PATCH] lvm2: Fix build with systemd/udev-183. + +--- + lib/misc/lvm-wrappers.c | 2 +- + tools/dmsetup.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c +index 84f61a6..d4fcea6 100644 +--- a/lib/misc/lvm-wrappers.c ++++ b/lib/misc/lvm-wrappers.c +@@ -72,7 +72,7 @@ const char *udev_get_dev_dir(void) + return NULL; + } + +- return udev_get_dev_path(_udev); ++ return "/dev"; + } + + struct udev* udev_get_library_context(void) +diff --git a/tools/dmsetup.c b/tools/dmsetup.c +index 6934de8..e09b56c 100644 +--- a/tools/dmsetup.c ++++ b/tools/dmsetup.c +@@ -1009,7 +1009,7 @@ static int _udevcookies(CMD_ARGS) + static int _set_up_udev_support(const char *dev_dir) + { + struct udev *udev; +- const char *udev_dev_dir; ++ const char *udev_dev_dir = "/dev"; + size_t udev_dev_dir_len; + int dirs_diff; + const char *env; +@@ -1031,7 +1031,6 @@ static int _set_up_udev_support(const char *dev_dir) + _udev_cookie); + + if (!(udev = udev_new()) || +- !(udev_dev_dir = udev_get_dev_path(udev)) || + !*udev_dev_dir) { + log_error("Could not get udev dev path."); + return 0; diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild index e72897d0e..349d5486f 100755 --- a/source/a/lvm2/lvm2.SlackBuild +++ b/source/a/lvm2/lvm2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=$(echo LVM2.*.tar.xz | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -68,8 +68,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix linking of librt until upstream does it correctly :) -zcat $CWD/build_with_udev_165_and_later.diff.gz | patch -p1 --verbose || exit 1 +# Not yet. +#zcat $CWD/fix-build-with-udev-183.patch.gz | patch -p1 --verbose || exit 1 # uid 0 = root # gid 6 = disk @@ -82,7 +82,6 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --enable-static_link \ --enable-realtime \ --with-lvm1=internal \ --enable-pkgconfig \ @@ -92,6 +91,11 @@ CFLAGS="$SLKCFLAGS" \ --with-device-uid=0 \ --with-device-gid=6 \ --with-device-mode=0660 \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-run-dir=/run/lvm \ + --with-clvmd-pidfile=/run/lvm/clvmd.pid \ + --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \ + --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -99,9 +103,6 @@ make install DESTDIR=$PKG || exit 1 mv $PKG/etc/lvm/lvm.conf $PKG/etc/lvm/lvm.conf.new -# Create default rundir -mkdir -p $PKG/var/run/lvm - if [ -d $PKG/usr/share/man ]; then # --mandir was ignored mv $PKG/usr/share/man $PKG/usr rmdir $PKG/usr/share @@ -116,27 +117,36 @@ mkdir -p $PKG/lib${LIBDIRSUFFIX} done ) -# The Makefile is DIW. -( cd $PKG/usr/lib${LIBDIRSUFFIX} - find . -name "*.so" -type l | cut -b3- | while read file ; do - # These two excluded files are in ./device-mapper/ subdir - if [ "$file" != "libdevmapper-event-lvm2mirror.so" -a "$file" != "libdevmapper-event-lvm2snapshot.so" ]; then - rm -f $file - ln -sf $(basename ../../lib${LIBDIRSUFFIX}/${file}.?.*) $file - fi - done -) - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + mkdir -p $PKG/usr/doc/LVM2.$VERSION cp -a \ COPYING* INSTALL README* VERSION WHATS_NEW \ $PKG/usr/doc/LVM2.$VERSION -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign b/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign deleted file mode 100644 index e5c727688..000000000 --- a/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNiYLLyGugalF9Dw4RAjiBAJkB62x+h+B7v24ghmwIUa2p44sWNwCeIZfe -sW9YOnjL/odR4C9Uuzu5pUQ= -=qI9A ------END PGP SIGNATURE----- diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild index 71f7c1a31..7ede6ab77 100755 --- a/source/a/mdadm/mdadm.SlackBuild +++ b/source/a/mdadm/mdadm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.1.5 +VERSION=${VERSION:-$(echo mdadm-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -34,22 +34,33 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mdadm +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf mdadm-$VERSION -tar xjvf $CWD/mdadm-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/mdadm-$VERSION.tar.?z || exit 1 cd mdadm-$VERSION -# With glibc on the initrd and installer, there is no longer a -# good reason to compile this statically. Commented out. -## Build this static: -##zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -57,28 +68,51 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Treating all warnings as errors causes the build to fail. +sed -i "s,-Werror,," Makefile + make clean || exit 1 -make || exit 1 -#make mdadm.static -make install DESTDIR=$PKG || exit 1 -#cat mdadm.static > $PKG/sbin/mdadm -mv $PKG/usr/share/man $PKG/usr -rmdir $PKG/usr/share +make CXFLAGS="$SLKCFLAGS" MANDIR=/usr/man || exit 1 +make install MANDIR=/usr/man DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + mkdir -p $PKG/etc cat mdadm.conf-example > $PKG/etc/mdadm.conf.new -gzip -9 $PKG/usr/man/man?/*.? + mkdir -p $PKG/usr/doc/mdadm-$VERSION cp -a \ - ANNOUNCE-$VERSION COPYING* ChangeLog INSTALL TODO \ + ANNOUNCE-$VERSION COPYING* INSTALL TODO \ $PKG/usr/doc/mdadm-$VERSION -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -makepkg -l y -c n $TMP/mdadm-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/mdadm-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/mdadm/mdadm.static.diff b/source/a/mdadm/mdadm.static.diff deleted file mode 100644 index ae8a46421..000000000 --- a/source/a/mdadm/mdadm.static.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig 2009-03-10 01:01:17.000000000 -0500 -+++ ./Makefile 2010-05-16 20:56:33.000000000 -0500 -@@ -55,7 +55,7 @@ - CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) - - # If you want a static binary, you might uncomment these --# LDFLAGS = -static -+LDFLAGS = -static - # STRIP = -s - - INSTALL = /usr/bin/install diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild index be060ec23..19ec515fa 100755 --- a/source/a/minicom/minicom.SlackBuild +++ b/source/a/minicom/minicom.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.5 +VERSION=2.6 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -56,7 +56,7 @@ mkdir -p $TMP $PKG # minicom cd $TMP rm -rf minicom-$VERSION -tar xzvf $CWD/minicom-$VERSION.tar.gz || exit 1 +tar xvf $CWD/minicom-$VERSION.tar.xz || exit 1 cd minicom-$VERSION # The following command renames the internal implementation of getline @@ -79,7 +79,7 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/etc zcat $CWD/minicom.users.gz > $PKG/etc/minicom.users.new -printf "# Machine-generated file - use "minicom -s" to change parameters.\n" \ +printf "# Machine-generated file - use \"minicom -s\" to change parameters.\n" \ > $PKG/etc/minirc.dfl.new mkdir -p $PKG/usr/doc/minicom-$VERSION @@ -97,8 +97,6 @@ if [ -r ChangeLog ]; then fi # lzrz -# If autotools causes failure here (which it probably will), temporarily -# move /usr/bin/auto{conf,header,make} out of the way and it should work... cd $TMP rm -rf lrzsz-990823 @@ -119,6 +117,9 @@ for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done --mandir=/usr/man \ --build=$ARCH-slackware-linux +touch stamp-h.in # to stop autoheader from running +touch -d yesterday aclocal.m4 # to stop automake from running + make $NUMJOBS || make || exit 1 cp src/lrz src/lsz $PKG/usr/bin diff --git a/source/a/mkinitrd/README.initrd b/source/a/mkinitrd/README.initrd index ca95c3322..c10bb6306 100644 --- a/source/a/mkinitrd/README.initrd +++ b/source/a/mkinitrd/README.initrd @@ -1,10 +1,10 @@ Slackware initrd mini HOWTO by Patrick Volkerding, volkerdi@slackware.com -Thu Apr 7 06:02:26 CDT 2011 +@DATE@ This document describes how to create and install an initrd, which may be -required to use the 2.6 kernel. Also see "man mkinitrd". +required to use some features of the kernel. Also see "man mkinitrd". 1. What is an initrd? 2. Why to I need an initrd? @@ -33,26 +33,26 @@ flexible to ship a generic kernel and a set of kernel modules for it. The easiest way to make the initrd is to use the mkinitrd script included in Slackware's mkinitrd package. We'll walk through the process of -upgrading to the generic 2.6.37.6 Linux kernel using the packages +upgrading to the generic @KERNEL_VERSION@ Linux kernel using the packages found in Slackware's slackware/a/ directory. First, make sure the kernel, kernel modules, and mkinitrd package are installed (the current version numbers might be a little different, so this is just an example): - installpkg kernel-generic-2.6.37.6-i686-1.tgz - installpkg kernel-modules-2.6.37.6-i686-1.tgz - installpkg mkinitrd-1.1.0-i486-1.tgz + installpkg kernel-generic-@KERNEL_VERSION@-@ARCH@-@BUILD@.tgz + installpkg kernel-modules-@KERNEL_VERSION@-@ARCH@-@BUILD@.tgz + installpkg mkinitrd-@MKINITRD_VERSION@-@ARCH@-@BUILD@.tgz Change into the /boot directory: cd /boot -Now you'll want to run "mkinitrd". I'm using reiserfs for my root -filesystem, and since it's an IDE system the reiserfs module will be -the only one I need to load: +Now you'll want to run "mkinitrd". I'm using ext4 for my root +filesystem, and since mkinitrd should figure out any other modules +it requires, I shouldn't need to specify any others: - mkinitrd -c -k 2.6.37.6 -m reiserfs + mkinitrd -c -k @KERNEL_VERSION@ -m ext4 This should do two things. First, it will create a directory /boot/initrd-tree containing the initrd's filesystem. Then it will @@ -61,10 +61,10 @@ you could make some additional changes in /boot/initrd-tree/ and then run mkinitrd again without options to rebuild the image. That's optional, though, and only advanced users will need to think about that. -Here's another example: Build an initrd image using Linux 2.6.37.6 +Here's another example: Build an initrd image using Linux @KERNEL_VERSION@ kernel modules for a system with an ext3 root partition on /dev/sdb3: - mkinitrd -c -k 2.6.37.6 -m ext3 -f ext3 -r /dev/sdb3 + mkinitrd -c -k @KERNEL_VERSION@ -m ext3 -f ext3 -r /dev/sdb3 4. Now that I've built an initrd, how do I use it? @@ -76,10 +76,10 @@ initrd. Here's an example section of lilo.conf showing how this is done: # Linux bootable partition config begins -image = /boot/vmlinuz-generic-2.6.37.6 +image = /boot/vmlinuz-generic-@KERNEL_VERSION@ initrd = /boot/initrd.gz root = /dev/sda6 - label = Lnx26376 + label = @LILO_KERNEL_NAME@ read-only # Linux bootable partition config ends diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config index 35b32a4f9..09ac6817e 100644..120000 --- a/source/a/mkinitrd/busybox-dot-config +++ b/source/a/mkinitrd/busybox-dot-config @@ -1,990 +1 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.18.4 -# Fri Mar 25 23:08:06 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_DESKTOP=y -# CONFIG_EXTRA_COMPAT is not set -CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=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_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_INSTALL_NO_USR=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# 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_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_WTMP=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=64 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y -# CONFIG_FEATURE_NON_POSIX_CP is not set -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_FEATURE_SEAMLESS_XZ=y -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -# CONFIG_FEATURE_AR_CREATE is not set -CONFIG_BUNZIP2=y -CONFIG_BZIP2=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_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_GZIP=y -CONFIG_FEATURE_GZIP_LONG_OPTIONS=y -CONFIG_LZOP=y -CONFIG_LZOP_COMPR_HIGH=y -CONFIG_RPM2CPIO=y -# CONFIG_RPM is not set -CONFIG_TAR=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 is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=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_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y -CONFIG_UNZIP=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_BASE64=y -CONFIG_CAL=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_FEATURE_CP_LONG_OPTIONS=y -CONFIG_CUT=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_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_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=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_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=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_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=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_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -# CONFIG_FEATURE_FLOAT_SLEEP is not set -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TOUCH=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_FGCONSOLE=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=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=y -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y -CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Common options for loadfont and setfont -# -# CONFIG_FEATURE_LOADFONT_PSF2 is not set -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_PATCH=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=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_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_OPTIMIZE_CURSOR=y -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_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 is not set -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_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=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 - -# -# 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_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=10 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_ADD_SHELL=y -CONFIG_REMOVE_SHELL=y -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_USE_BB_CRYPT_SHA=y -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_FIRST_SYSTEM_ID=1000 -CONFIG_LAST_SYSTEM_ID=12000 -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELUSER=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_GETTY=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y -CONFIG_TUNE2FS=y - -# -# Linux Module Utilities -# -CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_DEPMOD=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# 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_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" - -# -# Linux System Utilities -# -CONFIG_BLOCKDEV=y -CONFIG_REV=y -CONFIG_ACPID=y -CONFIG_FEATURE_ACPID_COMPAT=y -CONFIG_BLKID=y -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# 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=y -CONFIG_FEATURE_GPT_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -CONFIG_FINDFS=y -# CONFIG_FLOCK is not set -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -# CONFIG_MKFS_EXT2 is not set -CONFIG_MKFS_MINIX=y -CONFIG_FEATURE_MINIX2=y -# CONFIG_MKFS_REISER is not set -CONFIG_MKFS_VFAT=y -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -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_MKSWAP=y -CONFIG_FEATURE_MKSWAP_UUID=y -CONFIG_MORE=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_RDEV=y -CONFIG_READPROFILE=y -CONFIG_RTCWAKE=y -CONFIG_SCRIPT=y -CONFIG_SCRIPTREPLAY=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -CONFIG_FEATURE_MTAB_SUPPORT=y -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -CONFIG_FEATURE_VOLUMEID_EXT=y -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_FEATURE_COMPRESS_BBCONFIG=y -CONFIG_BEEP=y -CONFIG_FEATURE_BEEP_FREQ=4000 -CONFIG_FEATURE_BEEP_LENGTH_MS=30 -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y -# 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_CHRT=y -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -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=y -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FBSPLASH=y -# CONFIG_FLASHCP is not set -CONFIG_FLASH_LOCK=y -CONFIG_FLASH_UNLOCK=y -CONFIG_FLASH_ERASEALL=y -CONFIG_IONICE=y -CONFIG_INOTIFYD=y -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_DASHCMD=y -CONFIG_FEATURE_LESS_LINENUMS=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -# CONFIG_RFKILL is not set -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TIMEOUT=y -CONFIG_TTYSIZE=y -CONFIG_VOLNAME=y -# CONFIG_WALL is not set -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_NBDCLIENT=y -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_UNIX_LOCAL=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPD=y -CONFIG_FEATURE_FTP_WRITE=y -CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE 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=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -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_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -CONFIG_SLATTACH=y -CONFIG_TCPSVD=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -CONFIG_FEATURE_TFTP_PROGRESS_BAR=y -CONFIG_TFTP_DEBUG=y -CONFIG_TRACEROUTE=y -CONFIG_TRACEROUTE6=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -CONFIG_TUNCTL=y -CONFIG_FEATURE_TUNCTL_UG=y -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -CONFIG_UDPSVD=y -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -CONFIG_ZCIP=y - -# -# Print Utilities -# -# CONFIG_LPD is not set -CONFIG_LPR=y -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -CONFIG_MAKEMIME=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" -CONFIG_POPMAILDIR=y -CONFIG_FEATURE_POPMAILDIR_DELIVERY=y -CONFIG_REFORMIME=y -CONFIG_FEATURE_REFORMIME_COMPAT=y -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -CONFIG_IOSTAT=y -CONFIG_MPSTAT=y -CONFIG_PMAP=y -CONFIG_POWERTOP=y -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_TIME=y -CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=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=y -CONFIG_FEATURE_TOP_SMP_PROCESS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_FEATURE_RUNSVDIR_LOG=y -CONFIG_SV=y -CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS 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_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP 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_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -CONFIG_SH_MATH_SUPPORT_64=y -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y +busybox-dot-config.1.20.x
\ No newline at end of file diff --git a/source/a/mkinitrd/busybox-dot-config.1.18.x b/source/a/mkinitrd/busybox-dot-config.1.18.x new file mode 100644 index 000000000..35b32a4f9 --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.18.x @@ -0,0 +1,990 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.18.4 +# Fri Mar 25 23:08:06 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=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_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# 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_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=64 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=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_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +# CONFIG_RPM is not set +CONFIG_TAR=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 is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=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_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=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_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_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=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_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=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_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=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_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TOUCH=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=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=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=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_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_OPTIMIZE_CURSOR=y +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_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 is not set +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_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=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 + +# +# 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_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=10 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# 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_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# 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=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +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_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# 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_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +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=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE 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=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +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_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_SMEMCAP is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_NMETER=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=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=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS 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_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP 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_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/busybox-dot-config.1.19.x b/source/a/mkinitrd/busybox-dot-config.1.19.x new file mode 100644 index 000000000..864fed9da --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.19.x @@ -0,0 +1,1013 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.19.3 +# Sat Dec 10 20:40:02 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=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_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# 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_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=64 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_FEATURE_SKIP_ROOTFS is not set +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=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_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +# CONFIG_RPM is not set +CONFIG_TAR=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 is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=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_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_ID=y +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_WHO=y +CONFIG_USERS=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=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_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_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=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_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=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_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=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=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=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_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +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_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 is not set +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_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=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 + +# +# 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_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=10 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# 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_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# 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=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +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_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=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_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_SETSERIAL=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_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# 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_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +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=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE 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=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +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_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=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=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS 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_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP 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_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_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_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/busybox-dot-config.1.20.x b/source/a/mkinitrd/busybox-dot-config.1.20.x new file mode 100644 index 000000000..3184ac281 --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.20.x @@ -0,0 +1,1024 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.20.1 +# Tue Jun 12 09:42:03 2012 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=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_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# 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_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=64 +# 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=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_FEATURE_SKIP_ROOTFS is not set +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=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_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_GZIP_FAST=0 +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +# CONFIG_RPM is not set +CONFIG_TAR=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 is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=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_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_HOSTID=y +CONFIG_ID=y +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_WHO=y +CONFIG_USERS=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=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_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_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=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_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=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_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=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=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=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_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +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_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 is not set +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_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=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 + +# +# 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_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=10 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=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 is not set +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="s" +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# 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_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=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_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# 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=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=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_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_SETSERIAL=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_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# 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_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +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=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE 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=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +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_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_UDHCPC6=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=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_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=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=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS 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_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP 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_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_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_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch new file mode 100644 index 000000000..a012a7063 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch @@ -0,0 +1,12 @@ +--- busybox-1.20.1/shell/ash.c ++++ busybox-1.20.1-ash/shell/ash.c +@@ -6846,8 +6846,7 @@ evalvar(char *p, int flags, struct strli + patloc = expdest - (char *)stackblock(); + if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype, + startloc, varflags, +-//TODO: | EXP_REDIR too? All other such places do it too +- /* quotes: */ flags & (EXP_FULL | EXP_CASE), ++ /* quotes: */ flags & (EXP_FULL | EXP_CASE | EXP_REDIR), + var_str_list) + ) { + int amount = expdest - ( diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch new file mode 100644 index 000000000..b2a945614 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch @@ -0,0 +1,75 @@ +--- busybox-1.20.1/networking/ifupdown.c ++++ busybox-1.20.1-ifupdown/networking/ifupdown.c +@@ -140,8 +140,6 @@ static const char keywords_up_down[] ALI + "up\0" + "down\0" + "pre-up\0" +- "pre-down\0" +- "post-up\0" + "post-down\0" + ; + +@@ -895,6 +893,11 @@ static struct interfaces_file_t *read_in + if (rest_of_line[0] == '\0') + bb_error_msg_and_die("option with empty value \"%s\"", buf); + ++ if (strcmp(first_word, "post-up") == 0) ++ first_word += 5; /* "up" */ ++ else if (strcmp(first_word, "pre-down") == 0) ++ first_word += 4; /* "down" */ ++ + /* If not one of "up", "down",... words... */ + if (index_in_strings(keywords_up_down, first_word) < 0) { + int i; +@@ -963,7 +966,7 @@ static char *setlocalenv(const char *for + return result; + } + +-static void set_environ(struct interface_defn_t *iface, const char *mode) ++static void set_environ(struct interface_defn_t *iface, const char *mode, const char *opt) + { + int i; + char **pp; +@@ -976,7 +979,7 @@ static void set_environ(struct interface + } + + /* note: last element will stay NULL: */ +- G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6)); ++ G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 7)); + pp = G.my_environ; + + for (i = 0; i < iface->n_options; i++) { +@@ -990,6 +993,7 @@ static void set_environ(struct interface + *pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name); + *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name); + *pp++ = setlocalenv("%s=%s", "MODE", mode); ++ *pp++ = setlocalenv("%s=%s", "PHASE", opt); + if (G.startup_PATH) + *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH); + } +@@ -1044,21 +1048,21 @@ static int check(char *str) + static int iface_up(struct interface_defn_t *iface) + { + if (!iface->method->up(iface, check)) return -1; +- set_environ(iface, "start"); ++ set_environ(iface, "start", "pre-up"); + if (!execute_all(iface, "pre-up")) return 0; + if (!iface->method->up(iface, doit)) return 0; ++ set_environ(iface, "start", "post-up"); + if (!execute_all(iface, "up")) return 0; +- if (!execute_all(iface, "post-up")) return 0; + return 1; + } + + static int iface_down(struct interface_defn_t *iface) + { + if (!iface->method->down(iface,check)) return -1; +- set_environ(iface, "stop"); +- if (!execute_all(iface, "pre-down")) return 0; ++ set_environ(iface, "stop", "pre-down"); + if (!execute_all(iface, "down")) return 0; + if (!iface->method->down(iface, doit)) return 0; ++ set_environ(iface, "stop", "post-down"); + if (!execute_all(iface, "post-down")) return 0; + return 1; + } diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch new file mode 100644 index 000000000..f382e078f --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch @@ -0,0 +1,34 @@ +--- busybox-1.20.1/miscutils/man.c ++++ busybox-1.20.1-man/miscutils/man.c +@@ -129,27 +129,21 @@ static int show_manpage(const char *page + #endif + #if ENABLE_FEATURE_SEAMLESS_XZ + strcpy(ext, "xz"); +- if (run_pipe(pager, man_filename, man, level)) ++ if (run_pipe(pager, filename_with_zext, man, level)) + return 1; + #endif + #if ENABLE_FEATURE_SEAMLESS_BZ2 + strcpy(ext, "bz2"); +- if (run_pipe(pager, man_filename, man, level)) ++ if (run_pipe(pager, filename_with_zext, man, level)) + return 1; + #endif + #if ENABLE_FEATURE_SEAMLESS_GZ + strcpy(ext, "gz"); +- if (run_pipe(pager, man_filename, man, level)) ++ if (run_pipe(pager, filename_with_zext, man, level)) + return 1; + #endif + +-#if SEAMLESS_COMPRESSION +- ext[-1] = '\0'; +-#endif +- if (run_pipe(pager, man_filename, man, level)) +- return 1; +- +- return 0; ++ return run_pipe(pager, man_filename, man, level); + } + + int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch new file mode 100644 index 000000000..4129b6517 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch @@ -0,0 +1,11 @@ +--- busybox-1.20.1/archival/libarchive/get_header_tar.c ++++ busybox-1.20.1-tar/archival/libarchive/get_header_tar.c +@@ -84,7 +84,7 @@ static unsigned long long getOctal(char + first >>= 1; /* now 7th bit = 6th bit */ + v = first; /* sign-extend 8 bits to 64 */ + while (--len != 0) +- v = (v << 8) + (unsigned char) *str++; ++ v = (v << 8) + (uint8_t) *++str; + } + return v; + } diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init index 2205a5928..ae475d890 100755 --- a/source/a/mkinitrd/init +++ b/source/a/mkinitrd/init @@ -78,6 +78,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin" # Mount /proc and /sys: mount -n proc /proc -t proc mount -n sysfs /sys -t sysfs +mount -n tmpfs /run -t tmpfs -o mode=0755 if grep devtmpfs /proc/filesystems 1>/dev/null 2>/dev/null ; then DEVTMPFS=1 @@ -123,7 +124,17 @@ for ARG in $(cat /proc/cmdline); do esac done -# Load kernel modules: +# If udevd is available, use it to generate block devices +# else use mdev to read sysfs and generate the needed devices +if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then + /sbin/udevd --daemon --resolve-names=never + /sbin/udevadm trigger --subsystem-match=block --action=add + /sbin/udevadm settle --timeout=10 +else + [ "$DEVTMPFS" != "1" ] && mdev -s +fi + +# Load kernel modules (ideally this was already done by udev): if [ ! -d /lib/modules/$(uname -r) ]; then echo "No kernel modules found for Linux $(uname -r)." elif [ -x ./load_kernel_modules ]; then # use load_kernel_modules script: @@ -143,16 +154,6 @@ fi # A root filesystem on USB is a good example of that. sleep $WAIT -# If udevd is available, use it to generate block devices -# else use mdev to read sysfs and generate the needed devices -if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then - /sbin/udevd --daemon --resolve-names=never - /sbin/udevadm trigger --subsystem-match=block --action=add - /sbin/udevadm settle --timeout=10 -else - [ "$DEVTMPFS" != "1" ] && mdev -s -fi - # Load a custom keyboard mapping: if [ -n "$KEYMAP" ]; then echo "${INITRD}: Loading '$KEYMAP' keyboard mapping:" @@ -222,7 +223,9 @@ if [ "$RESCUE" = "" ]; then # Initialize LVM: if [ -x /sbin/vgchange ]; then - /sbin/vgchange -ay --ignorelockingfailure + mkdir -p /var/lock/lvm # this avoids useless warnings + /sbin/vgchange -ay --ignorelockingfailure 2>/dev/null + /sbin/udevadm settle --timeout=10 fi # Unlock any LUKS encrypted devices that were deferred above but have now @@ -247,8 +250,14 @@ if [ "$RESCUE" = "" ]; then echo "LUKS device '${LUKSDEV}' unavailable for unlocking!" fi done + /sbin/udevadm settle --timeout=10 fi + # Scan for btrfs multi-device filesystems: + if [ -x /sbin/btrfs ]; then + /sbin/btrfs device scan + fi + # Find root device if a label or UUID was given: if echo $ROOTDEV | grep -q "LABEL=" || \ echo $ROOTDEV | grep -q "UUID=" ; then @@ -264,14 +273,16 @@ if [ "$RESCUE" = "" ]; then # Resume state from swap if [ "$RESUMEDEV" != "" ]; then if ls -l $RESUMEDEV | grep -q "^l" ; then - RESUMEDEV=$(ls -l $RESUMEDEV | awk '{ print $NF }') + #RESUMEDEV=$(ls -l $RESUMEDEV | awk '{ print $NF }') + RESUMEDEV=$(readlink -f $RESUMEDEV) fi echo "Trying to resume from $RESUMEDEV" RESMAJMIN=$(ls -l $RESUMEDEV | tr , : | awk '{ print $5$6 }') echo $RESMAJMIN > /sys/power/resume fi - + # Switch to real root partition: + /sbin/udevadm settle --timeout=10 echo 0x0100 > /proc/sys/kernel/real-root-dev mount -o ro -t $ROOTFS $ROOTDEV /mnt @@ -296,14 +307,16 @@ else /bin/sh fi -if pgrep udevd >/dev/null ; then - /sbin/udevadm settle --timeout=30 - pkill udevd -fi +# Need to make sure OPTIONS+="db_persist" exists for all dm devices +# That should be handled in /sbin/mkinitrd now +/sbin/udevadm info --cleanup-db +/sbin/udevadm control --exit unset ERR mount -o move /proc /mnt/proc mount -o move /sys /mnt/sys +mount -o move /run /mnt/run + [ "$DEVTMPFS" = "1" ] && mount -o move /dev /mnt/dev echo "${INITRD}: exiting" exec switch_root /mnt $INIT $RUNLEVEL diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index 1a5b7731f..c5e30218b 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -42,13 +42,15 @@ # Add lukskey option (-K). Automatically add kernel modules listed in # load-kernel-modules if that file is executable. # Yada yada yada. +# Modified by Patrick Volkerding <volkerdi@slackware.com> 21 August 2012 +# Add Btrfs multi-device filesystem support option (-B). -MKINITRD_VERSION=1.4.6 +MKINITRD_VERSION=1.4.7 # Don't include these things from /lib/udev/ in the initrd image LIBUDEV_BLACKLIST="\ ipod-set-info \ - check-mtp-camera \ + check-mtp-device \ check-ptp-camera \ udev-configure-printer" @@ -97,6 +99,8 @@ initrd, and the script is easy to modify. Be creative. :-) For example, if your USB thumb drive has a FAT partition with label "TRAVELSTICK" and the actual keyfile is called "/keys/alien.luks", then you need to pass: -K LABEL=TRAVELSTICK:/keys/alien.luks + -B Add /sbin/btrfs to enable scanning for a root filesystem that is + part of a Btrfs multi-device filesystem. -M Add the files in /etc/modprobe.d/ to the initrd -R Add support for RAID partitions -V Display version number @@ -234,8 +238,9 @@ copy_libs() { } copy_modconf() { - mkdir -p $SOURCE_TREE/etc + mkdir -p $SOURCE_TREE/etc $SOURCE_TREE/lib cp -a /etc/modprobe.d $SOURCE_TREE/etc + cp -a /lib/modprobe.d $SOURCE_TREE/lib/ } # If --help is given, print_usage and exit: @@ -255,6 +260,8 @@ fi SOURCE_TREE=${SOURCE_TREE:-/boot/initrd-tree} OUTPUT_IMAGE=${OUTPUT_IMAGE:-""} KERNEL_VERSION=${KERNEL_VERSION:-"$(uname -r)"} +# The initrd requires udev to function correctly: +UDEV=1 # Default actions without options: if [ -z "$1" ]; then @@ -356,6 +363,10 @@ while [ ! -z "$1" ]; do LVM=1 shift ;; + -B) + BTRFS=1 + shift + ;; -M) MODCONF=1 shift @@ -459,12 +470,28 @@ fi # Include RAID support in initrd if [ ! -z "$RAID" ]; then - if [ -r /sbin/mdadm ]; then + if [ -r /sbin/mdadm -a -r /sbin/mdmon ]; then mkdir -p $SOURCE_TREE/sbin cp /sbin/mdadm $SOURCE_TREE/sbin/mdadm + cp /sbin/mdmon $SOURCE_TREE/sbin/mdmon chmod 0755 $SOURCE_TREE/sbin/mdadm + chmod 0755 $SOURCE_TREE/sbin/mdmon + mkdir -p $SOURCE_TREE/lib/udev/rules.d + echo 'KERNEL=="dm-[0-9]*", OPTIONS+="db_persist"' > \ + $SOURCE_TREE/lib/udev/rules.d/95-dm-initrd.rules + else + echo "ERROR: mdadm and/or mdmon binary is missing, RAID support not installed" + fi +fi + +# Include Btrfs support in initrd +if [ ! -z "$BTRFS" ]; then + if [ -r /sbin/btrfs ]; then + mkdir -p $SOURCE_TREE/sbin + cp /sbin/btrfs $SOURCE_TREE/sbin/btrfs + chmod 0755 $SOURCE_TREE/sbin/btrfs else - echo "ERROR: mdadm binary is missing, RAID support not installed" + echo "ERROR: btrfs binary is missing, Btrfs support not installed" fi fi @@ -474,7 +501,11 @@ if [ ! -z "$UDEV" ]; then cp -a /lib/udev $SOURCE_TREE/lib/ # But we don't want all of /lib/udev for file in $(echo $LIBUDEV_BLACKLIST) ; do - rm -f $SOURCE_TREE/lib/udev/$file ; + # Replace with a null script (avoids error spew): + cat << EOF > $SOURCE_TREE/lib/udev/$file +#!/bin/ash +# This space is intentionally left blank +EOF done fi @@ -493,6 +524,9 @@ if [ ! -z "$LVM" ]; then elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then MODULE_LIST="$MODULE_LIST:dm-mod" fi + mkdir -p $SOURCE_TREE/lib/udev/rules.d + echo 'KERNEL=="dm-[0-9]*", OPTIONS+="db_persist"' > \ + $SOURCE_TREE/lib/udev/rules.d/95-dm-initrd.rules else echo "LVM binary is missing, LVM support isn't installed" fi @@ -528,6 +562,16 @@ if [ ! -d $SOURCE_TREE/lib/modules/$KERNEL_VERSION ]; then mkdir -p $SOURCE_TREE/lib/modules/$KERNEL_VERSION fi +# Copy kmod/modprobe stuff to initrd: +for i in kmod depmod insmod lsmod modinfo modprobe rmmod ; do + rm -f $SOURCE_TREE/sbin/$i ; + cp -a /sbin/$i $SOURCE_TREE/sbin ; +done + +# Make sure modules.builtin and modules.order are there (for kmod): +cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order} \ + $SOURCE_TREE/lib/modules/$KERNEL_VERSION + # If an executable $SOURCE_TREE/load_kernel_modules already exists, then # we assume you will want to load the kernel modules mentioned in there. # This means, you do not have to explicitly add those on the commandline: @@ -589,8 +633,8 @@ if [ ! -z "$MODULE_LIST" ]; then /sbin/modprobe --set-version $KERNEL_VERSION --show-depends --ignore-install $MODULE 2>/dev/null \ | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do - if ! grep -q "$(basename $SRCMOD .ko)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then - LINE="$(echo "modprobe -v $(basename $SRCMOD .ko)" )" + if ! grep -Eq " $(basename $SRCMOD .ko)(\.| |$)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then + LINE="$(echo "modprobe -v $(basename ${SRCMOD%%.gz} .ko)" )" # Test to see if arguments should be passed # Over-ride the previously defined LINE variable if so @@ -611,6 +655,15 @@ if [ ! -z "$MODULE_LIST" ]; then # replacement. if cp -a --parents $SRCMOD $SOURCE_TREE 2>/dev/null; then echo "OK: $SRCMOD added." + # If a module needs firmware, copy that too + /sbin/modinfo -F firmware "$SRCMOD" | sed 's/^/\/lib\/firmware\//' | + while read SRCFW; do + if cp -a --parents "$SRCFW" $SOURCE_TREE 2>/dev/null; then + echo "OK: $SRCFW added." + else + echo "WARNING: Could not find firmware \"$SRCFW\"" + fi + done else echo "WARNING: Could not find module \"$SRCMOD\"" fi @@ -631,6 +684,11 @@ fi # Copy needed libraries copy_libs +# Make sure all libraries have symlinks: +/sbin/ldconfig $(readlink -f $SOURCE_TREE)/lib/ 2> /dev/null +/sbin/ldconfig $(readlink -f $SOURCE_TREE)/lib64/ 2> /dev/null +/sbin/ldconfig + # And finally, build the initrd: build_initrd_image diff --git a/source/a/mkinitrd/mkinitrd.8 b/source/a/mkinitrd/mkinitrd.8 index be4e9d42d..6ee25bdde 100644 --- a/source/a/mkinitrd/mkinitrd.8 +++ b/source/a/mkinitrd/mkinitrd.8 @@ -52,6 +52,9 @@ mkinitrd \- create or rebuilt an initrd (initial ramdisk) using initramfs (simpl .B \-K luks_keyfile ] [ +.B \-B +] +[ .B \-L ] [ @@ -171,6 +174,11 @@ you need to set: -K LABEL=TRAVELSTICK:/keys/alien.luks .TP +.B \-B +This option adds the btrfs utility to the initrd so that multi-device filesystems +will be picked up by a scan (/sbin/btrfs device scan). This is needed if the +root filesystem is a Btrfs multi-device filesystem. +.TP .B \-L This option adds LVM support to the initrd, if the tools are available on the system. diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 953d3cf87..322fa8c5d 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.4.6} -BB=1.18.4 -BUILD=${BUILD:-11} +VERSION=${VERSION:-1.4.7} +BB=1.20.1 +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -54,6 +54,12 @@ rm -rf busybox-$BB tar xvf $CWD/busybox-$BB.tar.?z* || exit 1 cd busybox-$BB +if [ -d $CWD/fixes-$BB ]; then + for pfile in $CWD/fixes-$BB/*.patch ; do + patch -p1 < $pfile || exit 1 + done +fi + chown -R root:root . sed -e \ 's#^CONFIG_PREFIX=.*#CONFIG_PREFIX="'$PKG'/usr/share/mkinitrd/initrd-tree"#' \ @@ -105,29 +111,18 @@ chown root:root $PKG/etc/mkinitrd.conf.sample chmod 644 $PKG/etc/mkinitrd.conf.sample mkdir -p $PKG/usr/doc/mkinitrd-$VERSION -cp -a $CWD/README.initrd $PKG/usr/doc/mkinitrd-$VERSION - -( cd $PKG/usr/doc/mkinitrd-$VERSION - DATE="$(date)" - KERNEL_VERSION="$(uname -r)" - PACKAGE_VERSION="$(uname -r | tr - _)" - LILO_KERNEL_NAME="$(echo $(uname -r) | tr -d . | tr -d - )" - cat README.initrd | sed -e s/@DATE@/"$DATE"/ > README.initrd1 - cat README.initrd1 | sed -e s/@KERNEL_VERSION@/"$KERNEL_VERSION"/ > README.initrd2 - cat README.initrd2 | sed -e s/@PACKAGE_VERSION@/"$PACKAGE_VERSION"/ > README.initrd3 - cat README.initrd3 | sed -e s/@LILO_KERNEL_NAME@/"$LILO_KERNEL_NAME"/ > README.initrd4 - cat README.initrd4 | sed -e s/@MKINITRD_VERSION@/"$VERSION"/ > README.initrd5 - cat README.initrd5 | sed -e s/@ARCH@/"$ARCH"/ > README.initrd6 - cat README.initrd6 | sed -e s/@BUILD@/"$BUILD"/ > README.initrd - rm -f README.initrd{1,2,3,4,5,6} -) -chmod 644 $PKG/usr/doc/mkinitrd-$VERSION/* -chown root:root $PKG/usr/doc/mkinitrd-$VERSION/* +sed $CWD/README.initrd \ + -e "s,@DATE@,$(date),g" \ + -e "s,@KERNEL_VERSION@,$(uname -r),g" \ + -e "s,@PACKAGE_VERSION@,$(uname -r | tr - _),g" \ + -e "s,@LILO_KERNEL_NAME@,$(echo $(uname -r) | tr -d . | tr -d - ),g" \ + -e "s,@MKINITRD_VERSION@,$VERSION,g" \ + -e "s,@ARCH@,$ARCH,g" \ + -e "s,@BUILD@,$BUILD,g" \ + > $PKG/usr/doc/mkinitrd-$VERSION/README.initrd mkdir $PKG/boot -( cd $PKG/boot - ln -sf /usr/doc/mkinitrd-$VERSION/README.initrd . -) +ln -sf /usr/doc/mkinitrd-$VERSION/README.initrd $PKG/boot/README.initrd find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh deleted file mode 100644 index f455be891..000000000 --- a/source/a/module-init-tools/doinst.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Remove/move obsolete configuration: -if [ -L etc/modprobe.d/modprobe.conf ]; then - rm -f etc/modprobe.d/modprobe.conf -fi -if [ -e etc/modprobe.conf ]; then - mv etc/modprobe.conf etc/modprobe.conf.obsolete -fi diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff deleted file mode 100644 index 5517502b7..000000000 --- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur module-init-tools-3.12.orig//modprobe.c module-init-tools-3.12/modprobe.c ---- module-init-tools-3.12.orig//modprobe.c 2010-05-04 00:19:27.000000000 -0500 -+++ module-init-tools-3.12/modprobe.c 2010-06-08 04:32:46.655088739 -0500 -@@ -38,6 +38,7 @@ - #include <asm/unistd.h> - #include <sys/wait.h> - #include <syslog.h> -+#include <regex.h> - - #include "util.h" - #include "elfops.h" -@@ -789,6 +790,20 @@ - return strsep(string, delim); - } - -+/* Let's exclude a few file extensions */ -+static int valid_file_name(const char *filename) -+{ -+ static regex_t *re = NULL; -+ -+ if (!re) { -+ re = NOFAIL(malloc(sizeof(regex_t))); -+ if (regcomp(re, "(^(\\.|\\.\\.)|\\.(new|orig|bak)$)", -+ REG_EXTENDED|REG_NOSUB) != 0) -+ fatal("regcomp failed: %s\n", strerror(errno)); -+ } -+ return regexec(re, filename, 0, NULL, 0); -+} -+ - static int parse_config_scan(const char *filename, - struct modprobe_conf *conf, - int dump_only, -@@ -1066,6 +1081,8 @@ - while ((i = readdir(dir)) != NULL) { - size_t len; - -+ if (!valid_file_name(i->d_name)) -+ continue; - if (i->d_name[0] == '.') - continue; - if (!config_filter(i->d_name)) diff --git a/source/a/module-init-tools/module-init-tools.SlackBuild b/source/a/module-init-tools/module-init-tools.SlackBuild deleted file mode 100755 index a8dc73ab3..000000000 --- a/source/a/module-init-tools/module-init-tools.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -VERSION=${VERSION:-$(echo module-init-tools-*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-module-init-tools - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf module-init-tools-$VERSION -tar xvf $CWD/module-init-tools-$VERSION.tar.?z* || exit 1 -cd module-init-tools-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Exclude *.{old,new,bak} files (and a few others that obviously aren't -# valid for this... Thanks to Marco d'Itri for the patch that it's based on -zcat $CWD/modprobe.ignore_some_suffixes.diff.gz | patch -p1 || exit 1 - -# Using --bindir=/sbin to make lsmod go there too -CFLAGS= \ -./configure \ - --prefix=/ \ - --bindir=/sbin \ - --docdir=/usr/doc/module-init-tools-$VERSION \ - --mandir=/usr/man \ - --enable-zlib \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Create the config directory just in case -mkdir -p $PKG/etc/modprobe.d/ - -# Link lsmod into /bin -mkdir -p $PKG/bin -( cd $PKG/bin ; ln -sf /sbin/lsmod . ) - -# Compress manpages -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/module-init-tools-$VERSION -cp -a \ - AUTHORS CODING COPYING FAQ README TODO \ - $PKG/usr/doc/module-init-tools-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/module-init-tools-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/a/module-init-tools/slack-desc b/source/a/module-init-tools/slack-desc deleted file mode 100644 index 99d071b0e..000000000 --- a/source/a/module-init-tools/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -module-init-tools: module-init-tools (kernel module utilities) -module-init-tools: -module-init-tools: Utilities to load and unload kernel modules. These are used on Linux -module-init-tools: to load extra drivers or other features into the running kernel. -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: diff --git a/source/a/ntfs-3g/99-ntfs-3g.rules b/source/a/ntfs-3g/99-ntfs-3g.rules new file mode 100644 index 000000000..c27c3cbbc --- /dev/null +++ b/source/a/ntfs-3g/99-ntfs-3g.rules @@ -0,0 +1,2 @@ +# Use ntfs-3g rather than regular ntfs for devices detected through udev: +ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g" diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild index ab5b1f717..086cb3e87 100755 --- a/source/a/ntfs-3g/ntfs-3g.SlackBuild +++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for ntfs-3g # Copyright 2008 Antonio Hernandez Blas <hba.nihilismus@gmail.com> +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -26,9 +27,10 @@ # Modified by Eric Hameleers <alien@slackware.com> PKGNAM=ntfs-3g -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=2012.1.15 +BUILD=${BUILD:-2} +SRCNAM=ntfs-3g_ntfsprogs NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: @@ -62,9 +64,9 @@ PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -90,17 +92,45 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# I hate to do this (it worked without it before), but recently /bin/ntfs-3g +# ceased to work for non-root users unless it is setuid root. If anyone has +# any better ideas, I'd like to hear them. +chmod 4711 $PKG/bin/ntfs-3g + # Add the HAL fdi file so that automount uses ntfs-3g for mounting # This should work with the "volume.fstype.alternative.*" in hal-0.5.12+ mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor cat $CWD/10-ntfs-3g-policy.fdi \ > $PKG/usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g-policy.fdi +# Create a mount.ntfs -> mount.ntfs-3g symlink. +# This causes ntfs-3g to always be used when mounting NTFS filesystems. +# NOTE: This also seems to make mounting with the old ntfs filesystem +# impossible. But does anyone care? +( cd $PKG/sbin ; ln -s mount.ntfs-3g mount.ntfs ) + +## Add a udev rule to use ntfs-3g instead of ntfs: +## (This is not needed if the mount.ntfs symlink is made) +#mkdir -p $PKG/lib/udev/rules.d +#cat $CWD/99-ntfs-3g.rules > $PKG/lib/udev/rules.d/99-ntfs-3g.rules + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi rm -rf $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff b/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff new file mode 100644 index 000000000..b882b725c --- /dev/null +++ b/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff @@ -0,0 +1,78 @@ +From 281537bcd92515ae3b9f154acd579ce97260f99b Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@linbit.com> +Date: Thu, 13 Sep 2012 14:13:08 +0000 +Subject: In a git-style diff, make sure not to unlink the original by accident + +* src/patch.c (main): Fail if a file is not empty as expected. +(output_files): In a git-style diff, make sure not to unlink the original when +making a backup of an unmodified file. +* tests/create-delete: Fix failed-file-deletion test and add +successful-file-deletion test. +--- +diff --git a/src/patch.c b/src/patch.c +index 1c6fb4b..ce81bbe 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -508,6 +508,7 @@ main (int argc, char **argv) + && ! (merge && somefailed)) + { + mismatch = true; ++ somefailed = true; + if (verbosity != SILENT) + say ("File %s is not empty after patch, as expected\n", + quotearg (outname)); +@@ -1865,7 +1866,7 @@ output_files (struct stat const *st) + output_file_now (file_to_output->from, &from_needs_removal, + from_st, file_to_output->to, + file_to_output->mode, file_to_output->backup); +- if (from_needs_removal) ++ if (file_to_output->to && from_needs_removal) + unlink (file_to_output->from); + + if (st && st->st_dev == from_st->st_dev && st->st_ino == from_st->st_ino) +diff --git a/tests/create-delete b/tests/create-delete +index 9a6e1bb..7eed11f 100644 +--- a/tests/create-delete ++++ b/tests/create-delete +@@ -176,12 +176,37 @@ EOF + echo data > target + cat > p.diff <<EOF + diff --git a/target b/target +-index 1..0 ++deleted file mode 100644 ++index 1269488..0000000 + EOF + + check 'patch -p1 -b < p.diff || echo status: $?' <<EOF + patching file target + File target is not empty after patch, as expected ++status: 1 ++EOF ++ ++check 'cat target' <<EOF ++data ++EOF ++ ++# Patch creates a backup file even when the original file remains unchanged: ++check 'cat target.orig' <<EOF ++data ++EOF ++ ++cat > p.diff <<EOF ++diff --git a/target b/target ++deleted file mode 100644 ++index 1269488..0000000 ++--- a/target +++++ /dev/null ++@@ -1 +0,0 @@ ++-data ++EOF ++ ++check 'patch -p1 -b -f < p.diff || echo status: $?' <<EOF ++patching file target + EOF + + ncheck 'test ! -e target' +-- +cgit v0.9.0.2 + diff --git a/source/a/patch/patch.99f2638763845d8173a0c9f9209ac2b4be947165.diff b/source/a/patch/patch.99f2638763845d8173a0c9f9209ac2b4be947165.diff new file mode 100644 index 000000000..14c342a51 --- /dev/null +++ b/source/a/patch/patch.99f2638763845d8173a0c9f9209ac2b4be947165.diff @@ -0,0 +1,88 @@ +From 99f2638763845d8173a0c9f9209ac2b4be947165 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@linbit.com> +Date: Tue, 18 Sep 2012 10:51:17 +0000 +Subject: Fix file truncation when switching from git diff to non-git diff + +* src/patch.c (main): Output queued output files only when switching from a git +diff to a non-git diff. This can modify the input file, so make sure to +stat() it again. +* tests/concat-git-diff: Add test case growing a file with a git diff and then +with a non-git diff; without this fix; the result would be truncated. +--- +diff --git a/src/patch.c b/src/patch.c +index 0bce8fb..0b0fdd4 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -196,8 +196,12 @@ main (int argc, char **argv) + + if (have_git_diff != pch_git_diff ()) + { ++ if (have_git_diff) ++ { ++ output_files (NULL); ++ inerrno = -1; ++ } + have_git_diff = ! have_git_diff; +- output_files (NULL); + } + + if (TMPREJNAME_needs_removal) +diff --git a/tests/concat-git-diff b/tests/concat-git-diff +index 927eb5a..c78da53 100644 +--- a/tests/concat-git-diff ++++ b/tests/concat-git-diff +@@ -56,11 +56,7 @@ check 'cat f' <<EOF + three + EOF + +-cat > f <<EOF +-1 +-2 +-3 +-EOF ++seq 3 > f + + cat > concat2.diff <<EOF + diff --git a/f b/f +@@ -95,3 +91,38 @@ a + 3 + b + EOF ++ ++seq 3 > f ++ ++cat > concat3.diff <<EOF ++diff --git a/f b/f ++index 01e79c3..0d0b976 100644 ++--- a/f +++++ b/f ++@@ -1,3 +1,4 @@ ++ 1 ++ 2 ++ 3 +++b ++diff a/f b/f ++--- a/f +++++ b/f ++@@ -1,3 +1,4 @@ +++a ++ 1 ++ 2 ++ 3 ++EOF ++ ++check 'patch -p1 < concat3.diff || echo "Status: $?"' <<EOF ++patching file f ++patching file f ++EOF ++ ++check 'cat f' <<EOF ++a ++1 ++2 ++3 ++b ++EOF +-- +cgit v0.9.0.2 + diff --git a/source/a/patch/patch.SlackBuild b/source/a/patch/patch.SlackBuild index 1175620b6..1607b4059 100755 --- a/source/a/patch/patch.SlackBuild +++ b/source/a/patch/patch.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.6.1 -BUILD=${BUILD:-1} +VERSION=2.7 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -53,7 +53,11 @@ fi cd $TMP rm -rf patch-${VERSION} tar xvf $CWD/patch-${VERSION}.tar.xz || exit 1 -cd patch-${VERSION} +cd patch-${VERSION} || exit 1 + +zcat $CWD/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patch.99f2638763845d8173a0c9f9209ac2b4be947165.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild index b3425b6a9..03268420e 100755 --- a/source/a/pciutils/pciutils.SlackBuild +++ b/source/a/pciutils/pciutils.SlackBuild @@ -24,7 +24,7 @@ VERSION=${VERSION:-$(echo pciutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:--j3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,21 +65,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fetch the latest pci.ids: -rm -f pci.ids -sh update-pciids.sh -# Now fix the update-pciids script and preinstall it before 'make install' -# decides that it knows best -zcat $CWD/pciutils.ids.dest.diff.gz | patch -p1 --verbose || exit 1 -mkdir -p $PKG/usr/sbin -cat update-pciids.sh > $PKG/usr/sbin/update-pciids -chmod 0755 $PKG/usr/sbin/update-pciids +zcat $CWD/pciutils.dontcompress.diff.gz | patch -p1 || exit 1 +zcat $CWD/pciutils.update.pci.ids.url.diff.gz | patch -p1 || exit 1 +# Make and install the shared library make \ PREFIX=/usr \ SBINDIR=/sbin \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ MANDIR=/usr/man \ + IDSDIR=/usr/share/hwdata \ + PCI_IDS=pci.ids \ + PCI_COMPRESSED_IDS=0 \ + SHARED=no \ OPT="$SLKCFLAGS" \ $NUMJOBS || exit 1 @@ -88,26 +86,52 @@ make install install-lib \ SBINDIR=/sbin \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ MANDIR=/usr/man \ + IDSDIR=/usr/share/hwdata \ + PCI_IDS=pci.ids \ + PCI_COMPRESSED_IDS=0 \ + SHARED=no \ DESTDIR=$PKG -# Do not compress pci.ids - hal needs it uncompressed +mkdir -p $PKG/usr/sbin +mv $PKG/sbin/update-pciids $PKG/usr/sbin/update-pciids + +# Do not compress pci.ids ( cd $PKG/usr/share ; gzip -d pci.ids.gz ) -# Remove the update-pciids script that 'make install' placed -rm -f $PKG/sbin/update-pciids -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +# Put a compat symlink in place +ln -s hwdata/pci.ids $PKG/usr/share/pci.ids + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/pciutils-$VERSION cp -a \ - ChangeLog README TODO \ + COPYING* README TODO \ $PKG/usr/doc/pciutils-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/pciutils/pciutils.dontcompress.diff b/source/a/pciutils/pciutils.dontcompress.diff new file mode 100644 index 000000000..91089b8e3 --- /dev/null +++ b/source/a/pciutils/pciutils.dontcompress.diff @@ -0,0 +1,11 @@ +--- ./update-pciids.sh.orig 2012-01-14 08:29:38.000000000 -0600 ++++ ./update-pciids.sh 2012-07-02 21:27:47.524912718 -0500 +@@ -5,7 +5,7 @@ + set -e + SRC="http://pci-ids.ucw.cz/v2.2/pci.ids" + DEST=pci.ids +-PCI_COMPRESSED_IDS= ++PCI_COMPRESSED_IDS=0 + GREP=grep + + # if pci.ids is read-only (because the filesystem is read-only), diff --git a/source/a/pciutils/pciutils.ids.dest.diff b/source/a/pciutils/pciutils.ids.dest.diff deleted file mode 100644 index 98d152c2b..000000000 --- a/source/a/pciutils/pciutils.ids.dest.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur pciutils-3.1.3.orig/update-pciids.sh pciutils-3.1.3/update-pciids.sh ---- pciutils-3.1.3.orig/update-pciids.sh 2008-11-10 17:11:51.000000000 -0600 -+++ pciutils-3.1.3/update-pciids.sh 2009-07-29 02:23:53.102308103 -0500 -@@ -3,8 +3,8 @@ - [ "$1" = "-q" ] && quiet=true || quiet=false - - set -e --SRC="http://pciids.sourceforge.net/v2.2/pci.ids" --DEST=pci.ids -+SRC="http://pciids.sourceforge.net/pci.ids" -+DEST=/usr/share/pci.ids - PCI_COMPRESSED_IDS= - GREP=grep - diff --git a/source/a/pciutils/pciutils.update.pci.ids.url.diff b/source/a/pciutils/pciutils.update.pci.ids.url.diff new file mode 100644 index 000000000..1588f729c --- /dev/null +++ b/source/a/pciutils/pciutils.update.pci.ids.url.diff @@ -0,0 +1,11 @@ +--- ./update-pciids.sh.orig 2012-07-02 21:45:31.280890064 -0500 ++++ ./update-pciids.sh 2012-07-02 21:46:03.875889369 -0500 +@@ -3,7 +3,7 @@ + [ "$1" = "-q" ] && quiet=true || quiet=false + + set -e +-SRC="http://pci-ids.ucw.cz/v2.2/pci.ids" ++SRC="http://pciids.sourceforge.net/pci.ids" + DEST=pci.ids + PCI_COMPRESSED_IDS=0 + GREP=grep diff --git a/source/a/pciutils/pciutils.url b/source/a/pciutils/pciutils.url index e77494b5e..66d422cea 100644 --- a/source/a/pciutils/pciutils.url +++ b/source/a/pciutils/pciutils.url @@ -1,2 +1,3 @@ -#ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ -ftp.kernel.org:/pub/software/utils/pciutils/ +ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ +ftp://ftp.kernel.org/pub/software/utils/pciutils/ +ftp://metalab.unc.edu/pub/Linux/hardware/
\ No newline at end of file diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 4d3a07bfc..c5bc2d439 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,9 +27,9 @@ fi PKG=$TMP/package-pkgtools # *** UPDATE THESE WITH EACH BUILD: -VERSION=13.37 +VERSION=14.0 ARCH=${ARCH:-noarch} -BUILD=9 +BUILD=2 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool index a64ef09c0..ba8ecd0ad 100644 --- a/source/a/pkgtools/scripts/pkgtool +++ b/source/a/pkgtools/scripts/pkgtool @@ -212,7 +212,7 @@ else # there were no arguments, so we'll get the needed information from the CMD_START="true" rm -f $TMP/SeT* while [ 0 ]; do - dialog --title "Slackware Package Tool (pkgtool version 13.37)" \ + dialog --title "Slackware Package Tool (pkgtool version 14.0)" \ --menu "\nWelcome to the Slackware package tool.\n\ \nWhich option would you like?\n" 17 75 7 \ "Current" "Install packages from the current directory" \ diff --git a/source/a/pkgtools/scripts/setup.services b/source/a/pkgtools/scripts/setup.services index aee2599fd..f700a8df4 100644 --- a/source/a/pkgtools/scripts/setup.services +++ b/source/a/pkgtools/scripts/setup.services @@ -148,7 +148,7 @@ if [ -r etc/rc.d/rc.messagebus ]; then RC_MESSAGEBUS=off fi cat << EOF >> $TMP/tmpscript - "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for communication by HAL and other programs." \\ + "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for interprocess communication and coordination." \\ EOF fi diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser index 5b674a852..ce06aac54 100644 --- a/source/a/shadow/adduser +++ b/source/a/shadow/adduser @@ -3,6 +3,7 @@ # Copyright 1995 Hrvoje Dogan, Croatia. # Copyright 2002-2004, 2008, 2009, 2010 Stuart Winter, Surrey, England, UK. # Copyright 2004, 2008-2010 Slackware Linux, Inc., Concord, CA, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,12 +30,16 @@ # Author : Stuart Winter <mozes@slackware.com> # Based on the original Slackware adduser by Hrvoje Dogan # with modifications by Patrick Volkerding -# Version: 1.13 +# Version: 1.15 ########################################################################## # Usage..: adduser [<new_user_name>] ########################################################################## # History # ########### +# v1.15 - 2012-09-13 +# * Added scanner group, which may be required by third party drivers. +# v1.14 - 2012-08-24 +# * Added lp group, which is now required for scanning. <pjv> # v1.13 - 13/01/10 # * Fixed bug that removed underscore characters from UNIX group names. # Thanks to mRgOBLIN for the report and Jim Hawkins for the fix. <sw> @@ -107,7 +112,7 @@ defhome=/home defshell=/bin/bash defchmod=711 # home dir permissions - may be preferable to use 701, however. defgroup=users -AGID="audio cdrom floppy plugdev video power netdev" # additional groups for desktop users +AGID="audio cdrom floppy plugdev video power netdev lp scanner" # additional groups for desktop users # Determine what the minimum UID is (for UID recycling) # (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs index dde37c97b..e52f91a53 100644 --- a/source/a/shadow/login.defs +++ b/source/a/shadow/login.defs @@ -300,7 +300,7 @@ CHFN_RESTRICT frwh # If set to DES, DES-based algorithm will be used for encrypting password (default) # Overrides the MD5_CRYPT_ENAB option # -ENCRYPT_METHOD MD5 +ENCRYPT_METHOD SHA256 # # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. @@ -327,7 +327,9 @@ ENCRYPT_METHOD MD5 # access to these groups, even when not logged in on the console. # How to do it is left as an exercise for the reader... # -# Most of these groups are self-explanatory. +# Most of these groups are self-explanatory, but in the case of +# "lp", it is because group lp is needed to use a scanner that +# is part of a multifunction printer. # # Note that users are added to these default groups only when # logging into a shell with /bin/login, not when using a login @@ -336,7 +338,7 @@ ENCRYPT_METHOD MD5 # when the user is added with adduser or useradd, or by editing # /etc/group directly, preferably using "vigr" # -CONSOLE_GROUPS floppy:audio:cdrom:video:scanner +CONSOLE_GROUPS floppy:audio:cdrom:video:lp:scanner # # Should login be allowed if we can't cd to the home directory? diff --git a/source/a/shadow/patches/README_PATCHES b/source/a/shadow/patches/README_PATCHES index 0c639d1a2..1d1f2173a 100644 --- a/source/a/shadow/patches/README_PATCHES +++ b/source/a/shadow/patches/README_PATCHES @@ -4,6 +4,7 @@ r3055.diff: Help output to stderr not stdout. r3060.diff: Fix memory leaks r3062.diff: Avoid memzero() on a possibly NULL pointer. r3096.diff: Fix parsing of gshadow entries. +r3090.diff: Fix improper sanitizing of locale variables. r3160.diff: Fixed limits support (non PAM enabled versions only) r3194.diff: shell's name must be -su when a su fakes a login. r3299.diff: man/ru/Makefile.am: Remove double inclusion of $(man_nopam) diff --git a/source/a/shadow/patches/r3090.diff b/source/a/shadow/patches/r3090.diff new file mode 100644 index 000000000..46057673e --- /dev/null +++ b/source/a/shadow/patches/r3090.diff @@ -0,0 +1,11 @@ +--- libmisc/env.c.orig 2011-02-13 11:58:11.000000000 -0600 ++++ libmisc/env.c 2012-08-14 10:38:25.304917619 -0500 +@@ -251,7 +251,7 @@ + if (strncmp (*cur, *bad, strlen (*bad)) != 0) { + continue; + } +- if (strchr (*cur, '/') != NULL) { ++ if (strchr (*cur, '/') == NULL) { + continue; /* OK */ + } + for (move = cur; NULL != *move; move++) { diff --git a/source/a/shadow/patches/r3299.diff b/source/a/shadow/patches/unused/r3299.diff index a46b18f05..a46b18f05 100644 --- a/source/a/shadow/patches/r3299.diff +++ b/source/a/shadow/patches/unused/r3299.diff diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index c3d2e9c72..41e9353ba 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=shadow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -63,8 +63,12 @@ for patch in $CWD/patches/*.diff.gz ; do zcat $patch | patch -p0 --verbose || exit 1 done +# Don't duplicate Russian man page installations: +zcat $CWD/shadow.man.nodups.diff.gz | patch -p1 --verbose || exit 1 + # Re-run automake because of r3299 patch to man/ru/Makefile.am: -automake -f +# (not used because it doesn't work... above patch does the intended fix) +#automake -f chown -R root:root . find . \ diff --git a/source/a/shadow/shadow.man.nodups.diff b/source/a/shadow/shadow.man.nodups.diff new file mode 100644 index 000000000..425321b99 --- /dev/null +++ b/source/a/shadow/shadow.man.nodups.diff @@ -0,0 +1,11 @@ +--- ./man/ru/Makefile.in.orig 2011-02-15 16:18:21.000000000 -0600 ++++ ./man/ru/Makefile.in 2012-06-26 23:21:34.866292111 -0500 +@@ -228,7 +228,7 @@ + grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \ + newgrp.1 newusers.8 nologin.8 passwd.1 passwd.5 pwck.8 \ + pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 su.1 suauth.5 \ +- useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1) ++ useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 + man_nopam = \ + limits.5 \ + login.access.5 \ diff --git a/source/a/slocate/slocate.CVE-2007-0277.diff b/source/a/slocate/slocate.CVE-2007-0277.diff new file mode 100644 index 000000000..4f109922f --- /dev/null +++ b/source/a/slocate/slocate.CVE-2007-0277.diff @@ -0,0 +1,42 @@ +--- slocate-3.1.orig/src/utils.c ++++ slocate-3.1/src/utils.c +@@ -524,6 +524,7 @@ + { + struct stat path_stat; + int ret = 0; ++ char *path_copy = NULL; + char *ptr = NULL; + + if (lstat(path, &path_stat) == -1) +@@ -532,15 +533,25 @@ + if (!S_ISLNK(path_stat.st_mode)) { + if (access(path, F_OK) != 0) + goto EXIT; +- } else if ((ptr = rindex(path, '/'))) { +- *ptr = 0; +- if (access(path, F_OK) == 0) +- ret = 1; +- *ptr = '/'; +- goto EXIT; + } + ++ /* "path" is const, so we shouldn't modify it. Also, for speed, ++ * I suspect strdup/free is less expensive than the deep access ++ * checks... */ ++ if (!(path_copy = strdup(path))) ++ goto EXIT; ++ + ret = 1; ++ ++ /* Each directory leading to the file (symlink or not) must be ++ * readable for us to allow it to be listed in search results. */ ++ while (ret && (ptr=rindex(path_copy,'/'))) { ++ *ptr=0; ++ if (*path_copy && access(path_copy, R_OK) != 0) ++ ret = 0; ++ } ++ free(path_copy); ++ + EXIT: + return ret; + } diff --git a/source/a/slocate/slocate.SlackBuild b/source/a/slocate/slocate.SlackBuild index eef2fd1f6..def08b8c8 100755 --- a/source/a/slocate/slocate.SlackBuild +++ b/source/a/slocate/slocate.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=3.1 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -55,8 +55,12 @@ explodepkg $CWD/_slocate.tar.gz cd $TMP rm -rf slocate-$VERSION -tar xzvf $CWD/slocate-$VERSION.tar.gz -cd slocate-$VERSION +tar xzvf $CWD/slocate-$VERSION.tar.gz || exit 1 +cd slocate-$VERSION || exit 1 + +zcat $CWD/slocate.bigfile.diff.gz | patch -p0 --verbose || exit 1 +zcat $CWD/slocate.CVE-2007-0277.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 2750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -65,7 +69,7 @@ find . \ -exec chmod 644 {} \; cd src -make CFLAGS="$SLKCFLAGS" +make CFLAGS="$SLKCFLAGS -D_LARGEFILE64_SOURCE" || exit 1 cd .. strip --strip-unneeded src/slocate mkdir -p $PKG/usr/bin diff --git a/source/a/slocate/slocate.bigfile.diff b/source/a/slocate/slocate.bigfile.diff new file mode 100644 index 000000000..6ccd1202e --- /dev/null +++ b/source/a/slocate/slocate.bigfile.diff @@ -0,0 +1,33 @@ +Fix 2GB limitation - brought to you by mancha + +--- src/utils.c.orig 2012-08-25 ++++ src/utils.c 2012-08-25 +@@ -284,12 +284,12 @@ int + verify_slocate_db(struct g_data_s *g_data, char *file) + { + char ch[1]; +- struct stat tf_stat; ++ struct stat64 tf_stat; + int bytes = 0; + int fd = -1; + + if (access(file, W_OK | R_OK) == 0) { +- if (lstat(file, &tf_stat) == -1) { ++ if (lstat64(file, &tf_stat) == -1) { + if (!report_error(g_data, FATAL, "get_temp_file: fstat(): %s: %s\n", file, strerror(errno))) + goto EXIT; + +@@ -522,11 +522,11 @@ EXIT: + * to check them separately */ + int verify_access(const char *path) + { +- struct stat path_stat; ++ struct stat64 path_stat; + int ret = 0; + char *ptr = NULL; + +- if (lstat(path, &path_stat) == -1) ++ if (lstat64(path, &path_stat) == -1) + goto EXIT; + + if (!S_ISLNK(path_stat.st_mode)) { diff --git a/source/a/syslinux/syslinux-3.84.tar.bz2.sign b/source/a/syslinux/syslinux-3.84.tar.bz2.sign deleted file mode 100644 index 987a8ed9b..000000000 --- a/source/a/syslinux/syslinux-3.84.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBLLBRQyGugalF9Dw4RAmsiAJ9geAzuilvLYCEc03sP1mJLG77UaQCeJlV+ -TgEccKCkyIkwwpBYDHesUjA= -=1AUa ------END PGP SIGNATURE----- diff --git a/source/a/syslinux/syslinux-4.05.tar.sign b/source/a/syslinux/syslinux-4.05.tar.sign new file mode 100644 index 000000000..892883aee --- /dev/null +++ b/source/a/syslinux/syslinux-4.05.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQIcBAABAgAGBQJO4mUDAAoJEIiuZH1Y96v+Dg8P/1Pn+22CIUHfgPtDse6U1+Wj +A7/c5AdtezK/UQlhCh/Po7mRdCGzm/Tb6pCnHOWvpEFMeRQARGx5ElqDUmH1Y6SW +NGrPxwj40eTdVrA6TE9/Jj1QkKnFZGTTzsSm5njt06cJM1s0kABlyS0MEx++YGyX +hEnO5C6oyfh30KkTsUFLljFev1wz5FdQVHtL4e0//dh5KXgulPCIDEufIdvdIM1o +4RB2vTwpcxm1Fuqd9Th73pD1u4V9mjCwKEazKpmmCkwebn6KAzyUlcKxXMUG+Q4C +mbqRDlNCL8ia9LajJKj00wz0428M3eIT9kVxROYWdZnQGC0gDbcD8/6AAvt06bL+ +ZrlUGl02JASMk2lO9QVp74zTdlnTKQef3V9/SIPk2zLcYuVsKni87ZnEEhDke6vn +DF4S2OySfZjBw7ohou7fkbiw/1uJTYLbh9gXXgEi+GKRkLEmEzrjalRc5I9X+D18 +kEg2rMZS4bpTKTk9IZEsCncyaO8tGrevLiMijoRnqDqzOPGjnYLBDrm+rNNn4cQ9 +biiF19uapF97goGzC315PKHKeMohFWhk3YGIUIwFzzShC0bKAYaZmMWC5Dcj1Udw +XOo0/CL0uRuneS5z4TfN4mh0nVZTTgUeY3n2SbIEpTPGJdT+GGGGg06uq9PpY5WS +Jx4uX40HrNIAw2qaR+fY +=gTaU +-----END PGP SIGNATURE----- diff --git a/source/a/syslinux/syslinux.SlackBuild b/source/a/syslinux/syslinux.SlackBuild index 1e7baad75..e7ec5fbbb 100755 --- a/source/a/syslinux/syslinux.SlackBuild +++ b/source/a/syslinux/syslinux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=syslinux -VERSION=${VERSION:-3.84} +VERSION=${VERSION:-4.05} BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: @@ -43,9 +43,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION +zcat $CWD/syslinux.altmbr.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/syslinux/syslinux.altmbr.diff b/source/a/syslinux/syslinux.altmbr.diff new file mode 100644 index 000000000..ee2dfbee1 --- /dev/null +++ b/source/a/syslinux/syslinux.altmbr.diff @@ -0,0 +1,11 @@ +--- ./mbr/altmbr.S.orig 2011-12-09 12:28:17.000000000 -0600 ++++ ./mbr/altmbr.S 2012-08-17 17:10:33.903688084 -0500 +@@ -204,7 +204,7 @@ + 5: + decb (partition) + jz boot +- addw $16, %bx ++ addw $16, %si + loopw 5b + + popw %cx /* %cx <- 4 */ diff --git a/source/a/sysvinit-scripts/scripts/inittab b/source/a/sysvinit-scripts/scripts/inittab index 9f8b422d1..ba6fe79e9 100644 --- a/source/a/sysvinit-scripts/scripts/inittab +++ b/source/a/sysvinit-scripts/scripts/inittab @@ -49,7 +49,7 @@ pf::powerfail:/sbin/genpowerfail start pg::powerokwait:/sbin/genpowerfail stop # These are the standard console login getties in multiuser mode: -c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux c2:12345:respawn:/sbin/agetty 38400 tty2 linux c3:12345:respawn:/sbin/agetty 38400 tty3 linux c4:12345:respawn:/sbin/agetty 38400 tty4 linux diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index ca1b4c8eb..465a0a4a7 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -124,6 +124,13 @@ if echo "$PS" | /bin/grep -q -w pppd ; then fi fi +# Shut down YP services: +if [ -x /etc/rc.d/rc.yp ]; then + if grep -wq stop /etc/rc.d/rc.yp ; then + /etc/rc.d/rc.yp stop + fi +fi + # Bring down the networking system, but first make sure that this # isn't a diskless client with the / partition mounted via NFS: if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then @@ -158,14 +165,17 @@ if [ -x /etc/rc.d/rc.acpid -a -r /var/run/acpid.pid ]; then # quit . /etc/rc.d/rc.acpid stop fi -# Kill all processes. -# INIT is supposed to handle this entirely now, but this didn't always -# work correctly without this second pass at killing off the processes. -# Since INIT already notified the user that processes were being killed, -# we'll avoid echoing this info this time around. -if [ ! "$1" = "fast" ]; then # shutdown did not already kill all processes +# Stop udev: +if [ -x /etc/rc.d/rc.udev ]; then + sh /etc/rc.d/rc.udev force-stop +fi + +# Kill all remaining processes. +if [ ! "$1" = "fast" ]; then + echo "Sending all processes the SIGTERM signal." /sbin/killall5 -15 /bin/sleep 5 + echo "Sending all processes the SIGKILL signal." /sbin/killall5 -9 fi diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index 8772409ed..63cb88015 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -83,8 +83,9 @@ if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f & fi -# If we are returning from single-user mode we will need to restart -# udevd on systems that use udev: +# Run rc.udev again. This will start udev if it is not already running +# (for example, upon return from runlevel 1), otherwise it will trigger it +# to look for device changes and to generate persistent rules if needed. if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then @@ -187,9 +188,11 @@ if [ -x /etc/rc.d/rc.bluetooth ]; then sh /etc/rc.d/rc.bluetooth start fi -# Start wicd: -if [ -x /etc/rc.d/rc.wicd ]; then +# Start wicd or networkmanager: +if [ -x /etc/rc.d/rc.wicd -a -x /usr/sbin/wicd ]; then sh /etc/rc.d/rc.wicd start +elif [ -x /etc/rc.d/rc.networkmanager ]; then + sh /etc/rc.d/rc.networkmanager start fi # These GTK+/pango files need to be kept up to date for @@ -225,7 +228,7 @@ fi # Start netatalk. (a file/print server for Macs using Appletalk) if [ -x /etc/rc.d/rc.atalk ]; then - /etc/rc.d/rc.atalk + /etc/rc.d/rc.atalk start fi # Start smartd, which monitors the status of S.M.A.R.T. compatible diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index c02f1e276..97ff7be4c 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -19,21 +19,27 @@ if [ -d /sys ]; then fi fi +# If /run exists, mount a tmpfs on it (unless the +# initrd has already done so): +if [ -d /run ]; then + if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then + /sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755 + fi +fi + # Load the loop device kernel module: if [ -x /etc/rc.d/rc.loop ]; then . /etc/rc.d/rc.loop start fi -# Initialize udev to manage /dev entries and hotplugging for 2.6.x kernels. +# Initialize udev to manage /dev entries and hotplugging for 3.x kernels. # You may turn off udev by making the /etc/rc.d/rc.udev file non-executable -# or giving the "nohotplug" option at boot, but in the 2.6.x+ kernels udev -# has taken over the job of hotplug (finding hardware and loading the kernel -# modules for it, as well as creating device nodes in /dev). Realize that -# if you turn off udev that you will have to load all the kernel modules -# that you need yourself (possibly in /etc/rc.d/rc.modules, which does not -# promise to list all of them), and make any additional device nodes that you -# need in the /dev directory. Even USB and IEEE1394 devices will need to have -# the modules loaded by hand if udev is not used with a 2.6 kernel. So use it. :-) +# or giving the "nohotplug" option at boot, but realize that if you turn off +# udev that you will have to load all the kernel modules that you need +# yourself (possibly in /etc/rc.d/rc.modules, which does not promise to list +# all of them), and make any additional device nodes that you need in the +# /dev directory. Even USB and IEEE1394 devices will need to have the +# modules loaded by hand if udev is not used. So use it. :-) if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then @@ -103,10 +109,7 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then echo "${PASS}" | /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS fi else - for i in seq 1 3 ; do - /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS </dev/tty0 >/dev/tty0 2>&1 - [ $? -eq 0 ] && break - done + /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS </dev/tty0 >/dev/tty0 2>&1 fi elif echo $OPTS | grep -wq swap ; then # If any of the volumes is to be used as encrypted swap, @@ -134,12 +137,13 @@ if [ -x /sbin/hwclock ]; then CLOCK_OPT="--directisa" fi if grep -wq "^UTC" /etc/hardwareclock ; then - echo "Setting system time from the hardware clock (UTC)." + echo -n "Setting system time from the hardware clock (UTC): " /sbin/hwclock $CLOCK_OPT --utc --hctosys else - echo "Setting system time from the hardware clock (localtime)." + echo -n "Setting system time from the hardware clock (localtime): " /sbin/hwclock $CLOCK_OPT --localtime --hctosys fi + date fi # Test to see if the root partition is read-only, like it ought to be. @@ -250,18 +254,14 @@ else read junk; fi # Done checking root filesystem -# Any /etc/mtab that exists here is old, so we delete it to start over: -/bin/rm -f /etc/mtab* -# Remounting the / partition will initialize the new /etc/mtab: -/sbin/mount -w -o remount / -# Read in the correct / filesystem complete with arguments so mount will -# show them correctly. This does not stop those arguments from functioning -# but does prevent a small bug with /etc/mtab. -/bin/grep ' / ' /proc/mounts | grep -v "^rootfs" > /etc/mtab +# Any /etc/mtab that exists here is old, so we start with a new one: +/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab + +# Add entry for / to /etc/mtab: +/sbin/mount -f -w / -# Fix /etc/mtab to list sys and proc if they were not yet entered in -# /etc/mtab because / was still mounted read-only: +# Add /proc and /sys mounts to /etc/mtab: if [ -d /proc/sys ]; then /sbin/mount -f proc /proc -t proc fi diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh index 5ef34d4d8..0bfca50d1 100644 --- a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh +++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh @@ -1,9 +1,11 @@ #!/bin/bash # Skript to rescan SCSI bus, using the # scsi add-single-device mechanism -# (c) 1998--2008 Kurt Garloff <kurt@garloff.de>, GNU GPL v2 or later +# (c) 1998--2010 Kurt Garloff <kurt@garloff.de>, GNU GPL v2 or v3 # (c) 2006--2008 Hannes Reinecke, GNU GPL v2 or later -# $Id: rescan-scsi-bus.sh,v 1.48 2010/08/10 19:32:22 garloff Exp $ +# $Id: rescan-scsi-bus.sh,v 1.56 2012/01/14 22:23:53 garloff Exp $ + +SCAN_WILD_CARD=4294967295 setcolor () { @@ -47,8 +49,9 @@ white_out () # Return hosts. sysfs must be mounted findhosts_26 () { - hosts= - for hostdir in /sys/class/scsi_host/host*; do + hosts=`find /sys/class/scsi_host/host* -maxdepth 4 -type d -o -type l 2> /dev/null | awk -F'/' '{print $5}' | sed -e 's~host~~' | sort -nu` + scsi_host_data=`echo "$hosts" | sed -e 's~^~/sys/class/scsi_host/host~'` + for hostdir in $scsi_host_data; do hostno=${hostdir#/sys/class/scsi_host/host} if [ -f $hostdir/isp_name ] ; then hostname="qla2xxx" @@ -57,14 +60,15 @@ findhosts_26 () else hostname=`cat $hostdir/proc_name` fi - hosts="$hosts $hostno" + #hosts="$hosts $hostno" echo "Host adapter $hostno ($hostname) found." done if [ -z "$hosts" ] ; then echo "No SCSI host adapters found in sysfs" exit 1; fi - hosts=`echo $hosts | sed 's/ /\n/g' | sort -n` + # Not necessary just use double quotes around variable to preserve new lines + #hosts=`echo $hosts | tr ' ' '\n'` } # Return hosts. /proc/scsi/HOSTADAPTER/? must exist @@ -337,11 +341,22 @@ idlist () getluns() { sgdevice - if test -z "$SGDEV"; then return; fi - if test ! -x /usr/bin/sg_luns; then echo 0; return; fi - LLUN=`sg_luns -d /dev/$SGDEV 2>/dev/null` - if test $? != 0; then echo 0; return; fi - echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p' + if test -z "$SGDEV"; then return 1; fi + if test ! -x /usr/bin/sg_luns; then echo 0; return 1; fi + LLUN=`sg_luns /dev/$SGDEV 2>/dev/null | sed -n 's/ \(.*\)/\1/p'` + if test $? != 0; then echo 0; return 1; fi + #echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p' + for lun in $LLUN ; do + # Swap LUN number + l0=$(printf '%u' 0x$lun) + l1=$(( ($l0 >> 48) & 0xffff )) + l2=$(( ($l0 >> 32) & 0xffff )) + l3=$(( ($l0 >> 16) & 0xffff )) + l4=$(( $l0 & 0xffff )) + l0=$(( ( ( ($l4 * 0xffff) + $l3 ) * 0xffff + $l2 ) * 0xffff + $l1 )) + printf "%u\n" $l0 + done + return 0 } # Wait for udev to settle (create device nodes etc.) @@ -351,6 +366,10 @@ udevadm_settle() print_and_scroll_back " Calling udevadm settle (can take a while) " /sbin/udevadm settle white_out + elif test -x /sbin/udevsettle; then + print_and_scroll_back " Calling udevsettle (can take a while) " + /sbin/udevsettle + white_out else usleep 20000 fi @@ -361,7 +380,7 @@ dolunscan() { SCSISTR= devnr="$host $channel $id $lun" - echo "Scanning for device $devnr ... " + echo -e " Scanning for device $devnr ... " printf "${yellow}OLD: $norm" testexist # Special case: lun 0 just got added (for reportlunscan), @@ -382,10 +401,6 @@ dolunscan() echo -e "${norm}\e[B\e[B" if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete - if test $RC -eq 1 -o $lun -eq 0 ; then - # Try readding, should fail if device is gone - echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan - fi # FIXME: Can we skip udevadm settle for removal? #udevadm_settle usleep 20000 @@ -440,7 +455,7 @@ doreportlun() lun=0 SCSISTR= devnr="$host $channel $id $lun" - echo -en "Scanning for device $devnr ...\r" + echo -en " Scanning for device $devnr ...\r" lun0added= #printf "${yellow}OLD: $norm" # Phase one: If LUN0 does not exist, try to add @@ -470,10 +485,31 @@ doreportlun() fi fi targetluns=`getluns` + REPLUNSTAT=$? lunremove= #echo "getluns reports " $targetluns + olddev=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null` + oldluns=`echo "$olddev" | awk -F'/' '{print $5}' | awk -F':' '{print $4}'` + oldtargets="$targetluns" + # OK -- if we don't have a LUN to send a REPORT_LUNS to, we could + # fall back to wildcard scanning. Same thing if the device does not + # support REPORT_LUNS + # TODO: We might be better off to ALWAYS use wildcard scanning if + # it works + if test "$REPLUNSTAT" = "1"; then + if test -e /sys/class/scsi_host/host${host}/scan; then + echo "$channel $id -" > /sys/class/scsi_host/host${host}/scan 2> /dev/null + udevadm_settle + else + echo "scsi add-single-device $host $channel $id $SCAN_WILD_CARD" > /proc/scsi/scsi + fi + targetluns=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null | awk -F'/' '{print $5}' | awk -F':' '{print $4}' | sort -n` + let found+=`echo "$targetluns" | wc -l` + let found-=`echo "$olddev" | wc -l` + fi + if test -z "$targetluns"; then targetluns="$oldtargets"; fi # Check existing luns - for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do + for dev in $olddev; do [ -d "$dev" ] || continue lun=${dev##*:} newsearch= @@ -589,11 +625,14 @@ if test -x /usr/bin/sg_inq; then sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) sg_version=${sg_version##0.} #echo "\"$sg_version\"" - if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then - sg_len_arg="-36" - else + #if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then + #sg_len_arg="-36" + #else sg_len_arg="--len=36" - fi + #fi +else + echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils" + echo " or rescan-scsi-bus.sh might not fully work." fi # defaults @@ -677,12 +716,15 @@ for host in $hosts; do # It's pointless to do a target scan on FC if test -n "$lipreset" ; then echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null; + udevadm_settle fi - # Always trigger a rescan for FC to update channels and targets - echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; + # We used to always trigger a rescan for FC to update channels and targets + # Commented out -- as discussed with Hannes we should rely + # on the main loop doing the scan, no need to do it here. + #echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; + #udevadm_settle channelsearch= idsearch= - udevadm_settle else channelsearch=$opt_channelsearch idsearch=$opt_idsearch @@ -707,3 +749,7 @@ fi echo "$found new device(s) found. " echo "$rmvd device(s) removed. " +# Local Variables: +# sh-basic-offset: 2 +# End: + diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff new file mode 100644 index 000000000..89e276935 --- /dev/null +++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff @@ -0,0 +1,18 @@ +--- rescan-scsi-bus.sh.orig 2012-01-14 16:43:33.000000000 -0600 ++++ rescan-scsi-bus.sh 2012-09-07 12:51:52.003994404 -0500 +@@ -625,11 +625,11 @@ + sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) + sg_version=${sg_version##0.} + #echo "\"$sg_version\"" +- if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then +- sg_len_arg="-36" +- else ++ #if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then ++ #sg_len_arg="-36" ++ #else + sg_len_arg="--len=36" +- fi ++ #fi + else + echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils" + echo " or rescan-scsi-bus.sh might not fully work." diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index c0b17ad83..cbc120304 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-2.0} ARCH=noarch -BUILD=${BUILD:-43} +BUILD=${BUILD:-13} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/a/sysvinit/sysvinit-2.86-timeval.patch b/source/a/sysvinit/sysvinit-2.86-timeval.patch deleted file mode 100644 index acb0d5b68..000000000 --- a/source/a/sysvinit/sysvinit-2.86-timeval.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- sysvinit-2.86/src/utmp.c.timeval 1999-06-09 07:11:33.000000000 -0400 -+++ sysvinit-2.86/src/utmp.c 2006-08-09 19:46:26.000000000 -0400 -@@ -47,7 +47,8 @@ - int fd; - struct utmp utmp; - struct utsname uname_buf; -- -+ struct timeval tv; -+ - /* - * Try to open the wtmp file. Note that we even try - * this if we have updwtmp() so we can see if the -@@ -76,7 +77,9 @@ - */ - memset(&utmp, 0, sizeof(utmp)); - #if defined(__GLIBC__) -- gettimeofday(&utmp.ut_tv, NULL); -+ gettimeofday(&tv, NULL); -+ utmp.ut_tv.tv_sec = tv.tv_sec; -+ utmp.ut_tv.tv_usec = tv.tv_usec; - #else - time(&utmp.ut_time); - #endif -@@ -113,6 +116,7 @@ - struct utmp utmp; - struct utmp tmp; - struct utmp *utmptr; -+ struct timeval tv; - - /* - * Can't do much if UTMP_FILE is not present. -@@ -144,7 +148,9 @@ - utmp.ut_pid = pid; - strncpy(utmp.ut_id, id, sizeof(utmp.ut_id)); - #if defined(__GLIBC__) -- gettimeofday(&utmp.ut_tv, NULL); -+ gettimeofday(&tv, NULL); -+ utmp.ut_tv.tv_sec = tv.tv_sec; -+ utmp.ut_tv.tv_usec = tv.tv_usec; - #else - time(&utmp.ut_time); - #endif diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild index 194ebf144..2a9459c2d 100755 --- a/source/a/sysvinit/sysvinit.SlackBuild +++ b/source/a/sysvinit/sysvinit.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.86} -BUILD=${BUILD:-6} +VERSION=${VERSION:-2.88dsf} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -43,29 +43,23 @@ mkdir -p $TMP $PKG cd $TMP rm -rf sysvinit-$VERSION -tar xzvf $CWD/sysvinit-$VERSION.tar.gz || exit 1 +tar xvf $CWD/sysvinit-$VERSION.tar.xz || exit 1 cd sysvinit-$VERSION chown -R root:root . -zcat $CWD/sysvinit.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/sysvinit.pidof.rhforkseverything.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -if [ "$ARCH" = "x86_64" ]; then - # Don't overwrite ut_addr_v6 in utmp records on 64-bit platforms - zcat $CWD/sysvinit-2.86-timeval.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -fi + +# Fix paths for /etc/forcefsck and /etc/fastboot: +zcat $CWD/sysvinit.paths.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 cd doc mkdir -p $PKG/usr/doc/sysvinit-$VERSION -cp -a Install Propaganda sysvinit-$VERSION.lsm \ +cp -a Install Propaganda sysvinit-2.86.lsm \ + ../COPYING* ../COPYRIGHT ../README* \ $PKG/usr/doc/sysvinit-$VERSION chmod -R 644 $PKG/usr/doc/sysvinit-$VERSION/* chmod 755 $PKG/usr/doc/sysvinit-$VERSION cd ../src -if [ "$ARCH" = "x86_64" ]; then - # static 'init' segfaults, so your computer never reaches command prompt: - sed -i -e "s/-static//" Makefile -fi -make clobber +make clobber || exit 1 make || exit 1 mkdir -p $PKG/sbin diff --git a/source/a/sysvinit/sysvinit.diff b/source/a/sysvinit/sysvinit.diff deleted file mode 100644 index 11477be72..000000000 --- a/source/a/sysvinit/sysvinit.diff +++ /dev/null @@ -1,125 +0,0 @@ -diff -Naur sysvinit-2.86.orig/man/init.8 sysvinit-2.86/man/init.8 ---- sysvinit-2.86.orig/man/init.8 2004-07-29 13:21:31.000000000 +0200 -+++ sysvinit-2.86/man/init.8 2007-12-23 12:22:51.000000000 +0100 -@@ -76,7 +76,7 @@ - are processed. - .PP - When starting a new process, \fBinit\fP first checks whether the file --\fI/etc/initscript\fP exists. If it does, it uses this script to -+\fI/sbin/initscript\fP exists. If it does, it uses this script to - start the process. - .PP - Each time a child terminates, \fBinit\fP records the fact and the reason -@@ -240,7 +240,7 @@ - .SH FILES - .nf - /etc/inittab --/etc/initscript -+/sbin/initscript - /dev/console - /var/run/utmp - /var/log/wtmp -diff -Naur sysvinit-2.86.orig/man/initscript.5 sysvinit-2.86/man/initscript.5 ---- sysvinit-2.86.orig/man/initscript.5 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86/man/initscript.5 2007-12-23 12:22:51.000000000 +0100 -@@ -2,15 +2,15 @@ - .SH NAME - initscript \- script that executes inittab commands. - .SH SYNOPSIS --/bin/sh /etc/initscript id runlevels action process -+/bin/sh /sbin/initscript id runlevels action process - .SH DESCRIPTION --When the shell script \fI/etc/initscript\fP is present, \fBinit\fP -+When the shell script \fI/sbin/initscript\fP is present, \fBinit\fP - will use it to execute the commands from \fIinittab\fP. - This script can be used to set things like \fBulimit\fP and - \fBumask\fP default values for every process. - .SH EXAMPLES - This is a sample initscript, which might be installed on your --system as \fI/etc/initscript.sample\fP. -+system as \fI/sbin/initscript.sample\fP. - .RS - .sp - .nf -@@ -20,7 +20,7 @@ - # initscript Executed by init(8) for every program it - # wants to spawn like this: - # --# /bin/sh /etc/initscript <id> <level> <action> <process> -+# /bin/sh /sbin/initscript <id> <level> <action> <process> - # - - # Set umask to safe level, and enable core dumps. -@@ -48,7 +48,7 @@ - .RE - .SH FILES - /etc/inittab, --/etc/initscript. -+/sbin/initscript. - .SH AUTHOR - Miquel van Smoorenburg ,<miquels@cistron.nl> - .SH "SEE ALSO" -diff -Naur sysvinit-2.86.orig/src/Makefile sysvinit-2.86/src/Makefile ---- sysvinit-2.86.orig/src/Makefile 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86/src/Makefile 2007-12-23 12:22:51.000000000 +0100 -@@ -11,7 +11,7 @@ - CC = gcc - CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE - LDFLAGS = -s --STATIC = -+STATIC = -static - - # For some known distributions we do not build all programs, otherwise we do. - BIN = -diff -Naur sysvinit-2.86.orig/src/initscript.sample sysvinit-2.86/src/initscript.sample ---- sysvinit-2.86.orig/src/initscript.sample 1997-11-26 14:06:33.000000000 +0100 -+++ sysvinit-2.86/src/initscript.sample 2007-12-23 12:22:51.000000000 +0100 -@@ -1,14 +1,14 @@ - # --# initscript If this script is intalled as /etc/initscript, -+# initscript If this script is intalled as /sbin/initscript, - # it is executed by init(8) for every program it - # wants to spawn like this: - # --# /bin/sh /etc/initscript <id> <level> <action> <process> -+# /bin/sh /sbin/initscript <id> <level> <action> <process> - # - # It can be used to set the default umask and ulimit - # of all processes. By default this script is installed --# as /etc/initscript.sample, so to enable it you must --# rename this script first to /etc/initscript. -+# as /sbin/initscript.sample, so to enable it you must -+# rename this script first to /sbin/initscript. - # - # Version: @(#)initscript 1.10 10-Dec-1995 MvS. - # -diff -Naur sysvinit-2.86.orig/src/paths.h sysvinit-2.86/src/paths.h ---- sysvinit-2.86.orig/src/paths.h 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86/src/paths.h 2007-12-23 12:23:50.000000000 +0100 -@@ -20,21 +20,21 @@ - #define INITTAB "/etc/inittab" /* Location of inittab */ - #define INIT "/sbin/init" /* Location of init itself. */ - #define NOLOGIN "/etc/nologin" /* Stop user logging in. */ --#define FASTBOOT "/fastboot" /* Enable fast boot. */ --#define FORCEFSCK "/forcefsck" /* Force fsck on boot */ -+#define FASTBOOT "/etc/fastboot" /* Enable fast boot. */ -+#define FORCEFSCK "/etc/forcefsck" /* Force fsck on boot */ - #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */ - #define SHELL "/bin/sh" /* Default shell */ - #define SULOGIN "/sbin/sulogin" /* Sulogin */ --#define INITSCRIPT "/etc/initscript" /* Initscript. */ -+#define INITSCRIPT "/sbin/initscript" /* Initscript. */ - #define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */ - - #if 0 - #define INITLVL "/etc/initrunlvl" /* COMPAT: New runlevel */ - #define INITLVL2 "/var/log/initrunlvl" /* COMPAT: New runlevel */ - /* Note: INITLVL2 definition needs INITLVL */ --#define HALTSCRIPT1 "/etc/init.d/halt" /* Called by "fast" shutdown */ -+#define HALTSCRIPT1 "/etc/init.d/rc.halt" /* Called by "fast" shutdown */ - #define HALTSCRIPT2 "/etc/rc.d/rc.0" /* Called by "fast" shutdown */ --#define REBOOTSCRIPT1 "/etc/init.d/reboot" /* Ditto. */ -+#define REBOOTSCRIPT1 "/etc/init.d/rc.reboot" /* Ditto. */ - #define REBOOTSCRIPT2 "/etc/rc.d/rc.6" /* Ditto. */ - #endif - diff --git a/source/a/sysvinit/sysvinit.paths.diff b/source/a/sysvinit/sysvinit.paths.diff new file mode 100644 index 000000000..453a677c0 --- /dev/null +++ b/source/a/sysvinit/sysvinit.paths.diff @@ -0,0 +1,13 @@ +--- ./src/paths.h.orig 2010-04-11 04:30:27.000000000 -0500 ++++ ./src/paths.h 2012-07-31 11:43:40.646053052 -0500 +@@ -29,8 +29,8 @@ + #define INITTAB "/etc/inittab" /* Location of inittab */ + #define INIT "/sbin/init" /* Location of init itself. */ + #define NOLOGIN "/etc/nologin" /* Stop user logging in. */ +-#define FASTBOOT "/fastboot" /* Enable fast boot. */ +-#define FORCEFSCK "/forcefsck" /* Force fsck on boot */ ++#define FASTBOOT "/etc/fastboot" /* Enable fast boot. */ ++#define FORCEFSCK "/etc/forcefsck" /* Force fsck on boot */ + #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */ + #define SHELL "/bin/sh" /* Default shell */ + #define SULOGIN "/sbin/sulogin" /* Sulogin */ diff --git a/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff b/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff deleted file mode 100644 index db94dcf19..000000000 --- a/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- sysvinit-2.86/man/pidof.8.chroot 1998-09-02 08:49:33.000000000 -0400 -+++ sysvinit-2.86/man/pidof.8 2005-12-19 15:37:40.000000000 -0500 -@@ -4,6 +4,7 @@ - .SH SYNOPSIS - .B pidof - .RB [ \-s ] -+.RB [ \-c ] - .RB [ \-x ] - .RB [ \-o - .IR omitpid ] -@@ -24,6 +25,10 @@ - .SH OPTIONS - .IP -s - Single shot - this instructs the program to only return one \fIpid\fP. -+.IP -c -+Only return process ids that are running with the same root directory. -+This option does not make sense for non-root users, as they will be -+unable to check the current root directory of processes they do not own. - .IP -x - Scripts too - this causes the program to also return process id's of - shells running the named scripts. ---- sysvinit-2.86/src/killall5.c.chroot 2004-07-30 08:16:23.000000000 -0400 -+++ sysvinit-2.86/src/killall5.c 2005-12-19 15:38:47.000000000 -0500 -@@ -476,16 +476,22 @@ - int f; - int first = 1; - int i, oind, opt, flags = 0; -+ int chroot_check = 0; -+ struct stat st; -+ char tmp[512]; - - for (oind = PIDOF_OMITSZ-1; oind > 0; oind--) - opid[oind] = 0; - opterr = 0; - -- while ((opt = getopt(argc,argv,"ho:sx")) != EOF) switch (opt) { -+ while ((opt = getopt(argc,argv,"hco:sx")) != EOF) switch (opt) { - case '?': - nsyslog(LOG_ERR,"invalid options on command line!\n"); - closelog(); - exit(1); -+ case 'c': -+ chroot_check = 1; -+ break; - case 'o': - if (oind >= PIDOF_OMITSZ -1) { - nsyslog(LOG_ERR,"omit pid buffer size %d " -@@ -518,6 +524,16 @@ - argc -= optind; - argv += optind; - -+ /* Check if we are in a chroot */ -+ if (chroot_check) { -+ snprintf(tmp, 512, "/proc/%d/root", getpid()); -+ if (stat(tmp, &st) < 0) { -+ nsyslog(LOG_ERR, "stat failed for %s!\n", tmp); -+ closelog(); -+ exit(1); -+ } -+ } -+ - /* Print out process-ID's one by one. */ - readproc(); - for(f = 0; f < argc; f++) { -@@ -541,6 +557,16 @@ - else - spid = 1; - } -+ if (chroot_check) { -+ struct stat st2; -+ snprintf(tmp, 512, "/proc/%d/root", -+ p->pid); -+ if (stat(tmp, &st2) < 0 || -+ st.st_dev != st2.st_dev || -+ st.st_ino != st2.st_ino) { -+ continue; -+ } -+ } - if (!first) - printf(" "); - printf("%d", p->pid); diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild index 8cf4feb47..c8134a80c 100755 --- a/source/a/tcsh/tcsh.SlackBuild +++ b/source/a/tcsh/tcsh.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=6.17.00 +VERSION=6.18.01 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild index 540b20472..7085fc99e 100755 --- a/source/a/tree/tree.SlackBuild +++ b/source/a/tree/tree.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2007-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.5.3 +VERSION=1.6.0 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -56,10 +56,12 @@ mkdir -p $PKG/usr/bin cat tree > $PKG/usr/bin/tree chmod 755 $PKG/usr/bin/tree mkdir -p $PKG/usr/man/man1 -cat man/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz +cat doc/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz +mkdir -p $PKG/usr/man/fr/man1 +cat doc/tree.1.fr | gzip -9c > $PKG/usr/man/fr/man1/tree.1.gz mkdir -p $PKG/usr/doc/tree-$VERSION cp -a \ - CHANGES LICENSE README* \ + CHANGES LICENSE README* TODO \ $PKG/usr/doc/tree-$VERSION ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/udev/config/modprobe.d/8139cp.conf b/source/a/udev/config/modprobe.d/8139cp.conf new file mode 100644 index 000000000..65f0af0d1 --- /dev/null +++ b/source/a/udev/config/modprobe.d/8139cp.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Alternate 8139 driver. Some 8139 cards need this specific driver, though... +blacklist 8139cp + diff --git a/source/a/udev/config/modprobe.d/README b/source/a/udev/config/modprobe.d/README new file mode 100644 index 000000000..43355e826 --- /dev/null +++ b/source/a/udev/config/modprobe.d/README @@ -0,0 +1,11 @@ +# /etc/modprobe.d/README +# +# The monolithic "blacklist" file (and others) that used to be here in this +# directory have been split into several more fine-grained files and moved +# to the /lib/modprobe.d/ directory. Any file in /lib/modprobe.d/ will be +# overridden by an identically named file in this directory (/etc/modprobe.d/) +# or /run/modprobe.d/ (but since /run is on a tmpfs, it's not persistent +# across reboots, so you probably don't want to use it). +# +# See "man modprobe.d" for more information. +# diff --git a/source/a/udev/config/modprobe.d/bcm43xx.conf b/source/a/udev/config/modprobe.d/bcm43xx.conf new file mode 100644 index 000000000..55b3c2abc --- /dev/null +++ b/source/a/udev/config/modprobe.d/bcm43xx.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Deprecated BCM4318 driver. +blacklist bcm43xx + diff --git a/source/a/udev/config/modprobe.d/blacklist.conf.new b/source/a/udev/config/modprobe.d/blacklist.conf.new deleted file mode 100644 index 25811703d..000000000 --- a/source/a/udev/config/modprobe.d/blacklist.conf.new +++ /dev/null @@ -1,270 +0,0 @@ -# -# Listing a module here prevents the hotplug scripts from loading it. -# Usually that'd be so that some other driver will bind it instead, -# no matter which driver happens to get probed first. Sometimes user -# mode tools can also control driver binding. - -# PC Speaker support: -# This one is loaded by /etc/rc.d/rc.modules. If you don't like -# the beeps and buzz from speaker, edit /etc/rc.d/rc.modules. -blacklist pcspkr - -# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices -blacklist de4x5 - -# At least 2.4.3 and later xircom_tulip doesn't have that conflict -# xircom_tulip_cb -blacklist dmfe - -#evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Alternate Intel EtherExpress Pro/100 support driver. List it -# here so it won't conflict with an already-loaded e100 module. -blacklist eepro100 - -# Alternate 8139 driver. Some 8139 cards need this specific driver, -# though... -blacklist 8139cp - -# Deprecated BCM4318 driver. -blacklist bcm43xx - -# Modules used to run a wireless adaptor as an access point. These -# conflict with the normal driver for the device, and so should be -# loaded manually. -blacklist hostap_cs -blacklist hostap_pci -blacklist hostap_plx -blacklist hostap - -# Ethernet over IEEE1394 module. In too many cases this will load -# when there's no eth1394 device present (just an IEEE1394 port) -blacklist eth1394 - -# This module has also been known to cause crashes with some hardware. -blacklist hw_random - -# The kernel lists this as "experimental", but for now it's "broken" -blacklist via-ircc - -# ALSA modules to support sound modems. These should be loaded manually -# if needed. For most people they just break sound support... -blacklist snd-atiixp-modem -blacklist snd-intel8x0m -blacklist snd-via82xx-modem - -# OSS (Open Sound System) modules. This is the old and deprecated Linux -# sound system. If you want to use OSS, remove the alsa-driver package -# and cut out (or comment out) this list. With these modules -# blacklisted ALSA will load by default. -blacklist ac97 -blacklist ac97_codec -blacklist aci -blacklist ad1816 -blacklist ad1848 -blacklist ad1889 -blacklist adlib_card -blacklist aedsp16 -blacklist ali5455 -blacklist awe_wave -blacklist btaudio -blacklist cmpci -blacklist cs4232 -blacklist cs4281 -blacklist cs46xx -blacklist emu10k1 -blacklist es1370 -blacklist es1371 -blacklist esssolo1 -blacklist forte -blacklist gus -blacklist i810_audio -blacklist kahlua -blacklist mad16 -blacklist maestro -blacklist maestro3 -blacklist maui -blacklist mpu401 -blacklist msnd -blacklist msnd_classic -blacklist msnd_pinnacle -blacklist nm256_audio -blacklist opl3 -blacklist opl3sa -blacklist opl3sa2 -blacklist pas2 -blacklist pss -blacklist rme96xx -blacklist sb -blacklist sb_lib -blacklist sgalaxy -blacklist sonicvibes -blacklist sound -blacklist sscape -blacklist trident -blacklist trix -blacklist uart401 -blacklist uart6850 -blacklist v_midi -blacklist via82cxxx_audio -blacklist wavefront -blacklist ymfpci - -# Hardware specific video framebuffer modules. If the user wants -# these, they can load them manually or de-blacklist them. Having -# them load automatically may lead to funny side effects with -# certain revisions of video hardware. -blacklist arcfb -blacklist aty128fb -blacklist atyfb -blacklist cirrusfb -blacklist clgenfb -blacklist cyber2000fb -blacklist fbcon-cfb2 -blacklist fbcon-cfb4 -blacklist fbcon-hga -blacklist fbcon-mfb -blacklist fbcon-vga-planes -blacklist fbgen -blacklist hgafb -blacklist i2c-matroxfb -blacklist i810fb -blacklist intelfb -blacklist kyrofb -blacklist matroxfb_DAC1064 -blacklist matroxfb_Ti3026 -blacklist matroxfb_accel -blacklist matroxfb_base -blacklist matroxfb_crtc2 -blacklist matroxfb_g450 -blacklist matroxfb_maven -blacklist matroxfb_misc -blacklist neofb -blacklist nvidiafb -blacklist pm2fb -blacklist pm3fb -blacklist radeonfb -blacklist rivafb -blacklist savagefb -blacklist sisfb -blacklist sstfb -blacklist tdfxfb -blacklist tridentfb -blacklist vga16fb - -# SCSI and SATA controller modules. Typically these are either -# built into the kernel or loaded with an initrd already. -blacklist 3w-xxxx -blacklist 53c7,8xx -blacklist AM53C974 -blacklist BusLogic -blacklist NCR53c406a -blacklist a100u2w -blacklist advansys -blacklist aha152x -blacklist aha1542 -blacklist aha1740 -blacklist aic79xx -blacklist aic7xxx -blacklist aic7xxx_old -blacklist aic94xx -blacklist ata_piix -blacklist atp870u -blacklist cpqfc -blacklist dc395x -blacklist dmx3191d -blacklist dpt_i2o -blacklist dtc -blacklist eata -blacklist eata_dma -blacklist eata_pio -blacklist fdomain -blacklist g_NCR5380 -blacklist g_NCR5380_mmio -blacklist gdth -blacklist ide-scsi -blacklist imm -blacklist in2000 -blacklist initio -blacklist ipr -blacklist ips -blacklist libata -blacklist megaraid -blacklist ncr53c8xx -blacklist nsp32 -blacklist osst -blacklist pas16 -blacklist pci2000 -blacklist pci2220i -blacklist ppa -blacklist psi240i -blacklist qla1280 -blacklist qla2100 -blacklist qla2200 -blacklist qla2300 -blacklist qla2322 -blacklist qla2xxx -blacklist qla6312 -blacklist qla6322 -blacklist qlogicfas -blacklist qlogicfas408 -blacklist qlogicfc -blacklist qlogicisp -blacklist seagate -blacklist sim710 -blacklist sata_promise -blacklist sata_sil -blacklist sata_sis -blacklist sata_svw -blacklist sata_sx4 -blacklist sata_via -blacklist sata_vsc -blacklist scsi_debug -blacklist scsi_transport_fc -blacklist scsi_transport_spi -blacklist sym53c416 -blacklist sym53c8xx -blacklist sym53c8xx -blacklist t128 -blacklist tmscsim -blacklist u14-34f - -# Blacklist all watchdog modules. Many motherboards hangs with them and, -# if you really need an watchdog you probably know how to load the module -blacklist acquirewdt -blacklist advantechwdt -blacklist alim1535_wdt -blacklist alim7101_wdt -blacklist cpu5wdt -blacklist eurotechwdt -blacklist hpwdt -blacklist i6300esb -blacklist iTCO_vendor_support -blacklist iTCO_wdt -blacklist ib700wdt -blacklist ibmasr -blacklist it8712f_wdt -blacklist machzwd -blacklist mixcomwd -blacklist pc87413_wdt -blacklist pcwd -blacklist pcwd_pci -blacklist pcwd_usb -blacklist sbc60xxwdt -blacklist sbc7240_wdt -blacklist sbc8360 -blacklist sbc_epx_c3 -blacklist sc1200wdt -blacklist sc520_wdt -blacklist scx200_wdt -blacklist smsc37b787_wdt -blacklist softdog -blacklist w83627hf_wdt -blacklist w83697hf_wdt -blacklist w83877f_wdt -blacklist w83977f_wdt -blacklist wafer5823wdt -blacklist wdt -blacklist wdt_pci - diff --git a/source/a/udev/config/modprobe.d/eepro100.conf b/source/a/udev/config/modprobe.d/eepro100.conf new file mode 100644 index 000000000..a7ca4aaea --- /dev/null +++ b/source/a/udev/config/modprobe.d/eepro100.conf @@ -0,0 +1,8 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Alternate Intel EtherExpress Pro/100 support driver. List it +# here so it won't conflict with an already-loaded e100 module. +blacklist eepro100 + diff --git a/source/a/udev/config/modprobe.d/eth1394.conf b/source/a/udev/config/modprobe.d/eth1394.conf new file mode 100644 index 000000000..a2f475afd --- /dev/null +++ b/source/a/udev/config/modprobe.d/eth1394.conf @@ -0,0 +1,8 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Ethernet over IEEE1394 module. In too many cases this will load +# when there's no eth1394 device present (just an IEEE1394 port) +blacklist eth1394 + diff --git a/source/a/udev/config/modprobe.d/evbug.conf b/source/a/udev/config/modprobe.d/evbug.conf new file mode 100644 index 000000000..0af0a83c6 --- /dev/null +++ b/source/a/udev/config/modprobe.d/evbug.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +#evbug is a debug tool and should be loaded explicitly +blacklist evbug + diff --git a/source/a/udev/config/modprobe.d/framebuffers.conf b/source/a/udev/config/modprobe.d/framebuffers.conf new file mode 100644 index 000000000..770ce420a --- /dev/null +++ b/source/a/udev/config/modprobe.d/framebuffers.conf @@ -0,0 +1,48 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Hardware specific video framebuffer modules. If the user wants +# these, they can load them manually or de-blacklist them. Having +# them load automatically may lead to funny side effects with +# certain revisions of video hardware. +blacklist arcfb +blacklist aty128fb +blacklist atyfb +blacklist cirrusfb +blacklist clgenfb +blacklist cyber2000fb +blacklist fbcon-cfb2 +blacklist fbcon-cfb4 +blacklist fbcon-hga +blacklist fbcon-mfb +blacklist fbcon-vga-planes +blacklist fbgen +blacklist hgafb +blacklist i2c-matroxfb +blacklist i810fb +blacklist intelfb +blacklist kyrofb +blacklist matroxfb_DAC1064 +blacklist matroxfb_Ti3026 +blacklist matroxfb_accel +blacklist matroxfb_base +blacklist matroxfb_crtc2 +blacklist matroxfb_g450 +blacklist matroxfb_maven +blacklist matroxfb_misc +blacklist neofb +blacklist nvidiafb +blacklist pm2fb +blacklist pm3fb +blacklist radeonfb +blacklist rivafb +blacklist savagefb +blacklist sisfb +blacklist sstfb +blacklist tdfxfb +blacklist tridentfb +blacklist vga16fb +blacklist viafb +blacklist virgefb + diff --git a/source/a/udev/config/modprobe.d/hostap.conf b/source/a/udev/config/modprobe.d/hostap.conf new file mode 100644 index 000000000..4254d3daa --- /dev/null +++ b/source/a/udev/config/modprobe.d/hostap.conf @@ -0,0 +1,12 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Modules used to run a wireless adapter as an access point. These +# conflict with the normal driver for the device, and so should be +# loaded manually. +blacklist hostap_cs +blacklist hostap_pci +blacklist hostap_plx +blacklist hostap + diff --git a/source/a/udev/config/modprobe.d/hw_random.conf b/source/a/udev/config/modprobe.d/hw_random.conf new file mode 100644 index 000000000..b912e0125 --- /dev/null +++ b/source/a/udev/config/modprobe.d/hw_random.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# This module has also been known to cause crashes with some hardware. +blacklist hw_random + diff --git a/source/a/udev/config/modprobe.d/isapnp.conf b/source/a/udev/config/modprobe.d/isapnp.conf new file mode 100644 index 000000000..a89ad6bb7 --- /dev/null +++ b/source/a/udev/config/modprobe.d/isapnp.conf @@ -0,0 +1,24 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# These aliases are here because many PnP modules do not provide them. +# +# NOTE: Commented out due to noise pollution from udev. +# In the unlikely event that your machine needs these aliases, copy this +# file to /etc/modprobe.d/isapnp.conf and uncomment them there. + +#alias pnp:dPNP0400 parport_pc +#alias pnp:dPNP0401 parport_pc +#alias pnp:dPNP0510 irtty-sir +#alias pnp:dPNP0511 irtty-sir +#alias pnp:dPNP0700 floppy +#alias pnp:dPNP0B00 rtc +#alias acpi:PNP0B00: rtc-cmos +#alias acpi:PNP0B01: rtc-cmos +#alias acpi:PNP0B02: rtc-cmos +#alias pnp:dPNPB02F analog +#alias pnp:dPNP0F13 psmouse +#alias pnp:dPNP0800 pcspkr +#alias pnp:dPNP0303 atkbd + diff --git a/source/a/udev/config/modprobe.d/isapnp.conf.new b/source/a/udev/config/modprobe.d/isapnp.conf.new deleted file mode 100644 index 2ed9305ee..000000000 --- a/source/a/udev/config/modprobe.d/isapnp.conf.new +++ /dev/null @@ -1,15 +0,0 @@ -# These aliases are here because many PnP modules do not -# provide aliases for them. -alias pnp:dPNP0400 parport_pc -alias pnp:dPNP0401 parport_pc -alias pnp:dPNP0510 irtty-sir -alias pnp:dPNP0511 irtty-sir -alias pnp:dPNP0700 floppy -alias pnp:dPNP0B00 rtc -alias acpi:PNP0B00: rtc-cmos -alias acpi:PNP0B01: rtc-cmos -alias acpi:PNP0B02: rtc-cmos -alias pnp:dPNPB02F analog -alias pnp:dPNP0F13 psmouse -alias pnp:dPNP0800 pcspkr -alias pnp:dPNP0303 atkbd diff --git a/source/a/udev/config/modprobe.d/isdn.conf b/source/a/udev/config/modprobe.d/isdn.conf new file mode 100644 index 000000000..7f7367536 --- /dev/null +++ b/source/a/udev/config/modprobe.d/isdn.conf @@ -0,0 +1,11 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# These two come from the hwdata project +# Bug numbers are Fedora/RH specific + +# ISDN - see bugs 154799, 159068 +blacklist hisax +blacklist hisax_fcpcipnp + diff --git a/source/a/udev/config/modprobe.d/oss.conf b/source/a/udev/config/modprobe.d/oss.conf new file mode 100644 index 000000000..52ed2f59c --- /dev/null +++ b/source/a/udev/config/modprobe.d/oss.conf @@ -0,0 +1,61 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# OSS (Open Sound System) modules. This is the old and deprecated Linux +# sound system. If you want to use OSS, remove the alsa-driver package +# and cut out (or comment out) this list. With these modules +# blacklisted ALSA will load by default. +blacklist ac97 +blacklist ac97_codec +blacklist aci +blacklist ad1816 +blacklist ad1848 +blacklist ad1889 +blacklist adlib_card +blacklist aedsp16 +blacklist ali5455 +blacklist awe_wave +blacklist btaudio +blacklist cmpci +blacklist cs4232 +blacklist cs4281 +blacklist cs46xx +blacklist emu10k1 +blacklist es1370 +blacklist es1371 +blacklist esssolo1 +blacklist forte +blacklist gus +blacklist i810_audio +blacklist kahlua +blacklist mad16 +blacklist maestro +blacklist maestro3 +blacklist maui +blacklist mpu401 +blacklist msnd +blacklist msnd_classic +blacklist msnd_pinnacle +blacklist nm256_audio +blacklist opl3 +blacklist opl3sa +blacklist opl3sa2 +blacklist pas2 +blacklist pss +blacklist rme96xx +blacklist sb +blacklist sb_lib +blacklist sgalaxy +blacklist sonicvibes +blacklist sound +blacklist sscape +blacklist trident +blacklist trix +blacklist uart401 +blacklist uart6850 +blacklist v_midi +blacklist via82cxxx_audio +blacklist wavefront +blacklist ymfpci + diff --git a/source/a/udev/config/modprobe.d/pcspkr.conf b/source/a/udev/config/modprobe.d/pcspkr.conf new file mode 100644 index 000000000..66de6b749 --- /dev/null +++ b/source/a/udev/config/modprobe.d/pcspkr.conf @@ -0,0 +1,9 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# PC Speaker support: +# This one is loaded by /etc/rc.d/rc.modules. If you don't like +# the beeps and buzz from speaker, edit /etc/rc.d/rc.modules. +blacklist pcspkr + diff --git a/source/a/udev/config/modprobe.d/psmouse.conf.new b/source/a/udev/config/modprobe.d/psmouse.conf index 70c0d8195..cc414141e 100644 --- a/source/a/udev/config/modprobe.d/psmouse.conf.new +++ b/source/a/udev/config/modprobe.d/psmouse.conf @@ -1,3 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + # PS/2 mouse support: # The default options when the psmouse module can cause problems with KVM # switches. If you experience this, you may want to uncomment the line diff --git a/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf b/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf new file mode 100644 index 000000000..61470416d --- /dev/null +++ b/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf @@ -0,0 +1,81 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# SCSI and SATA controller modules. Typically these are either +# built into the kernel or loaded with an initrd already. +blacklist 3w-xxxx +blacklist 53c7,8xx +blacklist AM53C974 +blacklist BusLogic +blacklist NCR53c406a +blacklist a100u2w +blacklist advansys +blacklist aha152x +blacklist aha1542 +blacklist aha1740 +blacklist aic79xx +blacklist aic7xxx +blacklist aic7xxx_old +blacklist aic94xx +blacklist ata_piix +blacklist atp870u +blacklist cpqfc +blacklist dc395x +blacklist dmx3191d +blacklist dpt_i2o +blacklist dtc +blacklist eata +blacklist eata_dma +blacklist eata_pio +blacklist fdomain +blacklist g_NCR5380 +blacklist g_NCR5380_mmio +blacklist gdth +blacklist ide-scsi +blacklist imm +blacklist in2000 +blacklist initio +blacklist ipr +blacklist ips +blacklist libata +blacklist megaraid +blacklist ncr53c8xx +blacklist nsp32 +blacklist osst +blacklist pas16 +blacklist pci2000 +blacklist pci2220i +blacklist ppa +blacklist psi240i +blacklist qla1280 +blacklist qla2100 +blacklist qla2200 +blacklist qla2300 +blacklist qla2322 +blacklist qla2xxx +blacklist qla6312 +blacklist qla6322 +blacklist qlogicfas +blacklist qlogicfas408 +blacklist qlogicfc +blacklist qlogicisp +blacklist seagate +blacklist sim710 +blacklist sata_promise +blacklist sata_sil +blacklist sata_sis +blacklist sata_svw +blacklist sata_sx4 +blacklist sata_via +blacklist sata_vsc +blacklist scsi_debug +blacklist scsi_transport_fc +blacklist scsi_transport_spi +blacklist sym53c416 +blacklist sym53c8xx +blacklist sym53c8xx +blacklist t128 +blacklist tmscsim +blacklist u14-34f + diff --git a/source/a/udev/config/modprobe.d/sound-modems.conf b/source/a/udev/config/modprobe.d/sound-modems.conf new file mode 100644 index 000000000..f458346de --- /dev/null +++ b/source/a/udev/config/modprobe.d/sound-modems.conf @@ -0,0 +1,10 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# ALSA modules to support sound modems. These should be loaded manually +# if needed. For most people they just break sound support... +blacklist snd-atiixp-modem +blacklist snd-intel8x0m +blacklist snd-via82xx-modem + diff --git a/source/a/udev/config/modprobe.d/tulip.conf b/source/a/udev/config/modprobe.d/tulip.conf new file mode 100644 index 000000000..64b6a5ca5 --- /dev/null +++ b/source/a/udev/config/modprobe.d/tulip.conf @@ -0,0 +1,11 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices +blacklist de4x5 + +# At least 2.4.3 and later xircom_tulip doesn't have that conflict +# xircom_tulip_cb +blacklist dmfe + diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf b/source/a/udev/config/modprobe.d/usb-controller.conf new file mode 100644 index 000000000..f5e4e5025 --- /dev/null +++ b/source/a/udev/config/modprobe.d/usb-controller.conf @@ -0,0 +1,9 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# The EHCI driver should be loaded before the ones for low speed controllers +# or some devices may be confused when they are disconnected and reconnected. +softdep uhci-hcd pre: ehci-hcd +softdep ohci-hcd pre: ehci-hcd + diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf.new b/source/a/udev/config/modprobe.d/usb-controller.conf.new deleted file mode 100644 index 4b77fd825..000000000 --- a/source/a/udev/config/modprobe.d/usb-controller.conf.new +++ /dev/null @@ -1,4 +0,0 @@ -# Make sure that ehci-hcd is always loaded before uhci-hci -# # or ohci-hcd to prevent a kernel warning: -install uhci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i uhci-hcd -install ohci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i ohci-hcd diff --git a/source/a/udev/config/modprobe.d/via-ircc.conf b/source/a/udev/config/modprobe.d/via-ircc.conf new file mode 100644 index 000000000..3dfa57315 --- /dev/null +++ b/source/a/udev/config/modprobe.d/via-ircc.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# The kernel lists this as "experimental", but for now it's "broken" +blacklist via-ircc + diff --git a/source/a/udev/config/modprobe.d/watchdog.conf b/source/a/udev/config/modprobe.d/watchdog.conf new file mode 100644 index 000000000..66d1f837d --- /dev/null +++ b/source/a/udev/config/modprobe.d/watchdog.conf @@ -0,0 +1,43 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Blacklist all watchdog modules. Many motherboards hang with them, and +# if you really need a watchdog, you probably know how to load the module +blacklist acquirewdt +blacklist advantechwdt +blacklist alim1535_wdt +blacklist alim7101_wdt +blacklist cpu5wdt +blacklist eurotechwdt +blacklist hpwdt +blacklist i6300esb +blacklist i8xx_tco +blacklist iTCO_vendor_support +blacklist iTCO_wdt +blacklist ib700wdt +blacklist ibmasr +blacklist it8712f_wdt +blacklist machzwd +blacklist mixcomwd +blacklist pc87413_wdt +blacklist pcwd +blacklist pcwd_pci +blacklist pcwd_usb +blacklist sbc60xxwdt +blacklist sbc7240_wdt +blacklist sbc8360 +blacklist sbc_epx_c3 +blacklist sc1200wdt +blacklist sc520_wdt +blacklist scx200_wdt +blacklist smsc37b787_wdt +blacklist softdog +blacklist w83627hf_wdt +blacklist w83697hf_wdt +blacklist w83877f_wdt +blacklist w83977f_wdt +blacklist wafer5823wdt +blacklist wdt +blacklist wdt_pci + diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new index 6a6218f6e..2bbd9819c 100644 --- a/source/a/udev/config/rc.d/rc.udev.new +++ b/source/a/udev/config/rc.d/rc.udev.new @@ -4,7 +4,6 @@ # appropriate kernel modules, and configures the devices. PATH="/sbin:/bin" -OPT="" . /etc/udev/udev.conf @@ -25,26 +24,38 @@ mount_devpts() { case "$1" in start) - # Sanity check #1, udev requires that the kernel support tmpfs: + # Sanity check #1, udev requires that the kernel support devtmpfs: + if ! grep -wq devtmpfs /proc/filesystems ; then + echo "Sorry, but you need devtmpfs support in the kernel to use udev." + echo "Both of these options are needed: CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y" + echo + echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 + exit 1 + fi + + # Sanity check #2, udev requires that the kernel support tmpfs: if ! grep -wq tmpfs /proc/filesystems ; then echo "Sorry, but you need tmpfs support in the kernel to use udev." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 exit 1 fi - # Sanity check #2, make sure that a 2.6.x kernel is new enough: + # Sanity check #3, make sure that a 2.6.x kernel is new enough: if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then echo "Sorry, but you need a 2.6.32+ kernel to use this udev." echo "Your kernel version is only $(uname -r)." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 exit 1 fi fi - # Sanity check #3, make sure the udev package was not removed. If udevd + # Sanity check #4, make sure the udev package was not removed. If udevd # is not there, this will also shut off this script to prevent further # problems: if [ ! -x /sbin/udevd ]; then @@ -52,6 +63,7 @@ case "$1" in echo "No udevd daemon found." echo "Turning off udev: chmod 644 /etc/rc.d/rc.udev" echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 exit 1 fi @@ -90,47 +102,41 @@ case "$1" in # Mount devpts mount_devpts - # Start udevd. - /sbin/udevd --daemon 2>/dev/null - - # If udevd was already running, then it will return !=0 exit code, - # so we'll try to re-run failed events - if [ $? != 0 ]; then - OPT="--type=failed $OPT" - ( cd ${UDEV_ROOT}/.udev - for TMPFILE in tmp-rules-*.rules ; do - mv $TMPFILE /etc/udev/rules.d/${TMPFILE/tmp-rules--/} 2>/dev/null - done - ) - else # udev is just now being started, so we'll do some initial setup: - - # Create rootdev rules - DEVICENUMBER=$( /bin/stat -c %d / ) - MAJORNUMBER=$(($DEVICENUMBER / 256)) - MINORNUMBER=$(($DEVICENUMBER % 256)) - - echo 'ACTION!="remove", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules - - # Set OPT="--action=add" to generate add events on coldplug - OPT="--action=add" - - fi - - echo "Triggering udev events: /sbin/udevadm trigger $OPT" - # Call udevtrigger and udevsettle to do the device configuration: - /sbin/udevadm trigger $OPT && /sbin/udevadm settle --timeout=120 - - ;; + if ! /sbin/pidof udevd 1>/dev/null 2>/dev/null; then # start udevd + echo "Starting udevd: /sbin/udevd --daemon" + /sbin/udevd --daemon + # Since udev is just now being started we want to use add events: + echo "Triggering udev events: /sbin/udevadm trigger --action=add" + # Call udevtrigger and udevsettle to do the device configuration: + /sbin/udevadm trigger --type=subsystems --action=add + /sbin/udevadm trigger --type=devices --action=add + else # trigger changes for already running udevd + # If the persistent rules files do not exist, trigger an add event: + if [ ! -r /etc/udev/rules.d/70-persistent-net.rules ]; then + # Test that we can actually write to the directory first: + if touch /etc/udev/rules.d/testfile 2> /dev/null ; then + rm -f /etc/udev/rules.d/testfile + # This should add persistent net/cd rules: + echo "Triggering udev to write persistent rules to /etc/udev/rules.d/" + /sbin/udevadm trigger --type=devices --action=add + sleep 3 + fi + fi + # Since udevd is running, most of the time we only need change events: + echo "Triggering udev events: /sbin/udevadm trigger --action=change" + /sbin/udevadm trigger --type=subsystems --action=change + /sbin/udevadm trigger --type=devices --action=change + fi + /sbin/udevadm settle --timeout=120 + ;; stop) echo "Stopping udevd is STRONGLY discouraged and not supported." echo "If you are sure you want to do this, use 'force-stop' instead." ;; force-stop) echo "Stopping udevd" - if [ -e /proc/sys/kernel/hotplug ]; then - echo /sbin/hotplug > /proc/sys/kernel/hotplug - fi - killall udevd + udevadm control --exit + killall udevd 2>/dev/null ;; restart) echo "Restarting udevd is STRONGLY discouraged and not supported." @@ -138,18 +144,18 @@ case "$1" in ;; force-restart) echo "Restarting udevd" - killall udevd - sleep 5 + udevadm control --exit + sleep 3 udevd --daemon ;; reload) echo "Reloading udev rules" - udevadm control --reload-rules + udevadm control --reload cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT ;; force-reload) echo "Updating all available device nodes in $UDEV_ROOT" - udevadm control --reload-rules + udevadm control --reload rm -rf $UDEV_ROOT/.udev $UDEV_ROOT/disk cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT ;; diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/udev/config/rules.d/40-slackware.rules index 6883f5268..9e8c63428 100644 --- a/source/a/udev/config/rules.d/40-slackware.rules +++ b/source/a/udev/config/rules.d/40-slackware.rules @@ -17,3 +17,6 @@ KERNEL=="mice", SYMLINK+="mouse" # Set rfkill device writable by netdev group KERNEL=="rfkill", GROUP:="netdev", MODE:="0664" +# Mount fusectl filesystem +KERNEL=="fuse", ACTION=="add", RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections" + diff --git a/source/a/udev/config/rules.d/90-network.rules b/source/a/udev/config/rules.d/90-network.rules deleted file mode 100644 index 03f2ddc76..000000000 --- a/source/a/udev/config/rules.d/90-network.rules +++ /dev/null @@ -1,5 +0,0 @@ -# This file will be overwritten in next upgrade. Please put your -# custom rules somewhere else (90-local.rules is a good idea) - -SUBSYSTEM=="net", NAME=="?*", ACTION=="add", RUN+="nethelper.sh $env{INTERFACE} start" -SUBSYSTEM=="net", NAME=="?*", ACTION=="remove", RUN+="nethelper.sh $env{INTERFACE} stop" diff --git a/source/a/udev/config/scripts/nethelper.sh b/source/a/udev/config/scripts/nethelper.sh deleted file mode 100755 index 9e1720271..000000000 --- a/source/a/udev/config/scripts/nethelper.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -DEVNAME="$1" -COMMAND="$2" - -testwrite() { - if touch /var/run/checkrw 2>/dev/null ; then - rm -rf /var/run/checkrw - RW=1 - fi -} - -case $DEVNAME in - eth*|ath*|wlan*|ra*|sta*|ctc*|lcs*|hsi*) - case $COMMAND in - 'start') - testwrite - - if [ $RW ]; then - if [ -x /etc/rc.d/rc.inet1 ]; then - if ! /sbin/ifconfig | /bin/grep -q "^${DEVNAME} "; then - /etc/rc.d/rc.inet1 ${DEVNAME}_start - fi - fi - exit 0 - else - exit 1 - fi - ;; - 'stop') - if [ -x /etc/rc.d/rc.inet1 ]; then - if /sbin/ifconfig | /bin/grep -q "^${DEVNAME} "; then - /etc/rc.d/rc.inet1 ${DEVNAME}_stop - fi - fi - # Does dhcpcd appear to still be running on the - # interface? If so, try to stop it. - if [ -r /etc/dhcpc/dhcpcd-$DEVNAME.pid -o -r /var/run/dhcpcd-$DEVNAME.pid ]; then - /sbin/dhcpcd -k -d $DEVNAME - # Force garbage removal, if needed: - if [ -r /etc/dhcpc/dhcpcd-$DEVNAME.pid ]; then - /bin/rm -f /etc/dhcpc/dhcpcd-$DEVNAME.pid - elif [ -r /var/run/dhcpcd-$DEVNAME.pid ]; then - /bin/rm -f /var/run/dhcpcd-$DEVNAME.pid - fi - fi - # If the interface is now down, exit with a status of 0: - if /sbin/ifconfig | /bin/grep -q "^${DEVNAME} " ; then - exit 0 - fi - ;; - *) - echo "usage $0 interface start|stop" - exit 1 - ;; - esac - ;; - *) - echo "Interface $DEVNAME not supported." - exit 1 - ;; -esac -exit 0 diff --git a/source/a/udev/doinst.sh b/source/a/udev/doinst.sh index 5b7f5f902..2912e5c86 100644 --- a/source/a/udev/doinst.sh +++ b/source/a/udev/doinst.sh @@ -25,17 +25,12 @@ fi # This should catch *all* files in /etc/modprobe.d/ and move them over to # have .conf extensions for modfile in $(ls etc/modprobe.d/ | grep -v "\.\(conf\|bak\|orig\|new\)"); do - if [ -e etc/modprobe.d/$modfile -a ! -e etc/modprobe.d/$modfile.conf ]; then + if [ "$modfile" = README ]; then + true # do nothing + elif [ -e etc/modprobe.d/$modfile -a ! -e etc/modprobe.d/$modfile.conf ]; then mv etc/modprobe.d/$modfile etc/modprobe.d/$modfile.conf elif [ -e etc/modprobe.d/$modfile -a -e etc/modprobe.d/$modfile.conf ]; then mv etc/modprobe.d/$modfile etc/modprobe.d/$modfile.bak fi done -config etc/modprobe.d/blacklist.conf.new -config etc/modprobe.d/isapnp.conf.new -config etc/modprobe.d/psmouse.conf.new -config etc/modprobe.d/usb-controller.conf.new - -/sbin/udevadm info --convert-db 1>/dev/null 2>/dev/null - diff --git a/source/a/udev/fix-42-usb-hid-pm.rules.diff b/source/a/udev/fix-42-usb-hid-pm.rules.diff new file mode 100644 index 000000000..2a1d529f7 --- /dev/null +++ b/source/a/udev/fix-42-usb-hid-pm.rules.diff @@ -0,0 +1,18 @@ +diff -u -r --new-file udev-182.orig/rules/42-usb-hid-pm.rules udev-182/rules/42-usb-hid-pm.rules +--- udev-182.orig/rules/42-usb-hid-pm.rules 2012-03-12 16:40:40.569534100 -0500 ++++ udev-182/rules/42-usb-hid-pm.rules 2012-09-10 13:36:44.171054934 -0500 +@@ -43,7 +43,13 @@ + ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b3", ATTR{idProduct}=="4012", TEST=="power/control", ATTR{power/control}="auto" + + # Raritan Computer, Inc KVM. +-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}="0002", TEST=="power/control", ATTR{power/control}="auto" ++ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}=="0002", TEST=="power/control", ATTR{power/control}="auto" + + # USB HID devices that are internal to the machine should also be safe to autosuspend ++ ++ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="removable", GOTO="usb_hid_pm_end" ++ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="unknown", GOTO="usb_hid_pm_end" ++ + ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="03", ATTRS{removable}=="fixed", TEST=="../power/control", ATTR{../power/control}="auto" ++ ++LABEL="usb_hid_pm_end" diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff index 212c09f17..25c72b845 100644 --- a/source/a/udev/rule_generator.diff +++ b/source/a/udev/rule_generator.diff @@ -1,6 +1,6 @@ -diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/rule_generator/write_cd_rules ---- udev-159.orig//extras/rule_generator/write_cd_rules 2010-06-25 04:37:36.000000000 -0500 -+++ udev-159/extras/rule_generator/write_cd_rules 2010-07-07 02:44:14.501947041 -0500 +diff -Nur udev-182.orig/src/rule_generator/write_cd_rules udev-182/src/rule_generator/write_cd_rules +--- udev-182.orig/src/rule_generator/write_cd_rules 2012-03-24 22:47:53.138527732 -0500 ++++ udev-182/src/rule_generator/write_cd_rules 2012-03-24 22:59:42.595889830 -0500 @@ -3,7 +3,8 @@ # This script is run if an optical drive lacks a rule for persistent naming. # @@ -21,58 +21,58 @@ diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/ru comment="$ID_MODEL ($ID_PATH)" - - write_rule "$match" "cdrom$link_num" "$comment" + write_rule "$match" "cdrom$link_num" "$comment" -[ "$ID_CDROM_CD_R" -o "$ID_CDROM_CD_RW" ] && \ -- write_rule "$match" "cdrw$link_num" +- write_rule "$match" "cdrw$link_num" -[ "$ID_CDROM_DVD" ] && \ -- write_rule "$match" "dvd$link_num" +- write_rule "$match" "dvd$link_num" -[ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \ -- write_rule "$match" "dvdrw$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdrom)" = "" ]; then -+ write_rule "$match" "cdrom" -+ fi +- write_rule "$match" "dvdrw$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdrom)" = "" ]; then ++ write_rule "$match" "cdrom" ++ fi + -+ if [ "$ID_CDROM_CD_R" ]; then -+ write_rule "$match" "cdr$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdr)" = "" ]; then -+ write_rule "$match" "cdr" -+ fi ++ if [ "$ID_CDROM_CD_R" ]; then ++ write_rule "$match" "cdr$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdr)" = "" ]; then ++ write_rule "$match" "cdr" ++ fi + -+ write_rule "$match" "cdwriter$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdwriter)" = "" ]; then -+ write_rule "$match" "cdwriter" -+ fi ++ write_rule "$match" "cdwriter$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdwriter)" = "" ]; then ++ write_rule "$match" "cdwriter" ++ fi + -+ if [ "$ID_CDROM_CD_RW" ]; then -+ write_rule "$match" "cdrw$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdrw)" = "" ]; then -+ write_rule "$match" "cdrw" -+ fi -+ fi ++ if [ "$ID_CDROM_CD_RW" ]; then ++ write_rule "$match" "cdrw$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdrw)" = "" ]; then ++ write_rule "$match" "cdrw" ++ fi ++ fi + -+ if [ "$(find_all_rules 'SYMLINK+=' writer)" = "" ]; then -+ write_rule "$match" "writer" -+ fi -+ fi ++ if [ "$(find_all_rules 'SYMLINK+=' writer)" = "" ]; then ++ write_rule "$match" "writer" ++ fi ++ fi + -+ if [ "$ID_CDROM_DVD" ]; then -+ write_rule "$match" "dvd$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' dvd)" = "" ]; then -+ write_rule "$match" "dvd" -+ fi ++ if [ "$ID_CDROM_DVD" ]; then ++ write_rule "$match" "dvd$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' dvd)" = "" ]; then ++ write_rule "$match" "dvd" ++ fi + -+ if [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ]; then -+ write_rule "$match" "dvdrw$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' dvdrw)" = "" ]; then -+ write_rule "$match" "dvdrw" -+ fi ++ if [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ]; then ++ write_rule "$match" "dvdrw$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' dvdrw)" = "" ]; then ++ write_rule "$match" "dvdrw" ++ fi + -+ write_rule "$match" "dvdwriter$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' dvdwriter)" = "" ]; then -+ write_rule "$match" "dvdwriter" -+ fi -+ fi -+ fi ++ write_rule "$match" "dvdwriter$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' dvdwriter)" = "" ]; then ++ write_rule "$match" "dvdwriter" ++ fi ++ fi ++ fi echo >> $RULES_FILE unlock_rules_file diff --git a/source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch b/source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch new file mode 100644 index 000000000..bfa0c76ae --- /dev/null +++ b/source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch @@ -0,0 +1,27 @@ +Adapted from the following patch (path and actual line number changes): + +From daa9cf546ce7265645ced9592dd54c6b2fc04302 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Thu, 5 Jul 2012 16:53:08 +0200 +Subject: [PATCH] udev: ata_id - fixup all 8 not only 6 bytes of the fw_rev + string + +The last two digits are in the wrong order: + $ hdparm -I /dev/sda | grep Revision + 4PC10362 + + $ /lib/udev/ata_id -x /dev/sda | grep REVISION + 4PC10326 + +diff -Nur udev-182.orig/src/ata_id/ata_id.c udev-182/src/ata_id/ata_id.c +--- udev-182.orig/src/ata_id/ata_id.c 2012-03-13 19:00:51.220734316 -0500 ++++ udev-182/src/ata_id/ata_id.c 2012-07-14 19:48:34.224478831 -0500 +@@ -511,7 +511,7 @@ + * use and copy it into the hd_driveid struct for convenience + */ + disk_identify_fixup_string (identify, 10, 20); /* serial */ +- disk_identify_fixup_string (identify, 23, 6); /* fwrev */ ++ disk_identify_fixup_string (identify, 23, 8); /* fwrev */ + disk_identify_fixup_string (identify, 27, 40); /* model */ + disk_identify_fixup_uint16 (identify, 0); /* configuration */ + disk_identify_fixup_uint16 (identify, 75); /* queue depth */ diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild index c6f83a0e4..183c6667e 100755 --- a/source/a/udev/udev.SlackBuild +++ b/source/a/udev/udev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -58,29 +58,35 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# So this is a major bug. At least, it triggers one in the kernel. -# We'll revert it for now. If left in place, machines using ATA -# (especially PATA) are liable to randomly crash on reboot. -# The last little bit of this patch fails to reverse but it won't matter. -if [ $VERSION = 165 ]; then - zcat $CWD/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz | patch -p1 -R -fi +# Fix ata_id (remove with udev-186+) +zcat $CWD/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch.gz | patch -p1 || exit 1 + +# Fix 42-usb-hid-pm.rules (remove with udev-187+) +zcat $CWD/fix-42-usb-hid-pm.rules.diff.gz | patch -p1 --verbose || exit 1 # Fixup the rule generator for our use -zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1 +zcat $CWD/rule_generator.diff.gz | patch -p1 --verbose || exit 1 # static libudev is needed for lvm2 +# --enable-udev_acl was removed (will be part of future CK release) +# --enable-floppy support was also disabled by default in 173 +# --enable-rule_generator was disabled by default in 175 ./configure \ - --enable-static \ --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/sbin \ + --with-rootprefix=/ \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-rootlibdir=/lib${LIBDIRSUFFIX} \ - --libexecdir=/lib/udev \ - --disable-introspection \ + --with-firmware-path=/lib/firmware/updates:/lib/firmware \ + --sysconfdir=/etc \ + --bindir=/sbin \ + --sbindir=/sbin \ + --libexecdir=/lib \ + --enable-introspection \ --mandir=/usr/man \ --docdir=/usr/doc/udev-$VERSION \ + --enable-floppy \ + --enable-static \ + --enable-rule_generator \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -92,8 +98,13 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # scsi_id is needed by multipath ( cd $PKG/sbin ; ln -s ../lib/udev/scsi_id scsi_id ) +# Put udevd back in /sbin +mv $PKG/lib/udev/udevd $PKG/sbin +ln -s /sbin/udevd $PKG/lib/udev/udevd + mkdir -p \ - $PKG/etc/modprobe.d \ + $PKG/run \ + $PKG/{etc,lib}/modprobe.d \ $PKG/etc/rc.d \ $PKG/etc/udev/rules.d \ $PKG/lib/firmware @@ -106,32 +117,23 @@ cp -a $CWD/config/rules.d/* $PKG/lib/udev/rules.d/ # Now the init script and module-init-tools stuff cp -a $CWD/config/rc.d/rc.udev.new $PKG/etc/rc.d/rc.udev.new -cp -a $CWD/config/modprobe.d/* $PKG/etc/modprobe.d +cp -a $CWD/config/modprobe.d/*.conf $PKG/lib/modprobe.d/ +cp -a $CWD/config/modprobe.d/README $PKG/etc/modprobe.d/ -chown -R root:root $PKG/etc -find $PKG/etc -type f -exec chmod 644 {} \; +chown -R root:root $PKG/etc $PKG/lib/modprobe.d +find $PKG/etc $PKG/lib/modprobe.d -type f -exec chmod 644 {} \; find $PKG/etc -type d -exec chmod 755 {} \; chmod 0755 $PKG/etc/rc.d/rc.udev.new # Add extra device nodes to the package that udev doesn't make: -# As of 156, some of these aren't be needed any more: -# removed core@ fd@ stderr@ stdin@ stdout@ tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG -# Add various helper scripts: -for file in $CWD/config/scripts/* ; do - cp -a $file $PKG/lib/udev/ -done chown -R root:root $PKG/lib/udev chmod 0755 $PKG/lib/udev/* -# Move the pkgconfig file to where we expect it -mv $PKG/usr/share/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -rmdir $PKG/usr/share/pkgconfig - mkdir -p $PKG/usr/doc/udev-$VERSION cp -a \ - COPYING* README* TODO extras/keymap/README.keymap.txt \ + COPYING* README* TODO \ $PKG/usr/doc/udev-$VERSION # Don't package the API docs: diff --git a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch deleted file mode 100644 index fc991b9af..000000000 --- a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 560de575148b7efda3b34a7f7073abd483c5f08e Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Thu, 4 Nov 2010 08:55:58 -0400 -Subject: [PATCH 1/1] Use ata_id, not scsi_id, on ATAPI devices - -The major benefit here, is that we get the ATAPI device serial -number. With SCSI ID we didn't get this since it's not part of the -SCSI INQUIRY command. Specifically this means that we get symlinks to -empty optical drives, e.g. - - /dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376 - -which we didn't get earlier. So this is a major win. - -Also make ata_id work on CD-ROM devices when using /dev/bsg nodes so -this works on both the scsi_device as well as the block device. We do -this, basically, by issuing the ATA IDENTIFY PACKET DEVICE command -instead of the ATA IDENTIFY command. We also use 16-byte pass-through -ATA passthrough instead of 12-byte passthrough to avoid clashing with -the MMC BLANK command. - -This means that we get this output - - # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: UDEV_LOG=3 - E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: DEVTYPE=scsi_device - E: DRIVER=sr - E: MODALIAS=scsi:t-0x05 - E: SUBSYSTEM=scsi - E: ID_ATA=1 - E: ID_TYPE=cd - E: ID_BUS=ata - E: ID_MODEL=VBOX_CD-ROM - E: ID_MODEL_ENC=VBOX\x20CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x 20\x20\x20\x20\x20\x20\x20 - E: ID_REVISION=1.0 - E: ID_SERIAL=VBOX_CD-ROM_VB2-01700376 - E: ID_SERIAL_SHORT=VB2-01700376 - -instead of just - - # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: UDEV_LOG=3 - E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: DEVTYPE=scsi_device - E: DRIVER=sr - E: MODALIAS=scsi:t-0x05 - E: SUBSYSTEM=scsi - E: ID_SCSI=1 - E: ID_VENDOR=VBOX - E: ID_VENDOR_ENC=VBOX\x20\x20\x20\x20 - E: ID_MODEL=CD-ROM - E: ID_MODEL_ENC=CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20 - E: ID_REVISION=1.0 - E: ID_TYPE=cd - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - extras/ata_id/ata_id.c | 122 ++++++++++++++++++++++++++--- - rules/rules.d/60-persistent-storage.rules | 4 + - 2 files changed, 114 insertions(+), 12 deletions(-) - -diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c -index 41544e9..92387e5 100644 ---- a/extras/ata_id/ata_id.c -+++ b/extras/ata_id/ata_id.c -@@ -202,6 +202,89 @@ static int disk_identify_command(int fd, - return ret; - } - -+static int disk_identify_packet_device_command(int fd, -+ void *buf, -+ size_t buf_len) -+{ -+ struct sg_io_v4 io_v4; -+ uint8_t cdb[16]; -+ uint8_t sense[32]; -+ uint8_t *desc = sense+8; -+ int ret; -+ -+ /* -+ * ATA Pass-Through 16 byte command, as described in -+ * -+ * T10 04-262r8 ATA Command Pass-Through -+ * -+ * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf -+ */ -+ memset(cdb, 0, sizeof(cdb)); -+ cdb[0] = 0x85; /* OPERATION CODE: 16 byte pass through */ -+ cdb[1] = 4 << 1; /* PROTOCOL: PIO Data-in */ -+ cdb[2] = 0x2e; /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */ -+ cdb[3] = 0; /* FEATURES */ -+ cdb[4] = 0; /* FEATURES */ -+ cdb[5] = 0; /* SECTORS */ -+ cdb[6] = 1; /* SECTORS */ -+ cdb[7] = 0; /* LBA LOW */ -+ cdb[8] = 0; /* LBA LOW */ -+ cdb[9] = 0; /* LBA MID */ -+ cdb[10] = 0; /* LBA MID */ -+ cdb[11] = 0; /* LBA HIGH */ -+ cdb[12] = 0; /* LBA HIGH */ -+ cdb[13] = 0; /* DEVICE */ -+ cdb[14] = 0xA1; /* Command: ATA IDENTIFY PACKET DEVICE */; -+ cdb[15] = 0; /* CONTROL */ -+ memset(sense, 0, sizeof(sense)); -+ -+ memset(&io_v4, 0, sizeof(struct sg_io_v4)); -+ io_v4.guard = 'Q'; -+ io_v4.protocol = BSG_PROTOCOL_SCSI; -+ io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD; -+ io_v4.request_len = sizeof (cdb); -+ io_v4.request = (uintptr_t) cdb; -+ io_v4.max_response_len = sizeof (sense); -+ io_v4.response = (uintptr_t) sense; -+ io_v4.din_xfer_len = buf_len; -+ io_v4.din_xferp = (uintptr_t) buf; -+ io_v4.timeout = COMMAND_TIMEOUT_MSEC; -+ -+ ret = ioctl(fd, SG_IO, &io_v4); -+ if (ret != 0) { -+ /* could be that the driver doesn't do version 4, try version 3 */ -+ if (errno == EINVAL) { -+ struct sg_io_hdr io_hdr; -+ -+ memset(&io_hdr, 0, sizeof(struct sg_io_hdr)); -+ io_hdr.interface_id = 'S'; -+ io_hdr.cmdp = (unsigned char*) cdb; -+ io_hdr.cmd_len = sizeof (cdb); -+ io_hdr.dxferp = buf; -+ io_hdr.dxfer_len = buf_len; -+ io_hdr.sbp = sense; -+ io_hdr.mx_sb_len = sizeof (sense); -+ io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; -+ io_hdr.timeout = COMMAND_TIMEOUT_MSEC; -+ -+ ret = ioctl(fd, SG_IO, &io_hdr); -+ if (ret != 0) -+ goto out; -+ } else { -+ goto out; -+ } -+ } -+ -+ if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) { -+ errno = EIO; -+ ret = -1; -+ goto out; -+ } -+ -+ out: -+ return ret; -+} -+ - /** - * disk_identify_get_string: - * @identify: A block of IDENTIFY data -@@ -256,31 +339,36 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offs - * @udev: The libudev context. - * @fd: File descriptor for the block device. - * @out_identify: Return location for IDENTIFY data. -+ * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE. - * -- * Sends the IDENTIFY DEVICE command to the device represented by -- * @fd. If successful, then the result will be copied into -- * @out_identify. -+ * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the -+ * device represented by @fd. If successful, then the result will be -+ * copied into @out_identify and @out_is_packet_device. - * - * This routine is based on code from libatasmart, Copyright 2008 - * Lennart Poettering, LGPL v2.1. - * -- * Returns: 0 if the IDENTIFY data was successfully obtained, -- * otherwise non-zero with errno set. -+ * Returns: 0 if the data was successfully obtained, otherwise -+ * non-zero with errno set. - */ - static int disk_identify (struct udev *udev, - int fd, -- uint8_t out_identify[512]) -+ uint8_t out_identify[512], -+ int *out_is_packet_device) - { - int ret; - uint8_t inquiry_buf[36]; - int peripheral_device_type; - int all_nul_bytes; - int n; -+ int is_packet_device; - - assert (out_identify != NULL); -+ - /* init results */ - ret = -1; - memset (out_identify, '\0', 512); -+ is_packet_device = 0; - - /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device - * we could accidentally blank media. This is because MMC's BLANK -@@ -309,6 +397,12 @@ static int disk_identify (struct udev *udev, - - /* SPC-4, section 6.4.2: Standard INQUIRY data */ - peripheral_device_type = inquiry_buf[0] & 0x1f; -+ if (peripheral_device_type == 0x05) -+ { -+ is_packet_device = 1; -+ ret = disk_identify_packet_device_command(fd, out_identify, 512); -+ goto check_nul_bytes; -+ } - if (peripheral_device_type != 0x00) { - ret = -1; - errno = EIO; -@@ -320,6 +414,7 @@ static int disk_identify (struct udev *udev, - if (ret != 0) - goto out; - -+ check_nul_bytes: - /* Check if IDENTIFY data is all NUL bytes - if so, bail */ - all_nul_bytes = 1; - for (n = 0; n < 512; n++) { -@@ -336,6 +431,8 @@ static int disk_identify (struct udev *udev, - } - - out: -+ if (out_is_packet_device != NULL) -+ *out_is_packet_device = is_packet_device; - return ret; - } - -@@ -350,7 +447,7 @@ int main(int argc, char *argv[]) - { - struct udev *udev; - struct hd_driveid id; -- uint8_t identify[512]; -+ uint8_t identify[512]; - char model[41]; - char model_enc[256]; - char serial[21]; -@@ -358,8 +455,9 @@ int main(int argc, char *argv[]) - const char *node = NULL; - int export = 0; - int fd; -- uint16_t word; -+ uint16_t word; - int rc = 0; -+ int is_packet_device = 0; - static const struct option options[] = { - { "export", no_argument, NULL, 'x' }, - { "help", no_argument, NULL, 'h' }, -@@ -408,7 +506,7 @@ int main(int argc, char *argv[]) - goto exit; - } - -- if (disk_identify(udev, fd, identify) == 0) { -+ if (disk_identify(udev, fd, identify, &is_packet_device) == 0) { - /* - * fix up only the fields from the IDENTIFY data that we are going to - * use and copy it into the hd_driveid struct for convenience -@@ -416,7 +514,7 @@ int main(int argc, char *argv[]) - disk_identify_fixup_string (identify, 10, 20); /* serial */ - disk_identify_fixup_string (identify, 23, 6); /* fwrev */ - disk_identify_fixup_string (identify, 27, 40); /* model */ -- disk_identify_fixup_uint16 (identify, 0); /* configuration */ -+ disk_identify_fixup_uint16 (identify, 0); /* configuration */ - disk_identify_fixup_uint16 (identify, 75); /* queue depth */ - disk_identify_fixup_uint16 (identify, 75); /* SATA capabilities */ - disk_identify_fixup_uint16 (identify, 82); /* command set supported */ -@@ -457,8 +555,8 @@ int main(int argc, char *argv[]) - udev_util_replace_chars(revision, NULL); - - if (export) { -- /* Set this to convey the disk speaks the ATA protocol */ -- printf("ID_ATA=1\n"); -+ /* Set this to convey the disk speaks the ATA protocol */ -+ printf("ID_ATA=1\n"); - - if ((id.config >> 8) & 0x80) { - /* This is an ATAPI device */ -diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules -index d3f2f73..8baabc2 100644 ---- a/rules/rules.d/60-persistent-storage.rules -+++ b/rules/rules.d/60-persistent-storage.rules -@@ -12,6 +12,8 @@ ACTION=="remove", GOTO="persistent_storage_end" - - # run scsi_id and ata_id on the actual SCSI device - SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{vendor}=="ATA", IMPORT{program}="ata_id --export $root/bsg/$kernel" -+# ATA/ATAPI devices is of type 0x05 and vendor is usually not ATA -+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{type}=="5", IMPORT{program}="ata_id --export $root/bsg/$kernel" - SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --whitelisted --export --device $root/bsg/$kernel" - - # from this point on, only care about block devices -@@ -40,6 +42,8 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode" - # ATA devices using the "scsi" subsystem - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode" -+# ATA/ATAPI devices using the "scsi" subsystem -+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", IMPORT{program}="ata_id --export $tempnode" - # scsi devices - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi" - KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss" --- -1.7.3.4 - diff --git a/source/a/udisks/slack-desc b/source/a/udisks/slack-desc new file mode 100644 index 000000000..a85adeb4d --- /dev/null +++ b/source/a/udisks/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +udisks: udisks (storage device daemon) +udisks: +udisks: The udisks project provides a storage daemon that implements D-Bus +udisks: interfaces that can be used to query and manipulate storage devices. +udisks: +udisks: It also includes a command-line tool, udisks(1), that can be used to +udisks: query and control the daemon. +udisks: +udisks: Homepage: http://www.freedesktop.org/wiki/Software/udisks +udisks: +udisks: diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild new file mode 100755 index 000000000..9d12e7837 --- /dev/null +++ b/source/a/udisks/udisks.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/sh + +# Slackware build script for udisks + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + + +PKGNAM=udisks +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$TARGET + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Move the bash completion file to the right place +mkdir -p $PKG/etc/bash_completion.d +mv $PKG/etc/profile.d/udisks-bash-completion.sh \ + $PKG/etc/bash_completion.d/udisks + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/udisks/udisks.url b/source/a/udisks/udisks.url new file mode 100644 index 000000000..cef0134ba --- /dev/null +++ b/source/a/udisks/udisks.url @@ -0,0 +1 @@ +http://hal.freedesktop.org/releases/ diff --git a/source/a/udisks2/doinst.sh b/source/a/udisks2/doinst.sh new file mode 100644 index 000000000..c186599af --- /dev/null +++ b/source/a/udisks2/doinst.sh @@ -0,0 +1,12 @@ +# udisks2 is stupid about testing files before using them. If /etc/crypttab +# does not exist, it will fill the log with "errors" as it tries to open the +# nonexistent file. There's really no reason that a system without encrypted +# volumes should require this file, but nobody upstream cares to fix the +# problem (and the code's too messy for me to find it), so we have little +# choice but to trowel over this. (sigh) + +if [ ! -r etc/crypttab ]; then + # echo "HEY, EVERYONE SHOULD HAVE A CRYPTTAB!!!" (just kidding) + touch etc/crypttab +fi + diff --git a/source/a/udisks2/slack-desc b/source/a/udisks2/slack-desc new file mode 100644 index 000000000..0d6d44272 --- /dev/null +++ b/source/a/udisks2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +udisks2: udisks2 (storage device daemon v2) +udisks2: +udisks2: The udisks project provides a storage daemon that implements D-Bus +udisks2: interfaces that can be used to query and manipulate storage devices. +udisks2: +udisks2: It also includes a command-line tool, udisks(1), that can be used to +udisks2: query and control the daemon. +udisks2: +udisks2: Homepage: http://www.freedesktop.org/wiki/Software/udisks +udisks2: +udisks2: diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild new file mode 100755 index 000000000..4316488e9 --- /dev/null +++ b/source/a/udisks2/udisks2.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/sh + +# Slackware build script for udisks + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + +PKGNAM=udisks2 +SRCNAM=udisks +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1 +cd $SRCNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$TARGET || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/upower/doinst.sh b/source/a/upower/doinst.sh new file mode 100644 index 000000000..46abf401c --- /dev/null +++ b/source/a/upower/doinst.sh @@ -0,0 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/UPower/UPower.conf.new + diff --git a/source/a/upower/slack-desc b/source/a/upower/slack-desc new file mode 100644 index 000000000..b4401b937 --- /dev/null +++ b/source/a/upower/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +upower: UPower (power management abstraction daemon) +upower: +upower: UPower is an abstraction for enumerating power devices, listening to +upower: device events and querying history and statistics. Any application or +upower: service on the system can access the org.freedesktop.UPower service +upower: via the system message bus. Some operations (such as suspending the +upower: system) are restricted using PolicyKit. +upower: +upower: Homepage: http://upower.freedesktop.org/ +upower: +upower: diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild new file mode 100755 index 000000000..e58319602 --- /dev/null +++ b/source/a/upower/upower.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh + +# Slackware build script for upower + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + + +PKGNAM=upower +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --enable-man-pages \ + --build=$TARGET + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Don't clobber the config file on upgrades +mv $PKG/etc/UPower/UPower.conf $PKG/etc/UPower/UPower.conf.new + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION +cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/upower/upower.url b/source/a/upower/upower.url new file mode 100644 index 000000000..30c25b7f4 --- /dev/null +++ b/source/a/upower/upower.url @@ -0,0 +1 @@ +http://upower.freedesktop.org/releases/ diff --git a/source/a/usb_modeswitch/device_reference.txt b/source/a/usb_modeswitch/device_reference.txt index 10fb5fe85..db7ac8c05 100644 --- a/source/a/usb_modeswitch/device_reference.txt +++ b/source/a/usb_modeswitch/device_reference.txt @@ -1,7 +1,7 @@ # # Device and Configuration Reference (UTF-8 encoding used) # -# Last modified: 2010-08-26 +# Last modified: 2012-01-20 # # Collection of configurations for usb_modeswitch, a mode switching # tool for controlling flip flop (multiple mode) USB devices @@ -13,22 +13,12 @@ # http://www.draisberghof.de/usb_modeswitch/device_reference.txt -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Important! This file is just a reference! Use the data package! +# Don't use this file directly; for your own experiments, create a +# config file, copy data from here, and use it with the -c parameter! # -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - - -# In order to activate a device included here you might remove the -# comment signs (";") from the respective entry. -# -# It is rather recommended to copy device information to a different -# file, to ease editing work and oversight and to avoid possible -# conflicts by activating multiple entries. -# There is no guarantee that this file is error-free! -# -# The actual entries are further down, after the command reference. +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # For custom settings: @@ -43,7 +33,8 @@ # * DefaultProduct -p <hex number> # # This is the ID the USB device shows after having been plugged in. -# The program needs this; if not found -> no action. +# The program needs this, either on the command line or in the config +# file; if not found -> no action. # # # * TargetVendor -V <hex number> @@ -67,11 +58,10 @@ # # # * MessageEndpoint -m <hex number> -# +# # A kind of address inside the interface to which the "message" # (the sequence that does the actual switching) is directed. -# Starting from version 0.9.7 the MessageEndpoint is autodetected -# if not given +# Obsolete since version 0.9.7, only useful for testing # # # * MessageContent -M <hex string> @@ -88,6 +78,7 @@ # * ReleaseDelay -w <milliseconds> # # Waiting time after message transfers. Helps with some sensitive devices +# that don't want any traffic after the mode switch initialisation # # # * ResponseEndpoint -r <hex number> @@ -101,42 +92,43 @@ # # * DetachStorageOnly <0/1> -d # -# Some devices just need to be detached from the usb-storage -# driver to initiate the mode switching. Using this feature -# instead of removing the whole usbstorage module keeps other -# storage devices working. +# Some early devices just needed to be detached from the usb-storage +# driver to initiate the mode switching. Now paractically obsolete for +# switching, but still comes handy sometimes # # # * HuaweiMode <0/1> -H # -# Some Huawei devices can be switched by a special control -# message. -# -# -# * SierraMode <0/1> -S -# -# Some Sierra devices can be switched by a special control -# message. +# Some early Huawei devices can be switched by a special control +# message. Don't use with recent devices # # # * SonyMode <0/1> -O # # Some Sony-Ericsson devices can be switched by a special control -# message. This is experimental and might not have a stable result +# message. May take a long time (20+ seconds). # -# * KobilMode <0/1> -T # -# Some Kobil devices can be switched by a special control -# message. +# * SierraMode <0/1> -S +# * KobilMode <0/1> -T +# * GCTMode <0/1> -G +# * SequansMode <0/1> -N +# * MobileActionMode <0/1> -A +# * QisdaMode <0/1> -B +# * CiscoMode <0/1> -B +# +# +# Flags to support devices that need special control messages. +# The names are referring to the respective manufacturers. # # # * ResetUSB <0/1> -R # -# Some devices need a rougher treatment. If the switching seems -# to do something (run udevmonitor), but your system does not reflect -# it, try this somewhat brutal method to do a reset after switching. -# Mind that if your device switched OK before, this will probably set -# it back to storage mode ... +# Few devices or systems need a rougher treatment. If the switching seems +# to do something but your system does not reflect it, try this somewhat +# brutal method to do a reset after switching. +# Mind that if your device switched OK before, this may set it back to +# storage mode ... # # # * Interface -i <hex number> @@ -175,16 +167,27 @@ # # The binary tells the wrapper script NOT to check for and initiate # binding of the serial driver after switching. -# Mostly useful for non-modem devices +# Mostly useful for non-modem devices. +# # +# * WaitBefore <seconds> (no command line parameter) # -# -> All other entries are just ignored <- +# Waiting time before taking any action. Helps with some sensitive setups. +# +# +# +# -> All other entries in config files are just ignored <- # Additional command line flags: -# +# # Verbose output -W # No output at all -q -# Other config file -c <file> +# Use config file -c <file> +# Use stdin for long config -t +# Give long config as string -f <multiline string using config file syntax> +# Give bus number for ID'ing -b +# Give dev number for ID'ing -g + # For filling in all this information for an unknown device, # see instructions and links on the homepage: @@ -197,47 +200,47 @@ ####################################################### # Option GlobeSurfer Icon (aka "Vodafone EasyBox") # -# The message SHOULD be the same for all Option devices +# The MessageContent is identical for all Option devices -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6600 +TargetVendor= 0x0af0 +TargetProduct= 0x6600 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" ####################################################### -# Option GlobeSurfer Icon 7.2 +# Option GlobeSurfer Icon 7.2 # # Contributor: The Pharscape Forum -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6901 +TargetVendor= 0x0af0 +TargetProduct= 0x6901 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## # Option GlobeTrotter GT MAX 3.6 (aka "T-Mobile Web'n'walk Card Compact II") # -# Contributor: Bernd Holzmüller +# Contributor: Bernd HolzmĂĽller -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6600 +TargetVendor= 0x0af0 +TargetProduct= 0x6600 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" # ResponseEndpoint=0x84 -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -245,13 +248,13 @@ # # Contributors: Lucas Benedicic, Morgwai Kotarbinski -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6701 +TargetVendor= 0x0af0 +TargetProduct= 0x6701 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## @@ -259,33 +262,92 @@ # # Contributor: Fridtjof Busse -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6701 +TargetVendor= 0x0af0 +TargetProduct= 0x6701 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" # Response reading needed according to one (1) report -;NeedResponse=1 +NeedResponse=1 ####################################################### # Option GlobeSurfer Icon 7.2, new firmware (HSO driver) # # Vendor/ProductID don't change when switching, only the device -# class does. Most new Option devices work with this. Just adapt IDs! -# HSO driver support is available at Pharscape (www.pharscape.org) -# -# Contributor: Paul Hardwick - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x6911 +# class does. Most new Option devices work with this. Just adapt the IDs. +# +# Option's HSO driver is part of the mainstream kernel; support is +# available at Pharscape (www.pharscape.org) +# +# Contributors: Paul Hardwick, Philip Aben + +DefaultVendor= 0x0af0 +DefaultProduct= 0x6911 + +TargetClass= 0xff + +MessageContent="55534243123456780000000000000601000000000000000000000000000000" + +# Here is a list with all currently supported Option default IDs: +# +# 0af0:6711 +# 0af0:6731 +# 0af0:6751 +# 0af0:6771 +# 0af0:6791 +# 0af0:6811 +# 0af0:6911 +# 0af0:6951 +# 0af0:6971 +# 0af0:7011 +# 0af0:7031 +# 0af0:7051 +# 0af0:7071 +# 0af0:7111 +# 0af0:7211 +# 0af0:7251 +# 0af0:7271 +# 0af0:7301 +# 0af0:7311 +# 0af0:7361 +# 0af0:7381 +# 0af0:7401 +# 0af0:7501 +# 0af0:7601 +# 0af0:7701 +# 0af0:7801 +# 0af0:7901 +# 0af0:7a01 +# 0af0:7a05 +# 0af0:8200 +# 0af0:8201 +# 0af0:8300 +# 0af0:8302 +# 0af0:8304 +# 0af0:8400 +# 0af0:8600 +# 0af0:8800 +# 0af0:8900 +# 0af0:9000 +# 0af0:c031 +# 0af0:c100 +# 0af0:d013 +# 0af0:d031 +# 0af0:d033 +# 0af0:d035 +# 0af0:d055 +# 0af0:d057 +# 0af0:d058 +# 0af0:d155 +# 0af0:d157 +# 0af0:d255 +# 0af0:d257 +# 0af0:d357 -;TargetClass= 0xff - -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## @@ -298,75 +360,15 @@ # # Contributor: wahlm, Peter Kraker, Pakdhetimin Sekum -;DefaultVendor= 0x1e0e -;DefaultProduct= 0xf000 - -;TargetVendor= 0x1e0e -;TargetProduct= 0x9000 - -;MessageContent="555342431234567800000000000006bd000000020000000000000000000000" - -;NeedResponse=1 - - -####################################################### -# Option iCON 225 HSDPA -# -# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org) -# -# Contributor: Matti Viljanen - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x6971 - -;TargetClass= 0xff - -;MessageContent="555342431223456780100000080000601000000000000000000000000000000" - - -####################################################### -# Option GlobeTrotter HSUPA Modem (aka "T-Mobile Web'n'walk Card Compact III') -# -# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org) -# -# Contributor: Gerold Gruber - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x7011 - -;TargetClass= 0xff - -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +DefaultVendor= 0x1e0e +DefaultProduct= 0xf000 +TargetVendor= 0x1e0e +TargetProduct= 0x9000 -###################################################### -# Option iCON 401 -# -# HSO driver -# -# Contributor: Vincent Teoh - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x7401 - -;TargetClass= 0xff - -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" - -;NeedResponse=1 - +MessageContent="555342431234567800000000000006bd000000020000000000000000000000" -######################################################## -# Vodafone K3760 (made by Option, HSO driver) -# -# Contributor: The Solutor - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x7501 - -;TargetClass= 0xff - -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +NeedResponse=1 ######################################################## @@ -374,12 +376,12 @@ # # Contributor: sissie from Bullteam -;DefaultVendor= 0x0af0 -;DefaultProduct= 0xd033 +DefaultVendor= 0x0af0 +DefaultProduct= 0xd033 -;TargetClass= 0xff +TargetClass= 0xff -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +MessageContent="55534243785634120100000080000601000000000000000000000000000000" ######################################################## @@ -387,27 +389,27 @@ # # Contributor: Hans Kurent, Denis Sutter, Vincent Teoh -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1003 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1003 -;TargetClass= 0xff +TargetClass= 0xff -;HuaweiMode=1 +HuaweiMode=1 ######################################################## -# Huawei E169 +# Huawei E169 and others # # Contributor: Dale Lane -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1001 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1001 -;TargetClass= 0xff +TargetClass= 0xff # choose one of these: -;DetachStorageOnly=1 -;HuaweiMode=1 +DetachStorageOnly=1 +HuaweiMode=1 ######################################################## @@ -415,12 +417,12 @@ # # Contributor: Tom Dawahare -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1414 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1414 -;TargetClass= 0xff +TargetClass= 0xff -;HuaweiMode=1 +HuaweiMode=1 ######################################################## @@ -431,13 +433,13 @@ # # Contributor: Joakim Wenrgren -;DefaultVendor= 0x1033 -;DefaultProduct= 0x0035 +DefaultVendor= 0x1033 +DefaultProduct= 0x0035 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1003 +TargetVendor= 0x12d1 +TargetProduct= 0x1003 -;HuaweiMode=1 +HuaweiMode=1 ######################################################## @@ -445,18 +447,18 @@ # # Probably works with DetachStorageOnly too # -# Contributor: Flávio Moringa and others +# Contributor: FlĂ¡vio Moringa and others -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProductList="0001" +TargetVendor= 0x19d2 +TargetProductList="0001" -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -464,16 +466,16 @@ # # Contributor: andylog -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0002 +TargetVendor= 0x19d2 +TargetProduct= 0x0002 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -484,28 +486,28 @@ # # Contributor: Alvaro Lopes <alvieboy at alvie dot com> -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 # To modem mode: -;TargetVendor= 0x19d2 -;TargetProduct= 0x0015 +TargetVendor= 0x19d2 +TargetProduct= 0x0015 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 # To SD slot mode: -;TargetVendor= 0x05c6 -;TargetProduct= 0x2001 +TargetVendor= 0x05c6 +TargetProduct= 0x2001 -;MessageContent="55534243123456782000000080000a86010101180101010101000000000000" +MessageContent="55534243123456782000000080000a86010101180101010101000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -515,19 +517,20 @@ # ZTE MF633 # ZTE MF636 (aka "Telstra / BigPond 7.2 Mobile Card") # ZTE MF637 +# and probably others not listed here # # Contributor: Joakim Wennergren and others -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0031 +TargetVendor= 0x19d2 +TargetProduct= 0x0031 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -535,16 +538,16 @@ # # Contributor: andylog -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0037 +TargetVendor= 0x19d2 +TargetProduct= 0x0037 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -557,29 +560,29 @@ # # Contributor: Michael Khurtsiya, Amit Pundir and others -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff5 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff5 -;TargetVendor= 0x19d2 -;TargetProduct= 0xffff +TargetVendor= 0x19d2 +TargetProduct= 0xffff # No. 2 -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff6 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff6 -;TargetVendor= 0x19d2 -;TargetProduct= 0xfff1 +TargetVendor= 0x19d2 +TargetProduct= 0xfff1 # No. 3 -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff5 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff5 -;TargetVendor= 0x19d2 -;TargetProduct= 0xfff1 +TargetVendor= 0x19d2 +TargetProduct= 0xfff1 -;MessageContent="5553424312345678c00000008000069f030000000000000000000000000000" +MessageContent="5553424312345678c00000008000069f030000000000000000000000000000" ######################################################## @@ -587,13 +590,13 @@ # # Contributor: Wasim Baig -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff5 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff5 -;TargetVendor= 0x19d2 -;TargetProduct= 0xffff +TargetVendor= 0x19d2 +TargetProduct= 0xffff -;MessageContent="5553424312345678c00000008000069f010000000000000000000000000000" +MessageContent="5553424312345678c00000008000069f010000000000000000000000000000" # Just for information: try it with the message from the AC8710 ... @@ -603,16 +606,16 @@ # # Contributor: David Taillandier -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0052 +TargetVendor= 0x19d2 +TargetProduct= 0x0052 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -620,16 +623,16 @@ # # Contributor: Lucio Asnaghi a.k.a. kRAkEn/gORe -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0002 +TargetVendor= 0x19d2 +TargetProduct= 0x0002 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -637,16 +640,16 @@ # # Contributor: Alex Scortegagna -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0002 +TargetVendor= 0x19d2 +TargetProduct= 0x0002 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -656,14 +659,14 @@ # # Contributor: Razvan Dragomirescu, Mike Kirk -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5010 +DefaultVendor= 0x1410 +DefaultProduct= 0x5010 -;TargetVendor= 0x1410 -;TargetProduct= 0x4400 +TargetVendor= 0x1410 +TargetProduct= 0x4400 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -673,14 +676,14 @@ # # Contributor: Chris Thielen -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5010 +DefaultVendor= 0x1410 +DefaultProduct= 0x5010 -;TargetVendor= 0x1410 -;TargetProduct= 0x4100 +TargetVendor= 0x1410 +TargetProduct= 0x4100 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -688,13 +691,19 @@ # # Contributor: Joakim Wennergren -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5020 +DefaultVendor= 0x1410 +DefaultProduct=0x5020 -;Interface= 5 +DefaultVendor= 0x1410 +TargetProductList="6000,7001" -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +# Don't use this, original report must be wrong, +# https://bugzilla.redhat.com/show_bug.cgi?id=728318 +# +# Interface=5 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -702,14 +711,14 @@ # # Contributor: Richard Laager -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5030 +DefaultVendor= 0x1410 +DefaultProduct= 0x5030 -;TargetVendor= 0x1410 -;TargetProduct= 0x6000 +TargetVendor= 0x1410 +TargetProduct= 0x6000 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -718,25 +727,25 @@ # # Contributor: Aleksandar Samardzic, Marcelo Fernandez -;DefaultVendor= 0x1c9e -;DefaultProduct= 0x1001 +DefaultVendor= 0x1c9e +DefaultProduct= 0x1001 -;TargetVendor= 0x1c9e -;TargetProduct= 0x6061 +TargetVendor= 0x1c9e +TargetProduct= 0x6061 -;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ######################################################## # Alcatel X200/X060S -;DefaultVendor= 0x1bbb -;DefaultProduct= 0xf000 +DefaultVendor= 0x1bbb +DefaultProduct= 0xf000 -;TargetVendor= 0x1bbb -;TargetProduct= 0x0000 +TargetVendor= 0x1bbb +TargetProduct= 0x0000 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -748,14 +757,14 @@ # # Contributor: Vladimir Poluektov, Gabriel Smolar -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x16d5 -;TargetProduct= 0x6502 +TargetVendor= 0x16d5 +TargetProduct= 0x6502 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -767,15 +776,15 @@ # # Contributor: Alexander Czigler -;DefaultVendor= 0x1a8d -;DefaultProduct= 0x1000 +DefaultVendor= 0x1a8d +DefaultProduct= 0x1000 -;TargetVendor= 0x1a8d -;TargetProduct= 0x1002 +TargetVendor= 0x1a8d +TargetProduct= 0x1002 -;MessageContent="55534243123456781200000080000603000000020000000000000000000000" +MessageContent="55534243123456781200000080000603000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -785,15 +794,15 @@ # # Contributor: Alexander Czigler -;DefaultVendor= 0x1dd6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x1dd6 +DefaultProduct= 0x1000 -;TargetVendor= 0x1dd6 -;TargetProduct= 0x1002 +TargetVendor= 0x1dd6 +TargetProduct= 0x1002 -;MessageContent="55534243123456781200000080000603000000020000000000000000000000" +MessageContent="55534243123456781200000080000603000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -804,13 +813,13 @@ # # Contributor: Alexander Czigler -;DefaultVendor= 0x16d8 -;DefaultProduct= 0x6803 +DefaultVendor= 0x16d8 +DefaultProduct= 0x6803 -;TargetVendor= 0x16d8 -;TargetProduct= 0x680a +TargetVendor= 0x16d8 +TargetProduct= 0x680a -;MessageContent="555342431234567824000000800008ff524445564348470000000000000000" +MessageContent="555342431234567824000000800008ff524445564348470000000000000000" ######################################################## @@ -818,13 +827,13 @@ # # Contributor: Mathias Picker -;DefaultVendor= 0x16d8 -;DefaultProduct= 0xf000 +DefaultVendor= 0x16d8 +DefaultProduct= 0xf000 -;TargetVendor= 0x16d8 -;TargetProduct= 0x6006 +TargetVendor= 0x16d8 +TargetProduct= 0x6006 -;MessageContent="55534243d85dd88524000000800008ff524445564348470000000000000000" +MessageContent="55534243d85dd88524000000800008ff524445564348470000000000000000" ######################################################## @@ -832,15 +841,15 @@ # # Contributor: Mijail Anton -;DefaultVendor= 0x0930 -;DefaultProduct= 0x0d46 +DefaultVendor= 0x0930 +DefaultProduct= 0x0d46 -;TargetVendor= 0x0930 -;TargetProduct= 0x0d45 +TargetVendor= 0x0930 +TargetProduct= 0x0d45 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -848,13 +857,13 @@ # # Contributor: Mark A. Ziesemer -;DefaultVendor= 0x106c -;DefaultProduct= 0x3b03 +DefaultVendor= 0x106c +DefaultProduct= 0x3b03 -;TargetVendor= 0x106c -;TargetProduct= 0x3715 +TargetVendor= 0x106c +TargetProduct= 0x3715 -;MessageContent="555342431234567824000000800008ff024445564348470000000000000000" +MessageContent="555342431234567824000000800008ff024445564348470000000000000000" ######################################################## @@ -862,15 +871,15 @@ # # Contributor: "paul" -;DefaultVendor= 0x1ab7 -;DefaultProduct= 0x5700 +DefaultVendor= 0x1ab7 +DefaultProduct= 0x5700 -;TargetVendor= 0x1ab7 -;TargetProduct= 0x5731 +TargetVendor= 0x1ab7 +TargetProduct= 0x5731 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -878,15 +887,15 @@ # # Contributor: A-Link Europe Ltd. -;DefaultVendor= 0x1e0e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1e0e +DefaultProduct= 0xf000 -;TargetVendor= 0x1e0e -;TargetProduct= 0x9200 +TargetVendor= 0x1e0e +TargetProduct= 0x9200 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -894,13 +903,13 @@ # # Contributor: Vincent Teoh -;DefaultVendor= 0x1199 -;DefaultProduct= 0x0fff +DefaultVendor= 0x1199 +DefaultProduct= 0x0fff -;TargetVendor= 0x1199 -;TargetProduct= 0x0023 +TargetVendor= 0x1199 +TargetProduct= 0x0023 -;SierraMode=1 +SierraMode=1 ######################################################## @@ -908,13 +917,13 @@ # # Contributor: Vincent Teoh -;DefaultVendor= 0x1199 -;DefaultProduct= 0x0fff +DefaultVendor= 0x1199 +DefaultProduct= 0x0fff -;TargetVendor= 0x1199 -;TargetProduct= 0x6856 +TargetVendor= 0x1199 +TargetProduct= 0x6856 -;SierraMode=1 +SierraMode=1 ######################################################## @@ -922,13 +931,13 @@ # # Special procedure, takes around 25 secs. on the whole -;DefaultVendor= 0x0fce -;DefaultProduct= 0xd0e1 +DefaultVendor= 0x0fce +DefaultProduct= 0xd0e1 -;TargetClass= 0x02 +TargetClass= 0x02 -;SonyMode=1 -;Configuration=2 +SonyMode=1 +Configuration=2 ######################################################## @@ -936,12 +945,12 @@ # # Recommended init command: ATE0V1&D2&C1S0=0 # -# Contributor: JĂ©rĂ´me Oufella +# Contributor: JĂ©rĂ´me Oufella -;DefaultVendor= 0x1004 -;DefaultProduct= 0x1000 +DefaultVendor= 0x1004 +DefaultProduct= 0x1000 -;MessageContent="55534243123456780000000000000aff554d53434847000000000000000000" +MessageContent="55534243123456780000000000000aff554d53434847000000000000000000" ######################################################## @@ -954,13 +963,13 @@ # # Contributor: A Friend -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x04e8 -;TargetProduct= 0x6601 +TargetVendor= 0x04e8 +TargetProduct= 0x6601 -;MessageContent="55534243123456780000000000000616000000000000000000000000000000" +MessageContent="55534243123456780000000000000616000000000000000000000000000000" ######################################################## @@ -968,13 +977,13 @@ # # Contributor: Stefan Olejnik -;DefaultVendor= 0x1c9e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1c9e +DefaultProduct= 0xf000 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9000 +TargetVendor= 0x1c9e +TargetProduct= 0x9000 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -984,13 +993,13 @@ # # Contributor: Vincent Teoh -;DefaultVendor= 0x1c9e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1c9e +DefaultProduct= 0xf000 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9063 +TargetVendor= 0x1c9e +TargetProduct= 0x9063 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -1000,13 +1009,13 @@ # # Contributor: Aaron Guidazzi -;DefaultVendor= 0x1c9e -;DefaultProduct= 0x9200 +DefaultVendor= 0x1c9e +DefaultProduct= 0x9200 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9202 +TargetVendor= 0x1c9e +TargetProduct= 0x9202 -;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ######################################################## @@ -1016,13 +1025,13 @@ # # Contributor: Jeffrey Hoogland -;DefaultVendor= 0x1f28 -;DefaultProduct= 0x0021 +DefaultVendor= 0x1f28 +DefaultProduct= 0x0021 -;TargetVendor= 0x1f28 -;TargetProduct= 0x0020 +TargetVendor= 0x1f28 +TargetProduct= 0x0020 -;MessageContent="555342431234567824000000800108df200000000000000000000000000000" +MessageContent="555342431234567824000000800108df200000000000000000000000000000" # Afterwards (optional): "usb_modeswitch -v 0x1f28 -p 0x0020 -R" @@ -1032,13 +1041,13 @@ # # Contributor: Chris Wright -;DefaultVendor= 0x1b7d -;DefaultProduct= 0x0700 +DefaultVendor= 0x1b7d +DefaultProduct= 0x0700 -;TargetVendor= 0x1b7d -;TargetProduct= 0x0001 +TargetVendor= 0x1b7d +TargetProduct= 0x0001 -;MessageContent="555342431234567824000000800008FF05B112AEE102000000000000000000" +MessageContent="555342431234567824000000800008FF05B112AEE102000000000000000000" ######################################################## @@ -1048,13 +1057,13 @@ # # Contributor: Arif Ahmed -;DefaultVendor= 0x04e8 -;DefaultProduct= 0xf000 +DefaultVendor= 0x04e8 +DefaultProduct= 0xf000 -;TargetVendor= 0x04e8 -;TargetProduct= 0x6601 +TargetVendor= 0x04e8 +TargetProduct= 0x6601 -;MessageContent="55534243123456780000000000000616000000000000000000000000000000" +MessageContent="55534243123456780000000000000616000000000000000000000000000000" ######################################################## @@ -1064,13 +1073,13 @@ # # Contributor: Paranoid Paranoia -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x14ac +TargetVendor= 0x12d1 +TargetProduct= 0x14ac -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1079,13 +1088,13 @@ # # Contributor: Anders Blomdell, Ahmed Soliman -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1001 +TargetVendor= 0x12d1 +TargetProduct= 0x1001 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1093,16 +1102,16 @@ # # Contributor: Paul McDermott -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0055 +TargetVendor= 0x19d2 +TargetProduct= 0x0055 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1111,13 +1120,13 @@ # # Contributor: Chris -;DefaultVendor= 0x1c9e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1c9e +DefaultProduct= 0xf000 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9603 +TargetVendor= 0x1c9e +TargetProduct= 0x9603 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -1125,15 +1134,15 @@ # # Contributor: Zhang Le -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x2001 +DefaultVendor= 0x05c6 +DefaultProduct= 0x2001 -;TargetVendor= 0x1e0e -;TargetProductList="ce16,cefe" +TargetVendor= 0x1e0e +TargetProductList="ce16,cefe" -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1141,15 +1150,15 @@ # # Contributor: Matt Roberds -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5031 +DefaultVendor= 0x1410 +DefaultProduct= 0x5031 -;TargetVendor= 0x1410 -;TargetProduct= 0x6002 +TargetVendor= 0x1410 +TargetProduct= 0x6002 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1157,31 +1166,31 @@ # # Contributor: Moritz Grosse-Wentrup -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0053 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0053 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0031 +TargetVendor= 0x19d2 +TargetProduct= 0x0031 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # Philips TalkTalk (NXP Semiconductors "Dragonfly") # -;DefaultVendor= 0x0471 -;DefaultProduct= 0x1237 +DefaultVendor= 0x0471 +DefaultProduct= 0x1237 -;TargetVendor= 0x0471 -;TargetProduct= 0x1234 +TargetVendor= 0x0471 +TargetProduct= 0x1234 -;MessageContent="5553424312345678000000000000061b000000030000000000000000000000" +MessageContent="5553424312345678000000000000061b000000030000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1189,33 +1198,33 @@ # # Contributor: Emfox Zhou -;DefaultVendor= 0x0471 -;DefaultProduct= 0x1237 +DefaultVendor= 0x0471 +DefaultProduct= 0x1237 -;TargetVendor= 0x0471 -;TargetProduct= 0x1206 +TargetVendor= 0x0471 +TargetProduct= 0x1206 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 -;Configuration=2 +Configuration=2 ######################################################## # ZTE K3565 # -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0063 +TargetVendor= 0x19d2 +TargetProduct= 0x0063 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1223,15 +1232,15 @@ # # Contributor: Prashad Prashant -;DefaultVendor= 0x148f -;DefaultProduct= 0x2578 +DefaultVendor= 0x148f +DefaultProduct= 0x2578 -;TargetVendor= 0x148f -;TargetProduct= 0x9021 +TargetVendor= 0x148f +TargetProduct= 0x9021 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1239,13 +1248,13 @@ # # Contributor: Genar Codina -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1406 +TargetVendor= 0x12d1 +TargetProduct= 0x1406 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1255,25 +1264,25 @@ # # Contributor: Carolin Latze and others -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x140c +TargetVendor= 0x12d1 +TargetProduct= 0x140c -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## # C-motech CHU-629S # -;DefaultVendor= 0x16d8 -;DefaultProduct= 0x700a +DefaultVendor= 0x16d8 +DefaultProduct= 0x700a -;TargetClass=0xff +TargetClass=0xff -;MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" +MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" ######################################################## @@ -1281,13 +1290,13 @@ # # Contributor: Yaroslav Levandovskiy -;DefaultVendor= 0x1076 -;DefaultProduct= 0x7f40 +DefaultVendor= 0x1076 +DefaultProduct= 0x7f40 -;TargetVendor= 0x1076 -;TargetProduct= 0x7f00 +TargetVendor= 0x1076 +TargetProduct= 0x7f00 -;GCTMode=1 +GCTMode=1 ######################################################## @@ -1295,15 +1304,13 @@ # # Contributor: Antti Turunen -;DefaultVendor= 0x0421 -;DefaultProduct= 0x0610 +DefaultVendor= 0x0421 +DefaultProduct= 0x0610 -;TargetVendor= 0x0421 -;TargetProduct= 0x0612 +TargetVendor= 0x0421 +TargetProduct= 0x0612 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" - -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## @@ -1311,13 +1318,13 @@ # # Contributor: Felix Schwarz -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1520 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1520 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1465 +TargetVendor= 0x12d1 +TargetProduct= 0x1465 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1325,13 +1332,13 @@ # # Contributor: Nikolaos Koutsianas -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1521 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1521 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1464 +TargetVendor= 0x12d1 +TargetProduct= 0x1464 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################### @@ -1339,8 +1346,8 @@ # # Contributor: Bob Williams -;DefaultVendor= 0x0471 -;DefaultProduct= 0x1210 +DefaultVendor= 0x0471 +DefaultProduct= 0x1210 # The report said that giving the target IDs prevented # the device from switching. Got to try it out ... @@ -1348,9 +1355,9 @@ #TargetVendor= 0x1dbc #TargetProduct= 0x0005 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1358,13 +1365,13 @@ # # Contributor: Antti Turunen -;DefaultVendor= 0x05c6 -;DefaultProduct= 0xf000 +DefaultVendor= 0x05c6 +DefaultProduct= 0xf000 -;TargetVendor= 0x05c6 -;TargetProduct= 0x9000 +TargetVendor= 0x05c6 +TargetProduct= 0x9000 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## @@ -1372,12 +1379,12 @@ # # WLAN devices from Linux kernel -;DefaultVendor= 0x0ace -;DefaultProduct= 0x2011 +DefaultVendor= 0x0ace +DefaultProduct= 0x2011 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1385,12 +1392,12 @@ # # WLAN devices from Linux kernel -;DefaultVendor= 0x0ace -;DefaultProduct= 0x20ff +DefaultVendor= 0x0ace +DefaultProduct= 0x20ff -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1398,28 +1405,28 @@ # # Contributor: Reinis Danne -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x1fe7 -;TargetProduct= 0x0100 +TargetVendor= 0x1fe7 +TargetProduct= 0x0100 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # AVM Fritz!Wlan USB Stick N # -;DefaultVendor= 0x057c -;DefaultProduct= 0x84ff +DefaultVendor= 0x057c +DefaultProduct= 0x84ff -;TargetVendor= 0x057c -;TargetProduct= 0x8401 +TargetVendor= 0x057c +TargetProduct= 0x8401 -;MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000" +MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000" ######################################################## @@ -1427,13 +1434,13 @@ # # Contributor: Bicio -;DefaultVendor= 0x072f -;DefaultProduct= 0x100d +DefaultVendor= 0x072f +DefaultProduct= 0x100d -;TargetVendor= 0x072f -;TargetProduct= 0x90cc +TargetVendor= 0x072f +TargetProduct= 0x90cc -;MessageContent="01b0000000000000000000000000000000000000000000000000000000000000" +MessageContent="01b0000000000000000000000000000000000000000000000000000000000000" ######################################################## @@ -1441,13 +1448,13 @@ # # Contributor: Jason Smith -;DefaultVendor= 0x106c -;DefaultProduct= 0x3b06 +DefaultVendor= 0x106c +DefaultProduct= 0x3b06 -;TargetVendor= 0x106c -;TargetProduct= 0x3717 +TargetVendor= 0x106c +TargetProduct= 0x3717 -;MessageContent="555342431234567824000000800008ff020000000000000000000000000000 +MessageContent="555342431234567824000000800008ff020000000000000000000000000000 ######################################################## @@ -1455,16 +1462,16 @@ # # Contributor: Alberto Maurizi -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0026 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0026 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0094 +TargetVendor= 0x19d2 +TargetProduct= 0x0094 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1472,12 +1479,12 @@ # # Contributor: Isaac Salgado -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x101e +DefaultVendor= 0x12d1 +DefaultProduct= 0x101e -;TargetClass=0xff +TargetClass=0xff -;MessageContent="55534243123456780600000080000601000000000000000000000000000000" +MessageContent="55534243123456780600000080000601000000000000000000000000000000" ######################################################## @@ -1485,11 +1492,11 @@ # # Contributor: Alexander Gordeev -;DefaultVendor= 0x198f -;DefaultProduct=0xbccd +DefaultVendor= 0x198f +DefaultProduct=0xbccd -;TargetVendor= 0x198f -;TargetProduct= 0x0220 +TargetVendor= 0x198f +TargetProduct= 0x0220 MessageContent="555342431234567824000000800006bc626563240000000000000000000000" @@ -1497,15 +1504,15 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" ######################################################## # LG HDM-2100 (EVDO Rev.A USB modem) # -# Contributor: JĂ©rĂ´me Oufella +# Contributor: JĂ©rĂ´me Oufella -;DefaultVendor= 0x1004 -;DefaultProduct=0x607f +DefaultVendor= 0x1004 +DefaultProduct=0x607f -;TargetVendor= 0x1004 -;TargetProduct= 0x6114 +TargetVendor= 0x1004 +TargetProduct= 0x6114 -;MessageContent="1201100102000040041014610000010200018006000100001200" +MessageContent="1201100102000040041014610000010200018006000100001200" ######################################################## @@ -1513,10 +1520,10 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" # # Contributor: Ying-Hung Lo -;DefaultVendor= 0x0482 -;DefaultProduct=0x024d +DefaultVendor= 0x0482 +DefaultProduct=0x024d -;Configuration=2 +Configuration=2 ######################################################## @@ -1524,16 +1531,16 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" # # Contributor: Alberto Ciampini -;DefaultVendor= 0x1266 -;DefaultProduct=0x1000 +DefaultVendor= 0x1266 +DefaultProduct=0x1000 -;TargetVendor= 0x1266 -;TargetProduct= 0x1009 +TargetVendor= 0x1266 +TargetProduct= 0x1009 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1541,13 +1548,13 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" # # Contributor: Betavine Project -;DefaultVendor= 0x0fce -;DefaultProduct=0xd0cf +DefaultVendor= 0x0fce +DefaultProduct=0xd0cf -;TargetClass=0x02 +TargetClass=0x02 -;DetachStorageOnly=1 -;Configuration=3 +DetachStorageOnly=1 +Configuration=3 ######################################################## @@ -1576,15 +1583,13 @@ NeedResponse=1 # # Contributor: Adam J. Porter -;DefaultVendor= 0x1fac -;DefaultProduct=0x0130 +DefaultVendor= 0x1fac +DefaultProduct=0x0130 -;TargetVendor= 0x1fac -;TargetProduct= 0x0131 +TargetVendor= 0x1fac +TargetProduct= 0x0131 -;CheckSuccess=20 - -;MessageContent="555342431234567824000000800108df200000000000000000000000000000" +MessageContent="555342431234567824000000800108df200000000000000000000000000000" ######################################################## @@ -1592,13 +1597,13 @@ NeedResponse=1 # # Contributor: John Watt -;DefaultVendor= 0x1bbb -;DefaultProduct= 0xf000 +DefaultVendor= 0x1bbb +DefaultProduct= 0xf000 -;TargetVendor= 0x1bbb -;TargetProduct= 0x0017 +TargetVendor= 0x1bbb +TargetProduct= 0x0017 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -1606,16 +1611,16 @@ NeedResponse=1 # # Contributors: Akos Ladanyi, John Talbut -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0103 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0103 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0031 +TargetVendor= 0x19d2 +TargetProduct= 0x0031 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1623,15 +1628,15 @@ NeedResponse=1 # # Contributor: Nils Radtke -;DefaultVendor= 0x0b3c -;DefaultProduct= 0xc700 +DefaultVendor= 0x0b3c +DefaultProduct= 0xc700 -;TargetVendor= 0x0b3c -;TargetProductList="c000,c001,c002" +TargetVendor= 0x0b3c +TargetProductList="c000,c001,c002" -;MessageContent="5553424312345678000000000000061b000000030000000000000000000000" +MessageContent="5553424312345678000000000000061b000000030000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1639,42 +1644,42 @@ NeedResponse=1 # # Contributor: uusrlnx -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0083 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0083 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0124 +TargetVendor= 0x19d2 +TargetProduct= 0x0124 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # ZTE MU351 -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0003 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0003 -;TargetClass=0xff +TargetClass=0xff -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # LG L-05A -;DefaultVendor= 0x1004 -;DefaultProduct= 0x613a +DefaultVendor= 0x1004 +DefaultProduct= 0x613a -;TargetVendor= 0x1004 -;TargetProduct= 0x6124 +TargetVendor= 0x1004 +TargetProduct= 0x6124 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1682,15 +1687,15 @@ NeedResponse=1 # # Contributor: Chris Jager -;DefaultVendor= 0x1004 -;DefaultProduct= 0x613f +DefaultVendor= 0x1004 +DefaultProduct= 0x613f -;TargetVendor= 0x1004 -;TargetProduct= 0x6141 +TargetVendor= 0x1004 +TargetProduct= 0x6141 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1698,58 +1703,47 @@ NeedResponse=1 # # Contributor: Oliver Mattos -;DefaultVendor= 0x1004 -;DefaultProduct=0x607f +DefaultVendor= 0x1004 +DefaultProduct=0x607f -;TargetVendor= 0x1004 -;TargetProduct= 0x6000 +TargetVendor= 0x1004 +TargetProduct= 0x6000 -;MessageContent="555342431234567803000000800006f1022000000000000000000000000000" -;MessageContent2="555342438765432103000000800006f1010100000000000000000000000000" +MessageContent="555342431234567803000000800006f1022000000000000000000000000000" +MessageContent2="555342438765432103000000800006f1010100000000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # Royaltek Q110 - UNCONFIRMED! -;DefaultVendor= 0x1266 -;DefaultProduct= 0x1000 - -;TargetVendor= 0x1266 -;TargetProduct= 0x1009 - -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" +DefaultVendor= 0x1266 +DefaultProduct=0x1000 -;NeedResponse=1 +TargetVendor= 0x1266 +TargetProduct= 0x1009 +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" -######################################################## -# Rogers Rocket Stick (a Sony Ericsson device) - -;DefaultVendor= 0x0fce -;DefaultProduct= 0xd103 - -;TargetClass= 0x02 - -;SonyMode=1 +NeedResponse=1 ######################################################## # BandRich BandLuxe C170, BandLuxe C270 -;DefaultVendor= 0x1a8d -;DefaultProduct=0x1000 +DefaultVendor= 0x1a8d +DefaultProduct=0x1000 -;TargetVendor= 0x1a8d -;TargetProduct= 0x1009 +TargetVendor= 0x1a8d +TargetProduct= 0x1009 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;ReleaseDelay=4000 +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +ReleaseDelay=4000 -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1763,8 +1757,6 @@ DefaultProduct=0x14c1 TargetVendor= 0x12d1 TargetProduct= 0x14c6 -CheckSuccess=20 - MessageContent="55534243123456780000000000000011060000000000000000000000000000" @@ -1779,8 +1771,6 @@ DefaultProduct=0x1523 TargetVendor= 0x12d1 TargetProduct= 0x1491 -CheckSuccess=20 - MessageContent="55534243123456780000000000000011060000000000000000000000000000" @@ -1795,7 +1785,6 @@ DefaultProduct=0x20ff TargetVendor= 0x0cf3 TargetProduct= 0x7010 -CheckSuccess=10 NoDriverLoading=1 MessageContent="5553424329000000000000000000061b000000020000000000000000000000" @@ -1813,16 +1802,14 @@ DefaultProduct=0x0013 TargetVendor= 0x1ee8 TargetProduct= 0x0012 -CheckSuccess=20 - MessageContent="555342431234567800000000000010ff000000000000000000000000000000" ResponseNeeded=1 ######################################################## -# Huawei U8110 / Joy, Vodafone 845 (Android smartphone) +# Huawei U8110 / U8300 / Joy, Vodafone 845 (Android smartphone) # -# Contributor: David Erosa GarcĂa +# Contributor: David Erosa GarcĂÂa DefaultVendor= 0x12d1 DefaultProduct=0x1031 @@ -1830,8 +1817,6 @@ DefaultProduct=0x1031 TargetVendor= 0x12d1 TargetProduct= 0x1035 -CheckSuccess=20 - MessageContent="55534243123456780600000080010a11060000000000000000000000000000" # for Android SDK @@ -1841,7 +1826,7 @@ NoDriverLoading=1 ######################################################## # Nokia CS-10 # -# Contributor: WacĹ‚aw Sierek +# Contributor: WacÅ‚aw Sierek DefaultVendor= 0x0421 DefaultProduct=0x060c @@ -1849,8 +1834,6 @@ DefaultProduct=0x060c TargetVendor= 0x0421 TargetProduct= 0x060e -CheckSuccess=20 - MessageContent="5553424312345678000000000000061b000000020000000000000000000000" @@ -1859,41 +1842,41 @@ MessageContent="5553424312345678000000000000061b000000020000000000000000000000" # # Contributor: Anoop John -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0108 +TargetVendor= 0x19d2 +TargetProduct= 0x0108 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # BSNL Capitel -;DefaultVendor= 0x1c9e -;DefaultProduct= 0x9e00 +DefaultVendor= 0x1c9e +DefaultProduct= 0x9e00 -;TargetClass=0xff +TargetClass=0xff -;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ####################################################### # Samsung GT-B3730 # -# Contributor: Per Ăyvind Karlsen +# Contributor: Per ĂËśyvind Karlsen -;DefaultVendor= 0x04e8 -;DefaultProduct=0x689a +DefaultVendor= 0x04e8 +DefaultProduct=0x689a -;TargetVendor= 0x04e8 -;TargetProduct= 0x6889 +TargetVendor= 0x04e8 +TargetProduct= 0x6889 -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +MessageContent="55534243785634120100000080000601000000000000000000000000000000" ####################################################### # Kobil mIdentity 3G (1) @@ -1928,14 +1911,14 @@ KobilMode=1 # # Contributor: Enrico Mioso -;DefaultVendor= 0x1ee8 -;DefaultProduct=0x0009 +DefaultVendor= 0x1ee8 +DefaultProduct=0x0009 -;TargetVendor= 0x1ee8 -;TargetProduct= 0x000b +TargetVendor= 0x1ee8 +TargetProduct= 0x000b -;MessageContent="555342431234567800000000000010ff000000000000000000000000000000" -;NeedResponse=1 +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" +NeedResponse=1 ######################################################## @@ -1943,28 +1926,28 @@ KobilMode=1 # # Contributor: Pierre-Andre Cornillon -;DefaultVendor= 0x0b3c -;DefaultProduct=0xf000 +DefaultVendor= 0x0b3c +DefaultProduct=0xf000 -;TargetVendor= 0x0b3c -;TargetProduct= 0xc003 +TargetVendor= 0x0b3c +TargetProduct= 0xc003 -;MessageContent="5553424312345678c000000080010606f50402527000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678c000000080010606f50402527000000000000000000000" +NeedResponse=1 ####################################################### # Huawei EC168C (from Zantel) # -# Contributor: Ă…smund Hjulstad +# Contributor: Ă…smund Hjulstad -;DefaultVendor= 0x12d1 -;DefaultProduct=0x1446 +DefaultVendor= 0x12d1 +DefaultProduct=0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1412 +TargetVendor= 0x12d1 +TargetProduct= 0x1412 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ####################################################### @@ -1972,13 +1955,13 @@ KobilMode=1 # # Contributor: Juho Frits -;DefaultVendor= 0x0421 -;DefaultProduct=0x0622 +DefaultVendor= 0x0421 +DefaultProduct=0x0622 -;TargetVendor= 0x0421 -;TargetProduct= 0x0623 +TargetVendor= 0x0421 +TargetProduct= 0x0623 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ####################################################### @@ -1986,13 +1969,13 @@ KobilMode=1 # # Contributor: Thomas Behan -;DefaultVendor= 0x0421 -;DefaultProduct=0x0627 +DefaultVendor= 0x0421 +DefaultProduct=0x0627 -;TargetVendor= 0x0421 -;TargetProduct= 0x0612 +TargetVendor= 0x0421 +TargetProduct= 0x0612 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ####################################################### @@ -2000,25 +1983,25 @@ KobilMode=1 # # Contributor: Alexey Charkov -;DefaultVendor= 0x05c7 -;DefaultProduct=0x1000 +DefaultVendor= 0x05c7 +DefaultProduct=0x1000 -;TargetVendor= 0x05c7 -;TargetProduct= 0x6000 +TargetVendor= 0x05c7 +TargetProduct= 0x6000 -;MessageContent="5553424312345678c00000008000069f140000000000000000000000000000" +MessageContent="5553424312345678c00000008000069f140000000000000000000000000000" ####################################################### # GW D301 (Advinne AMC) # -;DefaultVendor= 0x0fd1 -;DefaultProduct=0x1000 +DefaultVendor= 0x0fd1 +DefaultProduct=0x1000 -;TargetClass=0xff +TargetClass=0xff -;Configuration=3 +Configuration=3 ####################################################### @@ -2026,13 +2009,13 @@ KobilMode=1 # # Contributor: Shawn J. Goff -;DefaultVendor= 0x1004 -;DefaultProduct=0x6190 +DefaultVendor= 0x1004 +DefaultProduct=0x6190 -;TargetVendor= 0x1004 -;TargetProduct= 0x61a7 +TargetVendor= 0x1004 +TargetProduct= 0x61a7 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ####################################################### @@ -2040,25 +2023,25 @@ KobilMode=1 # # Contributor: Noel J. Bergman, Gus Esquivel -;DefaultVendor= 0x106c -;DefaultProduct=0x3b05 +DefaultVendor= 0x106c +DefaultProduct=0x3b05 -;TargetVendor= 0x106c -;TargetProduct= 0x3716 +TargetVendor= 0x106c +TargetProduct= 0x3716 -;MessageContent="555342431234567824000000800008ff020000000000000000000000000000" +MessageContent="555342431234567824000000800008ff020000000000000000000000000000" ####################################################### # AirPlus MCD-800 # -;DefaultVendor= 0x1edf -;DefaultProduct=0x6003 +DefaultVendor= 0x1edf +DefaultProduct=0x6003 -;TargetClass=0xff +TargetClass=0xff -;Configuration=3 +Configuration=3 ####################################################### @@ -2066,37 +2049,1373 @@ KobilMode=1 # # Contributor: Amit Mendapara -;DefaultVendor= 0x230d -;DefaultProduct=0x0001 +DefaultVendor= 0x230d +DefaultProduct=0x0001 -;TargetClass=0xff +TargetClass=0xff -;Configuration=3 +Configuration=3 ######################################################## # MediaTek Wimax USB Card # -;DefaultVendor= 0x0e8d -;DefaultProduct=0x7109 +DefaultVendor= 0x0e8d +DefaultProduct=0x7109 -;TargetVendor= 0x0e8d -;TargetProduct= 0x7118 +TargetVendor= 0x0e8d +TargetProduct= 0x7118 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NoDriverLoading=1 +NoDriverLoading=1 ######################################################## # C-motech CHU-628S +# +# Contributor: Jungwon Seo + +DefaultVendor= 0x16d8 +DefaultProduct=0x6281 + +TargetClass=0xff + +MessageContent="555342431234567824000000800008ff524445564348470000000000000000" + + +######################################################## +# HSDPA USB modem from dealextreme +# +# Contributor: Andrew 'Necromant' Andrianov + +DefaultVendor= 0x05c6 +DefaultProduct=0x2000 + +TargetVendor= 0x05c6 +TargetProduct= 0x0015 + +MessageContent="5553424368032c882400000080000612000000240000000000000000000000" + +NeedResponse=1 + +# This modem doesn't react fast - it pauses for some 30-40 seconds +CheckSuccess=40 + + +######################################################## +# Exiss Mobile E-190 series (made by C-motech) +# +# Contributor: Tri Mulya Saputra + +DefaultVendor= 0x8888 +DefaultProduct= 0x6500 + +TargetVendor= 0x16d8 +TargetProduct= 0x6533 + +MessageContent="5553424398e2c4812400000080000bff524445564348473d43440000000000" + + +######################################################## +# D-Link DWM-156 HSUPA 3.75G USB Modem +# +# Contributor: Fuego + +DefaultVendor= 0x07d1 +DefaultProduct=0xa800 + +TargetVendor= 0x07d1 +TargetProduct= 0x3e02 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Franklin Wireless U210 (Variant) + +DefaultVendor= 0x1fac +DefaultProduct=0x0032 + +Configuration=2 + + +######################################################## +# Haier CE 100 + +DefaultVendor= 0x201e +DefaultProduct=0x2009 + +TargetClass=0xff + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +####################################################### +# Huawei BM358 WiMAX + +DefaultVendor= 0x12d1 +DefaultProduct=0x380b + +TargetClass=0x02 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Huawei E352 +# +# Contributor: Antonio Talarico + +DefaultVendor= 0x12d1 +DefaultProduct=0x1449 + +TargetVendor= 0x12d1 +TargetProduct= 0x1444 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Huawei ET8282 +# +# Contributor: Emfox Zhou + +DefaultVendor= 0x12d1 +DefaultProduct=0x1da1 + +DefaultVendor= 0x12d1 +TargetProduct= 0x1d09 + +HuaweiMode=1 + + +######################################################## +# Huawei V725 Phone (aka Vodafone 725) + +DefaultVendor= 0x12d1 +DefaultProduct=0x1009 + +TargetClass=0xff + +HuaweiMode=1 + + +######################################################## +# Onda MW836UP-K + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0040 + +TargetVendor= 0x1ee8 +TargetProduct= 0x003e + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" + +NeedResponse=1 + + +######################################################## +# ZTE MF637 (Variant for Orange France) +# +# Contributor: David Vigier + +DefaultVendor= 0x19d2 +DefaultProduct=0x0110 + +TargetVendor= 0x19d2 +TargetProduct= 0x0121 + +MessageContent="5553424302000000000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Prolink P2000 CDMA +# +# Test string: uMa=SSE + +DefaultVendor= 0x05c6 +DefaultProduct=0x1000 + +TargetVendor= 0x05c6 +TargetProduct= 0x6000 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# Vibe 3G Modem +# +# Contributor: Steven James Drinnan + +DefaultVendor= 0x1c9e +DefaultProduct=0x6061 + +TargetClass=0xff + +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" + + +######################################################## +# Vodafone/ZTE K3806-Z + +DefaultVendor= 0x19d2 +DefaultProduct=0x0013 + +TargetVendor= 0x19d2 +TargetProduct= 0x0015 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +NeedResponse=1 + +######################################################## +# T-Mobile NL (Huawei E352) +# +# Contributor: Alex Hermann + +DefaultVendor= 0x12d1 +DefaultProduct=0x14fe + +TargetVendor= 0x12d1 +TargetProduct= 0x1506 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Huawei U8220, T-Mobile Pulse (Android smartphone) +# +# Contributor: Mobile Stream Team + +DefaultVendor= 0x12d1 +DefaultProduct=0x1030 + +TargetVendor= 0x12d1 +TargetProduct= 0x1034 + +MessageContent="55534243123456780600000080010a11060000000000000000000000000000" + +# for Android SDK +NoDriverLoading=1 + + +######################################################## +# D-Link DWM-156 HSUPA 3.75G USB Modem +# +# Contributor: Ari Suutari + +DefaultVendor= 0x07d1 +DefaultProduct=0xa804 + +TargetVendor= 0x07d1 +TargetProduct= 0x7e11 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Sony Ericsson MD400G (Rogers) +# +# Contributor: Kjartan Adolfsson + +DefaultVendor= 0x0fce +DefaultProduct= 0xd103 + +TargetClass= 0x02 + +SonyMode=1 + + +######################################################## +# ZTE "ffe" devices 1 (e.g. Cricket A605) +# +# Contributor: Matt Eaton + +DefaultVendor= 0x19d2 +DefaultProduct=0xffe6 + +TargetVendor= 0x19d2 +TargetProduct= 0xffe5 + +MessageContent="5553424330f4cf8124000000800108df200000000000000000000000000000" + + +######################################################## +# ZTE MF190 +# +# Contributor: Eshwar Andhavarapu + +DefaultVendor= 0x19d2 +DefaultProduct= 0x1224 + +TargetVendor= 0x19d2 +TargetProduct= 0x0082 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# JOA Telecom LM-700r + +DefaultVendor= 0x198a +DefaultProduct=0x0003 + +TargetVendor= 0x198a +TargetProduct= 0x0002 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Huawei E173 (Viettel 3G) + +TargetVendor= 0x12d1 +TargetProduct= 0x14a8 + +DefaultVendor= 0x12d1 +DefaultProduct=0x14b5 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# C-motech CHU-629S (Variant) +# +# Contributor: "wlsloi" + +DefaultVendor= 0x16d8 +DefaultProduct=0x700b + +TargetClass=0xff + +MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" + + +######################################################## +# ZTE MF691 (T-Mobile Rocket 2.0) +# +# Contributor: Michael Fogel + +DefaultVendor= 0x19d2 +DefaultProduct=0x1201 + +TargetVendor= 0x19d2 +TargetProduct= 0x1203 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF192 + +DefaultVendor= 0x19d2 +DefaultProduct=0x1216 + +TargetVendor= 0x19d2 +TargetProduct= 0x1218 + +#MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +# Different MessageContent enables cdc_ether interface which is preferable. +# Thanks to Alex Orlov! + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" + + +######################################################## +# ZTE MF190 (Variant) +# +# Contributor: Jean-Baptiste Dubois + +DefaultVendor= 0x19d2 +DefaultProduct=0x0149 + +TargetVendor= 0x19d2 +TargetProduct= 0x0124 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent3="55534243123456702000000080000c85010101180101010101000000000000" + +NeedResponse=1 + + +####################################################### +# Visiontek 82GH 3G + +DefaultVendor= 0x230d +DefaultProduct=0x0007 + +TargetClass=0xff + +Configuration=3 + + +####################################################### +# HP LaserJet Professional P1102 + +DefaultVendor= 0x03f0 +DefaultProduct=0x002a + +TargetClass=0x07 + +MessageContent="555342431234567800000000000006d0000000000000000000000000000000" + +NeedResponse=1 + + +####################################################### +# Mobile Action ("Smart Cable") +# +# No success check, device will vanish completely + +DefaultVendor= 0x0df7 +DefaultProduct=0x0800 + +TargetClass=0xff + +MobileActionMode=1 + +NoDriverLoading=1 + + +######################################################## +# Vodafone/Huawei K3770 +# +# Contributor: Alex Chiang + +DefaultVendor= 0x12d1 +DefaultProduct=0x14d1 + +TargetVendor= 0x12d1 +TargetProduct= 0x14c9 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Vodafone/Huawei K3771 +# +# Contributor: Ben Knight + +DefaultVendor= 0x12d1 +DefaultProduct=0x14c4 + +TargetVendor= 0x12d1 +TargetProduct= 0x14ca + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Option iCon 461 +# +# Contributor: Samit Basu + +DefaultVendor= 0x0af0 +DefaultProduct= 0x7a05 + +TargetClass= 0xff + +MessageContent="55534243123456780000000000000601000000000000000000000000000000" + +######################################################## +# ZTE AX226 WiMax +# +# may be supported by the Beceem driver + +DefaultVendor= 0x19d2 +DefaultProduct=0xbccd + +TargetVendor= 0x19d2 +TargetProduct= 0x0172 + +MessageContent="555342431234567824000000800006bc626563240000000000000000000000" + +NoDriverLoading=1 + + +######################################################## +# Huawei EC156 + +DefaultVendor= 0x12d1 +DefaultProduct=0x1505 + +TargetVendor= 0x12d1 +TargetProduct= 0x140b + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Longcheer SU9800 + +DefaultVendor= 0x1c9e +DefaultProduct=0x9800 + +TargetClass=0xff + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# SpeedUp SU-8000U + +DefaultVendor= 0x2020 +DefaultProduct=0xf00e + +TargetVendor= 0x2020 +TargetProduct= 0x1005 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + -;DefaultVendor= 0x16d8 -;DefaultProduct=0x6281 +######################################################## +# Cisco AM10 "Valet Connector" +# +# Contributor: David S. + +DefaultVendor= 0x1307 +DefaultProduct=0x1169 + +TargetVendor= 0x13b1 +TargetProduct= 0x0031 + +CiscoMode=1 + + +######################################################## +# Alcatel OT X220L +# +# Contributor: Sylvain Gros-Desormeaux + +DefaultVendor= 0x1bbb +DefaultProduct=0xf052 + +TargetVendor= 0x1bbb +TargetProduct= 0x0052 + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# Nokia CS-19 +# +# Contributor: ThatGuy + +DefaultVendor= 0x0421 +DefaultProduct=0x062c + +TargetVendor= 0x0421 +TargetProduct= 0x062d + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Huawei ET302 + +DefaultVendor= 0x12d1 +DefaultProduct=0x1d50 + +Configuration=2 + + +######################################################## +# 3GO 3GO11 HSUPA + +DefaultVendor= 0x1e89 +DefaultProduct=0xf000 + +TargetVendor= 0x1e89 +TargetProduct= 0x1a20 + +MessageContent="5553424312345678800000008000060619181a207000000000000000000000" + + +######################################################## +# Novatel Wireless MC545 HSPA + +DefaultVendor= 0x1410 +DefaultProduct=0x5059 + +TargetVendor= 0x1410 +TargetProduct= 0x7042 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE AC682 (a.k.a. SmartFren Connex) + +DefaultVendor= 0x19d2 +DefaultProduct=0xffde + +TargetVendor= 0x19d2 +TargetProduct= 0xffdd + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF820 4G LTE +# +# Contributor: Kenny Lam + +DefaultVendor= 0x19d2 +DefaultProduct=0x0166 + +TargetVendor= 0x19d2 +TargetProduct= 0x0167 + +MessageContent="55534243123456782400000080000685000000240000000000000000000000" + + +######################################################## +# Philips PicoPix 1020 Projector +# +# No known driver or application yet + +DefaultVendor= 0x1de1 +DefaultProduct=0x1101 + +TargetVendor= 0x21e7 +TargetProduct= 0x000e + +MessageContent="55534243123456780000000000000cff020000000000000000000000000000" + + +######################################################## +# AnyDATA APE-540H +# +# Contributor: Robert Gabriel + +DefaultVendor= 0x05c6 +DefaultProduct=0x6503 + +TargetVendor= 0x16d5 +TargetProduct= 0x6502 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF192 (Variant) +# +# Contributor: C!chy + +DefaultVendor= 0x19d2 +DefaultProduct=0x1517 + +TargetVendor= 0x19d2 +TargetProduct= 0x1519 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Qisda H21 Flying Beetle +# +# Contributor: Chi-Hang Long + +DefaultVendor= 0x1da5 +DefaultProduct=0xf000 + +TargetVendor= 0x1da5 +TargetProduct= 0x4512 + +QisdaMode=1 + + +######################################################## +# C-motech CDU-685a +# +# Contributor: Tom Cumming + +DefaultVendor= 0x16d8 +DefaultProduct=0x6804 + +TargetClass=0xff + +MessageContent="555342431234567824000000800008ff524445564348470000000000000000" + + +######################################################## +# StrongRising (China Telcom), Air FlexiNet + +DefaultVendor= 0x21f5 +DefaultProduct=0x1000 + +TargetVendor= 0x21f5 +TargetProduct= 0x2008 + +MessageContent="5553424312345678c000000080000671010000000000000000000000000000 + + +######################################################## +# BandRich BandLuxe C339 + +DefaultVendor= 0x1a8d +DefaultProduct=0x2000 + +TargetVendor= 0x1a8d +TargetProduct= 0x2006 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Celot CT-680 + +DefaultVendor= 0x05c6 +DefaultProduct=0x1000 + +TargetVendor= 0x211f +TargetProduct= 0x6802 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Huawei E353 (3.se) +# +# Contributor: Ulf Eklund + +DefaultVendor= 0x12d1 +DefaultProduct=0x1f01 + +TargetVendor= 0x12d1 +TargetProduct= 0x14db + +MessageContent="55534243123456780000000000000a11062000000000000100000000000000" + +# Driver is cdc_ether +NoDriverLoading=1 + + +######################################################## +# Haier CE682 (EVDO) +# +# Contributor: Ebedsat + +DefaultVendor= 0x201e +DefaultProduct=0x1023 + +TargetVendor= 0x201e +TargetProduct= 0x1022 + +MessageContent="55534243123456780000000000000600000000000000000000000000000000" +MessageContent2="5553424312345679c000000080000671030000000000000000000000000000" +NeedResponse=1 + + +####################################################### +# LG L-02C LTE +# +# Contributor: Yoshiaki Katsumata + +DefaultVendor= 0x1004 +DefaultProduct=0x61dd + +TargetVendor= 0x1004 +TargetProduct= 0x618f + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +####################################################### +# LG SD711 +# +# Contributor: Ryan Jenkins + +DefaultVendor= 0x1004 +DefaultProduct=0x61e7 + +TargetVendor= 0x1004 +TargetProduct= 0x61e6 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# LG L-08C (NTT docomo) +# +# Contributor: Shlomi Cohen + +DefaultVendor= 0x1004 +DefaultProduct=0x61eb + +TargetVendor= 0x1004 +TargetProduct= 0x61ea + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# I-O Data WMX2-U Wimax +# +# Contributor: Shlomi Cohen + +DefaultVendor= 0x04bb +DefaultProduct=0xbccd + +TargetVendor= 0x04bb +TargetProduct= 0x0949 + +MessageContent="55534243f0298d8124000000800006bc626563240000000000000000000000" + + +######################################################## +# Option GlobeTrotter GI1515 + +DefaultVendor= 0x0af0 +DefaultProduct=0xd001 + +TargetVendor= 0x0af0 +TargetProduct= 0xd157 + +MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +####################################################### +# LG L-07A +# +# Contributor: Shin Sterneck + +DefaultVendor= 0x1004 +DefaultProduct=0x614e + +TargetVendor= 0x1004 +TargetProduct= 0x6135 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE A371B +# +# Contributor: Wang Lei + +DefaultVendor= 0x19d2 +DefaultProduct=0x0169 + +TargetVendor= 0x19d2 +TargetProduct= 0x0170 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE MF652 +# +# Contributor: Björn Andreas Höfer + +DefaultVendor= 0x19d2 +DefaultProduct=0x1520 + +TargetVendor= 0x19d2 +TargetProduct= 0x0142 + +MessageContent="5553424312345679000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE MF652 (Variant) +# +# Contributor: Jackzy + +DefaultVendor= 0x19d2 +DefaultProduct=0x0146 + +TargetVendor= 0x19d2 +TargetProduct= 0x0143 + +MessageContent="5553424312345679000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# Telenet 3G dongle (T&W WU160) +# +# Contributor: Ben Van Mechelen + +DefaultVendor= 0x2077 +DefaultProduct=0xf000 + +TargetVendor= 0x2077 +TargetProduct= 0x9000 + +MessageContent="5553424308902082000000000000061b000000020000000000000000000000" + + +######################################################## +# Nokia CS-21M-02 +# +# Contributor: Wojciech Wiercho.a, Tore Anderson + +DefaultVendor= 0x0421 +DefaultProduct=0x0637 + +TargetVendor= 0x0421 +TargetProduct= 0x0638 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Telewell TW-3G HSPA+ +# +# Contributor: Teemu Merikumpu -;TargetClass=0xff +DefaultVendor= 0x1c9e +DefaultProduct=0x98ff -;MessageContent="555342431234567824000000800008ff524445564348470000000000000000" +TargetVendor= 0x1c9e +TargetProduct= 0x9801 +MessageContent="55534243123456780000000080000606f50402527000000000000000000000" + + +######################################################## +# ZTE MF637 +# +# Contributor: Johannes Hubertz + +DefaultVendor= 0x19d2 +DefaultProduct=0x0031 + +TargetVendor= 0x19d2 +TargetProduct= 0x0094 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# TW-3G HSPA+ +# +# Contributor: Nordic Nurse + +DefaultVendor= 0x1c9e +DefaultProduct=0x98ff + +TargetVendor= 0x1c9e +TargetProduct= 0x9801 + +MessageContent="55534243123456780000000080000606f50402527000000000000000000000" + + +######################################################## +# Samsung GT-B1110 +# +# Contributor: Spelroth + +DefaultVendor= 0x04e8 +DefaultProduct=0x680c + +TargetVendor= 0x04e8 +TargetProduct= 0x6792 + +MessageContent="0902200001010080fa0904000002080650000705010200020007058102000200" + + +######################################################## +# ZTE MF192 (yet annother variant) +# +# Contributor: Paul Hedderly + +DefaultVendor= 0x19d2 +DefaultProduct=0x1514 + +TargetVendor= 0x19d2 +TargetProduct= 0x1515 + +MessageContent="5553424348c4758600000000000010ff000000000000000000000000000000" + + +######################################################## +# MediaTek MT6276M +# +# Contributor: Meng Zhang + +DefaultVendor= 0x0e8d +DefaultProduct=0x0002 + +TargetVendor= 0x0e8d +TargetProductList="00a1,00a2" + +MessageContent="555342431234567800000000000006f0010300000000000000000000000000" + + +######################################################## +# Tata Photon+ +# +# Contributor: Nirbheek Chauhan + +DefaultVendor= 0x22f4 +DefaultProduct=0x0021 + +TargetClass=0xff + +MessageContent="555342439f000000000000000000061b000000020000000000000000000000" + + +######################################################## +# Option Globetrotter (Variant) +# +# Contributor: Roman Samarev + +DefaultVendor= 0x0af0 +DefaultProduct= 0x8006 + +TargetVendor= 0x0af0 +TargetProduct= 0x9100 + +MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +####################################################### +# Option iCon 711 +# +# Contributor: Rene Falcon + +DefaultVendor= 0x0af0 +DefaultProduct=0x4007 + +TargetVendor= 0x0af0 +TargetProduct= 0x4005 + +SierraMode=1 + + +####################################################### +# Celot K-300 +# +# Contributor: Jan Vecek + +DefaultVendor= 0x05c6 +DefaultProduct=0x1000 + +TargetVendor= 0x211f +TargetProduct= 0x6801 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Hisense E910 EVDO Phone +# +# Contributor: Zang MingJie + +DefaultVendor= 0x109b +DefaultProduct=0xf009 + +TargetVendor= 0x109b +TargetProduct= 0x9114 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +############################################################################# +# Yota Router (Quanta 1QDLZZZ0ST2) +# +# Contributor: Ilya Voronin + +DefaultVendor= 0x0408 +DefaultProduct=0xf000 + +TargetVendor= 0x0408 +TargetProduct= 0xd009 + +MessageContent="5553424312345678000000000000061b004600000000000000000000000000" + + +############################################################################# +# K5005 Vodafone/Huawei +# +# Contributor: Thomas Schaefer + +DefaultVendor= 0x12d1 +DefaultProduct=0x14c3 + +TargetVendor= 0x12d1 +TargetProduct= 0x14c8 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + + +############################################################################# +# D-Link DWM-156 (Variant) +# +# Contributor: ZML + +DefaultVendor= 0x2001 +DefaultProduct=0xa80b + +TargetVendor= 0x2001 +TargetProduct= 0x7d00 + +MessageContent="555342431234567800000000000003f0010100000000000000000000000000" + + +######################################################## +# Huawei E173 (Moviestar) +# +# Contributor: Molipha + +DefaultVendor= 0x12d1 +DefaultProduct=0x1c24 + +TargetVendor= 0x12d1 +TargetProduct= 0x1c12 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Onda MSA 14.4 (TIM Brasil) +# +# Contributor: Rafael Pagliuca + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0060 + +TargetVendor= 0x1ee8 +TargetProduct= 0x005f + +MessageContent="555342431234567800000000000008ff000000000000030000000000000000" + + +######################################################## +# Alcatel OT-X220D +# +# Contributor: Javier Llorente + +DefaultVendor= 0x1bbb +DefaultProduct=0xf017 + +TargetVendor= 0x1bbb +TargetProduct= 0x0017 + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# Alcatel OT-X080C +# +# Contributor: Hicham Haouari + +DefaultVendor= 0x1bbb +DefaultProduct=0x00ca + +TargetClass=0xff + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# TP-Link MA180 +# +# Contributor: complexgeek + +DefaultVendor= 0x2357 +DefaultProduct=0x0200 + +TargetVendor= 0x2357 +TargetProduct= 0x0201 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF821D +# +# Contributor: Thomas Schäfer + +DefaultVendor= 0x19d2 +DefaultProduct=0x0325 + +TargetVendor= 0x12d1 +TargetProduct= 0x0326 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Dymo LabelManager PnP +# +# Contributor: Kjell M. Myksvoll + +DefaultVendor= 0x0922 +DefaultProduct=0x1001 + +TargetVendor= 0x0922 +TargetProduct= 0x1002 + +MessageEndpoint= 0x01 +ResponseEndpoint=0x01 + +MessageContent="1b5a01" +NoDriverLoading=1 + + +######################################################## +# Onda MDC655 HSDPA 900/2100 MHz 14.4 Mbps +# +# Contributor: lmctv + +DefaultVendor = 0x1ee8 +DefaultProduct =0x004a + +TargetVendor = 0x1ee8 +TargetProduct = 0x0049 + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" + + +######################################################## +# Vodafone K5006Z (MF821) +# +# Contributor: Thomas Schäfer + +DefaultVendor= 0x19d2 +DefaultProduct=0x1017 + +TargetVendor= 0x12d1 +TargetProduct= 0x1018 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Option GI0643 (aka XYFI) +# +# Contributor: Amish Chana + +DefaultVendor= 0x0af0 +DefaultProduct=0x8700 + +TargetClass=0xff + +MessageContent="55534243785634120100000080000601000000000000000000000000000000" +NoDriverLoading=1 + + +####################################################### +# WeTelecom WM-D300 +# +# Contributor: Viktor Remennik + +DefaultVendor= 0x22de +DefaultProduct=0x6803 + +TargetVendor= 0x22de +TargetProduct= 0x6801 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + + +####################################################### +# China TeleCom CBP7.0 +# +# Contributor: tricky + +DefaultVendor= 0x15eb +DefaultProduct=0x7153 + +TargetVendor= 0x15eb +TargetProduct= 0x7152 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Linktop LW272/LW273 (BSNL Teracom) +# +# Contributor: Jigish Gohil + +DefaultVendor= 0x230d +DefaultProduct=0x0101 + +TargetClass=0xff + +Configuration=2 + + +####################################################### +# Nokia CS-11 +# +# Contributor: Alessandro Martins + +DefaultVendor= 0x0421 +DefaultProduct=0x061d + +TargetVendor= 0x0421 +TargetProduct= 0x061e + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# ZTE MF190 (Variant) +# +# Contributor: Radu C + +DefaultVendor= 0x19d2 +DefaultProduct=0x0154 + +TargetVendor= 0x19d2 +TargetProduct= 0x0117 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +####################################################### +# Huawei E535 +# +# Contributor: Andres Septer + +DefaultVendor= 0x12d1 +DefaultProduct=0x14fe + +TargetVendor= 0x12d1 +TargetProduct= 0x1506 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +####################################################### diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild index 67b2070ab..e71d68761 100755 --- a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild +++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for usb_modeswitch. -# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2010 David Somero, Athens, TN, USA # All rights reserved. # @@ -24,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=usb_modeswitch -VERSION=${VERSION:-1.1.6} -DATAVER=${DATAVER:-20101222} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.2.4} +DATAVER=${DATAVER:-20120812} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -73,11 +73,30 @@ find . \ -exec chmod 644 {} \; make clean -gcc $SLKCFLAGS $LDFLAGS -lusb -Wall -o usb_modeswitch usb_modeswitch.c || exit 1 - -install -D -s -m 0755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch -install -D -m 0755 usb_modeswitch.tcl $PKG/lib/udev/usb_modeswitch -install -D -m 0644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new +# "make static" uses the embedded "jim" Tcl interpreter +make static + +install -D -s --mode=755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch +install -D --mode=755 usb_modeswitch.sh $PKG/lib/udev/usb_modeswitch +install -D --mode=644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new +install -D --mode=644 usb_modeswitch.1 $PKG/usr/man/man1/usb_modeswitch.1 +install -d $PKG/var/lib/usb_modeswitch +install -D -s --mode=755 usb_modeswitch_dispatcher $PKG/usr/sbin/usb_modeswitch_dispatcher + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ @@ -85,6 +104,10 @@ cp -a \ $PKG/usr/doc/$PKGNAM-$VERSION # http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz cat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.txt +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/jim +cp -a \ + jim/{AUTHORS,LICENSE,README*} \ + $PKG/usr/doc/$PKGNAM-$VERSION/jim # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -105,9 +128,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -install -D -m 0644 40-usb_modeswitch.rules $PKG/lib/udev/rules.d/40-usb_modeswitch.rules -mkdir -p $PKG/etc -cp -a usb_modeswitch.d $PKG/etc +make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/usb-modeswitch-data-${DATAVER} cat ChangeLog | head -n 1000 > $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog touch -r ChangeLog $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog diff --git a/source/a/usbutils/usbutils-002.tar.bz2.sign b/source/a/usbutils/usbutils-002.tar.bz2.sign deleted file mode 100644 index 9d96e9bef..000000000 --- a/source/a/usbutils/usbutils-002.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNgpmUyGugalF9Dw4RAkkCAJ9AOpNKjFebxdbPfj3LYK+roL7UaACgiKtR -7L3j4M7iAo15yh6B4WP6uCI= -=fb1T ------END PGP SIGNATURE----- diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild index 163b53783..15694392b 100755 --- a/source/a/usbutils/usbutils.SlackBuild +++ b/source/a/usbutils/usbutils.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(echo usbutils-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo usbutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -58,7 +58,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf usbutils-$VERSION -tar xvf $CWD/usbutils-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/usbutils-$VERSION.tar.xz || exit 1 cd usbutils-$VERSION || exit 1 chown -R root:root . @@ -72,19 +72,27 @@ find . \ rm -f usb.ids* wget $(grep 'SRC=' update-usbids.sh.in | cut -d= -f2- | tr -d \") +# Use --datadir=/usr/share/hwdata so usb.ids is expected to be there CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sbindir=/sbin \ --mandir=/usr/man \ + --datadir=/usr/share/hwdata \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Get rid of this redundant file: -rm -f $PKG/usr/share/usb.ids.gz +rm -f $PKG/usr/share/hwdata/usb.ids.gz + +## Use the usb.ids file shipped with the hwdata package +#rm -f $PKG/usr/share/hwdata/usb.ids* + +# Put a compat symlink in place for stuff that doesn't know about pkgconfig +ln -s hwdata/usb.ids $PKG/usr/share/usb.ids # The usbids are kept under /usr, so it makes no sense at all to have # this util in /sbin rather than /usr/sbin: @@ -100,10 +108,6 @@ mv $PKG/sbin/update-usbids.sh $PKG/usr/sbin/update-usbids.sh # upstream name available there too... ( cd $PKG/sbin ; ln -sf /usr/sbin/update-usbids.sh . ) -# Move the pkgconfig directory to @libdir@ instead of @datadir@ -mkdir $PKG/usr/lib${LIBDIRSUFFIX} -mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/usbutils/usbutils.ids.dest b/source/a/usbutils/usbutils.ids.dest deleted file mode 100644 index 67111881e..000000000 --- a/source/a/usbutils/usbutils.ids.dest +++ /dev/null @@ -1,11 +0,0 @@ ---- ./update-usbids.sh.orig 2005-01-22 17:03:47.000000000 -0600 -+++ ./update-usbids.sh 2007-01-04 17:14:28.000000000 -0600 -@@ -4,7 +4,7 @@ - - set -e - SRC="http://www.linux-usb.org/usb.ids" --DEST=usb.ids -+DEST=/usr/share/usb.ids - - if which wget >/dev/null ; then - DL="wget -O $DEST.new $SRC" diff --git a/source/a/usbutils/usbutils.url b/source/a/usbutils/usbutils.url new file mode 100644 index 000000000..57e0013b2 --- /dev/null +++ b/source/a/usbutils/usbutils.url @@ -0,0 +1 @@ +http://www.kernel.org/pub/linux/utils/usb/usbutils/ diff --git a/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch b/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch new file mode 100644 index 000000000..afe6e5c91 --- /dev/null +++ b/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch @@ -0,0 +1,88 @@ +--- ./mount/mount.c.orig 2012-05-25 04:44:58.993195438 -0500 ++++ ./mount/mount.c 2012-08-02 12:04:52.455435631 -0500 +@@ -41,6 +41,7 @@ + #include "nls.h" + #include "blkdev.h" + #include "strutils.h" ++#include "xgetpass.h" + + #define DO_PS_FIDDLING + +@@ -1238,6 +1239,8 @@ + int looptype; + uintmax_t offset = 0, sizelimit = 0; + struct loopdev_cxt lc; ++ char *pwd = NULL; ++ int ret = EX_FAIL; + + /* + * In the case of a loop mount, either type is of the form lo@/dev/loop5 +@@ -1317,8 +1320,18 @@ + return EX_FAIL; + } + ++ if (opt_encryption) { ++#ifdef MCL_FUTURE ++ if (mlockall(MCL_CURRENT | MCL_FUTURE)) { ++ error(_("mount: couldn't lock into memory")); ++ return EX_FAIL; ++ } ++#endif ++ pwd = xgetpass(pfd, _("Password: ")); ++ } ++ + loopcxt_init(&lc, 0); +- /* loopcxt_enable_debug(&lc, 1); */ ++ /*loopcxt_enable_debug(&lc, 1);*/ + + if (*loopdev && **loopdev) + loopcxt_set_device(&lc, *loopdev); /* use loop=<devname> */ +@@ -1343,6 +1356,8 @@ + rc = loopcxt_set_offset(&lc, offset); + if (!rc && sizelimit) + rc = loopcxt_set_sizelimit(&lc, sizelimit); ++ if (!rc && opt_encryption && pwd) ++ loopcxt_set_encryption(&lc, opt_encryption, pwd); + if (!rc) + loopcxt_set_flags(&lc, loop_opts); + +@@ -1358,8 +1373,7 @@ + break; /* success */ + + if (rc != -EBUSY) { +- if (verbose) +- printf(_("mount: failed setting up loop device\n")); ++ error(_("mount: %s: failed setting up loop device: %m"), *loopfile); + if (!opt_loopdev) { + my_free(*loopdev); + *loopdev = NULL; +@@ -1399,9 +1413,15 @@ + } + } + +- return 0; ++ ret = 0; + err: +- return EX_FAIL; ++ if (pwd) { ++ char *p = pwd; ++ while (*p) ++ *p++ = '\0'; ++ free(pwd); ++ } ++ return ret; + } + + +--- ./mount/Makefile.am.orig 2012-05-25 04:44:58.000000000 -0500 ++++ ./mount/Makefile.am 2012-08-02 12:04:14.958439138 -0500 +@@ -23,7 +23,8 @@ + $(top_srcdir)/lib/at.c \ + $(top_srcdir)/lib/sysfs.c \ + $(top_srcdir)/lib/loopdev.c \ +- $(top_srcdir)/lib/strutils.c ++ $(top_srcdir)/lib/strutils.c \ ++ $(top_srcdir)/lib/xgetpass.c + + # generic flags for all programs + # -- note that pkg-config autoconf macros (pkg.m4) does not differentiate diff --git a/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch b/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch new file mode 100644 index 000000000..4d3622c32 --- /dev/null +++ b/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch @@ -0,0 +1,31 @@ +--- ./fdisk/fdisk.c.orig 2012-05-25 04:44:58.977195366 -0500 ++++ ./fdisk/fdisk.c 2012-08-02 12:00:59.692457377 -0500 +@@ -569,6 +569,19 @@ + lba_is_aligned(unsigned long long lba) + { + unsigned int granularity = max(phy_sector_size, min_io_size); ++ unsigned long long offset; ++ ++ if (grain > granularity) ++ granularity = grain; ++ offset = (lba * sector_size) & (granularity - 1); ++ ++ return !((granularity + alignment_offset - offset) & (granularity - 1)); ++} ++ ++static int ++lba_is_phy_aligned(unsigned long long lba) ++{ ++ unsigned int granularity = max(phy_sector_size, min_io_size); + unsigned long long offset = (lba * sector_size) & (granularity - 1); + + return !((granularity + alignment_offset - offset) & (granularity - 1)); +@@ -1808,7 +1821,7 @@ + static void + check_alignment(unsigned long long lba, int partition) + { +- if (!lba_is_aligned(lba)) ++ if (!lba_is_phy_aligned(lba)) + printf(_("Partition %i does not start on physical sector boundary.\n"), + partition + 1); + } diff --git a/source/a/util-linux/adjtimex_1.23-1.diff b/source/a/util-linux/adjtimex_1.29-2.2.diff index 8c250157e..62ac1db34 100644 --- a/source/a/util-linux/adjtimex_1.23-1.diff +++ b/source/a/util-linux/adjtimex_1.29-2.2.diff @@ -1,13 +1,107 @@ ---- adjtimex-1.23.orig/config.sub -+++ adjtimex-1.23/config.sub -@@ -0,0 +1,1622 @@ +--- adjtimex-1.29.orig/adjtimex.lsm ++++ adjtimex-1.29/adjtimex.lsm +@@ -1,7 +1,7 @@ + Begin4 + Title: adjtimex - display or set the kernel time variables + Version: 1.29 +-Entered-date: 2010-04-16 ++Entered-date: 2010-05-26 + Description: Display or set the kernel time variables. + This program gives you raw access to the kernel time variables. For + a machine connected to the Internet, or equipped with a precision +--- adjtimex-1.29.orig/config.h ++++ adjtimex-1.29/config.h +@@ -0,0 +1,80 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the <linux/rtc.h> header file. */ ++#define HAVE_LINUX_RTC_H 1 ++ ++/* Define to 1 if you have the <memory.h> header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mktime' function. */ ++#define HAVE_MKTIME 1 ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the `select' function. */ ++#define HAVE_SELECT 1 ++ ++/* Define to 1 if you have the <stdint.h> header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the <stdlib.h> header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the <strings.h> header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the <string.h> header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the <sys/time.h> header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the <unistd.h> header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Define to 1 if your <sys/time.h> declares `struct tm'. */ ++/* #undef TM_IN_SYS_TIME */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++/* #undef inline */ ++#endif +--- adjtimex-1.29.orig/config.sub ++++ adjtimex-1.29/config.sub +@@ -0,0 +1,1760 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. + -+timestamp='2007-01-18' ++timestamp='2011-03-23' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software @@ -35,13 +129,16 @@ + + +# Please send patches to <config-patches@gnu.org>. Submit a context -+# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. @@ -75,8 +172,9 @@ +version="\ +GNU config.sub ($timestamp) + -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free ++Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,8 +221,10 @@ +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -151,10 +251,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -+ -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 @@ -169,10 +272,10 @@ + os=-chorusos + basic_machine=$1 + ;; -+ -chorusrdb) -+ os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 -+ ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; @@ -252,13 +355,16 @@ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ @@ -271,28 +377,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rx \ + | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; -+ m6811 | m68hc11 | m6812 | m68hc12) ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none @@ -303,6 +423,18 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. @@ -323,7 +455,7 @@ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ @@ -332,14 +464,17 @@ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ @@ -354,27 +489,35 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ -+ | romp-* | rs6000-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -+ | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ -+ | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. @@ -392,7 +535,7 @@ + basic_machine=a29k-amd + os=-udi + ;; -+ abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) @@ -438,6 +581,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux @@ -446,10 +593,35 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd @@ -478,8 +650,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; -+ cr16c) -+ basic_machine=cr16c-unknown ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) @@ -517,6 +689,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp @@ -671,6 +847,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; @@ -682,10 +866,17 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; @@ -782,6 +973,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; @@ -812,6 +1009,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; @@ -856,9 +1061,10 @@ + ;; + power) basic_machine=power-ibm + ;; -+ ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; -+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown @@ -952,6 +1158,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; @@ -1008,17 +1217,14 @@ + basic_machine=t90-cray + os=-unicos + ;; -+ tic54x | c54x*) -+ basic_machine=tic54x-unknown -+ os=-coff -+ ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu + ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown @@ -1087,6 +1293,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos @@ -1095,6 +1304,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none @@ -1133,7 +1346,7 @@ + we32k) + basic_machine=we32k-att + ;; -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1180,9 +1393,12 @@ +if [ x"$os" != x"" ] +then +case $os in -+ # First match some system type aliases -+ # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; @@ -1203,10 +1419,11 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -+ | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1215,9 +1432,10 @@ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+ | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1225,7 +1443,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) @@ -1264,7 +1482,7 @@ + -opened*) + os=-openedition + ;; -+ -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) @@ -1313,7 +1531,7 @@ + -sinix*) + os=-sysv4 + ;; -+ -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) @@ -1355,6 +1573,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) @@ -1377,10 +1600,10 @@ +# system, and we'll never get to this point. + +case $basic_machine in -+ score-*) ++ score-*) + os=-elf + ;; -+ spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) @@ -1392,8 +1615,17 @@ + arm*-semi) + os=-aout + ;; -+ c4x-* | tic4x-*) -+ os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) @@ -1420,7 +1652,7 @@ + m68*-cisco) + os=-aout + ;; -+ mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) @@ -1447,7 +1679,7 @@ + *-ibm) + os=-aix + ;; -+ *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) @@ -1552,7 +1784,7 @@ + -sunos*) + vendor=sun + ;; -+ -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) @@ -1623,16 +1855,97 @@ +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: ---- adjtimex-1.23.orig/config.guess -+++ adjtimex-1.23/config.guess -@@ -0,0 +1,1516 @@ +--- adjtimex-1.29.orig/Makefile ++++ adjtimex-1.29/Makefile +@@ -0,0 +1,78 @@ ++#### Start of system configuration section. -*-makefile-*- #### ++ srcdir = . ++VPATH = . ++ ++VERSION=1.29 ++ ++CFLAGS = -Wall -g -O2 -Wall ++prefix = /usr ++man1dir=${prefix}/share/man/man1 ++exec_prefix = ${prefix} ++bindir=/sbin ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++ ++INSTALL=/usr/bin/install -c ++ ++ ++# Extension (not including `.') for the manual page filenames. ++manext = 8 ++# Where to put the manual pages. ++mandir = $(prefix)/share/man/man$(manext) ++ ++#### End of system configuration section. #### ++ ++SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ ++ configure Makefile.in config.h.in README README.ru adjtimex.lsm \ ++ adjtimex.lsm.in COPYING COPYRIGHT ChangeLog ++ ++all: adjtimex adjtimex.lsm Makefile ++ ++configure config.h.in: configure.in ++ autoconf ++ autoheader ++Makefile config.h: Makefile.in config.h.in ++ ./configure ++ ++adjtimex: adjtimex.c mat.o config.h Makefile ++ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex \ ++ adjtimex.c mat.o -lm ++ ++mat.o: mat.c ++ $(CC) $(CFLAGS) -c mat.c ++ ++install: all ++ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex ++ $(INSTALL) -d -g root -m 755 -o root $(mandir) ++ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ ++ $(mandir)/adjtimex.$(manext) ++ ++uninstall: ++ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) ++ ++clean: ++ rm -f core *.o ++veryclean: clean ++ rm -f adjtimex ++ ++adjtimex.lsm: adjtimex.lsm.in Makefile ++ sed -e 's/@VERSION@/$(VERSION)/' \ ++ -e "s/@DATE@/`date +%Y-%m-%d`/" \ ++ adjtimex.lsm.in >adjtimex.lsm ++ ++shar: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ shar $(SRC) >$$distname.shar ++ ++dist: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ rm -fr $$distname; \ ++ mkdir $$distname; \ ++ for file in $(SRC); do \ ++ ln $$file $$distname/$$file \ ++ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ ++ done; \ ++ chmod -R a+rX $$distname; \ ++ tar -chz -f $$distname.tar.gz $$distname; \ ++ rm -fr $$distname ++ +--- adjtimex-1.29.orig/config.guess ++++ adjtimex-1.29/config.guess +@@ -0,0 +1,1517 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. + -+timestamp='2007-03-06' ++timestamp='2011-05-11' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by @@ -1655,16 +1968,16 @@ +# the same distribution terms that you use for the rest of that program. + + -+# Originally written by Per Bothner <per@bothner.com>. -+# Please send patches to <config-patches@gnu.org>. Submit a context -+# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to <config-patches@gnu.org> and include a ChangeLog ++# entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# -+# The plan is that this can be called by configure scripts if you -+# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + +me=`echo "$0" | sed -e 's,.*/,,'` + @@ -1684,8 +1997,9 @@ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free ++Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1798,7 +2112,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? @@ -1808,7 +2122,7 @@ + fi + ;; + *) -+ os=netbsd ++ os=netbsd + ;; + esac + # The OS release @@ -1851,7 +2165,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on @@ -1897,7 +2211,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead @@ -1923,7 +2240,7 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) -+ echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} @@ -1952,14 +2269,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; -+ i86pc:SunOS:5.*:*) -+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize @@ -2003,23 +2339,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; @@ -2089,8 +2425,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -2103,7 +2439,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi -+ exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; @@ -2160,7 +2496,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; -+ *:AIX:*:[45]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 @@ -2203,52 +2539,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -+ esac ;; -+ esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include <stdlib.h> -+ #include <unistd.h> -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa @@ -2268,7 +2604,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else @@ -2339,22 +2675,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd -+ exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi -+ exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd -+ exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd -+ exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd -+ exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; @@ -2378,14 +2714,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -2413,24 +2749,30 @@ + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; -+ EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -2460,8 +2802,35 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -2473,7 +2842,18 @@ + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) -+ echo frv-unknown-linux-gnu ++ echo frv-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -2484,74 +2864,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; -+ mips:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips -+ #undef mipsel -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mipsel -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ mips64:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU -+ #undef mips64 -+ #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level @@ -2561,14 +2900,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -2576,78 +2918,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-tilera-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; -+ xtensa:Linux:*:*) -+ echo xtensa-unknown-linux-gnu ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; -+ i*86:Linux:*:*) -+ # The BFD linker knows what the default object file format is, so -+ # first see if it will tell us. cd to the root directory to prevent -+ # problems with other programs or directories called `ld' in the path. -+ # Set LC_ALL=C to ensure ld outputs messages in English. -+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -+ | sed -ne '/supported targets:/!d -+ s/[ ][ ]*/ /g -+ s/.*supported targets: *// -+ s/ .*// -+ p'` -+ case "$ld_supported_targets" in -+ elf32-i386) -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ ;; -+ a.out-i386-linux) -+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" -+ exit ;; -+ coff-i386) -+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ exit ;; -+ "") -+ # Either a pre-BFD a.out linker (linux-gnuoldld) or -+ # one that does not give us useful --help. -+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ exit ;; -+ esac -+ # Determine whether the default compiler is a.out or elf -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #include <features.h> -+ #ifdef __ELF__ -+ # ifdef __GLIBC__ -+ # if __GLIBC__ >= 2 -+ LIBC=gnu -+ # else -+ LIBC=gnulibc1 -+ # endif -+ # else -+ LIBC=gnulibc1 -+ # endif -+ #else -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+ LIBC=gnu -+ #else -+ LIBC=gnuaout -+ #endif -+ #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -+ ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both @@ -2655,11 +2937,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. -+ # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) @@ -2676,7 +2958,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) @@ -2691,7 +2973,7 @@ + fi + exit ;; + i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; @@ -2719,10 +3001,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i386. -+ echo i386-pc-msdosdjgpp -+ exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; @@ -2757,8 +3042,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; @@ -2771,7 +3066,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) @@ -2791,10 +3086,10 @@ + echo ns32k-sni-sysv + fi + exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says <Richard.M.Bartel@ccMail.Census.GOV> -+ echo i586-unisys-sysv4 -+ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm @@ -2820,11 +3115,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then -+ echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else -+ echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi -+ exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; @@ -2834,6 +3129,9 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; @@ -2861,6 +3159,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -2876,6 +3184,9 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; @@ -2921,13 +3232,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; @@ -2942,6 +3253,9 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 @@ -2964,11 +3278,11 @@ +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 -+ "4" ++ "4" +#else -+ "" ++ "" +#endif -+ ); exit (0); ++ ); exit (0); +#endif +#endif + @@ -3102,9 +3416,9 @@ +the operating system you are using. It is advised that you +download the most up to date version of the config scripts from + -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +If the version you run ($0) is already up to date, please +send the following data and any information you think might be @@ -3142,1211 +3456,236 @@ +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: ---- adjtimex-1.23.orig/debian/control -+++ adjtimex-1.23/debian/control -@@ -0,0 +1,20 @@ -+Source: adjtimex -+Section: admin -+Priority: optional -+Maintainer: James R. Van Zandt <jrv@debian.org> -+Build-Depends: debhelper (>= 5), po-debconf -+Standards-Version: 3.7.2 -+ -+Package: adjtimex -+Architecture: any -+Depends: ${shlibs:Depends}, debconf | debconf-2.0 -+Suggests: ntpdate -+Description: Utility to display or set the kernel time variables -+ This program gives you raw access to the kernel time variables. For -+ a machine connected to the Internet, or equipped with a precision -+ oscillator or radio clock, the best way to keep the system clock -+ correct is with ntpd. However, for a standalone or intermittently -+ connected machine, you may use adjtimex instead to at least correct -+ for systematic drift. adjtimex can optionally adjust the system -+ clock using the CMOS clock as a reference, and can log times for -+ long-term estimation of drift rates. ---- adjtimex-1.23.orig/debian/po/POTFILES.in -+++ adjtimex-1.23/debian/po/POTFILES.in +--- adjtimex-1.29.orig/debian/compat ++++ adjtimex-1.29/debian/compat @@ -0,0 +1 @@ -+[type: gettext/rfc822deb] templates ---- adjtimex-1.23.orig/debian/po/templates.pot -+++ adjtimex-1.23/debian/po/templates.pot -@@ -0,0 +1,59 @@ -+# 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. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\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: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" ---- adjtimex-1.23.orig/debian/po/fr.po -+++ adjtimex-1.23/debian/po/fr.po -@@ -0,0 +1,87 @@ -+# translation of fr.po to French -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+# Christian Perrier <bubulle@debian.org>, 2006. -+msgid "" -+msgstr "" -+"Project-Id-Version: fr\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2006-12-17 14:01+0100\n" -+"Last-Translator: Christian Perrier <bubulle@debian.org>\n" -+"Language-Team: French <debian-l10n-french@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Faut-il lancer adjtimex lors de l'installation et Ă chaque dĂ©marrage du " -+"système ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex peut ĂŞtre lancĂ© au dĂ©marrage du système afin de rĂ©gler les " -+"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" -+"default/adjtimex. Ne choisissez pas cette option si vous souhaitez " -+"simplement vous servir d'adjtimex pour consulter les paramètres actuels." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Faut-il lancer adjtimexconfig lors de l'installation ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " -+"appropriĂ©es pour les variables du noyau concernant le battement (« tick ») " -+"et la frĂ©quence d'horloge. Cela permettra Ă l'horloge du système d'ĂŞtre Ă " -+"peu près en accord avec l'horloge matĂ©rielle (parfois appelĂ©e « horloge " -+"CMOS »). Ces valeurs seront alors conservĂ©es dans le fichier de " -+"configuration /etc/default/adjtimex ce qui permettra de les restaurer Ă " -+"chaque dĂ©marrage quand /etc/init.d/adjtimex s'exĂ©cutera. " -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"La durĂ©e d'exĂ©cution du script est de 70 secondes. Vous pouvez Ă©galement " -+"utiliser adjtimexconfig vous-mĂŞme plus tard ou dĂ©terminer les valeurs des " -+"variables du noyau d'une autre manière (il en existe plusieurs : voir la " -+"page de manuel d'adjtimex). Ces valeurs devront ensuite ĂŞtre placĂ©es dans /" -+"etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/es.po -+++ adjtimex-1.23/debian/po/es.po -@@ -0,0 +1,81 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: Vicente H. <vherrerv@supercable.es>\n" -+"Language-Team: LANGUAGE <LL@li.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-15\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "żDebe ejecutarse adjtimex ahora y en cada arranque?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+#, fuzzy -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex puede ser ejecutado en el arranque del sistema para poner los " -+"parámetros de tiempo del núcleo en /etc/default/adjtimex. Si usted solamente " -+"quiere usar adjtimex para inspeccionar los parámetros actuales, conteste \"No" -+"\"." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "żDebe ejecutarse adjtimexconfig ahora?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"El guión adjtimexconfig usará adjtimex para encontrar los valores para el " -+"núcleo de la seńal y frecuencia que será tomada por el reloj del sistema " -+"para estar de acuerdo con el reloj del hardware (también conocido como el " -+"reloj CMOS). Este guión guardará los valores en el archivo de configuración /" -+"etc/default/adjtimex para que los ajustes sean restaurados en cada arranque " -+"del sistema, cuando /etc/init.d/adjtimex sea ejecutado." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"El guión toma 70 seg. para ser ejecutado. O bien, usted mismo puede ejecutar " -+"adjtimexconfig más tarde, o determinar las variables del núcleo de varias " -+"formas (mire la página man de adjtimex) y anótelos en /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/pl.po -+++ adjtimex-1.23/debian/po/pl.po -@@ -0,0 +1,83 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: Bartosz Zapałowski <zapal@debian.linux.org.pl>\n" -+"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org." -+"pl>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-2\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Czy adjtimex ma być uruchomiany podczas instalacji i każdego startu systemu?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex może być uruchamiany podczas każdego uruchomienia systemu,by " -+"ustawić parametry czasu w j±drze na warto¶ci znajduj±ce się w pliku/etc/" -+"default/adjtimex. Nie wyrażaj zgody, je¶li chcesz używać adjtimextylko do " -+"sprawdzania aktualnych warto¶ci." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Czy adjtimexconfig ma być uruchomiony podczas instalacji?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " -+"takichwarto¶ci parametrów j±dra tick i frequency, żeby zegar systemowy był " -+"zbliżonydo zegara sprzętowego (zegara CMOS). Następnie zapisze ustawienia w " -+"plikukonfiguracyjnym /etc/default/adjtimex, dzięki czemu warto¶ci te " -+"będ±przywrócane przy każdym starcie systemu w momencie wykonywania skryptu/" -+"etc/init.d/adjtimex." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Skrypt będzie działał przez 70 sekund. Możesz też uruchomić " -+"własnoręcznieadjtimexconfig w dowolnym czasie lub dobrać paramterty j±dra w " -+"innysposób (zapoznaj się ze stron± manuala adjtimex) i zapisać je w pliku/" -+"etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/nl.po -+++ adjtimex-1.23/debian/po/nl.po -@@ -0,0 +1,82 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2003-10-04 16:05+0100\n" -+"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n" -+"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" ++5 +--- adjtimex-1.29.orig/debian/changelog ++++ adjtimex-1.29/debian/changelog +@@ -0,0 +1,753 @@ ++adjtimex (1.29-2.2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Wilt u dat adjtimex bij elke installatie en bij elke opstartprocedure " -+"gedraaid wordt?" ++ * Non-maintainer upload. ++ * Make the package multiarch-ready: add build-arch and build-indep ++ build targets ++ * Fix pending l10n issues. Debconf translations: ++ - Vietnamese (Clytie Siddall). Closes: #601529 ++ - Brazilian Portuguese (Flamarion Jorge). Closes: #610409 ++ - Dutch (Michiel Sikkes). Closes: #625744 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan gedraaid worden bij het opstarten van het systeem om de " -+"kerneltijd parameters in te stellen zoals gedefinieerd in /etc/default/" -+"adjtimex. Accepteer deze optie niet als u adjtimex wilt gebruiken om de " -+"huidige parameters te bekijken." ++ -- Christian Perrier <bubulle@debian.org> Mon, 04 Jul 2011 07:06:43 +0200 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Wilt u dat adjtimexconfig bij het installeren wordt gedraaid?" ++adjtimex (1.29-2.1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Het adjtimexconfig script zal adjtimex gebruiken om de eigenschappen voor de " -+"kernelvariablen tick en frequency te vinden. Dit zal zorgen dat de " -+"systeemklok gelijk loopt met de hardware klok (ook bekend onder de naam CMOS " -+"klok). Het slaat deze eigenschappen op in het configuratiebestand /etc/" -+"default/adjtimex, dus de instellingen worden bij elke " -+"systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." ++ * Non-maintainer upload. ++ * Fix pending l10n issues. Debconf translations: ++ - Czech (Martin Sin). Closes: #589289 ++ - BokmĂĄl, Norwegian (Bjørn Steensrud). Closes: #600279 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " -+"adjtimexconfig later handmatig draaien, of de kerneleigenschappen op een " -+"andere manier bepalen (zie de adjtimex man-pagina) en deze zelf in /etc/" -+"default/adjtimex zetten." ---- adjtimex-1.23.orig/debian/po/da.po -+++ adjtimex-1.23/debian/po/da.po -@@ -0,0 +1,79 @@ -+# translation of adjtimex_1.16-1-da.po to Danish -+# translation of adjtimex_1.16-1_templates.po to Danish -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# Claus Hindsgaul <claus_h@image.dk>, 2004. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.16-1-da\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2004-03-24 17:57+0100\n" -+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" -+"Language-Team: Danish <dansk@klid.dk>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.3.1\n" ++ -- Christian Perrier <bubulle@debian.org> Tue, 19 Oct 2010 07:14:50 +0200 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Skal adjtimex køres under installation og ved hver opstart?" ++adjtimex (1.29-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan køres under opstart af systemet for at sætte kernens " -+"tidsparametre til værdierne i /etC/default/adjtimex. AcceptĂ©r ikke dette, " -+"hvis du kun vil bruge adjtimex til at gennemse de aktuelle parametre." ++ * debian/postinst: check conffile for corruption (Closes:Bug#571633, ++ thanks to Savvas Radevic <vicedar@gmail.com> for the idea, though I ++ chose a different implementation.) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Skal adjtimexconfig køres under installationen?" ++ -- James R. Van Zandt <jrv@debian.org> Tue, 25 May 2010 20:49:21 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skriftet adjtimexconfig vil bruge adjtimex til at finde de værdier til " -+"kernevariablene tick og frequency, der vil fĂĄ systemuret til at passe med " -+"computerens indbyggede ur (CMOS-uret). Den gemmer derefter værdierne i " -+"opsætningsfilen /etc/default/edjtimex, sĂĄ indstillingerne bliver sat under " -+"hver opstart, nĂĄr skriptet /etC/init.d/adjtimex køres." ++adjtimex (1.29-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Det tager 70 sekunder at køre skriptet. Alternativt kan du selv køre " -+"adjtimexconfig senere, eller finde kernevariablene pĂĄ en anden mĂĄde (se " -+"manualsiden adjtimex) og installere dem i /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/ja.po -+++ adjtimex-1.23/debian/po/ja.po -@@ -0,0 +1,78 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2003-11-21 00:02+0900\n" -+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n" -+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=EUC-JP\n" -+"Content-Transfer-Encoding: 8bit\n" ++ * New upstream release: Document the --force-adjust ++ option. --force-adjust suppresses warning printouts. Relax sanity ++ check to +- 1 percent. + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "adjtimex ¤ňĄ¤ĄóĄąĄČˇĽĄë»ţ¤Ş¤č¤ÓËč˛ó¤ÎµŻĆ°»ţ¤ËĆ°şî¤µ¤»¤Ţ¤ą¤«?" ++ * debian/adjtimexconfig: Use --force-adjust option, so adjustment is ++ applied even if system clock is way off. (Thanks to Santiago Vila ++ <sanvila@unex.es> for helping to diagnose the problem. ++ Closes:Bug#557949, #559882) ++ ++ * debian/adjtimex.init: fix LSB comment header: require $local_fs, start ++ in S + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex ¤ňĄ·ĄąĄĆĄŕ¤ÎµŻĆ°»ţ¤ËĆ°şî¤µ¤»¤ĆĄ«ˇĽĄÍĄë¤Î»ţ´ÖĄŃĄéĄáˇĽĄż¤ň /etc/" -+"default/adjtimex ¤ÎĂͤËŔßÄꤹ¤ë¤ł¤Č¤¬˛ÄÇ˝¤Ç¤ąˇŁ adjtimex ¤ň¸˝şß¤ÎĄŃĄéĄáˇĽĄż¤Î" -+"Ä´şş¤Ë¤Ŕ¤±¤Ë»Č¤¤¤ż¤¤¤Č¤¤¤¦ľěąç¤ĎĆ°şî¤ň¤µ¤»¤Ę¤¤¤Ç¤Ż¤Ŕ¤µ¤¤ˇŁ" ++ -- James R. Van Zandt <jrv@debian.org> Fri, 16 Apr 2010 20:08:49 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "adjtimexconfig ¤ňĄ¤ĄóĄąĄČˇĽĄë»ţ¤ËĆ°şî¤µ¤»¤Ţ¤ą¤«?" ++adjtimex (1.28-4) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"adjtimexconfig ĄąĄŻĄęĄ×ĄČ¤Ď adjtimex ¤ň»ČÍѤ·¤Ćˇ˘Ą·ĄąĄĆĄŕĄŻĄíĄĂĄŻ¤ňĄĎˇĽĄÉĄ¦Ą§" -+"Ą˘ĄŻĄíĄĂĄŻ (CMOS ĄŻĄíĄĂĄŻ¤Č¤·¤Ć¤âĂΤé¤ě¤Ć¤¤¤Ţ¤ą) ¤Č¤Ş¤Ş¤č¤˝Ć±´ü¤ą¤ë¤č¤¦¤ËĄ«ˇĽ" -+"ĄÍĄëĘŃżô tick ¤Č frequency ¤ËÍż¤¨¤ëĂͤň¸«¤Ä¤±¤Ţ¤ąˇŁ¤˝¤·¤Ćˇ˘¤ł¤ÎĂͤňŔßÄęĄŐĄˇĄ¤" -+"Ąë /etc/default/adjtimex ¤ËĘݸ¤ą¤ë¤ł¤Č¤ÇËč˛óµŻĆ°»ţ¤Ë /etc/init.d/adjtimex ¤¬" -+"Ć°şî¤ą¤ëşÝ¤ËŔßÄ꤬Éü¸µ¤µ¤ě¤Ţ¤ąˇŁ" ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge <brother@bsnet.se>, Closes:Bug#572579) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"ĄąĄŻĄęĄ×ĄČ¤ĎĆ°şî¤Ë 70 É䫤«¤ę¤Ţ¤ąˇŁĘ̲ň¤Č¤·¤Ć¤Ď adjtimexconfig ¤ň¸ĺ¤Ű¤ÉĽÂąÔ" -+"¤ą¤ëˇ˘¤Ţ¤ż¤ĎÂľ¤ÎĘýˡ¤ÇĄ«ˇĽĄÍĄëĘŃżô¤ň·č¤á¤Ć (adjtimex ¤Î man ĄÚˇĽĄ¸¤ň»˛ľČ) /" -+"etc/default/adjtimex ¤Ř¤ÎŔßÄę¤ňąÔ¤¦¤Ę¤É¤¬˛ÄÇ˝¤Ç¤ąˇŁ" ---- adjtimex-1.23.orig/debian/po/pt_BR.po -+++ adjtimex-1.23/debian/po/pt_BR.po -@@ -0,0 +1,82 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.16-1\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2004-01-17 20:55-0300\n" -+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n" -+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" ++ -- James R. Van Zandt <jrv@debian.org> Wed, 17 Mar 2010 19:51:06 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Executar o adjtimex durante a instalaçăo e a cada reinicializaçăo ?" ++adjtimex (1.28-3) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"O adjtimex pode ser executado na inicializaçăo do sistema para definir " -+"parâmetros de tempo de kernel para os valores em /etc/default/adjtimex. Năo " -+"aceite caso vocę somente queira usar o adjtimex para inspecionar os " -+"parâmetros atuais." ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge <brother@bsnet.se>, Closes:Bug#562932) ++ Russian (thanks to Yuri Kozlov <yuray@komyakino.ru>, Closes:Bug#563347) ++ Finnish (thanks to Esko =?UTF-8?Q?Araj=C3=A4rvi?= <edu@iki.fi>, ++ Closes:Bug#564508) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Executar o adjtimexconfig durante a instalaçăo ?" ++ * debian/control: bump standards version to 3.8.4 (no changes needed) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"O script adjtimex irá utilizar o adjtimex para encontrar valores para " -+"variáveis de kernel tick e frequency que farăo com que o relógio do sistema " -+"concorde aproimadamente com o relógio de hardware (também conhecido como " -+"relógio CMOS). Ele irá entăo gravar esses valores no arquivo de " -+"configuraçăo /etc/default/adjtimex de modo que as configuraçőes sejam " -+"restauradas a cada renicializaçăo, quando o /etc/init.d/adjtimex é executado." ++ -- James R. Van Zandt <jrv@debian.org> Mon, 08 Feb 2010 20:19:44 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"O script leva cerca de 70 segundos para ser executado. Alternativamente, " -+"vocę pode executar o adjtimexconfig vocę mesmo posteriormente, ou ainda " -+"determinar as variáveis de kernel usando uma das diversas maneiras possíveis " -+"(consulte a página de manul adjtimex) e instalar as mesmas em /etc/default/" -+"adjtimex." ---- adjtimex-1.23.orig/debian/po/de.po -+++ adjtimex-1.23/debian/po/de.po -@@ -0,0 +1,83 @@ -+# translation of adjtimex_1.21.1-2_de.po to German -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# -+# Erik Schanze <eriks@debian.org>, 2004-2007. -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.21.1-2_de\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2007-08-06 20:50+0200\n" -+"Last-Translator: Erik Schanze <eriks@debian.org>\n" -+"Language-Team: German <debian-l10n-german@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++adjtimex (1.28-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " -+"werden?" ++ * Move Swedish and Russian template translations to the correct directory ++ (thanks to Martin Bagge <brother@bsnet.se> for pointing out the ++ problem). + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex kann beim Hochfahren des Systems ablaufen, um die Zeitparameter im " -+"Kernel auf die Werte in /etc/defaults/adjtimex zu setzen. Stimmen Sie dem " -+"nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter ermitteln wollen." ++ * debian/control: bump standards version to 3.8.3 (no changes needed) ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 05 Feb 2010 21:42:54 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Soll »adjtimexconfig« zur Installation aufgerufen werden?" ++adjtimex (1.28-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " -+"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " -+"Rechneruhr (auch bekannt als CMOS-Uhr) ĂĽbereinstimmt. Das Skript speichert " -+"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " -+"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" -+"adjtimex startet." ++ * New upstream release: (compare): Correctly apply +-500 ppm sanity ++ check (Thanks to Jacques luder <j.luder@laposte.net>) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Das Skript benötigt 70 Sekunden, um durchzulaufen. Andererseits können Sie " -+"»adjtimexconfig« später selbst starten oder finden die Kernelvariablen auf " -+"einem anderen Weg (siehe Handbuchseite von Adjtimex) und speichern die Werte " -+"in der Datei /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/vi.po -+++ adjtimex-1.23/debian/po/vi.po -@@ -0,0 +1,75 @@ -+# Vietnamese Translation for adjtimex. -+# Copyright © 2005 Free Software Foundation, Inc. -+# Clytie Siddall <clytie@riverland.net.au>, 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-4\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-05-04 15:44+0930\n" -+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" -+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0\n" ++ * Update debconf template translations: ++ Swedish (thanks to: Martin Bagge <brother@bsnet.se>, ++ Closes:Bug#533567) ++ Russian (thanks to: Yuri Kozlov <yuray@komyakino.ru>, ++ Closes:Bug#532068) + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Bạn cĂł muốn chạy trình adjtimex khi cĂ i Ä‘áş·t vĂ mọi khi khởi Ä‘á»™ng khĂ´ng?" ++ -- James R. Van Zandt <jrv@debian.org> Sat, 07 Nov 2009 11:59:29 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Trình adjtimex (adjust time: Ä‘iá»u chỉnh thời gian) thì cĂł thá» chạy khi khởi " -+"Ä‘á»™ng hệ thống, Ä‘á» láşp những tham số thời gian của hạt nhân thĂ nh những giá " -+"trị trong /etc/default/adjtimex. Äừng hiệu lá»±c tĂąy chọn nĂ y náşżu bạn chỉ muốn " -+"sá» dụng trình adjtimex Ä‘á» kiá»m tra những tham số hiện thời." ++adjtimex (1.27.1-4) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Bạn cĂł muốn chạy táşp lệnh adjtimexconfig khi cĂ i Ä‘áş·t khĂ´ng?" ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#538242) ++ Spanish (Thanks to Francisco Javier Cuadrado <fcocuadrado@gmail.com>, ++ Closes:Bug#538425) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Táşp lệnh adjtimexconfig (adjust time configuration: Ä‘iá»u chỉnh cấu hình thời " -+"gian) thì sáş˝ dĂąng trinh adjtimex Ä‘á» tìm giá trị cho biáşżn hạt nhân «tick» vĂ " -+"«frequency» Ä‘á» khá»›p đồng hồ hệ thống xấp xi vá»›i đồng hồ phần cứng (cĹ©ng được " -+"biáşżt nhĆ° là đồng hồ CMOS). NhĆ° tháşż thì nĂł lĆ°u nhĆ°ng giá trị nĂ y trong táşp " -+"tin cấu hình /etc/default/adjtimex vì váşy sáş˝ phục hồi cách thiáşżt láşp ấy mọi " -+"khi khởi Ä‘á»™ng, khi chạy /etc/init.d/adjtimex." ++ -- James R. Van Zandt <jrv@debian.org> Sun, 26 Jul 2009 17:36:16 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Táşp lệnh nĂ y chạy được 70 giây. Hoáş·c bạn cĂł thá» tá»± chạy táşp lệnh " -+"adjtimexconfig vĂ o lĂşc sau, hoáş·c quyáşżt định những biáşżn hạt nhân má»™t của vĂ i " -+"cách khác (hĂŁy xem trang hĆ°á»›ng dáş«n: lệnh\n" -+"man adjtimex\n" -+"mà «man» lĂ trình hiá»n thị trang hĆ°á»›ng dáş«n), vĂ cĂ i Ä‘áş·t chĂşng vĂ o /etc/" -+"default/adjtimex." ---- adjtimex-1.23.orig/debian/po/cs.po -+++ adjtimex-1.23/debian/po/cs.po -@@ -0,0 +1,67 @@ -+# Czech translation of adjtimex templates -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-3\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-4-10 22:13+0200\n" -+"Last-Translator: Martin Sin <martin.sin@seznam.cz>\n" -+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-2\n" -+"Content-Transfer-Encoding: 8bit\n" ++adjtimex (1.27.1-3) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Má být adjtimex spuątěn při instalaci a při kaľdém spuątění?" ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#525233) ++ Swedish (thanks to: Martin Bagge <brother@bsnet.se>. Closes:Bug#525924) ++ Spanish (thanks to: Francisco Javier Cuadrado <fcocuadrado@gmail.com>, ++ Closes:Bug#528621) ++ Russian (thanks to: Yuri Kozlov <yuray@komyakino.ru>, Closes:Bug#529047) ++ Czech (thanks to: Martin Sin <martin.sin@zshk.cz>, Closes:Bug#529652) + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex můľe běľet při kaľdém startu systému a nastavit parametry jádra na " -+"hodnoty z /etc/default/adjtimex. Při nesouhlasu bude adjtimex nastaven na " -+"zjiątění aktuálních parametrů." ++ -- James R. Van Zandt <jrv@debian.org> Tue, 26 May 2009 20:47:42 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Má být adjtimexconfig spuątěn při instalaci?" ++adjtimex (1.27.1-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skript adjtimexconfig pouľije adjtimex k nalezení hodnot pro proměnné " -+"časovače a frekvence jádra tak, ľe nastaví systémové hodiny přibliľně na " -+"hodnotu hardwarových hodin (také známých jako CMOS hodiny). Pak uloľí tyto " -+"hodnoty do konfiguračního souboru /etc/default/adjtimex aby mohlo být " -+"nastavení obnoveno při kaľdém startu, vľdy při spuątění /etc/init.d/adjtimex." ++ * Debconf templates and debian/control reviewed by the debian-l10n- ++ english team as part of the Smith review project. Closes: #519431 ++ * Update translation: ++ French (Closes:Bug#520986) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Spuątění skriptu zabere 70 sekund. Nebo můľete spustit adjtimexconfig " -+"samostatně později, případně určit proměnné jádra jedním z několika různých " -+"způsobů (podívejte se na manuálovou stránku adjtimex) a umístěte je do /etc/" -+"default/adjtimex." ---- adjtimex-1.23.orig/debian/po/pt.po -+++ adjtimex-1.23/debian/po/pt.po -@@ -0,0 +1,71 @@ -+# 2005-10-27 - Marco Ferra <mferra@sdf.lonestar.org> (initial translation) -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-10-27 01:11+0100\n" -+"Last-Translator: Marco Ferra <mferra@sdf.lonestar.org>\n" -+"Language-Team: Portuguese <traduz@debianpt.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" ++ -- James R. Van Zandt <jrv@debian.org> Wed, 20 May 2009 22:03:38 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " -+"inicia?" ++adjtimex (1.27.1-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"O adjtimex pode correr quando o sistema inicia para ajustar os paramĂŞtros " -+"temporais do kernel para os valores especificados em /etc/default/adjtimex. " -+"Por favor recuse se apenas deseja usar o adjtimex para inspecionar os " -+"paramĂŞtros actuais." ++ * New upstream release. Provide workaround if linux/rtc.h ++ is missing (Closes:#308864) ++ ++ * debian/rules: delete config temporaries, but not config.h.in ++ * debian/control: bump version to 3.8.1 (no changes needed) ++ ++ * Update translations: ++ Japanese (Thanks to: henrich@debian.or.jp [188] Closes:Bug#522188) ++ Czech (Thanks to: martin.sin@zshk.cz [219] Closes:Bug#522193) ++ Swedish (Thanks to: brother@bsnet.se [194] Closes:Bug#522979) ++ Basque (Thanks to: pi+debian@beobide.net [207] Closes:Bug#523079) ++ Italian (Thanks to: vinz65@gmail.com [197] Closes:Bug#523419) ++ Spanish (Thanks to: fcocuadrado@gmail.com [193] Closes:Bug#523915) ++ Russian (Thanks to: yuray@komyakino.ru [223] Closes:Bug#524069) ++ German (Thanks to: schanzi_@gmx.de [226] Closes:Bug#524224) ++ Portuguese (Thanks to: carloslisboa@gmail.com [170] Closes:Bug#524283) ++ Danish (Thanks to: debian@overbygaard.dk [209] Closes:Bug#524368) ++ Galician (Thanks to: mvillarino@gmail.com [216] Closes:Bug#524397) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 18 Apr 2009 16:35:22 -0400 ++ ++adjtimex (1.27-1) unstable; urgency=low ++ ++ * New upstream release. If using update interrupt, sanity check the ++ delay. Sometimes the status includes an update complete flag, but it ++ actually didn't wait. Fall back to another method of reading RTC ++ (closes:Bug#517732) Calculate RTC correction as PPM of RTC time ++ (Thanks to Alain Guibert, closes:Bug#308863). ++ ++ * debian/control: add ${misc:Depends} per lintian warning. ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 22 Mar 2009 21:54:51 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Deve o adjtimexconfig correr enquanto o instala?" ++adjtimex (1.26-2) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"O script adjtimexconfig irá usar o comando adjtimex para encontrar os " -+"valores para variáveis do kernel que o farĂŁo aproximar e estar de acordo com " -+"o relĂłgio por hardware (tambem conhecido pelo CMOS clock). Este entĂŁo " -+"guarda esses valores no ficheiro /etc/default/adjtimex para que estes " -+"paramĂŞtros sejam reavidos sempre que o sistema inicia, nomeadamente quando " -+"o /etc/init.d/adjtimex corre." ++ * debian/templates: Clarify wording: ask about running "when installed ++ or upgraded" not just "at installation time" (thanks to Uwe Storbeck ++ <uwe@ibr.ch> and Michael Meskes <meskes@debian.org>, ++ Closes:Bug#514987) ++ ++ * debian/postinst: don't prepend path to command running adjtimexconfig ++ to silence lintian complaint. (The package management system already ++ puts /usr/sbin in path, because that's where install-info is.) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Este script demora 70 segundos a correr. De forma alternativa pode correr o " -+"adjtimexconfig por si prĂłprio numa altura mais tarde ou determinar as " -+"variáveis do kernel de outras formas (leia a página do manual do adjtimex) e " -+"instale-os em /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/sv.po -+++ adjtimex-1.23/debian/po/sv.po -@@ -0,0 +1,77 @@ -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# Developers do not need to manually edit POT or PO files. -+# , fuzzy -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-10-11 16:31+0200\n" -+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" -+"Language-Team: Swedish <sv@li.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" ++ -- James R. Van Zandt <jrv@debian.org> Sat, 14 Feb 2009 11:46:24 -0500 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" ++adjtimex (1.26-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " -+"till värdena i /etc/default/adjtimex. Acceptera inte om du bara vill använda " -+"adjtimex för att inspektera de nuvarande parametrarna." ++ * New upstream release. Fix a possible hang with the Intersil ISL1208, ++ one of those new non-PC-compatible RTCs. Cleanly exits with an error ++ message, instead of either hang or returning garbage. (Thanks to Alain ++ Guibert). ++ ++ * debian/control: bump Debian policy version to 3.8.0 (no changes needed) ++ ++ * debian/rules: use "filter" instead of "findstring" to parse ++ DEB_BUILD_OPTIONS. + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Ska adjtimexconfig köras vid installationstid?" ++ -- James R. Van Zandt <jrv@debian.org> Sun, 17 Aug 2008 17:52:14 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " -+"kärnvariablerna tick och frequency som gör att systemklockan kommer överens " -+"med hĺrdvaruklockan (ocksĺ kallad CMOS-klockan). Den sparar sedan dessa " -+"värden i konfigurationsfilen /etc/default/adjtimex sĺ att inställningarna " -+"kommer att användas vid varje uppstart, när /etc/init.d/adjtimex körs." ++adjtimex (1.25-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Skriptet tar 70 sekunder att köras. Alternativt kan du köra adjtimexconfig " -+"själv vid en senare tid eller bestämma variabler för kärnan pĺ ett eller " -+"flera sätt (se adjtimes manualsida) och installera dom i /etc/default/" -+"adjtimex)." ---- adjtimex-1.23.orig/debian/po/ru.po -+++ adjtimex-1.23/debian/po/ru.po -@@ -0,0 +1,80 @@ -+# translation of adjtimex_1.20-5_templates_ru.po to Russian -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# Yuri Kozlov <kozlov.y@gmail.com>, 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: template_adjtimex_1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-11-07 19:24+0300\n" -+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" -+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.9.1\n" ++ * New upstream release. Set an alarm to avoid blocking even if /dev/rtc ++ never becomes readable, then fall back to busywait. New --nointerrupt ++ option to force busywait without first waiting for the interrupt ++ timeout (thanks to Alain Guibert). (closes:Bug#477637,Bug#474337). ++ Update man page (closes:Bug#435956). + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Должен adjtimex быть Đ·Đ°ĐżŃщен ŃĐµĐąŃ‡Đ°Ń Đ¸ каждый раз при Ńтарте ŃиŃтемы?" ++ -- James R. Van Zandt <jrv@debian.org> Fri, 08 Aug 2008 19:43:38 -0400 + -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex можно Đ·Đ°ĐżŃŃкать при Ńтарте ŃиŃтемы для ŃŃтановки значений " -+"параметров времени ядра из файла /etc/default/adjtimex. Не ŃоглаŃайтеŃŃŚ, " -+"еŃли проŃŃ‚Đľ хотите иŃпользовать adjtimex для проверки текŃщих параметров." ++adjtimex (1.24-1) unstable; urgency=low + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Должен adjtimexconfig быть Đ·Đ°ĐżŃщен ŃейчаŃ?" ++ * New upstream release + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Сценарий adjtimexconfig иŃпользŃет adjtimex для поиŃка значений переменных " -+"ядра импŃльŃĐ° Ńигнала и чаŃтоты, которые помогают ŃоглаŃовывать ŃиŃтемные " -+"чаŃŃ‹ Ń Đ°ĐżĐżĐ°Ń€Đ°Ń‚Đ˝Ń‹ĐĽĐ¸ чаŃами (Ń‚Đ°Đş называемые чаŃŃ‹ CMOS). Затем он Ńохраняет эти " -+"значения в конфигŃрационный файл /etc/default/adjtimex, для того чтобы " -+"воŃŃтанавливать их при каждой загрŃзке Ń ĐżĐľĐĽĐľŃ‰ŃŚŃŽ Ńценария /etc/init.d/" -+"adjtimex." ++ * adjtimex.c: Reorganize cmos_read_time() to properly integrate the ++ fallback case for when /dev/rtc has no interrupts. Make this fallback ++ actually work. fixes partially(?) Debian bug #460065 (Thanks to Alain ++ Guibert <alguibert@free.fr>) (closes:Bug#471203) + -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"ДлительноŃŃ‚ŃŚ работы Ńценария -- 70 ŃекŃнд. Đ’ качеŃтве альтернативы вы можете " -+"Đ·Đ°ĐżŃŃтить adjtimexconfig врŃчнŃŃŽ позже, или определить переменные ядра одним " -+"из неŃкольких Đ´Ń€Ńгих ŃпоŃобов (Ńмотрите ŃŃ‚Ń€Đ°Đ˝Đ¸Ń†Ń Ń€ŃководŃтва по adjtimex) и " -+"Ńохранить их в файл /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/README.Debian -+++ adjtimex-1.23/debian/README.Debian -@@ -0,0 +1,21 @@ -+adjtimex for DEBIAN -+---------------------- ++ * (cmos_read_time): Fix Y2K bug: read century from byte 50, instead of ++ assuming we're in the range 1969-2068. + -+This is the Debian Linux prepackaged version of adjtimex. ++ * Implement second kind of busywait (busywait_second_change): when ++ /dev/rtc interrupt is not available, fallbacks to loops around ++ ioctl(RTC_RD_TIME) until the RTC second changes. Patch applies to ++ adjtimex 1.23 above first no-interrupt-fallback.patch fixes ++ partially(?) Debian bug #460065 (Thanks to: Alain Guibert ++ <alguibert@free.fr>) + -+This package was put together by Jim Van Zandt <jrv@debian.org>, -+who also maintains the program and therefore used the master sources. ++ * (cmos_read_time) If /dev/rtc does not exist then automatically ++ fallback to /dev/rtc0, so it works even without symlink. (Thanks to: ++ Alain Guibert <alguibert@free.fr>) + -+further Information: ++ * adjtimex.c (main): fix typo in options handling (thanks to Miroslav ++ Lichvar <mlichvar@redhat.com>) + -+* adjtimex manpage -+* copying policy -+ /usr/share/doc/adjtimex/copyright -+ (or debian/copyright in the source package) -+* changelog for debian package -+ /usr/share/doc/adjtimex/changelog.Debian -+* adjtimex's README: -+ /usr/share/doc/adjtimex/README ++ * debian/control: bump Debian policy version to 3.7.3 (no changes needed) + ++ * debian/dirs: don't install empty directory /usr/bin + -+James R. Van Zandt <jrv@debian.org>, Sun, 7 Mar 1999 21:58:51 -0500 ---- adjtimex-1.23.orig/debian/templates -+++ adjtimex-1.23/debian/templates -@@ -0,0 +1,22 @@ -+Template: adjtimex/run_daemon -+Type: boolean -+Default: true -+_Description: Should adjtimex be run at installation and at every startup? -+ adjtimex can run at system startup to set the kernel time parameters to -+ the values in /etc/default/adjtimex. Don't accept if you just want to -+ use adjtimex to inspect the current parameters. ++ -- James R. Van Zandt <jrv@debian.org> Fri, 04 Apr 2008 22:05:01 -0400 + -+Template: adjtimex/compare_rtc -+Type: boolean -+Default: true -+_Description: Should adjtimexconfig be run at installation time? -+ The adjtimexconfig script will use adjtimex to find values for the kernel -+ variables tick and frequency that will make the system clock approximately -+ agree with the hardware clock (also known as the CMOS clock). It then -+ saves these values in the configuration file /etc/default/adjtimex so the -+ settings will be restored on every boot, when /etc/init.d/adjtimex runs. -+ . -+ The script takes 70 sec to run. Alternatively, you can run adjtimexconfig -+ yourself at a later time, or determine the kernel variables one of several -+ other ways (see the adjtimex man page) and install them in -+ /etc/default/adjtimex. ---- adjtimex-1.23.orig/debian/changelog -+++ adjtimex-1.23/debian/changelog -@@ -0,0 +1,530 @@ +adjtimex (1.23-1) unstable; urgency=low + + * New upstream release @@ -4877,15 +4216,146 @@ + * Really say what we're doing in postinst (Bug#3474) + + ---- adjtimex-1.23.orig/debian/dirs -+++ adjtimex-1.23/debian/dirs -@@ -0,0 +1,4 @@ -+usr/bin +--- adjtimex-1.29.orig/debian/adjtimexconfig.8 ++++ adjtimex-1.29/debian/adjtimexconfig.8 +@@ -0,0 +1,41 @@ ++.\"{{{ Title Emacs major mode should be: -*- nroff -*- ++.TH ADJTIMEXCONFIG 8 "April 27, 2003" ++.\"}}} ++.\"{{{ Name ++.SH NAME ++adjtimexconfig \- find kernel clock variables and save for reboots ++.\"}}} ++.\"{{{ Synopsis ++.SH SYNOPSIS ++.ad l ++.\" commands only ++.B /sbin/adjtimexconfig ++.\"}}} ++.\"{{{ Config ++.SH DESCRIPTION ++This script uses \fBadjtimex\fP(8) to find values for the kernel ++variables \fBtick\fP and \fBfrequency\fP that will make the system ++clock approximately agree with the CMOS clock. It then saves these ++values in the configuration file \fI/etc/default/adjtimex\fP so the ++settings will be restored on every boot, when ++\fI/etc/init.d/adjtimex\fP runs. ++.P ++\fPadjtimexconfig\fP uses the drift rate recorded in ++\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. ++If you find the CMOS clock has a systematic drift, read the ++\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify ++\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. ++.SH AUTHOR ++Michael Meskes <meskes@debian.org>. ++.\"}}} ++.\"{{{ ++.SH FILES ++.nf ++\fI/etc/default/adjtimex\fP ++\fI/etc/init.d/adjtimex\fP ++.fi ++.\"}}} ++.\"{{{ See also ++.SH "SEE ALSO" ++.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) ++.\"}}} +--- adjtimex-1.29.orig/debian/adjust ++++ adjtimex-1.29/debian/adjust +@@ -0,0 +1,15 @@ ++ mode: 16384 ++ offset: 0 ++ frequency: 0 ++ maxerror: 0 ++ esterror: 0 ++ status: 0 ++time_constant: 0 ++ precision: 0 ++ tolerance: 0 ++ tick: 0 ++ raw time: 0s 0us = 0.000000 ++for this kernel: ++ USER_HZ = 100 (nominally 100 ticks per second) ++ 9000 <= tick <= 11000 ++ -33554432 <= frequency <= 33554432 +--- adjtimex-1.29.orig/debian/dirs ++++ adjtimex-1.29/debian/dirs +@@ -0,0 +1,3 @@ +usr/sbin +sbin +usr/share/man/man8 ---- adjtimex-1.23.orig/debian/postrm -+++ adjtimex-1.23/debian/postrm +--- adjtimex-1.29.orig/debian/adjtimexconfig ++++ adjtimex-1.29/debian/adjtimexconfig +@@ -0,0 +1,67 @@ ++#!/bin/sh ++ ++conffile=/etc/default/adjtimex ++startfile=/etc/init.d/adjtimex ++ ++echo -n "Comparing clocks (this will take 70 sec)..." ++ ++# Get the parameters ++ ++/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null ++baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` ++hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` ++/sbin/adjtimex --tick $baseline --frequency 0 ++/sbin/adjtimex --adjust --force-adjust >/etc/adj.adjust ++echo "done." ++ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` ++freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` ++# cat /etc/adj.adjust ++# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq ++rm /etc/adj.adjust ++adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` ++echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." ++ ++# Recreate /etc/adjtimex.conf if necessary ++ ++if [ -f $conffile ]; then ++# echo "using existing $conffile"; ++ true; ++else ++cat >$conffile <<EOF ++# $conffile - configuration file for adjtimex(8) ++# ++# you may adjust these values manually or by calling /usr/sbin/adjtimexconfig ++# ++# This file is sourced by $startfile ++# ++TICK=$TICK ++FREQ=$FREQ ++ ++EOF ++fi ++ ++# Reset values in $conffile ++ ++sed -e "s/^TICK=.*/TICK=$ticks/" \ ++ -e "s/^FREQ=.*/FREQ=$freq/" \ ++ $conffile >$conffile.TMP && \ ++ mv $conffile.TMP $conffile ++ ++# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick ++# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq ++# ++# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" ++# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" ++# ++# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP ++# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ ++# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex ++# ++# if [ -s /etc/init.d/adjtimex ] ++# then ++# rm -f /etc/init.d/adjtimex.TMP ++# fi ++# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust ++rm -f /etc/adj.adjust ++echo "done." ++ +--- adjtimex-1.29.orig/debian/postrm ++++ adjtimex-1.29/debian/postrm @@ -0,0 +1,25 @@ +#! /bin/sh -e + @@ -4912,8 +4382,79 @@ +esac + +#DEBHELPER# ---- adjtimex-1.23.orig/debian/copyright -+++ adjtimex-1.23/debian/copyright +--- adjtimex-1.29.orig/debian/control ++++ adjtimex-1.29/debian/control +@@ -0,0 +1,20 @@ ++Source: adjtimex ++Section: admin ++Priority: optional ++Maintainer: James R. Van Zandt <jrv@debian.org> ++Build-Depends: debhelper (>= 5), po-debconf ++Standards-Version: 3.8.4 ++ ++Package: adjtimex ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, debconf | debconf-2.0 ++Suggests: ntpdate ++Description: kernel time variables configuration utility ++ This package provides a utility to manipulate the kernel time ++ variables. For a machine connected to the Internet, or equipped with ++ a precision oscillator or radio clock, the best way to keep the ++ system clock accurate is using NTP (Network Time Protocol). However, ++ for a standalone or intermittently connected machine, you may use ++ adjtimex instead to at least correct for systematic drift. It can ++ optionally adjust the system clock using the CMOS clock as a ++ reference, and can log times for long-term estimation of drift rates. +--- adjtimex-1.29.orig/debian/adjtimex.init ++++ adjtimex-1.29/debian/adjtimex.init +@@ -0,0 +1,45 @@ ++#!/bin/sh ++# ++# Run ADJTIMEX at startup. ++ ++### BEGIN INIT INFO ++# Provides: adjtimex ++# Required-Start: $local_fs ++# Required-Stop: ++# Should-Start: ++# Should-Stop: ++# Default-Start: S ++# Default-Stop: ++# Short-Description: set the kernel time variables ++# Description: set the kernel time variables ++### END INIT INFO ++ ++test -x /sbin/adjtimex || exit 0 ++ ++# default values ++TICK=10000 ++FREQ=0 ++ ++# values in $cfg take precedence over the values here ++cfg=/etc/default/adjtimex ++ ++if [ -f $cfg ]; then ++ . $cfg ++fi ++ ++case "$1" in ++ start|restart|force-reload) ++ echo -n "Regulating system clock..." ++ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" ++ echo "done." ++ ;; ++ stop|status) ++ ;; ++ *) ++ echo "/etc/init.d/adjtimex: unknown command $1" >&2 ++ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 ++ exit 3 ++ ;; ++esac ++ ++exit 0 +--- adjtimex-1.29.orig/debian/copyright ++++ adjtimex-1.29/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by James R. Van Zandt jrv@debian.org on +Thu, 11 Dec 1997 21:48:01 -0500. @@ -4943,9 +4484,63 @@ +On Debian GNU/Linux systems, the complete text of the GNU Public +License can be found in `/usr/share/common-licenses/' + ---- adjtimex-1.23.orig/debian/rules -+++ adjtimex-1.23/debian/rules -@@ -0,0 +1,113 @@ +--- adjtimex-1.29.orig/debian/templates ++++ adjtimex-1.29/debian/templates +@@ -0,0 +1,35 @@ ++# These templates have been reviewed by the debian-l10n-english ++# team ++# ++# If modifications/additions/rewording are needed, please ask ++# debian-l10n-english@lists.debian.org for advice. ++# ++# Even minor modifications require translation updates and such ++# changes should be coordinated with translators and reviewers. ++ ++Template: adjtimex/run_daemon ++Type: boolean ++Default: true ++_Description: Should adjtimex be run at installation and at every startup? ++ Running adjtimex at system startup will set the kernel time parameters to ++ the values in /etc/default/adjtimex. ++ . ++ You should not choose this option if you just want to ++ use adjtimex to inspect the current parameters. ++ ++Template: adjtimex/compare_rtc ++Type: boolean ++Default: true ++#flag:comment:2 ++# Translators: do not translate "tick" and "frequency" ++_Description: Run adjtimexconfig when adjtimex is installed or upgraded? ++ The adjtimexconfig script will use adjtimex to find values for the kernel ++ variables "tick" and "frequency" that will make the system clock approximately ++ agree with the hardware clock (also known as the CMOS clock). It then ++ saves these values in the configuration file /etc/default/adjtimex so the ++ settings will be restored on every boot, when /etc/init.d/adjtimex runs. ++ . ++ The script takes 70 seconds to run, so running it for every upgrade ++ may be a waste of time. Alternatively, you can run adjtimexconfig ++ manually when needed, or determine the kernel variables by using other ++ methods and set them manually in /etc/default/adjtimex. +--- adjtimex-1.29.orig/debian/docs ++++ adjtimex-1.29/debian/docs +@@ -0,0 +1,2 @@ ++README ++README.ru +--- adjtimex-1.29.orig/debian/config ++++ adjtimex-1.29/debian/config +@@ -0,0 +1,8 @@ ++#! /bin/sh -e ++ ++# Source debconf library. ++. /usr/share/debconf/confmodule ++ ++db_input medium adjtimex/run_daemon || true ++db_input medium adjtimex/compare_rtc || true ++db_go +--- adjtimex-1.29.orig/debian/rules ++++ adjtimex-1.29/debian/rules +@@ -0,0 +1,117 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. @@ -4968,23 +4563,27 @@ +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif -+ ++# parallel build isn't worth while + +config.status: configure + dh_testdir + # configure the package. + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info ++ touch config.h + ++build: build-arch build-indep + -+build: build-stamp ++build-arch: build-stamp ++ ++build-indep: build-stamp + +build-stamp: config.status + dh_testdir @@ -5003,7 +4602,7 @@ + # clean up after the build process. + debconf-updatepo + [ ! -f Makefile ] || $(MAKE) veryclean -+ rm -rf adjtimex *.o config.* ++ rm -rf adjtimex *.o config.cache config.log config.status + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ @@ -5059,139 +4658,9 @@ + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install ---- adjtimex-1.23.orig/debian/docs -+++ adjtimex-1.23/debian/docs -@@ -0,0 +1,2 @@ -+README -+README.ru ---- adjtimex-1.23.orig/debian/adjtimexconfig -+++ adjtimex-1.23/debian/adjtimexconfig -@@ -0,0 +1,67 @@ -+#!/bin/sh -+ -+conffile=/etc/default/adjtimex -+startfile=/etc/init.d/adjtimex -+ -+echo -n "Comparing clocks (this will take 70 sec)..." -+ -+# Get the parameters -+ -+/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null -+baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` -+hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` -+/sbin/adjtimex --tick $baseline --frequency 0 -+/sbin/adjtimex --adjust >/etc/adj.adjust -+echo "done." -+ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` -+freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` -+# cat /etc/adj.adjust -+# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq -+rm /etc/adj.adjust -+adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` -+echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." -+ -+# Recreate /etc/adjtimex.conf if necessary -+ -+if [ -f $conffile ]; then -+# echo "using existing $conffile"; -+ true; -+else -+cat >$conffile <<EOF -+# $conffile - configuration file for adjtimex(8) -+# -+# you may adjust these values manually or by calling /usr/sbin/adjtimexconfig -+# -+# This file is sourced by $startfile -+# -+TICK=$TICK -+FREQ=$FREQ -+ -+EOF -+fi -+ -+# Reset values in $conffile -+ -+sed -e "s/^TICK=.*/TICK=$ticks/" \ -+ -e "s/^FREQ=.*/FREQ=$freq/" \ -+ $conffile >$conffile.TMP && \ -+ mv $conffile.TMP $conffile -+ -+# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick -+# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq -+# -+# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" -+# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" -+# -+# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP -+# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ -+# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex -+# -+# if [ -s /etc/init.d/adjtimex ] -+# then -+# rm -f /etc/init.d/adjtimex.TMP -+# fi -+# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust -+rm -f /etc/adj.adjust -+echo "done." -+ ---- adjtimex-1.23.orig/debian/adjtimexconfig.8 -+++ adjtimex-1.23/debian/adjtimexconfig.8 -@@ -0,0 +1,41 @@ -+.\"{{{ Title Emacs major mode should be: -*- nroff -*- -+.TH ADJTIMEXCONFIG 8 "April 27, 2003" -+.\"}}} -+.\"{{{ Name -+.SH NAME -+adjtimexconfig \- find kernel clock variables and save for reboots -+.\"}}} -+.\"{{{ Synopsis -+.SH SYNOPSIS -+.ad l -+.\" commands only -+.B /sbin/adjtimexconfig -+.\"}}} -+.\"{{{ Config -+.SH DESCRIPTION -+This script uses \fBadjtimex\fP(8) to find values for the kernel -+variables \fBtick\fP and \fBfrequency\fP that will make the system -+clock approximately agree with the CMOS clock. It then saves these -+values in the configuration file \fI/etc/default/adjtimex\fP so the -+settings will be restored on every boot, when -+\fI/etc/init.d/adjtimex\fP runs. -+.P -+\fPadjtimexconfig\fP uses the drift rate recorded in -+\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. -+If you find the CMOS clock has a systematic drift, read the -+\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify -+\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. -+.SH AUTHOR -+Michael Meskes <meskes@debian.org>. -+.\"}}} -+.\"{{{ -+.SH FILES -+.nf -+\fI/etc/default/adjtimex\fP -+\fI/etc/init.d/adjtimex\fP -+.fi -+.\"}}} -+.\"{{{ See also -+.SH "SEE ALSO" -+.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) -+.\"}}} ---- adjtimex-1.23.orig/debian/config -+++ adjtimex-1.23/debian/config -@@ -0,0 +1,8 @@ -+#! /bin/sh -e -+ -+# Source debconf library. -+. /usr/share/debconf/confmodule -+ -+db_input medium adjtimex/run_daemon || true -+db_input medium adjtimex/compare_rtc || true -+db_go ---- adjtimex-1.23.orig/debian/postinst -+++ adjtimex-1.23/debian/postinst -@@ -0,0 +1,119 @@ +--- adjtimex-1.29.orig/debian/postinst ++++ adjtimex-1.29/debian/postinst +@@ -0,0 +1,123 @@ +#! /bin/sh + +set -e @@ -5282,6 +4751,10 @@ +case "$1" in + configure) + ++# A previous installation may have left a corrupt conffile. ++# The regexp matches only blank lines, comments, and integer assignments: ++ egrep -qv '^([:space:]*(#.*)?|[:space:]*[a-zA-Z][a-zA-Z0-9]*[:space:]*=[:space:]*[0-9]+[:space:]*)$' $conffile && rm -f $conffile ++ + create_adjtimex_conf + + db_get adjtimex/run_daemon @@ -5297,7 +4770,7 @@ + + db_get adjtimex/compare_rtc + if [ "$RET" = "true" ]; then -+ /usr/sbin/adjtimexconfig ++ adjtimexconfig + fi + + ;; @@ -5311,146 +4784,1781 @@ +esac + +#DEBHELPER# ---- adjtimex-1.23.orig/debian/adjtimex.init -+++ adjtimex-1.23/debian/adjtimex.init -@@ -0,0 +1,45 @@ -+#!/bin/sh +--- adjtimex-1.29.orig/debian/README.Debian ++++ adjtimex-1.29/debian/README.Debian +@@ -0,0 +1,21 @@ ++adjtimex for DEBIAN ++---------------------- ++ ++This is the Debian Linux prepackaged version of adjtimex. ++ ++This package was put together by Jim Van Zandt <jrv@debian.org>, ++who also maintains the program and therefore used the master sources. ++ ++further Information: ++ ++* adjtimex manpage ++* copying policy ++ /usr/share/doc/adjtimex/copyright ++ (or debian/copyright in the source package) ++* changelog for debian package ++ /usr/share/doc/adjtimex/changelog.Debian ++* adjtimex's README: ++ /usr/share/doc/adjtimex/README ++ ++ ++James R. Van Zandt <jrv@debian.org>, Sun, 7 Mar 1999 21:58:51 -0500 +--- adjtimex-1.29.orig/debian/po/fr.po ++++ adjtimex-1.29/debian/po/fr.po +@@ -0,0 +1,90 @@ ++# Translation of adjtimex debconf screen to French ++# Copyright (C) 2005-2009 Debian French l10n team <debian-l10n-french@lists.debian.org> ++# This file is distributed under the same license as the adjtimex package. +# -+# Run ADJTIMEX at startup. ++# Christian Perrier <bubulle@debian.org>, 2006, 2009. ++# Translators: ++msgid "" ++msgstr "" ++"Project-Id-Version: fr\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-03-17 07:45+0100\n" ++"Last-Translator: Christian Perrier <bubulle@debian.org>\n" ++"Language-Team: French <debian-l10n-french@lists.debian.org>\n" ++"Language: fr\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" + -+### BEGIN INIT INFO -+# Provides: adjtimex -+# Required-Start: -+# Required-Stop: -+# Should-Start: -+# Should-Stop: -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 -+# Short-Description: set the kernel time variables -+# Description: set the kernel time variables -+### END INIT INFO ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Faut-il lancer adjtimex lors de l'installation et Ă chaque dĂ©marrage du " ++"système ?" + -+test -x /sbin/adjtimex || exit 0 ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex peut ĂŞtre lancĂ© au dĂ©marrage du système afin de rĂ©gler les " ++"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" ++"default/adjtimex." + -+# default values -+TICK=10000 -+FREQ=0 -+ -+# values in $cfg take precedence over the values here -+cfg=/etc/default/adjtimex ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vous ne devriez pas choisir cette option si vous souhaitez simplement vous " ++"servir d'adjtimex pour consulter les paramètres actuels." + -+if [ -f $cfg ]; then -+ . $cfg -+fi ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Faut-il lancer adjtimexconfig lors de l'installation ou de la mise Ă jour ?" + -+case "$1" in -+ start|restart|force-reload) -+ echo -n "Regulating system clock..." -+ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" -+ echo "done." -+ ;; -+ stop|status) -+ ;; -+ *) -+ echo "/etc/init.d/adjtimex: unknown command $1" >&2 -+ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 -+ exit 3 -+ ;; -+esac ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " ++"appropriĂ©es pour les variables du noyau concernant le battement (« tick ») " ++"et la frĂ©quence d'horloge. Cela permettra Ă l'horloge du système d'ĂŞtre Ă " ++"peu près en accord avec l'horloge matĂ©rielle (parfois appelĂ©e « horloge " ++"CMOS »). Ces valeurs seront alors conservĂ©es dans le fichier de " ++"configuration /etc/default/adjtimex ce qui permettra de les restaurer Ă " ++"chaque dĂ©marrage quand /etc/init.d/adjtimex s'exĂ©cutera. " + -+exit 0 ---- adjtimex-1.23.orig/debian/adjust -+++ adjtimex-1.23/debian/adjust -@@ -0,0 +1,15 @@ -+ mode: 16384 -+ offset: 0 -+ frequency: 0 -+ maxerror: 0 -+ esterror: 0 -+ status: 0 -+time_constant: 0 -+ precision: 0 -+ tolerance: 0 -+ tick: 0 -+ raw time: 0s 0us = 0.000000 -+for this kernel: -+ USER_HZ = 100 (nominally 100 ticks per second) -+ 9000 <= tick <= 11000 -+ -33554432 <= frequency <= 33554432 ---- adjtimex-1.23.orig/debian/compat -+++ adjtimex-1.23/debian/compat ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"La durĂ©e d'exĂ©cution du script est de 70 secondes, ce qui peut ĂŞtre vu comme " ++"une perte de temps au dĂ©marrage. Vous pouvez Ă©galement utiliser " ++"adjtimexconfig vous-mĂŞme plus tard ou dĂ©terminer les valeurs des variables " ++"du noyau d'une autre manière. Ces valeurs devront ensuite ĂŞtre placĂ©es dans /" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/it.po ++++ adjtimex-1.29/debian/po/it.po +@@ -0,0 +1,85 @@ ++# ITALIAN TRANSLATION OF ADJTIMEX'S.PO-DEBCONF FILE ++# COPYRIGHT (C) 2009 THE ADJTIMEX'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# ++# Vincenzo Campanella <vinz65@gmail.com>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.26-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-01 14:15+0200\n" ++"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n" ++"Language-Team: Italian <tp@lists.linux.it>\n" ++"Language: it\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Eseguire adjtimex all'installazione e con ogni avvio del sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"L'esecuzione di adjtimex all'avvio del sistema imposterĂ i parametri di " ++"tempo del kernel ai valori contenuti in «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non si dovrebbe scegliere questa opzione se si prevede di usare adjtimex " ++"solo per verificare i parametri attuali." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Eseguire adjtimexconfig quando adjtimex viene installato o aggiornato?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Lo script adjtimexconfig userĂ adjtimex per trovare i valori delle variabili " ++"del kernel «tick» e «frequency» per fare in modo che l'orario del sistema " ++"coincida approssimativamente a quello dell'orologio dell'hardware (anche " ++"conosciuto come orologio CMOS). Questi valori vengono poi salvati nel file " ++"di configurazione «/etc/default/adjtimex», in modo che le impostazioni " ++"vengano ripristinate a ogni avvio, quando «/etc/init.d/adjtimex» viene " ++"eseguito." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Lo script necessita di 70 secondi per essere eseguito, per cui lanciarlo a " ++"ogni aggiornamento potrebbe essere uno spreco di tempo. In alternativa è " ++"possibile eseguire manualmente adjtimexconfig quando è necessario, oppure " ++"determinare le variabili del kernel usando altri metodi e impostandole " ++"manualmente in «/etc/default/adjtimex»." +--- adjtimex-1.29.orig/debian/po/pt_BR.po ++++ adjtimex-1.29/debian/po/pt_BR.po +@@ -0,0 +1,96 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# AndrĂ© LuĂs Lopes <andrelop@debian.org>, 2010. ++# Flamarion Jorge <jorge.flamarion@gmail.com>, 2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-11-11 22:16-0200\n" ++"Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n" ++"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." ++"org>\n" ++"Language: \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" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "O adjtimex deve ser executado na instalação e em cada inicialização?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Executar o adjtimex na inicialização do sistema configurará os parâmetros de " ++"tempo do kernel para os valores em /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"VocĂŞ nĂŁo deve escolher esta opção se vocĂŞ apenas quer usar o adjtimex para " ++"inspecionar os parâmetros atuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Executar o adjtimexconfig quando o adjtimex for instalado ou atualizado?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig usará o adjtimex para encontrar valores para as " ++"variáveis \"tick\" e \"frequency\" do kernel, que farĂŁo o relĂłgio do sistema " ++"o mais prĂłximo do relĂłgio do hardware (tambĂ©m conhecido como o relĂłgio da " ++"CMOS). Ele entĂŁo salva estes valores no arquivo de configuração /etc/default/" ++"adjtimex, assim as configurações serĂŁo restauradas a cada inicialização, " ++"quando o /etc/init.d/adjtimex executar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script leva 70 segundos para rodar, portanto rodá-lo a cada atualização " ++"pode ser um desperdĂcio de tempo. Alternativamente, vocĂŞ pode executar o " ++"adjtimexconfig manualmente quando necessário, ou determinar as variáveis de " ++"kernel usando outros mĂ©todos e configurá-las manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/templates.pot ++++ adjtimex-1.29/debian/po/templates.pot +@@ -0,0 +1,68 @@ ++# 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. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\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: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" +--- adjtimex-1.29.orig/debian/po/gl.po ++++ adjtimex-1.29/debian/po/gl.po +@@ -0,0 +1,85 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# marce villarino <mvillarino@users.sourceforge.net>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: templates_[OK3397]\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 22:09+0200\n" ++"Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n" ++"Language-Team: Galician <proxecto@trasno.ent>\n" ++"Language: gl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 0.2\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Debe executarse adjtimex durante a instalaciĂłn e con cada inicio do sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Se executa adjtimex durante o inicio do sistema axustará os parámetros de " ++"hora do nĂşcleo cos valores que haxa en /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non deberĂa escoller esta opciĂłn se sĂł desexa empregar adjtimex para " ++"inspeccionar os parámetros actuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Desexa executar adjtimexconfig se instala ou actualiza?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig empregará adjtimex para achar valores paras as " ++"variábeis do nĂşcleo «tick» e «frequency» que fagan que o reloxo do sistema " ++"se corresponda aproximadamente co do hardware (o chamado reloxo da BIOS). " ++"Logo garda eses valores no ficheiro de configuraciĂłn /etc/default/adjtimex " ++"de xeito que os valores se restauren en cada arranque, cando se executa /etc/" ++"init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script tarda 70 segundos en executarse, pode que executalo cada vez que se " ++"actualice pode ser un desperdicio de tempo. En alternativa, pode executar " ++"adjtimexconfig manualmente cando o precise, ou determinar as variábeis do " ++"nĂşcleo empregando outros mĂ©todos e axustalas manualmente en /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/vi.po ++++ adjtimex-1.29/debian/po/vi.po +@@ -0,0 +1,82 @@ ++# Vietnamese Translation for adjtimex. ++# Copyright © 2010 Free Software Foundation, Inc. ++# Clytie Siddall <clytie@riverland.net.au>, 2005-2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-27 14:39+1030\n" ++"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" ++"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" ++"Language: vi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: LocFactoryEditor 1.8\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex cĂł nĂŞn chạy vĂ o lĂşc cĂ i Ä‘áş·t vĂ khi nĂ o khởi Ä‘á»™ng khĂ´ng?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Chạy adjtimex vĂ o lĂşc khởi chạy hệ thống thì láşp các tham số thời gian của " ++"hạt nhân thĂ nh những giá trị trong táşp tin « /etc/default/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"KhĂ´ng nĂŞn báşt tuỳ chọn nĂ y náşżu bạn chỉ muốn sá» dụng adjtimex Ä‘á» kiá»m tra " ++"những tham số hiện thời." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Chạy adjtimexconfig khi adjtimex được cĂ i Ä‘áş·t hay nâng cấp ?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"VÄn lệnh cấu hình adjtimexconfig thì sá» dụng adjtimex Ä‘á» tìm giá trị cho hai " ++"biáşżn hạt nhân « tick » và « frequency », Ä‘á» lĂ m cho đồng hồ hệ thống tương " ++"ứng xấp xỉ vá»›i đồng hồ phần cứng (cĹ©ng được gọi nhĆ° là đồng hồ CMOS). VÄn " ++"lệnh nĂ y lĆ°u các giá trị Ä‘Ăł vĂ o táşp tin cấu hình « /etc/default/adjtimex », " ++"Ä‘á» phục hồi thiáşżt láşp khi nĂ o việc khởi Ä‘á»™ng chạy « /etc/init.d/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"VÄn lệnh nĂ y chạy trong khoảng 70 giây thì cĂł thá» lĂ bạn khĂ´ng muốn chạy nĂł " ++"vĂ o má»—i lĂşc nâng cấp. Bạn cĹ©ng cĂł thá» chạy adjtimexconfig báş±ng tay khi cần " ++"thiáşżt, hoáş·c quyáşżt định những biáşżn hạt nhân báş±ng phương pháp khác vĂ láşp báş±ng " ++"tay trong táşp tin « /etc/default/adjtimex »." +--- adjtimex-1.29.orig/debian/po/fi.po ++++ adjtimex-1.29/debian/po/fi.po +@@ -0,0 +1,84 @@ ++# Copyright (C) 2009 ++# This file is distributed under the same license as the adjtimex package. ++# ++# Esko Arajärvi <edu@iki.fi>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-09 22:59+0200\n" ++"Last-Translator: Esko Arajärvi <edu@iki.fi>\n" ++"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" ++"Language: fi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Tulisiko adjtimex ajaa asennuksen yhteydessä ja aina kun järjestelmä " ++"käynnistetään?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Jos adjtimex ajetaan käynnistettäessä järjestelmä, ytimen aikaparametrit " ++"asetetaan tiedostossa /etc/default/adjtimex annettuihin arvoihin." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ă„lä valitse tätä vaihtoehtoa, jos haluat käyttää adjtimexiä vain nykyisten " ++"parametriarvojen tarkasteluun." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Tulisiko adjtimexconfig ajaa, kun adjtimex asennetaan tai päivitetään?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Komentosarja adjtimexconfig etsii ohjelman adjtimex avulla ytimen " ++"muuttujille ”tick” ja ”frequency” arvot, joilla järjestelmän kello näyttää " ++"suunnilleen samaa kuin laitteiston kello (CMOS-kello). Se tallentaa nämä " ++"arvot asetustiedostoon /etc/default/adjtimex, jolloin ne palautetaan " ++"järjestelmän käynnistyessä, kun /etc/init.d/adjtimex ajetaan." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Komentosarjan ajaminen kestää 70 sekuntia, joten sen ajaminen jokaisen " ++"päivityksen yhteydessä saattaa olla ajanhukkaa. Voit vaihtoehtoisesti ajaa " ++"adjtimexconfigin käsin tarvittaessa tai määrittää ytimen muuttujien arvot " ++"muilla keinoin ja asettaa ne käsin tiedostoon /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/pl.po ++++ adjtimex-1.29/debian/po/pl.po +@@ -0,0 +1,123 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: Bartosz Zapałowski <zapal@debian.linux.org.pl>\n" ++"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org." ++"pl>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=iso-8859-2\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Czy adjtimex ma być uruchomiany podczas instalacji i każdego startu systemu?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex może być uruchamiany podczas każdego uruchomienia systemu,by " ++"ustawić parametry czasu w j±drze na warto¶ci znajduj±ce się w pliku/etc/" ++"default/adjtimex. Nie wyrażaj zgody, je¶li chcesz używać adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"adjtimex może być uruchamiany podczas każdego uruchomienia systemu,by " ++"ustawić parametry czasu w j±drze na warto¶ci znajduj±ce się w pliku/etc/" ++"default/adjtimex. Nie wyrażaj zgody, je¶li chcesz używać adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "Should adjtimexconfig be run at installation time?" ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Czy adjtimexconfig ma być uruchomiony podczas instalacji?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The adjtimexconfig script will use adjtimex to find values for the kernel " ++#| "variables tick and frequency that will make the system clock " ++#| "approximately agree with the hardware clock (also known as the CMOS " ++#| "clock). It then saves these values in the configuration file /etc/" ++#| "default/adjtimex so the settings will be restored on every boot, when /" ++#| "etc/init.d/adjtimex runs." ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " ++"takichwarto¶ci parametrów j±dra tick i frequency, żeby zegar systemowy był " ++"zbliżonydo zegara sprzętowego (zegara CMOS). Następnie zapisze ustawienia w " ++"plikukonfiguracyjnym /etc/default/adjtimex, dzięki czemu warto¶ci te " ++"będ±przywrócane przy każdym starcie systemu w momencie wykonywania skryptu/" ++"etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " ++#| "yourself at a later time, or determine the kernel variables one of " ++#| "several other ways (see the adjtimex man page) and install them in /etc/" ++#| "default/adjtimex." ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skrypt będzie działał przez 70 sekund. Możesz też uruchomić " ++"własnoręcznieadjtimexconfig w dowolnym czasie lub dobrać paramterty j±dra w " ++"innysposób (zapoznaj się ze stron± manuala adjtimex) i zapisać je w pliku/" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ru.po ++++ adjtimex-1.29/debian/po/ru.po +@@ -0,0 +1,95 @@ ++# translation of adjtimex_1.28-1_ru.po to Russian ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Yuri Kozlov <kozlov.y@gmail.com>, 2005. ++# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.28-1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-02 09:43+0300\n" ++"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" ++"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" ++"Language: ru\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Đ—Đ°ĐżŃŃтить adjtimex ŃĐµĐąŃ‡Đ°Ń Đ¸ каждый раз при Ńтарте ŃиŃтемы?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Đ—Đ°ĐżŃŃĐş adjtimex при включении компьютера выполнит наŃŃ‚Ń€ĐľĐąĐşŃ Đ·Đ˝Đ°Ń‡ĐµĐ˝Đ¸Đą " ++"параметров времени ядра из файла /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ответьте отрицательно, еŃли проŃŃ‚Đľ хотите иŃпользовать adjtimex для проверки " ++"текŃщих параметров." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Đ—Đ°ĐżŃŃкать adjtimexconfig при ŃŃтановке или обновлении adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Сценарий adjtimexconfig иŃпользŃет adjtimex при поиŃке значений переменных " ++"ядра \"tick\" и \"frequency\", которые помогают ŃоглаŃовывать ŃиŃтемные чаŃŃ‹ " ++"Ń Đ°ĐżĐżĐ°Ń€Đ°Ń‚Đ˝Ń‹ĐĽĐ¸ чаŃами (Ń‚Đ°Đş называемые чаŃŃ‹ CMOS). Затем он Ńохраняет эти " ++"значения в файл наŃтройки /etc/default/adjtimex для того, чтобы " ++"воŃŃтанавливать их Ń ĐżĐľĐĽĐľŃ‰ŃŚŃŽ Ńценария /etc/init.d/adjtimex при каждом " ++"Đ·Đ°ĐżŃŃке ŃиŃтемы." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"ДлительноŃŃ‚ŃŚ работы Ńценария -- 70 ŃекŃнд, ĐżĐľŃŤŃ‚ĐľĐĽŃ ĐżŃ€Đ¸ каждом обновлении " ++"бŃдет такая задержка в работе. Đ’ качеŃтве альтернативы вы можете Đ·Đ°ĐżŃŃтить " ++"adjtimexconfig врŃчнŃŃŽ позже, или определить переменные ядра одним из " ++"неŃкольких Đ´Ń€Ńгих ŃпоŃобов (Ńмотрите ŃправочнŃŃŽ ŃŃ‚Ń€Đ°Đ˝Đ¸Ń†Ń ĐżĐľ adjtimex) и " ++"Ńохранить их в файл /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ja.po ++++ adjtimex-1.29/debian/po/ja.po +@@ -0,0 +1,91 @@ ++#
++# Translators, if you are not familiar with the PO format, gettext
++# documentation is worth reading, especially sections dedicated to
++# this format, e.g. by running:
++# info -n '(gettext)PO Files'
++# info -n '(gettext)Header Entry'
++#
++# Some information specific to po-debconf are available at
++# /usr/share/doc/po-debconf/README-trans
++# or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++# Developers do not need to manually edit POT or PO files.
++#
++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-24 18:05+0900\n" ++"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" ++"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" ++"Language: ja\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex をイăłă‚ąăăĽă«ć™‚ăŠă‚ăłćŻŽĺ›žă®čµ·ĺ‹•ć™‚ă«ĺ‹•ä˝śă•ă›ăľă™ă‹?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"ă‚·ă‚ąă†ă ă®čµ·ĺ‹•ć™‚ă«ă‚«ăĽăŤă«ă§ă®ć™‚é–“ă®ă‘ă©ăˇăĽă‚żă‚’ /etc/default/adjtimex ă®ĺ€¤ă«" ++"č¨ĺ®šă™ă‚‹ă‚ă†ă« adjtimex を動作ă•ă›ă‚‹ă“ă¨ăŚă§ăŤăľă™ă€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"ă‚·ă‚ąă†ă ă®čµ·ĺ‹•ć™‚ă«ă‚«ăĽăŤă«ă§ă®ć™‚é–“ă®ă‘ă©ăˇăĽă‚żă‚’ /etc/default/adjtimex ă®ĺ€¤ă«" ++"č¨ĺ®šă™ă‚‹ă‚ă†ă« adjtimex を動作ă•ă›ă‚‹ă“ă¨ăŚă§ăŤăľă™ă€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"adjtimexconfig ă‚’ adjtimex をイăłă‚ąăăĽă«ă€ă‚ă‚‹ă„ăŻă‚˘ăă—ă‚°ă¬ăĽă‰ă—ăźć™‚ă«ĺ®źčˇŚ" ++"ă—ăľă™ă‹?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"adjtimexconfig ă‚ąă‚ŻăŞă—ă㯠adjtimex を使用ă—ă¦ă€ă‚·ă‚ąă†ă ă‚Żăăă‚Żă‚’ăŹăĽă‰ă‚¦ă‚§" ++"アクăăă‚Ż (CMOS ă‚Żăăă‚Żă¨ă—ă¦ă‚‚知られă¦ă„ăľă™) ă¨ăŠăŠă‚ăťĺŚćśźă™ă‚‹ă‚ă†ă«ă‚«ăĽ" ++"ăŤă«ĺ¤‰ć•°ă€Śtick」ă¨ă€Śfrequency」ă«ä¸Žăる値を見ă¤ă‘ăľă™ă€‚ăťă—ă¦ă€ă“ă®ĺ€¤ă‚’č¨ĺ®š" ++"ă•ă‚ˇă‚¤ă« /etc/default/adjtimex ă«äżťĺă™ă‚‹ă“ă¨ă§ćŻŽĺ›žčµ·ĺ‹•ć™‚ă« /etc/init.d/" ++"adjtimex ăŚĺ‹•ä˝śă™ă‚‹éš›ă«č¨ĺ®šăŚĺľ©ĺ…ă•ă‚Śăľă™ă€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"ă‚ąă‚ŻăŞă—ăăŻĺ‹•ä˝śă« 70 秒もă‹ă‹ă‚‹ă®ă§ă‚˘ăă—ă‚°ă¬ăĽă‰ă®ĺş¦ă«ćŻŽĺ›žĺ®źčˇŚă™ă‚‹ă®ăŻć™‚é–“" ++"ă®ç„ˇé§„ă§ă™ă€‚ĺĄč§Łă¨ă—ă¦ăŻ adjtimexconfig を後ă»ă©ĺ®źčˇŚă™ă‚‹ă€ăľăźăŻä»–ă®ć–ąćł•ă§" ++"ă‚«ăĽăŤă«ĺ¤‰ć•°ă‚’決ă‚ă¦ă€ć‰‹ĺ‹•ă§ /etc/default/adjtimex ă¸ă®č¨ĺ®šă‚’行ă†ă€ăŞă©ăŚĺŹŻč˝" ++"ă§ă™ă€‚" +--- adjtimex-1.29.orig/debian/po/nb.po ++++ adjtimex-1.29/debian/po/nb.po +@@ -0,0 +1,82 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-15 14:50+0200\n" ++"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n" ++"Language-Team: Norwegian BokmĂĄl <i18n-nb@lister.ping.uio.no>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex kjøres ved installasjon og hver gang systemet startes?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Om adjtimex kjøres ved oppstart blir kjernens tidsparametre satt til " ++"verdiene i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Du bør ikke velge dette hvis du bare vil bruke adjtimex til ĂĄ se hva de " ++"gjeldende parametrene er." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig kjøres nĂĄr adjtimex installeres eller oppgraderes?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruke adjtimex til ĂĄ finne verdier for kjerne- " ++"variablene «tick» og «frequency» som vil fĂĄ systemklokka til ĂĄ gĂĄ omtrent " ++"lik maskinklokka (ogsĂĄ kalt CMOS-klokka). Deretter lagres disse verdiene i " ++"oppsettsfila /etc/default/adjtimex, slik at de blir tilbakestilt ved hver " ++"oppstart nĂĄt /etc/init.d/adjtimex kjører." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder ĂĄ kjøre, sĂĄ det kan være bortkastet tid ĂĄ kjøre det " ++"ved hver oppgradering. Du kan ellers kjøre adjtimexconfig manuelt nĂĄr det " ++"trengs, eller bestemme kjernevariablene pĂĄ annen mĂĄte og sette dem inn " ++"manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/sv.po ++++ adjtimex-1.29/debian/po/sv.po +@@ -0,0 +1,85 @@ ++# Translation of adjtimex debconf template to Swedish ++# Copyright (C) 2009 Martin Bagge <brother@bsnet.se> ++# This file is distributed under the same license as the adjtimex package. ++# ++# Martin Bagge <brother@bsnet.se>, 2009 ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-03-17 19:49-0400\n" ++"Last-Translator: Martin Bagge <brother@bsnet.se>\n" ++"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" ++"Language: sv\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Swedish\n" ++"X-Poedit-Country: Sweden\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " ++"till värdena i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Aktivera inte denna funktion om du endast vill använda adjtime för att " ++"inspektera aktuella parameterar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Ska adjtimexconfig köras efter installation eller uppgradering av adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " ++"kärnvariablerna \"tick\" och \"frequency\" som gör att systemklockan kommer " ++"överens med hĂĄrdvaruklockan (ocksĂĄ kallad CMOS-klockan). Den sparar sedan " ++"dessa värden i konfigurationsfilen /etc/default/adjtimex sĂĄ att " ++"inställningarna kommer att användas vid varje uppstart, när /etc/init.d/" ++"adjtimex körs." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder att köra vilket innebär att det kan vara slöseri " ++"med tid att köra vid varje uppgradering. Alternativt kan du köra " ++"adjtimexconfig själv när det behövs eller bestämma variabler för kärnan pĂĄ " ++"andra sätt och ange dessa i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/POTFILES.in ++++ adjtimex-1.29/debian/po/POTFILES.in @@ -0,0 +1 @@ -+5 ---- adjtimex-1.23.orig/Makefile -+++ adjtimex-1.23/Makefile -@@ -0,0 +1,70 @@ -+# Generated automatically from Makefile.in by configure. -+#### Start of system configuration section. -*-makefile-*- #### -+ srcdir = . ++[type: gettext/rfc822deb] templates +--- adjtimex-1.29.orig/debian/po/pt.po ++++ adjtimex-1.29/debian/po/pt.po +@@ -0,0 +1,83 @@ ++# 2005-10-27 - Marco Ferra <mferra@sdf.lonestar.org> (initial translation) ++# 2009, Carlos Lisboa <carloslisboa@gmail.com> ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 22:00+0100\n" ++"Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n" ++"Language-Team: Portuguese <traduz@debianpt.org>\n" ++"Language: pt\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" + -+VERSION=1.22 ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " ++"inicia?" + -+CFLAGS = -g -O2 -Wall -+prefix = /usr -+man1dir=${prefix}/share/man/man1 -+exec_prefix = ${prefix} -+bindir=/sbin ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Correr o adjtimex no arranque do sistema irá colocar os parâmetros de tempo " ++"do kernel para os valores em /etc/default/adjtimex." + -+INSTALL=/usr/bin/install -c ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"NĂŁo deve escolher esta opção se apenas deseja usar o adjtimex para verificar " ++"os parâmetros actuais." + -+# Extension (not including `.') for the manual page filenames. -+manext = 8 -+# Where to put the manual pages. -+mandir = $(prefix)/share/man/man$(manext) ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Correr o adjtimexconfig quando o adjtimex Ă© instalado ou actualizado?" + -+#### End of system configuration section. #### ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig irá usar adjtimex para encontrar valores para as " ++"variáveis do kernel \"tick\" e \"frequency\" que irĂŁo tornar o relĂłgio do " ++"sistema em concordância com o relĂłgio de hardware (tambĂ©m conhecido por " ++"relĂłgio CMOS). Irá entĂŁo guardar os valores no ficheiro de configuração /etc/" ++"default/adjtimex para que as configurações sejam restauradas em cada " ++"arranque, quando o /etc/init.d/adjtimex Ă© corrido." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Este script demora 70 segundos a correr, podendo ser um desperdĂcio de tempo " ++"corrĂŞ-lo em cada actualização. Como alternativa, pode correr o " ++"adjtimexconfig manualmente quando necessário, ou determine as variáveis do " ++"kernel usando outro mĂ©todo e configure-as manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/de.po ++++ adjtimex-1.29/debian/po/de.po +@@ -0,0 +1,96 @@ ++# translation of adjtimex_1.26-3_de.po to German ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Erik Schanze <eriks@debian.org>, 2004-2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.26-3_de\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 18:02+0200\n" ++"Last-Translator: Erik Schanze <eriks@debian.org>\n" ++"Language-Team: German <debian-l10n-german@lists.debian.org>\n" ++"Language: de\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" + -+SHELL = /bin/sh ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " ++"werden?" + -+SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ -+ configure Makefile.in README README.ru adjtimex.lsm adjtimex.lsm.in \ -+ COPYING COPYRIGHT ChangeLog ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Wird Adjtimex beim Hochfahren des Systems gestartet, werden die " ++"Zeitparameter im Kernel auf die Werte in /etc/defaults/adjtimex gesetzt." + -+all: adjtimex adjtimex.lsm ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Stimmen Sie nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter " ++"ermitteln wollen." + -+adjtimex: adjtimex.c mat.o -+ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex adjtimex.c \ -+ mat.o -lm ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Adjtimexconfig zur Installation oder Aktualisierung von Adjtimex aufrufen?" + -+adjtimex.lsm: adjtimex.lsm.in Makefile.in -+ sed -e 's/@VERSION@/$(VERSION)/' \ -+ -e "s/@DATE@/`date +%d%b%y|tr [a-z] [A-Z]`/" \ -+ adjtimex.lsm.in >adjtimex.lsm ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " ++"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " ++"Rechneruhr (auch bekannt als CMOS-Uhr) ĂĽbereinstimmt. Das Skript speichert " ++"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " ++"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" ++"adjtimex ausgefĂĽhrt wird." + -+mat.o: mat.c -+ $(CC) $(CFLAGS) -c mat.c ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Das Skript benötigt 70 Sekunden, um durchzulaufen, es bei jeder " ++"Aktualisierung laufen zu lassen, dĂĽrfte Zeitverschwendung sein. Andererseits " ++"können Sie »adjtimexconfig« selbst bei Bedarf starten oder Sie finden die " ++"Kernelvariablen auf einem anderen Weg heraus (siehe Handbuchseite von " ++"Adjtimex) und speichern die Werte in der Datei /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/eu.po ++++ adjtimex-1.29/debian/po/eu.po +@@ -0,0 +1,84 @@ ++# translation of adjtimex-eu.po to Euskara ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Piarres Beobide <pi@beobide.net>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex-eu\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-08 12:49+0200\n" ++"Last-Translator: Piarres Beobide <pi@beobide.net>\n" ++"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" + -+install: all -+ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex -+ $(INSTALL) -d -g root -m 755 -o root $(mandir) -+ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ -+ $(mandir)/adjtimex.$(manext) ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Adjtimex instalazio eta abiarazte bakoitzean exekutatu behar al da?" + -+uninstall: -+ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex sistema abiaraztean exekutatzean kernelaren denbora parametroak /" ++"etc/default/adjtimex-eko balioetara ezarriko dira." + -+clean: -+ rm -f core *.o -+veryclean: clean -+ rm -f adjtimex ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ez zenuke aukera hau aukeratu beharko adjtimex uneko parametroak begiratzeko " ++"bakarrik erabili nahi baduzu." + -+shar: $(SRC) -+ distname=adjtimex-$(VERSION); \ -+ shar $(SRC) >$$distname.shar ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Adjtimexconfig exekutatu adjtimex instalatu edo bertsio-berritzean?" + -+dist: $(SRC) -+ distname=adjtimex-$(VERSION); \ -+ rm -fr $$distname; \ -+ mkdir $$distname; \ -+ for file in $(SRC); do \ -+ ln $$file $$distname/$$file \ -+ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ -+ done; \ -+ chmod -R a+rX $$distname; \ -+ tar -chz -f $$distname.tar.gz $$distname; \ -+ rm -fr $$distname ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Adjtimexconfig script-ak adjtimex erabiliko du kerneleko \"tick\" eta " ++"\"frequency\" aldagaien balioa aurkitzeko honekin sistema erlojuak hardware " ++"erlojuarekin (CMOS ordularia bezala ere ezagutua) bat egingo du. Orduan " ++"balio hauek /etc/default/adjtimex konfigurazio fitxategian gordeko ditu Abio " ++"bakoitzean balio horiek berrezarri daitezen /etc/init.d/adjtimex " ++"exekutatzean." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Script-ak 70 segundu behar ditu exekutatzeko, beraz berau bertsio-berritze " ++"bakoitzean exekutatzea denbora galtze bat izan daiteke. Bestela behar " ++"duzunean adjtimexconfig eskuz konfiguratu dezakezu edo kernel aldagaiak " ++"beste metodo batez atzeman eta /etc/default/adjtimex fitxategian eskuz ipini " ++"ditzakezu." +--- adjtimex-1.29.orig/debian/po/da.po ++++ adjtimex-1.29/debian/po/da.po +@@ -0,0 +1,92 @@ ++# translation of adjtimex_1.16-1-da.po to Danish ++# translation of adjtimex_1.16-1_templates.po to Danish ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# Claus Hindsgaul <claus_h@image.dk>, 2004. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.16-1-da\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 16:56+0200\n" ++"Last-Translator: Frank Damgaard <debian@overbygaard.dk>\n" ++"Language-Team: Danish\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.3.1\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex køres under installation og ved hver opstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Køres adjtimex under opstart af systemet, sættes kernens tidsparametre til " ++"værdierne i /etc/default/adjtimex. " ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vælg ikke dette hvis du ønsker at bruge adjtimex til at gemmense de aktuelle " ++"parametre." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig køres ved installation eller opgradering?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruge adjtimex til at finde de værdier til " ++"kernevariablene \"tick\" og \"frequency\", der vil fĂĄ systemuret til at " ++"passe med computerens indbyggede ur (CMOS-uret). Den gemmer derefter " ++"værdierne i opsætningsfilen /etc/default/edjtimex, sĂĄ indstillingerne bliver " ++"sat under hver opstart, nĂĄr skriptet /etC/init.d/adjtimex køres." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Det tager 70 sekunder at køre skriptet, sĂĄ at køre skriptet ved hver " ++"opgradering kan være spild af tid. Alternativt kan du selv køre " ++"adjtimexconfig nĂĄr der er behov, eller finde kernevariablene pĂĄ en anden " ++"mĂĄde og sætte dem manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/nl.po ++++ adjtimex-1.29/debian/po/nl.po +@@ -0,0 +1,86 @@ ++# Dutch translation of adjtimex debconf templates. ++# Copyright (C) 2003-2011 THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# Michiel Sikkes <michiel@sikkes.xs4all.nl>, 2003. ++# Jeroen Schot <schot@a-eskwadraat.nl>, 2011. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2011-05-05 17:49+0200\n" ++"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n" ++"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" ++"Language: nl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Wilt u dat adjtimex bij de installatie en bij elke opstartprocedure gedraaid " ++"wordt?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Het draaien van adjtimex bij het opstarten van het systeem zal " ++"tijdparameters van de kernel instellen zoals gedefinieerd in /etc/default/" ++"adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Accepteer deze optie niet als u adjtimex alleen wilt gebruiken om de huidige " ++"parameters te bekijken." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Wilt u dat adjtimexconfig bij het installeren en opwaarderen wordt gedraaid?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Het adjtimexconfig-script zal adjtimex gebruiken om de eigenschappen voor de " ++"kernelvariabelen \"tick\" en \"frequency\" te vinden. Dit zal er voor zorgen " ++"dat de systeemklok gelijk loopt met de hardware-klok (ook bekend onder de " ++"naam CMOS-klok). Deze eigenschappen worden opgeslagen in het " ++"configuratiebestand /etc/default/adjtimex, dus de instellingen worden bij " ++"elke systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " ++"adjtimexconfig later handmatig draaien, of de kernelvariabelen op een andere " ++"manier bepalen en deze zelf in /etc/default/adjtimex zetten." +--- adjtimex-1.29.orig/debian/po/cs.po ++++ adjtimex-1.29/debian/po/cs.po +@@ -0,0 +1,78 @@ ++# Czech translation of adjtimex templates ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-07-16 14:53+0200\n" ++"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n" ++"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" ++"Language: cs\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Má bĂ˝t adjtimex spuštÄ›n po instalaci a pĹ™i kaĹľdĂ©m spuštÄ›nĂ poÄŤĂtaÄŤe?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"SpuštÄ›nĂ adjtimex pĹ™i startu poÄŤĂtaÄŤe nastavĂ ÄŤasovĂ© parametry jádra na " ++"hodnoty uloĹľenĂ© v /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Pokud chcete pouĹľĂvat adjtimex pouze ke zjištÄ›nĂ aktuálnĂch hodnot, pak tuto " ++"moĹľnost nemusĂte pouĹľĂvat." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Spustit adjtimexconfig po instalaci nebo aktualizaci adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skript adjtimexconfig pouĹľije adjtimex k nalezenĂ hodnot „tick“ a " ++"„frequency“ jádra tak, Ĺľe nastavĂ systĂ©movĂ© hodiny pĹ™ibliĹľnÄ› na hodnoty tÄ›ch " ++"hardwarovĂ˝ch (takĂ© známĂ˝ch jako CMOS hodiny). Tyto hodnoty pak uložà do " ++"konfiguraÄŤnĂho souboru /etc/default/adjtimex, aby mohlo bĂ˝t nastavenĂ " ++"obnoveno pĹ™i kaĹľdĂ©m startu, vĹľdy pĹ™i spuštÄ›nĂ /etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"SpuštÄ›nĂ skriptu zabere 70 sekund, takĹľe jeho spuštÄ›nĂ pĹ™i kaĹľdĂ© aktualizaci " ++"mĹŻĹľe bĂ˝t ztrátou ÄŤasu. VolitelnÄ› mĹŻĹľete adjtimexconfig spustit podle potĹ™eby " ++"takĂ© ruÄŤnÄ› nebo urÄŤit promÄ›nnĂ© jádra jinĂ˝mi zpĹŻsoby a nastavit je ruÄŤnÄ› v " ++"souboru /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/es.po ++++ adjtimex-1.29/debian/po/es.po +@@ -0,0 +1,108 @@ ++# adjtimex po-debconf translation to Spanish ++# Copyright (C) 2009 Software in the Public Interest ++# This file is distributed under the same license as the adjtimex package. ++# ++# Changes: ++# - Initial translation ++# Vicente H. <vherrerv@supercable.es> ++# ++# - Updates ++# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009 ++# ++# Traductores, si no conocen el formato PO, merece la pena leer la ++# documentaciĂłn de gettext, especialmente las secciones dedicadas a este ++# formato, por ejemplo ejecutando: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Equipo de traducciĂłn al español, por favor lean antes de traducir ++# los siguientes documentos: ++# ++# - El proyecto de traducciĂłn de Debian al español ++# http://www.debian.org/intl/spanish/coordinacion ++# especialmente las notas de traducciĂłn en ++# http://www.debian.org/intl/spanish/notas ++# ++# - La guĂa de traducciĂłn de po's de debconf: ++# /usr/share/doc/po-debconf/README-trans ++# o http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-25 20:18+0100\n" ++"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" ++"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "ÂżSe debe ejecutar adjtimex ahora y en cada arranque?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Ejecutar adjtimex al inicio del sistema configurará los parámetros de tiempo " ++"del nĂşcleo a los valores del archivo «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"No deberĂa escoger esta opciĂłn si sĂłlo quiere utilizar adjtimex para " ++"inspeccionar los parámetros actuales." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "ÂżDesea ejecutar adjtimexconfig cuando adjtimex se instale o actualice?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"El script adjtimexconfig utilizará adjtimex para encontrar los valores de " ++"las variables «tick» y «frecuency» del nĂşcleo que harán que el reloj del " ++"sistema concuerde aproximadamente con el reloj del hardware (tambiĂ©n " ++"conocido como reloj CMOS). Entonces, se guardan estos valores en el archivo " ++"de configuraciĂłn «/etc/default/adjtimex» de modo que los valores se " ++"restaurarán en cada arranque, cuando el script «/etc/init.d/adjtimex» se " ++"ejecute." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"El script tarda 70 segundos para ejecutarse, por lo que ejecutarlo en cada " ++"actualizaciĂłn puede ser una pĂ©rdida de tiempo. De forma alternativa, puede " ++"ejecutar manualmente ajdtimexconfig cuando lo necesite, o determinar las " ++"variables del nĂşcleo utilizando otros mĂ©todos e configurándolas en el " ++"archivo «/etc/default/adjtimex»." diff --git a/source/a/util-linux/column-fix_long_opts.diff b/source/a/util-linux/column-fix_long_opts.diff new file mode 100644 index 000000000..e5215db7b --- /dev/null +++ b/source/a/util-linux/column-fix_long_opts.diff @@ -0,0 +1,15 @@ +diff -Naur util-linux-2.21.2/text-utils/column.c util-linux-2.21.2.patched//text-utils/column.c +--- util-linux-2.21.2/text-utils/column.c 2012-05-25 05:44:59.000000000 -0400 ++++ util-linux-2.21.2.patched//text-utils/column.c 2012-08-14 05:22:17.000000000 -0400 +@@ -121,9 +121,9 @@ + { + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, +- { "columns", 0, 0, 'c' }, ++ { "columns", 1, 0, 'c' }, + { "table", 0, 0, 't' }, +- { "separator", 0, 0, 's' }, ++ { "separator", 1, 0, 's' }, + { "fillrows", 0, 0, 'x' }, + { NULL, 0, 0, 0 }, + }; diff --git a/source/a/util-linux/net-tools.config.h b/source/a/util-linux/net-tools.config.h new file mode 100644 index 000000000..e271f863f --- /dev/null +++ b/source/a/util-linux/net-tools.config.h @@ -0,0 +1,78 @@ +/* +* config.h Automatically generated configuration includefile +* +* NET-TOOLS A collection of programs that form the base set of the +* NET-3 Networking Distribution for the LINUX operating +* system. +* +* DO NOT EDIT DIRECTLY +* +*/ + +/* + * + * Internationalization + * + * The net-tools package has currently been translated to French, + * German and Brazilian Portugese. Other translations are, of + * course, welcome. Answer `n' here if you have no support for + * internationalization on your system. + * + */ +#define I18N 1 + +/* + * + * Protocol Families. + * + */ +#define HAVE_AFUNIX 1 +#define HAVE_AFINET 1 +#define HAVE_AFINET6 1 +#define HAVE_AFIPX 1 +#define HAVE_AFATALK 1 +#define HAVE_AFAX25 1 +#define HAVE_AFNETROM 1 +#define HAVE_AFROSE 0 +#define HAVE_AFX25 1 +#define HAVE_AFECONET 0 +#define HAVE_AFDECnet 0 +#define HAVE_AFASH 0 +#define HAVE_AFBLUETOOTH 1 + +/* + * + * Device Hardware types. + * + */ +#define HAVE_HWETHER 1 +#define HAVE_HWARC 1 +#define HAVE_HWSLIP 1 +#define HAVE_HWPPP 1 +#define HAVE_HWTUNNEL 1 +#define HAVE_HWSTRIP 1 +#define HAVE_HWTR 1 +#define HAVE_HWAX25 1 +#define HAVE_HWROSE 0 +#define HAVE_HWNETROM 1 +#define HAVE_HWX25 1 +#define HAVE_HWFR 1 +#define HAVE_HWSIT 0 +#define HAVE_HWFDDI 1 +#define HAVE_HWHIPPI 1 +#define HAVE_HWASH 0 +#define HAVE_HWHDLCLAPB 0 +#define HAVE_HWIRDA 1 +#define HAVE_HWEC 0 +#define HAVE_HWEUI64 1 +#define HAVE_HWIB 1 + +/* + * + * Other Features. + * + */ +#define HAVE_FW_MASQUERADE 1 +#define HAVE_IP_TOOLS 1 +#define HAVE_MII 1 +#define HAVE_SELINUX 0 diff --git a/source/a/util-linux/net-tools.diff b/source/a/util-linux/net-tools.diff deleted file mode 100644 index a19af2026..000000000 --- a/source/a/util-linux/net-tools.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- ./config.h.orig Wed Mar 21 21:23:31 2001 -+++ ./config.h Wed Mar 21 21:23:12 2001 -@@ -0,0 +1,74 @@ -+/* -+* config.h Automatically generated configuration includefile -+* -+* NET-TOOLS A collection of programs that form the base set of the -+* NET-3 Networking Distribution for the LINUX operating -+* system. -+* -+* DO NOT EDIT DIRECTLY -+* -+*/ -+ -+/* -+ * -+ * Internationalization -+ * -+ * The net-tools package has currently been translated to French, -+ * German and Brazilian Portugese. Other translations are, of -+ * course, welcome. Answer `n' here if you have no support for -+ * internationalization on your system. -+ * -+ */ -+#define I18N 1 -+ -+/* -+ * -+ * Protocol Families. -+ * -+ */ -+#define HAVE_AFUNIX 1 -+#define HAVE_AFINET 1 -+#define HAVE_AFINET6 1 -+#define HAVE_AFIPX 1 -+#define HAVE_AFATALK 1 -+#define HAVE_AFAX25 1 -+#define HAVE_AFNETROM 1 -+#define HAVE_AFROSE 0 -+#define HAVE_AFX25 1 -+#define HAVE_AFECONET 0 -+#define HAVE_AFDECnet 0 -+#define HAVE_AFASH 0 -+ -+/* -+ * -+ * Device Hardware types. -+ * -+ */ -+#define HAVE_HWETHER 1 -+#define HAVE_HWARC 1 -+#define HAVE_HWSLIP 1 -+#define HAVE_HWPPP 1 -+#define HAVE_HWTUNNEL 1 -+#define HAVE_HWSTRIP 1 -+#define HAVE_HWTR 1 -+#define HAVE_HWAX25 1 -+#define HAVE_HWROSE 0 -+#define HAVE_HWNETROM 1 -+#define HAVE_HWX25 1 -+#define HAVE_HWFR 1 -+#define HAVE_HWSIT 0 -+#define HAVE_HWFDDI 0 -+#define HAVE_HWHIPPI 0 -+#define HAVE_HWASH 0 -+#define HAVE_HWHDLCLAPB 0 -+#define HAVE_HWIRDA 1 -+#define HAVE_HWEC 0 -+ -+/* -+ * -+ * Other Features. -+ * -+ */ -+#define HAVE_FW_MASQUERADE 1 -+#define HAVE_IP_TOOLS 1 -+#define HAVE_MII 1 diff --git a/source/a/util-linux/net-tools_1.60-19.diff b/source/a/util-linux/net-tools_1.60-19.diff deleted file mode 100644 index f754f02d5..000000000 --- a/source/a/util-linux/net-tools_1.60-19.diff +++ /dev/null @@ -1,29401 +0,0 @@ ---- net-tools-1.60.orig/lib/ether.c -+++ net-tools-1.60/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 -@@ -39,7 +39,7 @@ - { - 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) - ); ---- net-tools-1.60.orig/lib/inet6.c -+++ net-tools-1.60/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.12 2002/12/10 01:03:09 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; -@@ -83,14 +98,14 @@ - return (-1); - } - if (numeric & 0x7FFF) { -- inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80); -+ inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80); - return (0); - } - if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - if (numeric & 0x8000) - strcpy(name, "default"); - else -- strcpy(name, "*"); -+ strcpy(name, "[::]"); - return (0); - } - -@@ -109,13 +124,14 @@ - } - - -+ - /* Display an Internet socket address. */ - static char *INET6_print(unsigned 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); - } - - -@@ -129,13 +145,14 @@ - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); - if (INET6_rresolve(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; -@@ -143,7 +160,9 @@ - - 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; /* ?;) */ - } - ---- net-tools-1.60.orig/lib/inet6_gr.c -+++ net-tools-1.60/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 -@@ -71,11 +71,15 @@ - 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", -@@ -87,13 +91,19 @@ - &slen, - naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3], - naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7], -- &metric, &use, &refcnt, &iflags, iface); -+ &metric, &refcnt, &use, &iflags, iface); - #if 0 - if (num < 23) - continue; - #endif -- if (!(iflags & RTF_UP)) -- 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], -@@ -112,7 +122,12 @@ - inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1)); - - /* 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 +138,19 @@ - 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); - } - -@@ -144,8 +169,7 @@ - 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")); - ---- net-tools-1.60.orig/lib/ipx_gr.c -+++ net-tools-1.60/lib/ipx_gr.c -@@ -38,21 +38,27 @@ - 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) { -- perror(_PATH_PROCNET_IPX_ROUTE); -- printf(_("IPX not configured in this system.\n")); -+ fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r"); -+ } -+ -+ if (!fp) { -+ 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")); - ---- net-tools-1.60.orig/lib/proc.c -+++ net-tools-1.60/lib/proc.c -@@ -1,11 +1,12 @@ - /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */ --/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ -+/* $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 <ctype.h> -+#include <unistd.h> - - /* Caller must free return string. */ - -@@ -72,3 +73,22 @@ - 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; -+} ---- net-tools-1.60.orig/lib/proc.h -+++ net-tools-1.60/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); -+ ---- net-tools-1.60.orig/lib/util-ank.c -+++ net-tools-1.60/lib/util-ank.c -@@ -293,7 +293,7 @@ - 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) { ---- net-tools-1.60.orig/lib/Makefile -+++ net-tools-1.60/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 - 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 ---- net-tools-1.60.orig/lib/ddp_gr.c -+++ net-tools-1.60/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,61 @@ - #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; -+ } -+ -+ fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev); -+ free(dest); free(gw); free(dev); free(flags); -+ -+ printf("%s\n", hdr); -+ -+ while (fscanf(fp, "%as %as %as %as\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(dev); free(flags); -+ } -+ -+ fclose(fp); -+ -+ return 0; -+ - } - #endif ---- net-tools-1.60.orig/lib/hw.c -+++ net-tools-1.60/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.18 2001/11/12 02:12:05 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -73,6 +73,8 @@ - - extern struct hwtype ec_hwtype; - -+extern struct hwtype eui64_hwtype; -+ - static struct hwtype *hwtypes[] = - { - -@@ -144,6 +146,9 @@ - #if HAVE_HWX25 - &x25_hwtype, - #endif -+#if HAVE_HWEUI64 -+ &eui64_hwtype, -+#endif - &unspec_hwtype, - NULL - }; -@@ -217,6 +222,9 @@ - #if HAVE_HWEC - ec_hwtype.title = _("Econet"); - #endif -+#if HAVE_HWEUI64 -+ eui64_hwtype.title = _("Generic EUI-64"); -+#endif - sVhwinit = 1; - } - ---- net-tools-1.60.orig/lib/inet.c -+++ net-tools-1.60/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 -@@ -144,7 +144,7 @@ - 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,7 +155,7 @@ - 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); - #endif ---- net-tools-1.60.orig/lib/inet_sr.c -+++ net-tools-1.60/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 @@ - isnet = 1; break; - case 2: - isnet = 0; break; -- default: - } - - /* Fill in the other fields. */ ---- net-tools-1.60.orig/lib/ipx.c -+++ net-tools-1.60/lib/ipx.c -@@ -133,6 +133,9 @@ - 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] = ---- net-tools-1.60.orig/lib/interface.c -+++ net-tools-1.60/lib/interface.c -@@ -7,7 +7,7 @@ - 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.28 2003/05/29 02:09:14 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) -@@ -87,14 +88,20 @@ - - 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) -@@ -104,7 +111,7 @@ - } - new(new); - safe_strncpy(new->name, name, IFNAMSIZ); -- nextp = ife ? &ife->next : &int_list; -+ nextp = ife ? &ife->next : &int_list; // keep sorting - new->prev = ife; - new->next = *nextp; - if (new->next) -@@ -117,19 +124,22 @@ - - struct interface *lookup_interface(char *name) - { -- struct interface *ife = NULL; -- -- if (if_readlist_proc(name) < 0) -- return NULL; -- ife = add_interface(name); -- return ife; -+ /* if we have read all, use it */ -+ if (if_list_all) -+ return if_cache_add(name); -+ -+ /* 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 @@ - 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; - } - -@@ -180,7 +192,7 @@ - } - if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) { - /* assume it overflowed and try again */ -- numreqs += 10; -+ numreqs *= 2; - continue; - } - break; -@@ -188,7 +200,7 @@ - - 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 @@ - 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 @@ - 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 @@ - return p; - } - --static int procnetdev_version(char *buf) -+int procnetdev_version(char *buf) - { - if (strstr(buf, "compressed")) - return 3; -@@ -234,12 +249,12 @@ - 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 @@ - &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 @@ - 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,22 +315,16 @@ - - 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(); -+ return -2; - } - fgets(buf, sizeof buf, fh); /* eat line */ - fgets(buf, sizeof buf, fh); -@@ -350,7 +359,7 @@ - while (fgets(buf, sizeof buf, fh)) { - char *s, name[IFNAMSIZ]; - s = get_name(name, buf); -- ife = add_interface(name); -+ ife = if_cache_add(name); - get_dev_fields(s, ife); - ife->statistics_valid = 1; - if (target && !strcmp(target,name)) -@@ -359,7 +368,6 @@ - if (ferror(fh)) { - perror(_PATH_PROCNET_DEV); - err = -1; -- proc_read = 0; - } - - #if 0 -@@ -371,9 +379,16 @@ - - int if_readlist(void) - { -- int err = if_readlist_proc(NULL); -- if (!err) -- err = if_readconf(); -+ /* caller will/should check not to call this too often -+ * (i.e. only if if_list_all == 0 -+ */ -+ int err = 0; -+ -+ err |= if_readlist_proc(NULL); -+ err |= if_readconf(); -+ -+ if_list_all = 1; -+ - return err; - } - -@@ -579,11 +594,11 @@ - - void ife_print_short(struct interface *ptr) - { -- printf("%-5.5s ", ptr->name); -- printf("%5d %3d", ptr->mtu, ptr->metric); -+ printf("%-9s ", ptr->name); -+ printf("%5d %-2d ", ptr->mtu, ptr->metric); - /* 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 +651,8 @@ - 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"; - - #if HAVE_AFIPX - static struct aftype *ipxtype = NULL; -@@ -670,7 +685,7 @@ - if (hw == NULL) - hw = get_hwntype(-1); - -- printf(_("%-9.9s Link encap:%s "), ptr->name, hw->title); -+ printf(_("%-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) && -@@ -843,10 +858,38 @@ - 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 (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"; -+ } -+ 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"), -@@ -867,7 +910,7 @@ - } - - if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || -- ptr->map.base_addr)) { -+ ptr->map.base_addr >= 0x100)) { - printf(" "); - if (ptr->map.irq) - printf(_("Interrupt:%d "), ptr->map.irq); ---- net-tools-1.60.orig/lib/net-features.h -+++ net-tools-1.60/lib/net-features.h -@@ -295,6 +295,13 @@ - "-" - #endif - "HDLC/LAPB " -+ -+#if HAVE_HWEUI64 -+"+" -+#else -+"-" -+#endif -+"EUI64 " - ; - - ---- net-tools-1.60.orig/lib/nstrcmp.c -+++ net-tools-1.60/lib/nstrcmp.c -@@ -1,34 +1,157 @@ - /* 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) - { -- const char *a = astr; -+ 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; -+} - -- 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 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 atoi(a) > atoi(b) ? 1 : -1; -- } -- return *a - *b; -+ return 0; -+} -+ -+ -+/* like strcmp(), but knows about numbers and ':' alias suffix */ -+int nstrcmp(const char *ap, const char *bp) -+{ -+ char *a = (char*)strdup(ap); -+ char *b = (char*)strdup(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) -+ { free(a); free(b); return res; } -+ -+ if (aindex > bindex) -+ { free(a); free(b); return 1; } -+ -+ if (aindex < bindex) -+ { free(a); free(b); return -1; } -+ -+ an = a+aindex; -+ bn = b+bindex; -+ -+ av = atoi(an); -+ bv = atoi(bn); -+ -+ if (av < bv) -+ { free(a); free(b); return -1; } -+ -+ if (av > bv) -+ { free(a); free(b); return 1; } -+ -+ av = -1; -+ if (aalias != NULL) -+ av = atoi(aalias); -+ -+ bv = -1; -+ if (balias != NULL) -+ bv = atoi(balias); -+ -+ free(a); free(b); -+ -+ if (av < bv) -+ return -1; -+ -+ if (av > bv) -+ return 1; -+ -+ return 0; -+} -+ -+ -+#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() -+{ -+ 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); -+ -+ return err; -+} -+ -+#endif ---- net-tools-1.60.orig/lib/pathnames.h -+++ net-tools-1.60/lib/pathnames.h -@@ -1,4 +1,3 @@ -- - /* - * lib/pathnames.h This file contains the definitions of the path - * names used by the NET-LIB. -@@ -29,8 +28,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" -@@ -45,6 +46,7 @@ - #define _PATH_PROCNET_X25 "/proc/net/x25" - #define _PATH_PROCNET_X25_ROUTE "/proc/net/x25_routes" - #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" -+#define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route" - - /* pathname for the netlink device */ - #define _PATH_DEV_ROUTE "/dev/route" ---- net-tools-1.60.orig/lib/tr.c -+++ net-tools-1.60/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,8 +30,14 @@ - #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) - { -@@ -42,7 +48,7 @@ - (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) - ); - return (buff); --} -+ } - - - static int in_tr(char *bufp, struct sockaddr *sap) -@@ -51,7 +57,17 @@ - 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; ---- net-tools-1.60.orig/lib/util.h -+++ net-tools-1.60/lib/util.h -@@ -14,3 +14,6 @@ - - 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)) ---- net-tools-1.60.orig/lib/irda.c -+++ net-tools-1.60/lib/irda.c -@@ -1,13 +1,15 @@ - /********************************************************************* - * - * 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> -+ * 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 -@@ -59,9 +61,9 @@ - */ - static char *irda_print(unsigned 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); ---- net-tools-1.60.orig/lib/x25_sr.c -+++ net-tools-1.60/lib/x25_sr.c -@@ -67,7 +67,7 @@ - strcpy(target, *args++); - - /* 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 +76,8 @@ - } - 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")) { ---- net-tools-1.60.orig/lib/eui64.c -+++ net-tools-1.60/lib/eui64.c -@@ -0,0 +1,155 @@ -+/* -+ * 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 char *pr_eui64( unsigned 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); -+} -+ -+/* Start the PPP encapsulation on the file descriptor. */ -+static int in_eui64( char *bufp, struct sockaddr *sap ) -+{ -+ unsigned 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 { -+#ifdef DEBUG -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+#endif -+ 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_eui64(%s): invalid eui64 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 == EUI64_ALEN) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"), -+ orig) -+#endif -+ ; /* nothing */ -+ } -+ bufp++; -+ } -+ } -+ -+ /* That's it. Any trailing junk? */ -+ if ((i == EUI64_ALEN) && (*bufp != '\0')) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig); -+ errno = EINVAL; -+ return (-1); -+#endif -+ } -+#ifdef DEBUG -+ fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data)); -+#endif -+ -+ return (0); -+} -+ -+struct hwtype eui64_hwtype = -+{ -+ "eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN, -+ pr_eui64, in_eui64, NULL, 0 -+}; -+ -+ -+#endif /* HAVE_EUI64 */ ---- net-tools-1.60.orig/rarp.c -+++ net-tools-1.60/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,6 +40,7 @@ - #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"); - -@@ -154,7 +155,7 @@ - - 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) ---- net-tools-1.60.orig/slattach.c -+++ net-tools-1.60/slattach.c -@@ -73,7 +73,7 @@ - - - const char *Release = RELEASE, -- *Version = "@(#) slattach 1.21 (1999-11-21)", -+ *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $", - *Signature = "net-tools, Fred N. van Kempen et al."; - - -@@ -115,7 +115,7 @@ - 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 -@@ -342,9 +342,11 @@ - 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 */ -+ 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); - } ---- net-tools-1.60.orig/include/util-ank.h -+++ net-tools-1.60/include/util-ank.h -@@ -75,6 +75,6 @@ - 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__ */ ---- net-tools-1.60.orig/include/interface.h -+++ net-tools-1.60/include/interface.h -@@ -64,13 +64,17 @@ - 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; ---- net-tools-1.60.orig/include/mii.h -+++ net-tools-1.60/include/mii.h -@@ -6,11 +6,14 @@ - * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org - */ - --#ifndef _LINUX_MII_H --#define _LINUX_MII_H -+#ifndef _NETTOOL_MII_H -+#define _NETTOOLS_MII_H -+ -+#include <linux/sockios.h> - - /* network interface ioctl's for MII commands */ - #ifndef SIOCGMIIPHY -+#warning "SIOCGMIIPHY is not defined by your kernel source" - #define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ - #define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ - #define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ -@@ -38,6 +41,7 @@ - #define MII_BMCR_RESTART 0x0200 - #define MII_BMCR_DUPLEX 0x0100 - #define MII_BMCR_COLTEST 0x0080 -+#define MII_BMCR_SPEED1000 0x0040 - - /* Basic Mode Status Register */ - #define MII_BMSR 0x01 -@@ -83,4 +87,17 @@ - #define MII_ANER_PAGE_RX 0x0002 - #define MII_ANER_LP_AN_ABLE 0x0001 - --#endif /* _LINUX_MII_H */ -+#define MII_CTRL1000 0x09 -+#define MII_BMCR2_1000FULL 0x0200 -+#define MII_BMCR2_1000HALF 0x0100 -+ -+#define MII_STAT1000 0x0a -+#define MII_LPA2_1000LOCALOK 0x2000 -+#define MII_LPA2_1000REMRXOK 0x1000 -+#define MII_LPA2_1000FULL 0x0800 -+#define MII_LPA2_1000HALF 0x0400 -+ -+/* Last register we need for show_basic_mii() */ -+#define MII_BASIC_MAX (MII_STAT1000+1) -+ -+#endif /* _NETTOOLS_MII_H */ ---- net-tools-1.60.orig/man/en_US/rarp.8 -+++ net-tools-1.60/man/en_US/rarp.8 -@@ -61,8 +61,8 @@ - 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. ---- net-tools-1.60.orig/man/en_US/arp.8 -+++ net-tools-1.60/man/en_US/arp.8 -@@ -1,56 +1,111 @@ --.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" -+.TH ARP 8 "2007-12-01" "net-tools" "Linux Programmer'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 ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.RB [ \-a ] -+.RI [ hostname ] - .PP - .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 [ \-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" ] -+.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" ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-Ds -+.I hostname -+.I ifname -+.RB [ netmask -+.IR nm ] - .B pub - .PP - .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 priveledge 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 simplyfy 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" -@@ -76,21 +131,13 @@ - 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. --.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 \-a -+Use alternate BSD style output format (with no 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" - Select an interface. When dumping the ARP cache only entries matching -@@ -106,33 +153,15 @@ - .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 - entire subnet. Linux instead does automagic proxy arp when a route - 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" - Similar to the -@@ -167,8 +196,18 @@ - and published entries have the - .B P - flag. -+.SH EXSAMPLES -+.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 +217,4 @@ - .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>. ---- net-tools-1.60.orig/man/en_US/ethers.5 -+++ net-tools-1.60/man/en_US/ethers.5 -@@ -1,4 +1,4 @@ --.TH ETHERS 5 "April 26th, 1996" "" "File formats" -+.TH ETHERS 5 "May 15th, 2005" "" "File formats" - .SH NAME \"{{{roff}}}\"{{{ - ethers \- Ethernet address to IP number database - .\"}}} -@@ -10,8 +10,8 @@ - \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 -+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 , ---- net-tools-1.60.orig/man/en_US/ifconfig.8 -+++ net-tools-1.60/man/en_US/ifconfig.8 -@@ -1,10 +1,10 @@ --.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer'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 -@@ -41,11 +41,27 @@ - (AMPR Packet radio). - .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 -@@ -173,11 +189,20 @@ - 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 ipchains (8) -+or -+.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 -@@ -189,7 +214,9 @@ - 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), ipchains(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 +225,5 @@ - Phil Blundell, <Philip.Blundell@pobox.com> - .br - Andi Kleen -+.br -+Bernd Eckenfels, <net-tools@lina.inka.de> ---- net-tools-1.60.orig/man/en_US/netstat.8 -+++ net-tools-1.60/man/en_US/netstat.8 -@@ -8,7 +8,7 @@ - .\" Modified: Tuan Hoang tqhoang@bigfoot.com - .\" - .\" --.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - - .SH NAME - netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships -@@ -23,7 +23,7 @@ - .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 ] -@@ -37,31 +37,30 @@ - .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 -@@ -78,6 +77,8 @@ - .P - .IR address_family_options : - .PP -+.RB [ -4 ] -+.RB [ -6 ] - .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ] - .RB [ \-\-unix | \-x ] - .RB [ \-\-inet | \-\-ip ] -@@ -98,12 +99,17 @@ - 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" -@@ -165,12 +171,11 @@ - .SS "\-a, \-\-all" - Show both listening and non-listening sockets. With the - .B --interfaces --option, show interfaces that are not marked -+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 -@@ -221,7 +226,7 @@ - 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 -@@ -438,7 +443,7 @@ - .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 ---- net-tools-1.60.orig/man/en_US/route.8 -+++ net-tools-1.60/man/en_US/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NAME - route \- show / manipulate the IP routing table - .SH SYNOPSIS -@@ -141,7 +141,7 @@ - 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 -+discovery occurred. 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) - .TP -@@ -179,17 +179,20 @@ - - .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 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. -+adds a route to the local network 192.56.76.x via -+"eth0". The word "dev" can be omitted here. -+ -+.TP -+.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-gw -@@ -289,7 +292,7 @@ - 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. -@@ -323,4 +326,4 @@ - 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>. ---- net-tools-1.60.orig/man/en_US/slattach.8 -+++ net-tools-1.60/man/en_US/slattach.8 -@@ -1,4 +1,4 @@ --.TH SLATTACH 8 "12 Feb 1994" "" "" -+.TH SLATTACH 8 "10 Oct 2006" "" "" - .SH NAME - slattach \- attach a network interface to a serial line - .SH SYNOPSIS -@@ -24,6 +24,7 @@ - .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. -+.TP - .B "[-v]" - Enable verbose output. Useful in shell scripts. - .TP -@@ -41,7 +42,7 @@ - .TP - .B "[-e]" - Exit right after initializing device, instead of waiting for the --line to hangup. -+line to hang up. - .TP - .B "[-L]" - Enable 3 wire operation. The terminal is moved into CLOCAL mode, -@@ -50,8 +51,8 @@ - .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" ---- net-tools-1.60.orig/man/en_US/mii-tool.8 -+++ net-tools-1.60/man/en_US/mii-tool.8 -@@ -1,7 +1,7 @@ - .\" 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 "2004/03/28 23:30:00" "net-tools" - - .SH NAME - mii-tool \- view, manipulate media-independent interface status -@@ -72,7 +72,24 @@ - commas. Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR, - \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\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 \- ecki@debian.org ---- net-tools-1.60.orig/man/fr_FR/arp.8 -+++ net-tools-1.60/man/fr_FR/arp.8 -@@ -140,8 +140,8 @@ - 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 entrées ARP ŕ configurer sont -+.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. -@@ -160,8 +160,8 @@ - .LP - Chaque entrée complčte se trouvant dans le cache ARP est marquée de - l'indicateur --.B C --. Les entrées permanentes sont marquées de l'indicateur -+.BR C . -+Les entrées permanentes sont marquées de l'indicateur - .B M - et les entrées 'pub' ont l'indicateur - .B P ---- net-tools-1.60.orig/man/fr_FR/hostname.1 -+++ net-tools-1.60/man/fr_FR/hostname.1 -@@ -84,8 +84,8 @@ - .LP - .B hostname - 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. -+.BR getdomainname (2). -+Ceci est connu comme nom de domaine YP/NIS du systčme. - - - .LP -@@ -145,8 +145,8 @@ - .LP - 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 . - ---- net-tools-1.60.orig/man/fr_FR/ifconfig.8 -+++ net-tools-1.60/man/fr_FR/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NOM - ifconfig \- configure une interface réseau - .SH SYNOPSIS -@@ -60,14 +60,14 @@ - .TP - .B "[\-]promisc" - Valide ou invalide le mode --.B promiscuous --. S'il est validé, tous les paquets circulant sur le réseau -+.BR promiscuous . -+S'il est validé, tous les paquets circulant sur le réseau - seront reçus sur cette 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 réseau -+.BR all-multicast . -+S'il est validé, tous les paquets multicast circulant sur le réseau - seront reçus sur cette interface. - .TP - .B "metric N" -@@ -196,7 +196,7 @@ - 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) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTHORS - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br ---- net-tools-1.60.orig/man/fr_FR/netstat.8 -+++ net-tools-1.60/man/fr_FR/netstat.8 -@@ -8,7 +8,7 @@ - .\" Modified: Tuan Hoang tuan@optimus.mitre.org - .\" - .\" --.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - - .SH NAME - netstat \- Affiche les connexions réseau, les tables de routage, les -@@ -106,7 +106,7 @@ - .BR route (8) - 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 -@@ -118,8 +118,8 @@ - .BR ifconfig (8). - .B "netstat -ei" - affiche une table ou une seule entrée d'interface comme la commande --.B ifconfig --. Avec le paramčtre -+.BR ifconfig . -+Avec le paramčtre - .B -a - , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui - n'ont pas l'indicateur -@@ -249,7 +249,7 @@ - avant d'entreprendre la fermeture. - .TP - .I --CLOSED -+CLOSE - La socket n'est pas utilisée. - .TP - .I -@@ -409,8 +409,7 @@ - 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 définir des rčgles spécifiques ŕ l'aide de la commande --.BR ipchains(8) --. -+.BR ipchains (8). - - .SH FICHIERS - .ta ---- net-tools-1.60.orig/man/fr_FR/rarp.8 -+++ net-tools-1.60/man/fr_FR/rarp.8 -@@ -55,8 +55,8 @@ - Crée manuellement une correspondance d'adresses RARP pour l'hôte - .B nom_d_hôte - avec l'adresse matérielle --.B adr_materielle --. Le format de l'adresse matérielle est dépendant du matériel, -+.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. ---- net-tools-1.60.orig/man/fr_FR/route.8 -+++ net-tools-1.60/man/fr_FR/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "8 Aoűt 1997" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NAME - route \- affiche / manipule la table de routage IP - .SH SYNOPSIS -@@ -330,6 +330,6 @@ - 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>. -+Maintenu par Phil Blundell <Philip.Blundell@pobox.com> et Bernd Eckenfels <net-tools@lina.inka.de>. - .SH TRADUCTION --Jean-Michel VANSTEENE (vanstee@worldnet.fr) -+Jean-Michel VANSTEENE <vanstee@worldnet.fr> ---- net-tools-1.60.orig/man/pt_BR/ifconfig.8 -+++ net-tools-1.60/man/pt_BR/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - .SH NOME - ifconfig \- configura uma interface de rede - .SH SINOPSE -@@ -169,7 +169,7 @@ - Os endereços appletalk DDP e IPX serăo mostrados, mas năo podem ser alterados - com este comando. - .SH VEJA TAMBÉM --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTORES - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - Alan Cox, <Alan.Cox@linux.org> ---- net-tools-1.60.orig/man/pt_BR/netstat.8 -+++ net-tools-1.60/man/pt_BR/netstat.8 -@@ -8,7 +8,7 @@ - .\" 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 conexőes de rede, tabelas de roteamento, estatísticas de interface e conexőes -@@ -97,7 +97,7 @@ - .BR route (8) - para maiores detalhes. - --.SS "\-i, \-\-interface \fIiface\fI" -+.SS "\-i, \-\-interfaces \fIiface\fI" - Se vocę usar a opçăo - .BR -i ", " --interfaces - , uma tabela de todas (ou da ---- net-tools-1.60.orig/man/pt_BR/rarp.8 -+++ net-tools-1.60/man/pt_BR/rarp.8 -@@ -50,8 +50,8 @@ - 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 -+.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 (:). ---- net-tools-1.60.orig/man/pt_BR/route.8 -+++ net-tools-1.60/man/pt_BR/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - .SH NOME - route \- mostra / manipula a tabela de roteamento IP - .SH SINOPSE -@@ -321,7 +321,7 @@ - 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 AUTHOR -+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>. - .SH TRADUÇĂO - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998 --.SH BUGS --nenhum :) ---- net-tools-1.60.orig/man/de_DE/ifconfig.8 -+++ net-tools-1.60/man/de_DE/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - .SH NAME - ifconfig \- Konfiguration einer Netzwerkskarte - .SH SYNOPSIS -@@ -193,7 +193,7 @@ - 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), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTOREN - Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - .br ---- net-tools-1.60.orig/man/de_DE/route.8 -+++ net-tools-1.60/man/de_DE/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - .SH NAME - route \- Anzeigen der IP-Routen-Tabelle - .SH SYNOPSIS -@@ -345,6 +345,6 @@ - irtt beigesteuert und den Code mit dem von Netstat vereinigt. - .SH AUTOREN - .B Route --wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet. -+wird zur Zeit von Phil Blundel <Philip.Blundell@pobox.com> und Bernd Eckenfels <net-tools@lina.inka.de> gewartet. - .SH \(:Ubersetzung - Ralf B\(:achle <ralf@gnu.org> ---- net-tools-1.60.orig/man/de_DE/netstat.8 -+++ net-tools-1.60/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 -@@ -44,7 +44,6 @@ - .B netstat - .RB [ \-veenpac ] - .RB { \-\-interfaces | \-i } --.RI [ Schnittstelle ] - - .PP - -@@ -68,6 +67,8 @@ - .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 +104,17 @@ - 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 +182,7 @@ - und - .BR \-\-ddp. - --.SS "\-c, \-\-continous" -+.SS "\-c, \-\-continuous" - Mit dieser Option wiederholt - .B netstat - im Sekundenabstand die Ausgabe, bis es abgebrochen wird. ---- net-tools-1.60.orig/po/pt_BR.po -+++ net-tools-1.60/po/pt_BR.po -@@ -10,275 +10,287 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.54\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "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-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: preciso do nome da máquina\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Nenhuma entrada ARP para %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: năo foi possível obter o endereço de hardware para `%s': %s.\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: erro no tipo do protocolo.\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: preciso do endereço de hardware\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: endereço inválido de hardware\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: năo foi possível abrir o arquivo etherfile %s!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: năo foi possível 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" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr "%s: interface desconhecida.\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(incompleto)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) em " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<incompleto> " - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "mascara %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "em %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- nenhuma entrada\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: em %d entradas năo foi encontrado.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - "Uso:\n" --" arp [-vn] [<HW>] [-i <if>] [-a] [<máquina>] <-Mostra cache " --"ARP\n" -+" arp [-vn] [<HW>] [-i <if>] [-a] [<máquina>] <-Mostra cache ARP\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, 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 <máquina> [pub][nopub] <-Remove entrada " --"ARP\n" -+msgstr " arp [-v] [-i <if>] -d <máquina> [pub][nopub] <-Remove entrada ARP\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, 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 [<arquivo>] <-Inclui entrada de " - "arquivo\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, 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 <máquina> <end_hw> [temp][nopub] <-Inc. " --"Entrada\n" -- --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [netmask <nm>] pub " --"<-''-\n" -+msgstr " arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [temp][nopub] <-Inc. Entrada\n" - --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, 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 <máquina> <if> [netmask <nm>] pub " --"<-''-\n" -+msgstr " arp [-v] [<HW>] [-i <if>] -Ds <máquina> <if> [netmask <nm>] pub <-''-\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" --msgstr "" --" -a mostra (todas as) máquinas no estilo alternativo " --"(BSD)\n" -+msgstr " -a mostra (todas as) máquinas no estilo alternativo (BSD)\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set define uma nova entrada ARP\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete remove a entrada especificada\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose listagem detalhada\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric năo resolve nomes\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device especifica a interface de rede (ex: eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device leia <hwaddr> de um dispositivo\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol especifica a família de protocolos\n" - --#: ../arp.c:628 -+#: ../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 leia novas entradas de arquivo ou de " --"/etc/ethers\n" -+" -f, --file leia novas entradas de arquivo ou de /etc/" -+"ethers\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" --msgstr "" --" <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n" -+msgstr " <HW>=Use '-H <hw>' para especificar o tipo de endereço de hw. Default: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Lista dos tipos de hardware possíveis (que suportam ARP):\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: tipo de hardware năo suportado!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: família de endereços năo suportada!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N ainda năo suportada.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: família de endereços desconhecida.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: tipo de hardware desconhecido.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: kernel somente suporta ínet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Configurando nome do nó como `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: vocę deve ser root para mudar o nome do nó\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nome muito longo\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Configurando nome da máquina para `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: vocę deve ser root para mudar o nome da máquina\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Configurando nome do domínio para `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: vocę deve ser root para mudar o nome do domínio\n" -@@ -303,37 +315,38 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Resultado: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: năo foi possível abrir `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" --msgstr "" --"Uso: hostname [-v] {máquina|-F arquivo} configura nome da máquina (de " --"arquivo)\n" -+msgstr "Uso: hostname [-v] {máquina|-F arquivo} configura nome da máquina (de arquivo)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n" - " (a partir de arquivo)\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" --msgstr "" --"Uso: hostname [-v] {máquina|-F arquivo} configura o nome do nó DECnet (de " --"arquivo)\n" -+msgstr "Uso: hostname [-v] {máquina|-F arquivo} configura o nome do nó DECnet (de arquivo)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, 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] mostra nome formatado\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -341,7 +354,8 @@ - " hostname [-v] mostra nome da máquina\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -349,7 +363,8 @@ - " hostname -V|--version|-h|--help mostra informaçőes e termina\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -357,35 +372,43 @@ - " dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short nome curto da máquina\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias aliases para a máquina\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address endereços da máquina\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long nome longo da máquina (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain nome do domínio DNS\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis nome do domínio NIS/YP\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node nome do nó DECnet\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -393,7 +416,8 @@ - " -F, --file leia o nome da máquina ou domínio NIS do arquivo\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, 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" -@@ -413,15 +437,16 @@ - msgstr "%s: Vocę năo pode mudar o nome do domínio DNS com este comando\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"A menos que esteja usando bind ou NIS para resoluçăo de nomes vocę pode " --"mudar\n" -+"A menos que esteja usando bind ou NIS para resoluçăo de nomes vocę pode mudar\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n" - -@@ -440,552 +465,453 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Encapsulamento do Link: %s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opçőes\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "Endereço de HW %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "" -+"%s: erro obtendo informaçőes da interface: %s\n" -+"\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Mídia:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Este sistema năo tem suporte a INET.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "" -+"%s: erro obtendo informaçőes da interface: %s\n" -+"\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s end.: %s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Uso:\n" -+" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-a-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <endereço>[/<tam_prefixo>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <endereço>[/<tam_prefixo>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Masc:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<endereço>]] [[-]pointopoint [<endereço>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " endereço inet6: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Escopo:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <endereço>] [dstaddr <endereço>] [tunnel <endereço>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Link" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - - #: ../ifconfig.c:212 --msgid "Site" --msgstr "Site" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Compat" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Máquina" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Desconhecido" -- --#: ../ifconfig.c:236 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " Endereço IPX/Ethernet II:%s\n" -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <endereço>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:213 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " Endereço IPX/Ethernet SNAP:%s\n" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:214 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " Endereço IPX/Ethernet 802.2:%s\n" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:215 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " Endereço IPX/Ethernet 802.3:%s\n" -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <tipo>]\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:217 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " Endereço EtherTalk fase 2:%s\n" -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen <NN>]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:220 - #, c-format --msgid " econet addr:%s\n" --msgstr " Endereço econet:%s\n" -- --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[NENHUMA FLAG] " -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST" -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK" -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -- --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -- --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:224 -+#, c-format -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Tipo de Hardware.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " Lista dos tipos possíveis de hardware:\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=Família de endereços. Default: %s\n" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " Lista de famílias de endereços possíveis:\n" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:380 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Métrica:%d" -+msgid "Unknown media type.\n" -+msgstr "Tipo desconhecido de mídia.\n" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:417 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:429 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu frame:%lu\n" -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:441 - #, c-format --msgid " compressed:%lu\n" --msgstr " compactados:%lu\n" -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:329 -+#: ../ifconfig.c:465 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" - msgstr "" --"Pacotes TX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu portadora:%lu\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:523 - #, c-format --msgid " collisions:%lu " --msgstr " colisőes:%lu " -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:652 - #, c-format --msgid "compressed:%lu " --msgstr "compactados:%lu " -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:684 - #, c-format --msgid "txqueuelen:%d " --msgstr "txqueuelen:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "IRQ:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Endereço de E/S:0x%x " -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:350 -+#: ../ifconfig.c:693 - #, c-format --msgid "Memory:%lx-%lx " --msgstr "Memória:%lx-%lx " -+msgid "%s: invalid %s address.\n" -+msgstr "%s: endereço %s inválido.\n" - --#: ../ifconfig.c:353 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid "DMA chan:%x " --msgstr "Canal DMA:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "Este sistema năo tem suporte a INET6.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: interface desconhecida: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Uso:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <endereço>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <endereço>[/<tam_prefixo>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <endereço>[/<tam_prefixo>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<endereço>]] [[-]pointopoint [<endereço>]]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <endereço>] [dstaddr <endereço>] [tunnel <endereço>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <endereço>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\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 <tipo>]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen <NN>]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Tipo de Hardware.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Lista dos tipos possíveis de hardware:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=Família de endereços. Default: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Lista de famílias de endereços possíveis:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Tipo desconhecido de mídia.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: endereço %s inválido.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Este sistema năo tem suporte a INET6.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Remoçăo de endereço năo suportada neste sistema.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Este sistema năo tem suporte a INET.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Năo sei como configurar endereços para a família %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Este sistema năo tem suporte a ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Năo sei como configurar endereços para a família %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, 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 "" --"(Năo foi possível ler informaçőes para \"-p\": geteuid()=%d mas vocę deve " --"ser root.)\n" -+msgstr "(Năo foi possível ler informaçőes para \"-p\": geteuid()=%d mas vocę deve ser root.)\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 "" --"(Nem todos os processos puderam ser identificados, informaçőes sobre " --"processos\n" -+"(Nem todos os processos puderam ser identificados, informaçőes sobre processos\n" - " de outrem năo serăo mostrados, vocę deve ser root para vę-los todos.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "OUVINDO" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN ENVIADO" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC ENVIADO" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABELECIDA" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Ative sockets NET/ROM\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" --msgstr "" --"Usuário Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Usuário Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Problemas lendo dados de %s\n" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_ENVIADO" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECEBIDO" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "ESPERA_FIN1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "ESPERA_FIN2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "FECHAR" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "ESPERANDO_FECHAR" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "ÚLTIMO_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "OUÇA" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "FECHANDO" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "atençăo, recebi linha igmp6 inválida %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:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: família de protocolos %d năo suportada!\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 "atençăo, recebi linha igmp inválida %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Ativar sockets AX.25\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "atençăo, recebi linha tcp inválida.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "desligado (0.00/%ld/%ld)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "em (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "desconh.-%d (%2.2f/%ld)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "atençăo, recebi linha udp inválida.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "DESCONHECIDA" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "ligado %d (%2.2f/%ld)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "atençăo, recebi linha raw inválida.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "atençăo, recebi linha unix inválida.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "LIVRE" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "CONECTANDO" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "CONECTADO" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "DESCONECTANDO" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Domain sockets UNIX ativos " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(servidores e estabelecidas)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(sem os servidores)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(sem os servidores)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -993,114 +919,118 @@ - "\n" - "Proto CntRef Flags Tipo Estado I-Node Rota" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Caminho\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM ENVIADO" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECUPERAÇĂO" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Ativar sockets AX.25\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "problemas lendo dados de %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Sockets IPX ativos\n" --"Proto Recv-Q Send-Q Endereço Local Endereço Remoto " --"Estado" -+"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Usuário" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "DESC." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - estatísticas năo disponíveis -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[SEM FLAGS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tabela de Interfaces do Kernel\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, 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 "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV " --"Opçőes\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opçőes\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "falta informaçăo da interface" - --#: ../netstat.c:1425 -+#: ../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 "" - "uso: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeo] [<Socket>]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - msgstr " netstat [-vnNcaeo] [<Socket>]\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route mostra tabela de roteamento\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces mostra tabela de interfaces\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -o, --timers mostra temporizadores\n" - "\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr " -i, --interfaces mostra tabela de interfaces\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1108,19 +1038,38 @@ - " -M, --masquerade mostra conexőes mascaradas\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric năo resolve nomes\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric năo resolve nomes\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric năo resolve nomes\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -n, --numeric năo resolve nomes\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend mostra outras/mais informaçőes\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr " -r, --route mostra tabela de roteamento\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1128,30 +1077,33 @@ - " -c, --continuous listagem contínua\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr " -L, --netlink mostra mensagens netlink do kernel\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr " -a, --all, --listening mostra tudo\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr "" - " -o, --timers mostra temporizadores\n" - "\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" --msgstr "" --" -F, --fib mostra a Base de Informaçőes de Repasse " --"(default)\n" -+msgstr " -F, --fib mostra a Base de Informaçőes de Repasse (default)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1159,136 +1111,145 @@ - " -C, --cache mostra cache de roteamento no lugar da FIB\n" - "\n" - --#: ../netstat.c:1448 -+#: ../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 "" --" <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" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=Use '-A <af>' ou [--<af>' Default: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" --msgstr "" --" Lista das famílias de endereços possíveis (que suportam roteamento):\n" -+msgstr " Lista das famílias de endereços possíveis (que suportam roteamento):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Conexőes Internet Ativas " - --#: ../netstat.c:1673 -+#: ../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 "" - "\n" --"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado " --" " -+"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Usuário " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Temporizador" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 Group Memberships\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Interface CntRef Grupo\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Este kernel năo tem suporte a RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "Sem entrada RARP para %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: endereço de hardware inválido\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: năo foi possível abrir o arquivo %s:%s.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: erro de formato em %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: máquina desconhecida\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: năo é possível incluir uma entrada para %s:%u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - "Uso: rarp -a lista entradas no cache\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr "" --" rarp -d máquina remove entrada do cache\n" -+msgstr " rarp -d máquina remove entrada do cache\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" --msgstr "" --" rarp [-t tipo-hw] -s máquina endereço-hw adiciona entrada ao cache\n" -+msgstr " rarp [-t tipo-hw] -s máquina endereço-hw adiciona entrada ao cache\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f adiciona entradas a partir do\n" - " arquivo ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" --msgstr "" --" rarp -V mostra versăo do programa\n" -+msgstr " rarp -V mostra versăo do programa\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: mistura ilegal de opçőes.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: %s: tipo desconhecido de hardware.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" --"Uso: route [-nNvee] [-FC] [famílias_de_endereços] Lista as tabelas de " --"rotea-\n" -+"Uso: route [-nNvee] [-FC] [famílias_de_endereços] Lista as tabelas de rotea-\n" - " mento do kernel\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1298,35 +1259,42 @@ - " mento da família.\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} [família_de_endereços] Sintaxe para a AF " --"(Família\n" --" de endereços) " --"espeficicada.\n" -+" route {-h|--help} [família_de_endereços] Sintaxe para a AF (Família\n" -+" de endereços) espeficicada.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" --" route {-V|--version} Mostra a versăo do " --"comando\n" -+" route {-V|--version} Mostra a versăo do comando\n" - " e sai.\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Use '-A <af>' ou [--<af>' Default: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [[família] endereço]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1335,25 +1303,29 @@ - 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 "Uso: iptunnel { add | change | del | show } [ NOME ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" --msgstr "" --" [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" -+msgstr " [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\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 KEY ] [ [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 DISP_FÍSICO ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1361,451 +1333,734 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Onde: NAME := STRING\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " END := { ENDEREÇO_IP | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { NÚMERO | 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 " KEY := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "Chaves năo săo permitidas com ipip e sit.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Um túnel de broadcast precisa de um endereço de origem.\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 e noptmudisc săo incompatíveis\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "năo foi possível determinar o modo do túnel (ip, gre ou sit)\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip remoto %s local %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Desconhecido" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Descarte pacotes fora de seqüęncia.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " É necessário checksum nos pacotes recebidos.\n" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Seqüencie pacotes na saída.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Calcule o checksum para pacotes de saída.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "Formato errado de /proc/net/dev. Desculpe.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Năo foi possível obter o tipo de [%s]\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pacotes Bytes Erros CsunErrs ForaSeq Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pacotes Bytes Erros DeadLoop SemRota SemBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "Histograma de entrada ICMP:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "Histograma de saída ICMP" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Repassagem está %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Default TTL é %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "%d total de pacotes recebidos" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "%d com cabeçalhos inválidos" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d com endereços inválidos" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d repassados" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d com protocolo desconhecido" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d pacotes entrantes descartados" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d pacotes entrantes despachados" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d requisiçőes enviadas" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d pacotes saintes descartados" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d descartados devido a falta de rota" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d fragmentos descartados após estouro de tempo" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d remontagens requeridas" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d pacotes remontados sem problemas" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d remontagens de pacotes falharam" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d fragmentos recebidos sem problemas" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "%d fragmentos falharam" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d fragmentos criados" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "%d mensagens ICMP recebidas" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "%d mensagens ICMP entrantes falharam." - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "destino năo alcançável: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "estouro de tempo em trânsito: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "parâmetros errados: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "source quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "redireçőes: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "requisiçőes de eco: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "respostas de eco: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "requisiçőes de timestamp: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "respostas a timestamps: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "requisiçőes de mascara de endereço: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "resposta a mascara de endereço" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "respostas a máscara de endereço: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d mensagens ICMP enviadas" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "%d mensagens ICMP falharam" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "tempo excedido: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "source quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "redireçőes: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "requisiçőes de eco: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "requisiçőes de timestamp: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "respostas a timestamp: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "requisiçőes de máscara de endereço: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "respostas a máscara de endereço: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "Algorítmo RTO é %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "%d tentativas de conexăo falharam" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "%d opens passivos" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "%d tentativas de conexăo falharam" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "%d resets de conexăo recebidas" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "%d conexőes estabelecidas" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "%d segmentos recebidos" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "%d segmentos enviados" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "%d segmentos retransmitidos" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "%d segmentos ruins recebidos." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "%d resets enviados" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "%d pacotes recebidos" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "%d pacotes para portas desconhecidas recebidos." - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "%d erros de recepçăo de pacotes" - --#: ../statistics.c:137 --#, c-format --msgid "%d packets sent" -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" - msgstr "%d pacotes enviados" - --#: ../statistics.c:142 -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d pacotes enviados" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d resets recebidos para sockets embriônicos SYN_RECV" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d pacotes retirados da fila de recepçăo devido a sobreposiçăo de buffers de sockets" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposiçăo de buffers de sockets" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d pacotes ICMP descartados porque estavam fora da janela" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" -+ -+#: ../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 "%d SYN cookies sent" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" - msgstr "%d pacotes enviados" - --#: ../statistics.c:143 -+#: ../statistics.c:170 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d pacotes recebidos" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:172 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d pacotes recebidos" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:173 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d resets recebidos para sockets embriônicos SYN_RECV" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:175 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "%u SYNs to LISTEN sockets ignored" - msgstr "" --"%d pacotes retirados da fila de recepçăo devido a sobreposiçăo de buffers de " --"sockets" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" -+ -+#: ../statistics.c:178 - #, c-format --msgid "%d packets pruned from out-of-order queue" -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" - msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" - --#: ../statistics.c:152 -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:184 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" --"%d pacotes descartados da fila de fora de ordem devido a sobreposiçăo de " --"buffers de sockets" - --#: ../statistics.c:154 -+#: ../statistics.c:186 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d pacotes ICMP descartados porque estavam fora da janela" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%d pacotes para portas desconhecidas recebidos." -+ -+#: ../statistics.c:189 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d segmentos ruins recebidos." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d resets enviados" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d segmentos retransmitidos" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d segmentos retransmitidos" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d remontagens de pacotes falharam" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d pacotes retirados da fila de recepçăo devido a sobreposiçăo de buffers de sockets" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d total de pacotes recebidos" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d resets de conexăo recebidas" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d resets de conexăo recebidas" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d resets de conexăo recebidas" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d resets de conexăo recebidas" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "habilitado" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "desabilitado" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "título %s desconhecido\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "erro lendo /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "năo foi possível abrir /proc/net/snmp" - -@@ -1819,89 +2074,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Năo foi possível mudar a disciplina da linha para `%s'.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "Năo Especificado" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "UNIX Domain" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AX.25 AMPR" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "NET/ROM AMPR" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Por favor năo especifique mais que uma família de endereços.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Excesso no número de famílias de endereços.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Família de endereços `%s' desconhecida.\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 "[Nenhum configurado]" -- --#: ../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): endereço arcnet inválido!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): trailing : ignorado!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): lixo no trailing!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Endereço Ash mal formado" - -+#: ../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/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[Nenhum configurado]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Callsign inválido" -@@ -1911,22 +2172,21 @@ - msgstr "Callsign muito longo" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "O AX.25 năo foi configurado neste sistema.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Tabela de roteamento AX.25 do kernel\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Destino Iface Uso\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Tabela de roteamento para `ddp' ainda năo suportada.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1942,253 +2202,268 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): lixo no trailing!\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): endereço fddi inválido!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): trailing : ignorado!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): lixo no trailing!\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 "Família de endereços `%s' năo suportada.\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 "Nenhum roteamento para a família `%s'\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_fddi(%S): endereço fddi inválido!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): trailing : ignorado!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_fddi(%s): lixo no trailing!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Loopback Local" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "SLIP" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "SLIP VJ" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "SLIP 6 bits" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "SLIP VJ 6 bits" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "SLIP Adaptativo" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "FDDI - Fibra Ótica" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "Túnel IPIP" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Protocolo Ponto-a-Ponto" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "FRAD - Dispositivo de Acesso a Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6 sobre IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "16/4 Mbps Token Ring" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "16/4 Mbps Token Ring (Novo)" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: família de endereços %d năo suportada!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "DESCONHECIDA" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "NET/ROM năo configurado neste sistema.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Tabela de Roteamento IPv6 do Kernel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" --msgstr "" --"Destino Próximo \"Hop\" " --" Opçőes Métrica Ref Uso Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "Destino Próximo \"Hop\" Opçőes Métrica Ref Uso Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache de Vizinhos IPv6 do Kernel\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" --msgstr "" --"Vizinho Endereço HW Iface Opçőes " --"Estado Ref\n" -+msgstr "Vizinho Endereço HW Iface Opçőes Estado Ref\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" - msgstr "" --"Vizinho Endereço HW Iface Opçőes " --"Estado Ref\n" -+"Vizinho Endereço HW Iface Opçőes Estado Ref\n" - " Parado(seg) Remover(seg)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Uso: inet6_route [-vF] del Destino\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 Destino [gw Gw] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NĂO suportado\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Limpeza da tabela de roteamento `inet6' năo é suportada\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "NET/ROM năo configurado neste sistema.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Tabela de Roteamento IP do Kernel\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes MSS Janela irtt " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes MSS Janela irtt Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" --msgstr "" --"Destino Roteador MáscaraGen Opçőes Métrica Ref Uso " --"Iface MSS Janela irtt\n" -+msgstr "Destino Roteador MáscaraGen Opçőes Métrica Ref Uso Iface MSS Janela irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Tabela de Roteamento IP do Kernel\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes Métrica Ref Uso Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opçőes MSS Janela irtt " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opçőes MSS Janela irtt Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" --msgstr "" --"Destino Roteador Origem Opçőes Métrica Ref Uso " --"Iface MSS Janela irtt HH Arp\n" -+msgstr "Destino Roteador Origem Opçőes Métrica Ref Uso Iface MSS Janela 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 "" --"Destino Roteador Origem Opçőes Métrica Ref Uso " --"Iface MSS Janela irtt HH Arp\n" -+msgstr "Destino Roteador Origem Opçőes Métrica Ref Uso Iface MSS Janela irtt HH Arp\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" -@@ -2196,31 +2471,36 @@ - "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric 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} Destino[/prefixo] [gw Gw] [metric " - "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} Destino[/prefixo] [metric 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 NĂO suportado\n" - -@@ -2230,14 +2510,17 @@ - msgstr "route: %s: năo é possível usar uma REDE como roteador!\n" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: MSS inválido.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: janela inválida.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: rtt inicial inválido.\n" - -@@ -2252,75 +2535,92 @@ - msgstr "route: netmask %s inválida\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: a netmask năo casa com o endereço de rede\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Năo é suportado limpar a tabela de roteamento `inet'\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Năo é suportado modificar o cache de roteamento `inet'\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "O AX.25 năo foi configurado neste sistema.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Tabela de roteamento IPX do kernel\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Destino Rede Roteadora Nó Roteador\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "NET/ROM: isto precisa ser escrito\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "Entradas de IP mascarado\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot expira origem destino portas\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 expira initseq delta prevd origem destino " --" portas\n" -+"prot expira initseq delta prevd origem " -+"destino portas\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM năo configurado neste sistema.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Tabela de roteamento NET/ROM do kernel\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Destino Mnemônico Qualidade Vizinho Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "uso de netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: isto precisa ser escrito\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Vocę năo pode iniciar o PPP com este programa.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Desculpe, use o pppd!\n" - -@@ -2329,51 +2629,314 @@ - msgstr "Endereço do nó deve ter dez dígitos" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE năo configurada neste sistema.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Tabela de roteamento ROSE do kernel\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): endereço token ring inválido!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): trailing : ignorado!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): lixo no trailing!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "atençăo: nenhum socket inet disponível: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Atençăo: năo foi possível abrir %s (%s). Saída limitada.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "%s: dispositivo năo encontrado" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" -+msgstr "%s: erro obtendo informaçőes da interface: %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - estatísticas năo disponíveis -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[SEM FLAGS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Encapsulamento do Link: %s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "Endereço de HW %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Mídia:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s end.: %s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-a-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Masc:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " endereço inet6: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Escopo:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Link" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Site" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Máquina" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Desconhecido" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " Endereço IPX/Ethernet II:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " Endereço IPX/Ethernet SNAP:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " Endereço IPX/Ethernet 802.2:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " Endereço IPX/Ethernet 802.3:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " Endereço EtherTalk fase 2:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " Endereço econet:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[NENHUMA FLAG] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST" -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK" -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Métrica:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu frame:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " compactados:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposiçőes:%lu portadora:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " colisőes:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "compactados:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "txqueuelen:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "" --"%s: erro obtendo informaçőes da interface: %s\n" --"\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "IRQ:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Endereço de E/S:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Memória:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Canal DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n" - -@@ -2397,29 +2960,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argumento errado: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev STRING ] [ 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 "família %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " usuários %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Năo foi possível criar o socket" - -@@ -2434,6 +3000,7 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: năo foi possível escrever o arquivo PID\n" - -@@ -2452,39 +3019,69 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: nome muito longo\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: năo foi possível obter o estado corrente!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" --msgstr "" --"slattach: tty_open: năo foi possível obter a disciplina de linha corrente!\n" -+msgstr "slattach: tty_open: năo foi possível obter a disciplina de linha corrente!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: năo foi possível configurar o modo RAW!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: năo foi possível configurar %s bps!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: năo foi possível configurar modo 8N1!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "%s inicializado" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " em %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr "%s: interface desconhecida.\n" -+ -+#~ msgid "" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr " arp [-v] [<HW>] [-i <if>] -s <máquina> <end_hw> [netmask <nm>] pub <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: interface desconhecida: %s\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "resposta a mascara de endereço" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "título %s desconhecido\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Tabela de roteamento para `ddp' ainda năo suportada.\n" ---- net-tools-1.60.orig/po/Makefile -+++ net-tools-1.60/po/Makefile -@@ -3,13 +3,13 @@ - INSTALL_DATA= ${INSTALL} -m 644 - INSTALLNLSDIR=${BASEDIR}/usr/share/locale - --TUPDATE = tupdate -+TUPDATE = msgmerge - - NLSPACKAGE = net-tools - - -include ../config.make - ifeq ($(I18N),1) --CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo -+CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo - else - CATALOGS = - endif -@@ -49,7 +49,7 @@ - lang=`echo $$cat | sed 's/.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!"; \ ---- net-tools-1.60.orig/po/et_EE.po -+++ net-tools-1.60/po/et_EE.po -@@ -6,7 +6,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.58\n" --"POT-Creation-Date: 2001-02-15 21:28+0200\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 2001-02-15 18:00+0300\n" - "Last-Translator: Meelis Roos <mroos@linux.ee>\n" - "Language-Team: Estonian <linux-ee@eenet.ee>\n" -@@ -14,53 +15,58 @@ - "Content-Type: text/plain; charset=iso-8859-15\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: puudub hosti nimi\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "%s jaoks pole ARP kirjet\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, 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:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: vale protokolli tüüp\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, 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:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: puudub riistvaraline aadress\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: vigane riistvaraline aadress\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ei saa avada faili %s\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, 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:427 - #, 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:448 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" -@@ -68,45 +74,52 @@ - "Aadress HWtüüp HWaadress Lipud Mask " - "Liides\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr " liides %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(mittetäielik)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) aadressil " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<mittetäielik>" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "vőrgumask %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "liides %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, 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:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- pole kirjet\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, 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:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -@@ -116,47 +129,45 @@ - "ARP cache vaatamine:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hosti nimi>]\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, 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 kirje kustutamine:\n" - " arp [-v] [-i <if>] -d <hosti nimi> [pub] [nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, 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 kirjete lisamine failist:\n" - " arp [-vnD] [<HW>] [-i <if>] -f [<failinimi>]\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, 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 kirje lisamine:\n" - " arp [-v] [<HW>] [-i <if>] -s <hosti nimi> <hwaddr> [temp] [nopub]\n" - --#: ../arp.c:617 --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:630 -+#, fuzzy, 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 <hosti nimi> <if> [netmask <nm>] pub\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -164,122 +175,132 @@ - " -a näita kőiki hoste alternatiivsel (BSD) " - "kujul\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set uue ARP kirje seadmine\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete määratud kirje kustutamine\n" - --#: ../arp.c:623 ../netstat.c:1485 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose jutukas väljund\n" - --#: ../arp.c:624 -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric mitte lahendada nimesid\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device vőrguliidese täpsustamine (näiteks eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device lugeda <hwaddr> vastavalt liideselt\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol protokollipere määramine\n" - --#: ../arp.c:628 -+#: ../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 lugeda kirjed antud failist vői " --"/etc/ethers'st\n" -+" -f, --file lugeda kirjed antud failist vői /etc/" -+"ethers'st\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../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 määramiseks.\n" - " Vaikimisi: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Vőimalike ARP-i toetavate riistvara tüüpide nimekiri:\n" - --#: ../arp.c:664 ../arp.c:749 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "arp: riistvara tüüpi %s ei toetata\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "arp: aadressiperekonda %s ei toetata\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N toetust pole veel\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: tundmatu aadressiperekond %s\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: tundmatu riistvara tüüp %s\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n" - --#: ../arp.c:754 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: riistvara tüübil %s pole ARP toetust\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Sean sőlme nimeks `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: ainult root saab sőlme nime muuta\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nimi on liiga pikk\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Sean hosti nimeks `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, 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" -@@ -304,25 +325,28 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Tulemus: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: ei saa avada faili `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - 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:223 -+#, c-format - 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:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" -@@ -330,18 +354,21 @@ - " nodename [-v] {nodename|-F fail} DECneti vőrgusőlme nime " - "seadmine\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, 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] nime näitamine antud formaadis\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr " hostname [-v] hosti nime näitamine\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +377,8 @@ - " hostname -h|--help seesama abiinfo\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -358,36 +386,44 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short lühike hosti nimi\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias alias-nimed\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address hosti IP aadressid\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - " -f, --fqdn, --long pikk hosti nimi (FQDN - täielik süsteeminimi)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain DNS domeeni nimi\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis NIS/YP domeeni nimi\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node DECneti vőrgusőlme nimi\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -395,7 +431,8 @@ - " -F, --file lugeda hosti vői NIS domeeni nimi failist\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, 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" -@@ -415,6 +452,7 @@ - msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -423,6 +461,7 @@ - "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n" - -@@ -441,76 +480,97 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:110 -+#: ../ifconfig.c:107 -+#, 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 "" --"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"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 --#, c-format --msgid "%s: unknown interface: %s\n" --msgstr "ifconfig: tundmatu liides %s: %s\n" -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: viga liidese info küsimisel: %s\n" - --#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format - msgid "No support for INET on this system.\n" - msgstr "Antud süsteem ei toeta INET aadressiperekonda\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: viga liidese info küsimisel: %s\n" -+ -+#: ../ifconfig.c:202 -+#, fuzzy, c-format - msgid "" - "Usage:\n" --" ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" - msgstr "" - "Kasutamine:\n" - " ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:204 -+#, c-format - msgid " [add <address>[/<prefixlen>]]\n" - msgstr " [add <aadress>[/<prefiksi pikkus>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 -+#, c-format - msgid " [del <address>[/<prefixlen>]]\n" - msgstr " [del <aadress>[/<prefiksi pikkus>]]\n" - --#: ../ifconfig.c:183 -+#: ../ifconfig.c:206 -+#, c-format - msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" - msgstr " [[-]broadcast [<aadress>]] [[-]pointopoint [<aadress>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:207 -+#, c-format - msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" - msgstr " [netmask <aadress>] [dstaddr <aadress>] [tunnel <aadress>]\n" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:210 -+#, c-format - msgid " [outfill <NN>] [keepalive <NN>]\n" - msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:212 -+#, c-format - msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" - msgstr " [hw <HW> <aadress>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:213 -+#, c-format - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:191 -+#: ../ifconfig.c:214 -+#, c-format - msgid " [multicast] [[-]promisc]\n" - msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:215 -+#, c-format - msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <tüüp>]\n" - --#: ../ifconfig.c:194 -+#: ../ifconfig.c:217 -+#, c-format - msgid " [txqueuelen <NN>]\n" - msgstr " [txqueuelen <NN>]\n" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:220 -+#, c-format - msgid " [[-]dynamic]\n" - msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:222 -+#, c-format - msgid "" - " [up|down] ...\n" - "\n" -@@ -518,73 +578,134 @@ - " [up|down] ...\n" - "\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:224 -+#, c-format - msgid " <HW>=Hardware Type.\n" - msgstr " <HW>=riistvara tüüp\n" - --#: ../ifconfig.c:202 -+#: ../ifconfig.c:225 -+#, c-format - msgid " List of possible hardware types:\n" - msgstr " Vőimalike riistvara tüüpide nimekiri:\n" - - #. 1 = ARPable --#: ../ifconfig.c:204 -+#: ../ifconfig.c:227 - #, c-format - msgid " <AF>=Address family. Default: %s\n" - msgstr " <AF>=aadressiperekond, vaikimisi %s\n" - --#: ../ifconfig.c:205 -+#: ../ifconfig.c:228 -+#, c-format - msgid " List of possible address families:\n" - msgstr " Vőimalike aadressiperekondade nimekiri:\n" - --#: ../ifconfig.c:361 -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" -+ -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" -+ -+#: ../ifconfig.c:380 -+#, c-format - msgid "Unknown media type.\n" - msgstr "Tundmatu meedia tüüp\n" - --#: ../ifconfig.c:653 -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:684 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaőnn\n" - --#: ../ifconfig.c:662 -+#: ../ifconfig.c:693 - #, 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:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n" - --#: ../ifconfig.c:749 ../ifconfig.c:840 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "Liides %s pole initsialiseeritud\n" - --#: ../ifconfig.c:761 ../ifconfig.c:851 -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format - msgid "Bad address.\n" - msgstr "Vigane aadress\n" - --#: ../ifconfig.c:854 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Antud süsteem ei toeta aadresside kustutamist\n" - --#: ../ifconfig.c:947 -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" -+ -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n" - --#: ../ifconfig.c:955 -+#: ../ifconfig.c:991 - #, 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 -+#: ../ifconfig.c:1021 -+#, 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 "" - "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n" - --#: ../netstat.c:433 -+#: ../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" -@@ -592,210 +713,223 @@ - "(Mőnesid protsesse ei saanud identifitseerida, teiste kasutajate\n" - "info lugemiseks peab olema root)\n" - --#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:441 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:442 ../netstat.c:1250 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:465 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktiivsed NET/ROM soklid\n" - --#: ../netstat.c:466 -+#: ../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 "" - "Kasutaja Sihtpunkt Lähtepunkt Liides Olek Vr/Vs SaatJrk " - "VvJrk\n" - --#: ../netstat.c:476 ../netstat.c:1290 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:511 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:512 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:513 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:514 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:515 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:516 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:517 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:518 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:519 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:520 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:587 -+#: ../netstat.c:596 - #, 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: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: aadressiperekonda %d ei toetata\n" - --#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n" - --#: ../netstat.c:668 -+#: ../netstat.c:677 -+#, c-format - 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: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 "" - "Sihtpunkt Lähtepunkt Liides LCI Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:747 -+#: ../netstat.c:759 -+#, c-format - 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:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "eikäi ((0.00/%ld/%d)" - --#: ../netstat.c:792 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "käib (%2.2f/%ld/%d)" - --#: ../netstat.c:797 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:802 -+#: ../netstat.c:814 - #, 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:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "eitea-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:879 -+#: ../netstat.c:894 -+#, c-format - 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:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "TUNDMATU" - --#: ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "käib-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:1028 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "Hoiatus - sain imeliku raw rea\n" - --#: ../netstat.c:1110 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "Hoiatus - sain imeliku unix rea\n" - --#: ../netstat.c:1137 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1141 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1145 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1149 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1153 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1162 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "VABA" - --#: ../netstat.c:1178 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "ÜHENDUMAS" - --#: ../netstat.c:1182 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "ÜHENDATUD" - --#: ../netstat.c:1186 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "LAHTIÜHENDUMAS" - --#: ../netstat.c:1217 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Aktiivsed UNIX domeeni soklid " - --#: ../netstat.c:1219 ../netstat.c:1729 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(serverid ja ühendatud)" - --#: ../netstat.c:1222 ../netstat.c:1732 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(ainult serverid)" - --#: ../netstat.c:1224 ../netstat.c:1734 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(ilma serveriteta)" - --#: ../netstat.c:1227 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -803,32 +937,36 @@ - "\n" - "Proto Mitu Lipud Tüüp Olek I-kirje " - --#: ../netstat.c:1229 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr "Tee\n" - --#: ../netstat.c:1249 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM SENT" - --#: ../netstat.c:1252 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECOVERY" - --#: ../netstat.c:1266 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktiivsed AX.25 soklid\n" - --#: ../netstat.c:1267 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Sihtpunkt Lähtepunkt Liides Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:1310 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:1361 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " -@@ -838,47 +976,53 @@ - "Proto VvJrk SaatJrk Kohalik aadress Väline aadress " - "Olek " - --#: ../netstat.c:1363 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Kasutaja" - --#: ../netstat.c:1397 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1405 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1443 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tuuma liideste tabel\n" - --#: ../netstat.c:1447 -+#: ../netstat.c:1465 -+#, fuzzy, 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 "" --"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"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:1469 - msgid "missing interface information" - msgstr "Puudulik informatsioon liideste kohta" - --#: ../netstat.c:1474 -+#: ../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 "" - "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1475 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Sokkel> ...]\n" - --#: ../netstat.c:1476 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -886,25 +1030,30 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1478 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route ruutingutabeli näitamine\n" - --#: ../netstat.c:1479 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces liideste tabeli näitamine\n" - --#: ../netstat.c:1480 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr " -g, --groups multiedastuse gruppide näitamine\n" - --#: ../netstat.c:1481 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics vőrgu statistika näitamine (SNMP stiilis)\n" - --#: ../netstat.c:1483 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -912,36 +1061,39 @@ - " -M, --masquerade maskeeritavate ühenduste näitamine\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:1505 -+#, fuzzy, c-format -+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:1506 -+#, fuzzy, c-format -+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:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" - msgstr " --numeric-users mitte lahendada kasutajanimesid\n" - --#: ../netstat.c:1490 -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic lahendada riistvara aadressid\n" - --#: ../netstat.c:1491 ../route.c:87 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend muu info/lisainfo näitamine\n" - --#: ../netstat.c:1492 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs soklite kohta PID/protsessi nime näitamine\n" - --#: ../netstat.c:1493 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -949,22 +1101,26 @@ - " -c, --continuous pidevalt uuenev nimekiri\n" - "\n" - --#: ../netstat.c:1494 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr " -l, --listening kuulavate serversoklite näitamine\n" - --#: ../netstat.c:1495 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening kőigi soklite näitamine (vaikimisi " - "ühendatud)\n" - --#: ../netstat.c:1496 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers taimerite näitamine\n" - --#: ../netstat.c:1497 ../route.c:88 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -972,7 +1128,8 @@ - " -F, --fib üldiste ruutingutabelite näitamine " - "(vaikimisi)\n" - --#: ../netstat.c:1498 ../route.c:89 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -981,108 +1138,121 @@ - "näitamine\n" - "\n" - --#: ../netstat.c:1500 -+#: ../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 "" --" <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <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" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=kasutage '-A <af>' vői '--<af>' vaikimisi: %s\n" - --#: ../netstat.c:1502 ../route.c:92 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Vőimalike ruutingu toetavate aadressiperekondade nimekiri:\n" - --#: ../netstat.c:1726 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktiivsed internetiühendused " - --#: ../netstat.c:1736 -+#: ../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 "" - "\n" --"Proto VvJrk SaatJrk Kohalik aadress Väline aadress Olek " --" " -+"Proto VvJrk SaatJrk Kohalik aadress Väline aadress " -+"Olek " - --#: ../netstat.c:1738 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Kasutaja I-kirje " - --#: ../netstat.c:1741 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Taimer" - --#: ../netstat.c:1771 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 grupikuuluvused\n" - --#: ../netstat.c:1772 -+#: ../netstat.c:1799 -+#, c-format - 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 -+#, c-format - 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 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr " rarp -d <hosti nimi> kirje kustutamine puhvrist\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - 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 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f kirjete lisamine failist /etc/ethers\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1090,24 +1260,26 @@ - " rarp -V programmi versiooni näitamine\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: lubamatu vőtmete kombinatsioon\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: tundmatu riistvara tüüp %s\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Kasutamine:\n" - " route [-nNvee] [-FC] [<AF>] Tuuma ruutingutabeli näitamine\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1115,7 +1287,8 @@ - " route [-v] [-FC] {add|del|flush} ... Tuuma ruutingutabeli muutmine\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [<AF>] Detailed usage syntax for " - "specified AF.\n" -@@ -1123,7 +1296,8 @@ - " route {-h|--help} [<AF>] Detailne süntaks perekonna AF " - "jaoks\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1132,15 +1306,23 @@ - " route {-V|--version} Versiooni ja oskuste näitamine\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=kasutage '-A <af>' vői '--<af>' vaikimisi: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Kasutamine: plipconfig [-a] [-i] [-v] liides\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" - -@@ -1149,25 +1331,30 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:86 -+#, c-format - 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 -+#, c-format - 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 -+#, c-format - 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 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1175,83 +1362,99 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:89 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Kus: NIMI := STRING\n" - --#: ../iptunnel.c:90 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " AADR := { IP_AADRESS | any }\n" - --#: ../iptunnel.c:91 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { ARV | inherit }\n" - --#: ../iptunnel.c:92 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:93 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - " KEY := { PUNKTIDEGA_ARVUNELIK | ARV }\n" - " LIIDES := FÜÜSILISE_LIIDESE_NIMI\n" - --#: ../iptunnel.c:331 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "ipip ja sit juures ei ole vőtmed lubatud\n" - --#: ../iptunnel.c:351 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Leviedastusega tunnel vajab lähteaadressi\n" - --#: ../iptunnel.c:366 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n" - --#: ../iptunnel.c:378 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "Ei suuda määrata tunneli moodi (ipip, gre vői 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 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Järjekorravälised paketid visatakse minema\n" - --#: ../iptunnel.c:454 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Vastuvőetavates pakettides on kontrollsumma kohustuslik\n" - --#: ../iptunnel.c:456 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Väljuvad paketid varustatakse järjekorranumbritega\n" - --#: ../iptunnel.c:458 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Väljuvad paketid varustatakse kontrollsummaga\n" - --#: ../iptunnel.c:486 -+#: ../iptunnel.c:487 -+#, c-format - 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 tüüpi\n" - --#: ../iptunnel.c:515 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakette Baite Vigu KSumVigu JrkVigu Levipakette\n" - --#: ../iptunnel.c:518 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakette Baite Vigu DeadLoop EiRuudi MäluOtsas\n" - -@@ -1658,13 +1861,13 @@ - msgstr "%u paketti pandi otse recvmsg eeljärjekorda" - - #: ../statistics.c:178 --#, c-format --msgid "%u packets directly received from backlog" -+#, fuzzy, c-format -+msgid "%u of bytes directly received from backlog" - msgstr "%u paketti vőeti vastu otse backlog-ist" - - #: ../statistics.c:180 --#, c-format --msgid "%u packets directly received from prequeue" -+#, fuzzy, c-format -+msgid "%u of bytes directly received from prequeue" - msgstr "%u paketti vőeti vastu otse eeljärjekorrast" - - #: ../statistics.c:182 -@@ -1673,8 +1876,8 @@ - msgstr "%u paketti kustutati eeljärjekorrast" - - #: ../statistics.c:183 --#, c-format --msgid "%u packets header predicted" -+#, fuzzy, c-format -+msgid "%u packet headers predicted" - msgstr "%u paketti päise őige ennustusega" - - #: ../statistics.c:184 -@@ -1687,19 +1890,210 @@ - msgid "Ran %u times out of system memory during packet sending" - msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa" - --#: ../statistics.c:253 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%u sisenevat paketti tundmatule pordile" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%u vigast segmenti vőeti vastu" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, fuzzy, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%u katkestust saadeti" -+ -+#: ../statistics.c:202 -+#, fuzzy, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:206 -+#, fuzzy, c-format -+msgid "%u forward retransmits" -+msgstr "%u edastati" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%u pakettide kokkupanekut ebaőnnestus" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "" -+"%u paketti kustutati vastuvőtu järjekorrast sokli puhvri ületäitumise tőttu" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%u paketti vőeti vastu" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "kokku vőeti vastu %u paketti" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%u aktiivsest ühendusest keelduti ajatempli tőttu" -+ -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "lubatud" - --#: ../statistics.c:253 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "keelatud" - --#: ../statistics.c:336 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "Viga /proc/net/snmp analüüsimisel" - --#: ../statistics.c:349 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "Ei saa avada faili /proc/net/snmp" - -@@ -1713,7 +2107,7 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Ei suuda seada `%s' liiniprotokolliks\n" - --#: ../lib/af.c:153 ../lib/hw.c:156 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - -@@ -1729,11 +2123,11 @@ - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:164 ../lib/hw.c:177 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:167 ../lib/hw.c:183 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - -@@ -1745,7 +2139,7 @@ - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:176 ../lib/hw.c:218 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - -@@ -1753,19 +2147,21 @@ - msgid "CCITT X.25" - msgstr "CCITT X.25" - --#: ../lib/af.c:182 ../lib/hw.c:180 -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:185 ../lib/hw.c:168 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - - #: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Meil on kombeks üks aadressiperekond korraga\n" - - #: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Liiga palju aadressiperekonna argumente\n" - -@@ -1790,6 +2186,7 @@ - msgstr "in_arcnet(%s): sodi lőpus\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Vigane Ash aadress" - -@@ -1808,22 +2205,21 @@ - msgstr "Liiga pikk kutsung" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 pole antud süsteemis konfigureeritud\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Tuuma AX.25 ruutingutabel\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Sihtpunkt Liides Kasutus\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1879,90 +2275,94 @@ - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): sodi lőpus\n" - --#: ../lib/hw.c:155 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Kohalik loopback" - --#: ../lib/hw.c:158 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "Serial Line IP" - --#: ../lib/hw.c:159 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "VJ Serial Line IP" - --#: ../lib/hw.c:160 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6-bitine Serial Line IP" - --#: ../lib/hw.c:161 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "VJ 6-bitine Serial Line IP" - --#: ../lib/hw.c:162 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptiivne Serial Line IP" - --#: ../lib/hw.c:165 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:171 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:174 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:186 -+#: ../lib/hw.c:191 - msgid "generic X.25" - msgstr "üldine X.25" - --#: ../lib/hw.c:189 -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP tunnel" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Kakspunktprotokoll" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco-)HDLC" - --#: ../lib/hw.c:196 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:199 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:202 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Frame Relay Access Device" - --#: ../lib/hw.c:206 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:209 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:212 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "16/4 Mbps Token Ring" - --#: ../lib/hw.c:214 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "16/4 Mbps Token Ring (New)" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" -@@ -1972,27 +2372,32 @@ - msgid "[UNKNOWN]" - msgstr "[TUNDMATU]" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Tuuma IPv6 ruutingutabel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Sihtpunkt Järgmine samm " --" Lipud Meetr Mitu Kasut Liides\n" -+"Sihtpunkt Järgmine " -+"samm Lipud Meetr Mitu Kasut Liides\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Tuuma IPv6 naabrite puhver\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2000,7 +2405,8 @@ - "Naaber HW Aadress Liides Lipud " - "Mitu Olek\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" -@@ -2009,31 +2415,38 @@ - "Mitu Olek Stale(sec) Delete(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Kasutamine: route [-vF] del AADRESS\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr "" - " route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " route [-FC] flush Seda EI toetata\n" - - #: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\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) pole antud süsteemis konfigureeritud\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Tuuma IP ruutingutabel\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2042,6 +2455,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2050,6 +2464,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" -@@ -2058,10 +2473,12 @@ - "Liides MSS Aken irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Tuuma IP ruutingu puhver\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2070,6 +2487,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2078,6 +2496,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" -@@ -2086,6 +2505,7 @@ - "Liides MSS Aken 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" -@@ -2093,7 +2513,8 @@ - "Lähtepunkt Sihtpunkt Ruuter Lipud Meetr Mitu Kasut " - "Liides MSS Aken irtt TOS HHRef HHUptod SpecDst\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" -@@ -2101,31 +2522,36 @@ - "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric " - "M] [[dev] LIIDES]\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 "" - " route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric " - "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] LIIDES]\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 "" - " route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] " - "reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " route [-FC] flush Seda EI toetata\n" - -@@ -2135,14 +2561,17 @@ - msgstr "route: %s: vőrku ei saa kasutada ruuterina\n" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: vigane MSS/MTU\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Vigane akna suurus\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: vigane algne rtt\n" - -@@ -2157,75 +2586,92 @@ - msgstr "route: vale vőrgumask %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: vőrgumask ei sobi ruutingu aadressiga\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "`inet' ruutingu puhvri muutmist ei toetata\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX pole antud süsteemis konfigureeritud\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Tuuma IPX ruutingutabel\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Sihtpunkt Ruuteri vőrk Ruuter ise\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX osa vajab ümbertegemist\n" - - #: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP maskeerimise kirjed\n" - - #: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "Proto Aegub Lähtepunkt Sihtpunkt Pordid\n" - - #: ../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 "" --"Proto Aegub Initseq Delta Prevd Lähtepunkt Sihtpunkt " --" Pordid\n" -+"Proto Aegub Initseq Delta Prevd Lähtepunkt " -+"Sihtpunkt Pordid\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM pole antud süsteemis konfigureeritud\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Tuuma NET/ROM ruutingutabel\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Sihtpunkt Mnemoonika Kvaliteet Naaber Liides\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "netrom kasutus\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM osa vajab ümbertegemist\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Sellest programmist ei saa PPP-d käivitada\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Palun kasutage pppd'd\n" - -@@ -2234,287 +2680,314 @@ - msgstr "Sőlme aadress peab olema kümnekohaline" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE pole antud süsteemis konfigureeritud\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Tuuma ROSE ruutingutabel\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): vigane token ring-aadress\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): ignoreerin lőpetavat koolonit\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): sodi lőpus\n" - --#: ../lib/interface.c:164 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "Hoiatus: `inet' sokleid ei ole: %s\n" - --#: ../lib/interface.c:316 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:556 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Liidest ei leitud" - --#: ../lib/interface.c:560 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: viga liidese info küsimisel: %s\n" - --#: ../lib/interface.c:593 -+#: ../lib/interface.c:608 - msgid " - no statistics available -" - msgstr " - statistikat ei ole -" - --#: ../lib/interface.c:597 -+#: ../lib/interface.c:612 -+#, c-format - msgid "[NO FLAGS]" - msgstr "[LIPPE POLE]" - --#: ../lib/interface.c:673 -+#: ../lib/interface.c:688 - #, c-format - msgid "%-9.9s Link encap:%s " - msgstr "%-9.9s kapseldus:%s " - --#: ../lib/interface.c:678 -+#: ../lib/interface.c:693 - #, c-format - msgid "HWaddr %s " - msgstr "HWaddr %s " - --#: ../lib/interface.c:681 -+#: ../lib/interface.c:696 - #, c-format - msgid "Media:%s" - msgstr "meedia:%s" - --#: ../lib/interface.c:683 -+#: ../lib/interface.c:698 -+#, c-format - msgid "(auto)" - msgstr "(auto)" - --#: ../lib/interface.c:690 -+#: ../lib/interface.c:705 - #, c-format - msgid " %s addr:%s " - msgstr " %s aadress:%s " - --#: ../lib/interface.c:693 -+#: ../lib/interface.c:708 - #, c-format - msgid " P-t-P:%s " - msgstr " P-t-P:%s " - --#: ../lib/interface.c:696 -+#: ../lib/interface.c:711 - #, c-format - msgid " Bcast:%s " - msgstr " bcast:%s " - --#: ../lib/interface.c:698 -+#: ../lib/interface.c:713 - #, c-format - msgid " Mask:%s\n" - msgstr " mask:%s\n" - --#: ../lib/interface.c:715 -+#: ../lib/interface.c:730 - #, c-format - msgid " inet6 addr: %s/%d" - msgstr " inet6 aadr: %s/%d" - --#: ../lib/interface.c:717 -+#: ../lib/interface.c:732 -+#, c-format - msgid " Scope:" - msgstr " skoop:" - --#: ../lib/interface.c:720 -+#: ../lib/interface.c:735 -+#, c-format - msgid "Global" - msgstr "globaalne" - --#: ../lib/interface.c:723 -+#: ../lib/interface.c:738 -+#, c-format - msgid "Link" - msgstr "ühendus" - --#: ../lib/interface.c:726 -+#: ../lib/interface.c:741 -+#, c-format - msgid "Site" - msgstr "site" - --#: ../lib/interface.c:729 -+#: ../lib/interface.c:744 -+#, c-format - msgid "Compat" - msgstr "ühilduvus" - --#: ../lib/interface.c:732 -+#: ../lib/interface.c:747 -+#, c-format - msgid "Host" - msgstr "host" - --#: ../lib/interface.c:735 -+#: ../lib/interface.c:750 -+#, c-format - msgid "Unknown" - msgstr "tundmatu" - --#: ../lib/interface.c:750 -+#: ../lib/interface.c:765 - #, c-format - msgid " IPX/Ethernet II addr:%s\n" - msgstr " IPX/Ethernet II aadr:%s\n" - --#: ../lib/interface.c:753 -+#: ../lib/interface.c:768 - #, c-format - msgid " IPX/Ethernet SNAP addr:%s\n" - msgstr " IPX/Ethernet SNAP aadr:%s\n" - --#: ../lib/interface.c:756 -+#: ../lib/interface.c:771 - #, c-format - msgid " IPX/Ethernet 802.2 addr:%s\n" - msgstr " IPX/Ethernet 802.2 aadr:%s\n" - --#: ../lib/interface.c:759 -+#: ../lib/interface.c:774 - #, c-format - msgid " IPX/Ethernet 802.3 addr:%s\n" - msgstr " IPX/Ethernet 802.3 aadr:%s\n" - --#: ../lib/interface.c:769 -+#: ../lib/interface.c:784 - #, c-format - msgid " EtherTalk Phase 2 addr:%s\n" - msgstr " EtherTalk Phase 2 aadr:%s\n" - --#: ../lib/interface.c:778 -+#: ../lib/interface.c:793 - #, c-format - msgid " econet addr:%s\n" - msgstr " econeti aadr:%s\n" - --#: ../lib/interface.c:785 -+#: ../lib/interface.c:800 -+#, c-format - msgid "[NO FLAGS] " - msgstr "[LIPPE POLE]" - --#: ../lib/interface.c:787 -+#: ../lib/interface.c:802 -+#, c-format - msgid "UP " - msgstr "UP " - --#: ../lib/interface.c:789 -+#: ../lib/interface.c:804 -+#, c-format - msgid "BROADCAST " - msgstr "BROADCAST " - --#: ../lib/interface.c:791 -+#: ../lib/interface.c:806 -+#, c-format - msgid "DEBUG " - msgstr "DEBUG " - --#: ../lib/interface.c:793 -+#: ../lib/interface.c:808 -+#, c-format - msgid "LOOPBACK " - msgstr "LOOPBACK " - --#: ../lib/interface.c:795 -+#: ../lib/interface.c:810 -+#, c-format - msgid "POINTOPOINT " - msgstr "POINTOPOINT " - --#: ../lib/interface.c:797 -+#: ../lib/interface.c:812 -+#, c-format - msgid "NOTRAILERS " - msgstr "NOTRAILERS " - --#: ../lib/interface.c:799 -+#: ../lib/interface.c:814 -+#, c-format - msgid "RUNNING " - msgstr "RUNNING " - --#: ../lib/interface.c:801 -+#: ../lib/interface.c:816 -+#, c-format - msgid "NOARP " - msgstr "NOARP " - --#: ../lib/interface.c:803 -+#: ../lib/interface.c:818 -+#, c-format - msgid "PROMISC " - msgstr "PROMISC " - --#: ../lib/interface.c:805 -+#: ../lib/interface.c:820 -+#, c-format - msgid "ALLMULTI " - msgstr "ALLMULTI " - --#: ../lib/interface.c:807 -+#: ../lib/interface.c:822 -+#, c-format - msgid "SLAVE " - msgstr "SLAVE " - --#: ../lib/interface.c:809 -+#: ../lib/interface.c:824 -+#, c-format - msgid "MASTER " - msgstr "MASTER " - --#: ../lib/interface.c:811 -+#: ../lib/interface.c:826 -+#, c-format - msgid "MULTICAST " - msgstr "MULTICAST " - --#: ../lib/interface.c:814 -+#: ../lib/interface.c:829 -+#, c-format - msgid "DYNAMIC " - msgstr "DYNAMIC " - - #. DONT FORGET TO ADD THE FLAGS IN ife_print_short --#: ../lib/interface.c:817 -+#: ../lib/interface.c:832 - #, c-format - msgid " MTU:%d Metric:%d" - msgstr " MTU:%d meetrika:%d" - --#: ../lib/interface.c:821 -+#: ../lib/interface.c:836 - #, c-format - msgid " Outfill:%d Keepalive:%d" - msgstr " ülalhoidepakettide intervall:%d ülalhoidetaimaut:%d" - --#: ../lib/interface.c:835 -+#: ../lib/interface.c:850 - #, c-format - msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" - msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n" - --#: ../lib/interface.c:840 -+#: ../lib/interface.c:855 - #, c-format - msgid " compressed:%lu\n" - msgstr " pakitud:%lu\n" - --#: ../lib/interface.c:852 -+#: ../lib/interface.c:895 - #, c-format - msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" - msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n" - --#: ../lib/interface.c:856 -+#: ../lib/interface.c:899 - #, c-format - msgid " collisions:%lu " - msgstr " kollisioone:%lu " - --#: ../lib/interface.c:858 -+#: ../lib/interface.c:901 - #, c-format - msgid "compressed:%lu " - msgstr "pakitud:%lu " - --#: ../lib/interface.c:860 -+#: ../lib/interface.c:903 - #, c-format - msgid "txqueuelen:%d " - msgstr "txqueuelen:%d " - --#: ../lib/interface.c:862 -+#: ../lib/interface.c:905 - #, c-format - msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "RX baite:%llu (%lu.%lu %s) TX baite:%llu (%lu.%lu %s)\n" - --#: ../lib/interface.c:873 -+#: ../lib/interface.c:916 - #, c-format - msgid "Interrupt:%d " - msgstr "katkestus:%d " - - #. Only print devices using it for - #. I/O maps --#: ../lib/interface.c:876 -+#: ../lib/interface.c:919 - #, c-format - msgid "Base address:0x%x " - msgstr "baasaadress:0x%x " - --#: ../lib/interface.c:878 -+#: ../lib/interface.c:921 - #, c-format - msgid "Memory:%lx-%lx " - msgstr "mälu:%lx-%lx " - --#: ../lib/interface.c:881 -+#: ../lib/interface.c:924 - #, c-format - msgid "DMA chan:%x " - msgstr "DMA kanal:%x " - - #: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n" - -@@ -2538,29 +3011,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "iptunnel: vale argument %s\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n" - --#: ../ipmaddr.c:59 -+#: ../ipmaddr.c:62 -+#, c-format - 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 -+#, c-format - 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" - -@@ -2575,6 +3051,7 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: ei saa PID faili kirjutada\n" - -@@ -2594,18 +3071,22 @@ - msgstr "slattach: tty_hangup(RAISE): %s\n" - - #: ../slattach.c:468 -+#, c-format - msgid "slattach: tty name too long\n" - msgstr "slattach: terminali nimi on liiga pikk\n" - - #: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n" - - #: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "slattach: tty_open: liiniprotokolli küsimine ebaőnnestus\n" - - #: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: ei saa seada RAW moodi\n" - -@@ -2615,6 +3096,7 @@ - msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n" - - #: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n" - -@@ -2637,3 +3119,20 @@ - #, c-format - msgid " interface %s\n" - msgstr " liides %s\n" -+ -+#~ 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" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "ifconfig: tundmatu liides %s: %s\n" -+ -+#~ msgid " -n, --numeric dont resolve names\n" -+#~ msgstr "" -+#~ " -n, --numeric mitte lahendada numbreid nimedeks\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" ---- net-tools-1.60.orig/po/de.po -+++ net-tools-1.60/po/de.po -@@ -1,106 +1,121 @@ --# $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 Bächle <ralf@gnu.org> - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" --"PO-Revision-Date: 1998-03-01 00:02+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" -+"PO-Revision-Date: 2005-06-13 00:02+0100\n" - "Last-Translator: Ralf Bächle <ralf@gnu.org>\n" - "Language-Team:\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso8859-1\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: Hostname muß angegeben werden\n" -+msgstr "arp: Hostname muss angegeben werden\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" --msgstr "Kein ARP Eintrag für %s\n" -+msgstr "Kein ARP-Eintrag für %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: unpassende Protokolltypen.\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" --msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n" -+msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" --msgstr "arp: Hardwareadresse muß angegeben werden\n" -+msgstr "arp: Hardwareadresse muss angegeben werden\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: ungültige Hardwareadresse\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: Kann %s nicht öffnen!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - 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" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t Flags Maske\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr " Schnittstelle: %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" --msgstr "(unvollsändig)" -+msgstr "(unvollständig)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) auf " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "<unvollständig> " - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "netzmaske %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "auf %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Einträge: %d Ignoriert: %d Gefunden: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- kein Eintrag\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" --msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n" -+msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -@@ -109,157 +124,165 @@ - "Benutzung:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<Hostname>]\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, 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 <Hostname> [pub][nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, 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 <Dateiname> <- Eintrag aus Datei hinzufügen\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, 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 <Rechnername> <hwaddr> [temp][nopub]\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<HW>] [-i <if>] -s <Hostname> <hwaddr> [netmask <nm>] pub\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, 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 <hostname> <if> [netmask <nm>] pub\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr " -a Alle Hosts im BSD-Format anzeigen\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set Neuen ARP-Eintrag setzen\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete Einen bestimmten Eintrag löschen\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose Ausführliche Ausgaben\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr " -i, --device Netzwerksgerät (z.B. eth0) angeben\n" -+msgstr " -i, --device Netzwerkgerät (z.B. eth0) angeben\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr " -D, --use-device <hwaddr> von gegebenem Gerät lesen\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol Routentabelle anzeigen\n" - --#: ../arp.c:628 -+#: ../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 Neue Einträge aus Datei lesen\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr " <HW>='-H <hw>' um Hardwareadresstyp anzugeben. Standard: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Liste möglicher Hardwaretypen, die ARP unterstützen:\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: Hardwaretyp nicht unterstützt!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: Adressfamilie nicht unterstützt!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N noch nicht unterstützt.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: unbekannte Adressfamilie.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: unbekannter Hardwaretyp.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" --msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n" -+msgstr "arp: %s: Kernel unterstützt nur »inet«.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: Hardware unterstützt kein ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" --msgstr "Rechnernamen auf ,,%s'' setzen\n" -+msgstr "Rechnernamen auf »%s« setzen\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: Nur Root darf den Rechnernamen ändern\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: name zu lang\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" --msgstr "Setze Hostname auf ,,%s''\n" -+msgstr "Setze Hostname auf »%s«\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" --msgstr "%s: Nur Root darf then Rechnernamen ändern\n" -+msgstr "%s: Nur Root darf den Rechnernamen ändern\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" --msgstr "Setze domainname auf ,,%s''\n" -+msgstr "Setze domainname auf »%s«\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: Nur Root darf den Domainnamen ändern\n" -@@ -267,51 +290,56 @@ - #: ../hostname.c:131 - #, c-format - msgid "Resolving `%s' ...\n" --msgstr "Löse ,,%s'' auf ...\n" -+msgstr "Löse »%s« auf ...\n" - - #: ../hostname.c:137 - #, c-format - msgid "Result: h_name=`%s'\n" --msgstr "Ergebnis: h_name=,,%s''\n" -+msgstr "Ergebnis: h_name=»%s«\n" - - #: ../hostname.c:142 - #, c-format - msgid "Result: h_aliases=`%s'\n" --msgstr "Ergebnis: h_aliases=,,%s''\n" -+msgstr "Ergebnis: h_aliases=»%s«\n" - - #: ../hostname.c:147 - #, c-format - msgid "Result: h_addr_list=`%s'\n" --msgstr "Ergebnis: h_addr_list=,,%s''\n" -+msgstr "Ergebnis: h_addr_list=»%s«\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" --msgstr "%s: Kann ,,%s'' nicht öffnen\n" -+msgstr "%s: Kann »%s« nicht öffnen\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" --" domainname [-v] {nisdomain|-F file} NIS Domainname (aus Datei) " -+" domainname [-v] {nisdomain|-F file} NIS-Domainname (aus Datei) " - "setzen.\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr " nodename [-v] {Rechnername|-F Datei}\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, 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]\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -319,7 +347,8 @@ - " hostname [-v] Hostnamen anzeigen\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -328,7 +357,8 @@ - "beenden.\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -336,43 +366,52 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short Kurzer Hostname\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias Namensalias\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address Adressen für den Hostnamen\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long Langer Hostname (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" --msgstr " -d, --domain DNS Domainname\n" -+msgstr " -d, --domain DNS-Domainname\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" --msgstr " -y, --yp, --nis NIS/YP Domainname\n" -+msgstr " -y, --yp, --nis NIS/YP-Domainname\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" --msgstr " -n, --node DECnet Knotennamen\n" -+msgstr " -n, --node DECnet-Knotennamen\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file Hostnamen oder NIS Domainnamen aus Datei lesen\n" -+" -F, --file Hostnamen oder NIS-Domainnamen aus Datei lesen\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, 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" -@@ -380,395 +419,268 @@ - " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" --" Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n" --" Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n" -+" Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n" -+" Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n" - " ausgeben zu lassen. Außer wenn DNS oder NIS als Namensdienst verwendet\n" --" wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n" -+" wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n" - " Teil des FQDNs ist) in /etc/hosts geändert werden.\n" - - #: ../hostname.c:338 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" --msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n" -+msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der " --"DNS\n" -+"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" --msgstr "" --"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert " --"werden.\n" -+msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n" - - #: ../hostname.c:357 - #, c-format - msgid "gethostname()=`%s'\n" --msgstr "gethostname()=,,%s''\n" -+msgstr "gethostname()=»%s«\n" - - #: ../hostname.c:374 - #, c-format - msgid "getdomainname()=`%s'\n" --msgstr "getdomainname()=,,%s''\n" -+msgstr "getdomainname()=»%s«\n" - - #: ../hostname.c:389 - #, c-format - msgid "getnodename()=`%s'\n" --msgstr "getnodename()=,,%s''\n" -+msgstr "getnodename()=»%s«\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Protokoll:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb Flg\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "Hardware Adresse %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Medium:%s" -+msgid "No support for INET on this system.\n" -+msgstr "INET ist auf diesem System nicht verfügbar.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s Adresse:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Syntax:\n" -+" ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-z-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <Adresse>[/<Präfixlänge>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <Adresse>[/<Präfixlänge>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Maske:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<Adresse>]] [[-]pointopoint [<Adresse>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6 Adresse: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Gültigkeitsbereich:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <Adresse>] [dstaddr <Adresse>] [tunnel <Adresse>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Verbindung" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - - #: ../ifconfig.c:212 --msgid "Site" --msgstr "Standort" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilität" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Maschine" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Unbekannt" -- --#: ../ifconfig.c:236 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II Adresse:%s\n" -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <Adresse>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:213 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP Adresse:%s\n" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:214 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 Adresse:%s\n" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:215 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 Adresse:%s\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:255 -+#: ../ifconfig.c:217 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 Adresse:%s\n" -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen <Länge>]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:220 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet Adresse:%s\n" -- --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[KEINE FLAGS] " -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST " -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK " -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "PUNKTZUPUNKT " -- --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:224 -+#, c-format -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Hardwaretyp.\n" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " Liste möglicher Hardwaretypen:\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=Adressfamilie. Standardwert: %s\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " List der möglichen Adressfamilien:\n" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Typ des Mediums unbekannt.\n" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:417 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metric:%d" -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:429 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:441 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" - msgstr "" --"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:465 - #, c-format --msgid " compressed:%lu\n" --msgstr " komprimiert:%lu\n" -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --#: ../ifconfig.c:329 -+#: ../ifconfig.c:523 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgid "Warning: Interface %s still in BROADCAST mode.\n" - msgstr "" --"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:652 - #, c-format --msgid " collisions:%lu " --msgstr " Kollisionen:%lu " -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:684 - #, c-format --msgid "compressed:%lu " --msgstr "Komprimiert:%lu " -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:693 - #, c-format --msgid "txqueuelen:%d " --msgstr "Sendewarteschlangenlänge:%d " -+msgid "%s: invalid %s address.\n" -+msgstr "%s: ungültige %s Adresse.\n" - --#: ../ifconfig.c:345 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid "Interrupt:%d " --msgstr "Interrupt:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Basisadresse:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Speicher:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "DMA Kanal:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "INET6 ist auf diesem System nicht verfügbar.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: unbekannte Schnittstelle: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Syntax:\n" --" ifconfig [-a] [-i] [-v] <Schnittstelle> [[<AF>] <Adresse>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <Adresse>[/<Prefixlänge>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <Adresse>[/<Prefixlänge>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<Adresse>]] [[-]pointopoint [<Adresse>]]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <Addresse>] [dstaddr <Adresse>] [tunnel <Adresse>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <Adresse>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\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:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen <Länge>]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Hardwaretyp.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Liste möglicher Hardwaretypen:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=Adressfamilie. Standardwert: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " List der möglichen Adressfamilien:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Typ des Mediums unbekannt.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: ungültige %s Adresse.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "INET6 ist auf diesem System nicht verfügbar.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" --msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n" -+msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "INET ist auf diesem System nicht verfügbar.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Kann die Adressen der Familie %d nicht setzen.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "ECONET wird auf diesem System nicht unterstützt.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Kann die Adressen der Familie %d nicht setzen.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, 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 "" --"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie " --"sollten Root sein.)\n" -+msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\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" -@@ -776,198 +688,220 @@ - "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n" - "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "HÖRT" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "VERBINGSAUFBAU GESCHICKT" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "VERBINDUNGSABBAU GESCHICKT" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "VERBUNDEN" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktive NET/ROM Sockets\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" --msgstr "" --"Benutzer Ziel Quelle Gerät Zustand Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Benutzer Ziel Quelle Gerät Zustand Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleme beim Lesen von %s\n" - --#: ../netstat.c:465 -+#: ../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 "CLOSE" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "Warnung, fehlerhafte igmp6 line %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:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: Nicht unterstützte Adressfamilie %d!\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 "Warnung, fehlerhafte igmp-Zeile %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktive AX.25 Sockets\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Ziel Quelle Gerät Zustand Vr/Vs Send-Q Empf-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "Warnung, fehlerhafte TCP Zeile.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "aus (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "ein (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "unkn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "Warnung, fehlerhafe UDP-Zeile.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "UNBEKANNT" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "Warnung, fehlerhafte raw-Zeile.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "Warnung, fehlerhafte UNIX-Zeile.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" --msgstr "SEQPACKET" -+msgstr "SEQPAKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "FREI" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "VERBINDUNGSAUFBAU" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "VERBUNDEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "VERBINDUNGSABBAU" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " --msgstr "Aktive Sockets in der UNIX Domäne " -+msgstr "Aktive Sockets in der UNIX-Domäne " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(Server und stehende Verbindungen)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(Nur Server)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(ohne Server)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -975,90 +909,90 @@ - "\n" - "Proto RefZäh Flaggen Typ Zustand I-Node" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Pfad\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM GESCHICKT" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "WIEDERHERSTELLUNG" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktive AX.25 Sockets\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Ziel Quelle Gerät Zustand Vr/Vs Send-Q Empf-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Problem beim Lesen von Daten von %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Aktive IPX Sockets\n" --"Proto Recv-Q Send-Q Lokale Adresse Gegenaddress " -+"Proto Recv-Q Send-Q Lokale Adresse Gegenadresse " - "Zustand" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Benutzer" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "VERBUNDEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNB." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - keine Statistiken verfügbar -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[KEINE FLAGS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" --msgstr "Kernel Schnittstellentabelle\n" -+msgstr "Kernel-Schnittstellentabelle\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " --"Flg\n" --msgstr "" --"SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" -+msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb Flg\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" --msgstr "Fehlende Interfaceinformation" -+msgstr "Fehlende Interfaceinformationen" - --#: ../netstat.c:1425 -+#: ../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 "" - "Benutzung: netstat [-veenNcCF] [<Af>] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Socket> ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1066,27 +1000,32 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route Routentabelle anzeigen\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces Schnittstellentabelle auflisten\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups Mitgliedschaft in Multicastgruppen " - "anzeigen\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics Netzwerksstatistiken anzeigen (wie SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1094,23 +1033,38 @@ - " -M, --masquerade Maskierte Verbindungen auflisten\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic Hardwarenamen auflösen\n" - --#: ../netstat.c:1439 ../route.c:88 --#, fuzzy -+#: ../netstat.c:1509 ../route.c:88 -+#, fuzzy, c-format - msgid " -e, --extend display other/more information\n" --msgstr "" --" -e, --extend Weitere / zusätzliche Informationen " --"anzeigen\n" -+msgstr " -e, --extend Weitere / zusätzliche Informationen anzeigen\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" --msgstr "" --" -p, --programs PID/Programmnamen für Sockets anzeigen\n" -+msgstr " -p, --programs PID/Programmnamen für Sockets anzeigen\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1118,24 +1072,27 @@ - " -c, --continuous Anzeige laufend aktualisieren\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - " -l, --listening Empfangsbereite Serversockets auflisten\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening Alle Sockets anzeigen (normal: nur " - "verbundene)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers Timer auflisten\n" - --#: ../netstat.c:1445 ../route.c:89 --#, fuzzy -+#: ../netstat.c:1515 ../route.c:89 -+#, fuzzy, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -1143,7 +1100,8 @@ - " -F, --fib Forwarding Infomation Base anzeigen " - "(Standard)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1151,110 +1109,118 @@ - " -C, --cache Routencache statt FIB anzeigen\n" - "\n" - --#: ../netstat.c:1448 -+#: ../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 "" --" <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" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Liste möglicher Adressfamilien, die Routen unterstützen:\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktive Internetverbindungen " - --#: ../netstat.c:1673 -+#: ../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 "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Benutzer Inode " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Timer" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" --msgstr "IPv4 Gruppenmitgliedschaften\n" -+msgstr "IPv4-Gruppenmitgliedschaften\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Schnittstelle RefZäh Grupp\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Dieser Kernel unterstützt kein RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" --msgstr "Kein RARP Eintrag für %s.\n" -+msgstr "Kein RARP-Eintrag für %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: fehlerhafte Hardwareadresse\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: kann Datei %s:%s nicht öffnen.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: Formatfehler bei %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: Unbekannter Host\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "" --"Benutzung: rarp -a Einträge im Cache listen.\n" -+msgstr "Benutzung: rarp -a Einträge im Cache listen.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr "" --" rarp -d <hostname> Eintrag aus dem Cache löschen.\n" -+msgstr " rarp -d <hostname> Eintrag aus dem Cache löschen.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" --msgstr "" --" rarp [<HW>] -s <hostname> <hwaddr> Eintrag zum Cache zufügen.\n" -+msgstr " rarp [<HW>] -s <hostname> <hwaddr> Eintrag zum Cache zufügen.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" --msgstr "" --" rarp -f Einträge aus /etc/ethers " --"zufügen.\n" -+msgstr " rarp -f Einträge aus /etc/ethers zufügen.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1262,24 +1228,26 @@ - " rarp -V Programmversion anzeigen.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: Unerlaubte Mischung von Optionen.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" --msgstr "rarp: %s: unknown hardware type.\n" -+msgstr "rarp: %s: unbekannter Hardwaretyp.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Benutzung: route [-nNvee] [-FC] [<AF>] Kernelroutentabelle " - "anzeigen\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1287,14 +1255,15 @@ - " route [-v] [-FC] {add|del|flush} ... Routentabelle für AF ändern.\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>] Genaue Syntax für AF anzeigen.\n" -+msgstr " route {-h|--help} [<AF>] Genaue Syntax für AF anzeigen.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1304,590 +1273,891 @@ - "Ende.\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=,,-A <af>'' or ,,--<af>'' benutzen. Standard: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 --#, fuzzy -+#, c-format - msgid " plipconfig -V | --version\n" --msgstr " plipconfig -V\n" -+msgstr " plipconfig -V | --version\n" - - #: ../plipconfig.c:74 - #, c-format - 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 "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr " [ mode { ipip | gre | sit } ] [ remote ADR ] [ local 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 SCHLÜSSEL ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 --#, fuzzy -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" --msgstr "" --" [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n" --"\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" -+" iptunnel -V | --version\n" -+"\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Wobei: NAME := ZEICHENKETTE\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " ADR := { IP_ADRESSE | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { NUMBER | 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 " KEY := { DOTTED_QUAD | ZAHL }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 und noptmudisc sind inkompatibel\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip Gegenseite %s lokal %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Unbekannt" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Pakete außer der Reihenfolge fallenlassen.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Prüfsumme im empfangenen Paket wird benötigt.\n" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Pakete in Reihenfolge ausgeben.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Prüfsumme für ausgegebene Pakete berechnen.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" --msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n" -+msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Kann den Typ von [%s] nicht holen\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakete Bytes Fehler CsumErrs OutOfSeq Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakete Bytes Fehler DeadLoop NoRoute NoBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" --msgstr "ICMP Eingabehistogramm:" -+msgstr "ICMP-Eingabehistogramm:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" --msgstr "ICMP Ausgabehistogramm:" -+msgstr "ICMP-Ausgabehistogramm:" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Weiterleitung ist %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Standard-TTL ist %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" --msgstr "%d Pakete insgesamt empfangen" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" -+msgstr "%d Pakete insgesamt empfangen" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" --msgstr "%d with ungültigen Headern" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" -+msgstr "%d mit ungültigen Headern" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d mit ungültigen Adressen" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d weitergeleitet" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d mit unbekanntem Protokoll" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d eingehende Pakete weggeworfen" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d eingehende Pakete zugestellt" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d Anfragen ausgesandt" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d ausgehende Pakete weggeworfen" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d weggeworfen wegen fehlender Route" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d Fragmente nach Timeout weggeworfen" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d Wiederzusammenstellungen nötig" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d Fragmente korrekt empfangen" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d fehlgeschlagene Paketdefragmentierungen" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d Fragmente korrekt empfangen" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" --msgstr "%d Fragmente Fehlgeschlagen" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" -+msgstr "%d Fragmente fehlgeschlagen" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d Fragmente erzeugt" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" --msgstr "%d ICMP Nachrichten empfangen" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" -+msgstr "%d ICMP-Nachrichten empfangen" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." --msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen" -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." -+msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "Ziel unerreichbar: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "Timeout beim Transit: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "Fehlerhafte Parameter: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "Source Quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "Umleitungen: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" --msgstr "Echo Requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" -+msgstr "Echo Anfragen: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "Echo Antworten: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "Zeitstempelanfragen: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "Zeitstempelantworten: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "Adressmaskenanfragen: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "Adressmaskenantworten" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "Adressmaskenantworten: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d ICMP-Nachrichten geschickt" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" --msgstr "%d ICMP Nachrichten fehlgeschlagen" -- - #: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" -+msgstr "%d ICMP-Nachrichten fehlgeschlagen" -+ -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "Zeitüberschreitung: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "Source Quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "Umleitungen: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "Echo Anfragen: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "Zeitstempel Anfragen: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "Zeitstempel Antworten: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "Adressmaskenanfragen: %d" - --#: ../statistics.c:111 -+#: ../statistics.c:118 - #, c-format --msgid "address mask replies: %d" --msgstr "Adressmaskenantworten: %d" -+msgid "RTO algorithm is %s" -+msgstr "RTO-Algorithmus ist %s" -+ -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" -+msgstr "%d Verbindungen aktiv geöffnet" -+ -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" -+msgstr "%d Verbindungen passiv geöffnet" -+ -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" -+msgstr "%d fehlerhafte Verbindungsversuche" -+ -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" -+msgstr "%d Verbindungen aufgebaut" -+ -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" -+msgstr "%d Segmente empfangen" -+ -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" -+msgstr "%d Segmente abgeschickt" -+ -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." -+msgstr "%d fehlerhafte Segmente empfangen." -+ -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" -+msgstr "%d Rücksetzungen geschickt" -+ -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" -+msgstr "%d Pakete empfangen" -+ -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." -+msgstr "%d Pakete für unbekannte Ports empfangen." -+ -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" -+msgstr "%d Paketempfangsfehler" -+ -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" -+msgstr "%d Pakete geschickt" -+ -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d SYN-Cookies verschickt" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d SYN-Cookies empfangen" - --#: ../statistics.c:116 -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d ungültige SYN-Cookies empfangen" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war" -+ -+#: ../statistics.c:160 - #, c-format --msgid "RTO algorithm is %s" --msgstr "RTO Algorithmus is %s" -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" - --#: ../statistics.c:120 -+#: ../statistics.c:161 - #, c-format --msgid "%d active connections openings" --msgstr "%d Verbindungen aktiv geöffnet" -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" - --#: ../statistics.c:121 -+#: ../statistics.c:162 - #, c-format --msgid "%d passive connection openings" --msgstr "%d Verbindungen passiv geöffnet" -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" - --#: ../statistics.c:122 -+#: ../statistics.c:163 - #, c-format --msgid "%d failed connection attempts" --msgstr "%d fehlerhafte Verbindungsversuche" -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" - --#: ../statistics.c:123 -+#: ../statistics.c:165 - #, c-format --msgid "%d connection resets received" --msgstr "%d Verbindungsrücksetzungen empfangen" -+msgid "%u active connections rejected because of time stamp" -+msgstr "" - --#: ../statistics.c:124 -+#: ../statistics.c:167 - #, c-format --msgid "%d connections established" --msgstr "%d Verbindungen aufgebaut" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" - --#: ../statistics.c:125 -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" -+msgstr "%d Pakete geschickt" -+ -+#: ../statistics.c:170 - #, c-format --msgid "%d segments received" --msgstr "%d Segmente empfangen" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" - --#: ../statistics.c:126 -+#: ../statistics.c:172 - #, c-format --msgid "%d segments send out" --msgstr "%d Segmente abgeschickt" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:127 -+#: ../statistics.c:173 - #, c-format --msgid "%d segments retransmited" --msgstr "%d Segmente erneut geschickt" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:128 -+#: ../statistics.c:175 - #, c-format --msgid "%d bad segments received." --msgstr "%d fehlerhafte Segmente empfangen." -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" - --#: ../statistics.c:129 -+#: ../statistics.c:176 - #, c-format --msgid "%d resets sent" --msgstr "%d Rücksetzungen geschickt" -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" - --#: ../statistics.c:134 -+#: ../statistics.c:178 - #, c-format --msgid "%d packets received" -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+ -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" - msgstr "%d Pakete empfangen" - --#: ../statistics.c:135 -+#: ../statistics.c:184 - #, c-format --msgid "%d packets to unknown port received." -+msgid "%u packets header predicted and directly queued to user" -+msgstr "" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" -+ -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" - msgstr "%d Pakete für unbekannte Ports empfangen." - --#: ../statistics.c:136 -+#: ../statistics.c:189 - #, c-format --msgid "%d packet receive errors" --msgstr "%d Paketempfangsfehler" -+msgid "%u predicted acknowledgments" -+msgstr "" - --#: ../statistics.c:137 -+#: ../statistics.c:190 - #, c-format --msgid "%d packets sent" --msgstr "%d Pakete geschickt" -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" - --#: ../statistics.c:142 -+#: ../statistics.c:191 - #, c-format --msgid "%d SYN cookies sent" --msgstr "%d SYN-Cookies verschickt" -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" - --#: ../statistics.c:143 -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d fehlerhafte Segmente empfangen." -+ -+#: ../statistics.c:193 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d SYN-Cookies empfangen" -+msgid "Detected reordering %u times using FACK" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:194 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d ungültige SYN-Cookies empfangen" -+msgid "Detected reordering %u times using SACK" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:195 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets" -+msgid "Detected reordering %u times using time stamp" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:196 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "Detected reordering %u times using reno fast retransmit" - msgstr "" --"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange " --"weggeworfen" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:197 - #, c-format --msgid "%d packets pruned from out-of-order queue" --msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+msgid "%u congestion windows fully recovered" -+msgstr "" - --#: ../statistics.c:152 -+#: ../statistics.c:198 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u congestion windows partially recovered using Hoe heuristic" - msgstr "" --"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen" - --#: ../statistics.c:154 -+#: ../statistics.c:199 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren" -+msgid "%u congestion window recovered using DSACK" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d Rücksetzungen geschickt" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d fehlgeschlagene Paketdefragmentierungen" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d Pakete empfangen" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d Pakete insgesamt empfangen" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:220 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war" -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d Verbindungsrücksetzungen empfangen" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "aktiviert" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "deaktiviert" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "Unbekannter Titel %s\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "Fehler beim Parsen von /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "Kann /proc/net/snmp nicht öffnen" - - #: ../lib/activate.c:69 - #, c-format - msgid "Hardware type `%s' not supported.\n" --msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n" -+msgstr "Hardwaretyp »%s« nicht unterstützt.\n" - - #: ../lib/activate.c:73 - #, c-format - msgid "Cannot change line discipline to `%s'.\n" --msgstr "Kann line discipline nicht auf ``%s'' setzen.\n" -+msgstr "Kann line discipline nicht auf »%s« setzen.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" --msgstr "UNIX Domain" -+msgstr "UNIX-Domain" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" --msgstr "DARPA Internet" -+msgstr "DARPA-Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Bitte nur eine Adressfamilie angeben.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Zu viele Adressfamilien angegeben.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" --msgstr "Unbekannte Adressfamilie `%s'.\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 "[NICHT GESETZT]" -+msgstr "Unbekannte Adressfamilie »%s«.\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): Ungültige ARCnet-Adresse!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): angehängt : ignoriert!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): Nachfolgender Müll!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" --msgstr "Fehlerhafte Ash Adresse" -+msgstr "Fehlerhafte Ash-Adresse" -+ -+#: ../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/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[NICHT GESETZT]" - - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" -@@ -1898,22 +2168,21 @@ - msgstr "Rufzeichen zu lang" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Kernel AX.25 Routentabelle\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Ziel SStelle Benutzer\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1929,153 +2198,168 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): Nachfolgender Müll!\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): Ungültige FDDI-Adresse!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): nachfolgend : ignoriert!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): Nachfolgender Müll!\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 "Adressfamilie `%s' wird nicht unterstützt.\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 "Kein Routen für Adressfamilie `%s'.\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): Ungültige HIPPI-Adresse!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): nachfolgend : ignoriert!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): Nachfolgender Müll!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Lokale Schleife" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "Serielle IP" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "Serielle VJ-IP" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6-bit Serielle IP" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "VJ 6-bit Serielle IP" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptive Serielle IP" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" --msgstr "Punkt-zu-Punkt Verbindung" -+msgstr "Punkt-zu-Punkt-Verbindung" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Frame Relay Access Device" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-nach-IPv4" - --#: ../lib/hw.c:198 --#, fuzzy -+#: ../lib/hw.c:214 - msgid "IrLAP" --msgstr "LAPB" -+msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "UNBEKANNT" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" --msgstr "Kernel IPv6 Routentabelle\n" -+msgstr "Kernel-IPv6-Routentabelle\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" --msgstr "" --"Ziel Nächster Hop " --" Flags Metric Ref Benutzer Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "Ziel Nächster Hop Flags Metric Ref Benutzer Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Kernel IPv6 Nachbarcache\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2083,39 +2367,45 @@ - "Nachbar HW-Adresse Iface Flags " - "Ref Zustand\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" --msgstr "" --"Nachbar HW-Adresse Iface Flags " --"Ref Zustand Stale(sec) Löschen(sec)\n" -+msgstr "Nachbar HW-Adresse Iface Flags Ref Zustand Stale(sec) Löschen(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Benutzung: inet6_route [-vF] del Ziel\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 Ziel [gw Gateway] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NICHT unterstützt\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" --msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n" -+msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\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) ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" --msgstr "Kernel IP Routentabelle\n" -+msgstr "Kernel-IP-Routentabelle\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2124,6 +2414,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2132,6 +2423,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" -@@ -2140,10 +2432,12 @@ - "Iface MSS Fenster irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" --msgstr "Kernel IP Routencache\n" -+msgstr "Kernel-IP-Routencache\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2152,6 +2446,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2160,6 +2455,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" -@@ -2168,6 +2464,7 @@ - "Iface MSS Fenster 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" -@@ -2175,37 +2472,39 @@ - "Quelle Ziel Gateway Flags Metrik Ref Ben " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\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 "" --"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric " --"M] [[dev] If]\n" -+msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric 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} Ziel[/Prefix] [gw Gw] [metric M]\n" -+msgstr " inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric 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} Ziel[/Präfix] [metric M] reject\n" -+msgstr " inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric 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 NICHT unterstützt\n" - -@@ -2215,15 +2514,17 @@ - msgstr "route: %s: Netzadresse als Gateway ungültig!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: Ungültige MSS.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Ungültige Fenstergröße.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: Ungültige Start-RTT.\n" - -@@ -2238,126 +2539,408 @@ - msgstr "Route: Fehlerhafte Netzmaske %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: Netzmaske passt nicht zur Routenadresse\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" --msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n" -+msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" --msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n" -+msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" --msgstr "Kernel IPX Routentabelle\n" -+msgstr "Kernel-IPX-Routentabelle\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" --msgstr "Ziel Router Netz Router Knoten\n" -+msgstr "Ziel Router-Netz Router-Knoten\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" --msgstr "IPX: dies muß noch geschrieben werden\n" -+msgstr "IPX: dies muss noch geschrieben werden\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP-Maskierungseinträge\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "Prot expire Quelle Ziel Ports\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 Ablauf Anf-Seq Delta Prevd Quelle Ziel " --" Ports\n" -+"Prot Ablauf Anf-Seq Delta Prevd Quelle " -+"Ziel Ports\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" --msgstr "Kernel NET/ROM Routentabelle\n" -+msgstr "Kernel-NET/ROM-Routentabelle\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Ziel Mnemonic Qualität Nachbar Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" --msgstr "NET/ROM Benutzung\n" -+msgstr "NET/ROM-Benutzung\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" --msgstr "NET/ROM: Dies muß noch geschrieben werden\n" -+msgstr "NET/ROM: Dies muss noch geschrieben werden\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" --msgstr "Bitte benutzen sie pppd.\n" -+msgstr "Bitte benutzen Sie pppd.\n" - - #: ../lib/rose.c:87 - msgid "Node address must be ten digits" --msgstr "Knotenadresse muß zehn Ziffern haben" -+msgstr "Knotenadresse muss zehn Ziffern haben" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE ist auf diesem System nicht verfügbar.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" --msgstr "ROSE Kernel Routentabelle\n" -+msgstr "ROSE-Kernel-Routentabelle\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): ungültige Tokenringadresse!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): nachfolgend : ignoriert!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): nachfolgender Müll!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" --msgstr "Warnung: Keine INET Sockets verfügbar: %s\n" -+msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Gerät nicht gefunden" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - keine Statistiken verfügbar -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[KEINE FLAGS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Protokoll:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "Hardware Adresse %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Medium:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s Adresse:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-z-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Maske:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6-Adresse: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Gültigkeitsbereich:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Verbindung" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Standort" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Kompatibilität" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Maschine" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Unbekannt" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/Ethernet II Adresse:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/Ethernet SNAP Adresse:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/Ethernet 802.2 Adresse:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/Ethernet 802.3 Adresse:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " EtherTalk Phase 2 Adresse:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " econet Adresse:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[KEINE FLAGS] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "PUNKTZUPUNKT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metrik:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " komprimiert:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " Kollisionen:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "Komprimiert:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "Sendewarteschlangenlänge:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Interrupt:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Basisadresse:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Speicher:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "DMA Kanal:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Keine benutzbaren Adressfamilien gefunden.\n" - -@@ -2369,41 +2952,44 @@ - #: ../lib/util-ank.c:238 - #, c-format - msgid "ip: %s is invalid inet prefix\n" --msgstr "ip: %s ist ein ungültiges INET-Prefix\n" -+msgstr "ip: %s ist ein ungültiges INET-Präfix\n" - - #: ../lib/util-ank.c:248 - #, c-format - msgid "ip: %s is invalid IPv4 address\n" --msgstr "ip: %s ist eine ungültige IPv4 Adresse\n" -+msgstr "ip: %s ist eine ungültige IPv4-Adresse\n" - - #: ../lib/util-ank.c:256 - #, c-format - msgid "ip: argument is wrong: %s\n" - msgstr "ip: Fehlerhaftes Argument: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "familie %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " Benutzer %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Kann Socket nicht öffnen" - -@@ -2418,13 +3004,14 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: Kann PID-Datei nicht schreiben\n" - - #: ../slattach.c:202 - #, c-format - msgid "slattach: tty_lock: UUCP user %s unknown!\n" --msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n" -+msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n" - - #: ../slattach.c:430 - #, c-format -@@ -2436,39 +3023,71 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: name zu lang\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "%s gestartet" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " auf %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr " Schnittstelle: %s\n" -+ -+msgid "" -+" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+"<-''-\n" -+msgstr "" -+" arp [-v] [<HW>] [-i <if>] -s <Hostname> <hwaddr> [netmask <nm>] pub\n" -+ -+msgid "%s: unknown interface: %s\n" -+msgstr "%s: unbekannte Schnittstelle: %s\n" -+ -+msgid "address mask replies" -+msgstr "Adressmaskenantworten" -+ -+msgid "unknown title %s\n" -+msgstr "Unbekannter Titel %s\n" -+ -+msgid "Routing table for `ddp' not yet supported.\n" -+msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n" ---- net-tools-1.60.orig/po/fr.po -+++ net-tools-1.60/po/fr.po -@@ -4,7 +4,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 1998-03-01 00:02+0100\n" - "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n" - "Language-Team:\n" -@@ -12,273 +13,277 @@ - "Content-Type: text/plain; charset=iso8859-1\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: nécessite un nom d'hôte\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Pas d'entrée ARP pour %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, fuzzy, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: nécessite une adresse matériel\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: adresse matériel invalide\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ne peut ouvrir le fichier ether %s !\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: erreur de format ligne %u du fichier ether %s !\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t Indicateurs\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr "%s: interface inconnue: %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: aucune correspondance trouvée dans %d entrées\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - "Syntaxe:\n" --" arp [-vn] [<MAT>] [-i <if>] [-a] [<hôte>] <-Affiche cache " --"ARP\n" -+" arp [-vn] [<MAT>] [-i <if>] [-a] [<hôte>] <-Affiche cache ARP\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, 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 <hôte> [pub][nopub] <-Supprime entrée " --"ARP\n" -+msgstr " arp [-v] [-i <if>] -d <hôte> [pub][nopub] <-Supprime entrée ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, fuzzy, 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] [<MAT>] [-i <if>] -f <fichier> <-Ajout entrée " --"depuis fichier\n" -+msgstr " arp [-vnD] [<MAT>] [-i <if>] -f <fichier> <-Ajout entrée depuis fichier\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, 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] [<MAT>] [-i <if>] -s <hôte> <adrmat> [temp][nopub] <-Ajout " --"entrée\n" -+msgstr " arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [temp][nopub] <-Ajout entrée\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" --" arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [netmask <nm>] pub " --"<-''-\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, 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] [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub " --"<-''-\n" -+" arp [-v] [<MAT>] [-i <if>] -Ds <hôte> <if> [netmask <nm>] pub <-''-\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" --msgstr "" --" -a affiche (tous) les hôtes en style BSD\n" -+msgstr " -a affiche (tous) les hôtes en style BSD\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set définit une nouvelle entrée ARP\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete supprime une entrée\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose mode verbeux\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric ne résout pas les noms\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr "" --" -i, --device spécifie l'interface réseau (p.ex. eth0)\n" -+msgstr " -i, --device spécifie l'interface réseau (p.ex. eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" --msgstr "" --" -D, --use-device lit l'<adrmat> depuis le périphérique\n" -+msgstr " -D, --use-device lit l'<adrmat> depuis le périphérique\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, fuzzy, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -r, --route affiche la table de routage\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, fuzzy, 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 lit les nouvelles entrées dans le fichier\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" --msgstr "" --" <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: " --"%s\n" -+msgstr " <HW>=Utilisez '-H <hw>' pour spécifier le type d'adresse matériel. Défaut: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Liste les types de matériels supportant ARP:\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: type de matétiel non supporté !\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: famille d'adresses non supportée !\n" - --#: ../arp.c:703 --#, fuzzy -+#: ../arp.c:716 -+#, fuzzy, c-format - msgid "arp: -N not yet supported.\n" - msgstr "Table de routage pour `ddp' pas encore supporté.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: famille d'adresses inconnue.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: type de matériel inconnu.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: le noyau ne supporte que 'inet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: type de matériel sans support ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Définit le nom de noeud ŕ `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: vous devez ętre root pour changer le nom de noeud\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nom trop long\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Définit le nom d'hôte ŕ `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: vous devez ętre root pour changer le nom d'hôte\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Définit le nom de domaine ŕ `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: vous devez ętre root pour changer le nom de domaine\n" -@@ -303,38 +308,36 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Résultat : h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: ne peut ouvrir `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" --msgstr "" --"Syntaxe : hostname [-v] {hôte|-F fichier} définit le nom d'hôte (depuis " --"le fichier)\n" -+msgstr "Syntaxe : hostname [-v] {hôte|-F fichier} définit le nom d'hôte (depuis le fichier)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" --msgstr "" --" domainname [-v] {domaine_nis|-F fichier} définit le domaine NIS " --"(depuis le fichier)\n" -+msgstr " domainname [-v] {domaine_nis|-F fichier} définit le domaine NIS (depuis le fichier)\n" - --#: ../hostname.c:226 --#, fuzzy -+#: ../hostname.c:225 -+#, fuzzy, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" --msgstr "" --" nodename [-v] {nom_noeud|-F fichier} Définit le nom de noeud " --"DECnet (depuis le fichier)\n" -+msgstr " nodename [-v] {nom_noeud|-F fichier} Définit le nom de noeud DECnet (depuis le fichier)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, 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] affiche le nom formatté\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -342,7 +345,8 @@ - " hostname [-v] affiche le nom d'hôte\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +354,8 @@ - " hostname -V|--version|-h|--help affiche des infos et termine\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -358,45 +363,52 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short nom d'hôte court\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias noms d'alias\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address adresses de l'hôte\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long nom d'hôte long (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain nom de domaine DNS\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis nom de domaine NIS/YP\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node nom de noeud DECnet\n" - --#: ../hostname.c:241 --#, fuzzy -+#: ../hostname.c:240 -+#, fuzzy, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file lit le nom d'hôte ou le nom de domaine NIS depuis " --"le fichier\n" -+" -F, --file lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, 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" -@@ -411,15 +423,16 @@ - msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez " --"changer le\n" -+"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n" -@@ -439,554 +452,453 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Lien encap:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Indic\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "HWaddr %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Media:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Pas de support de INET sur ce systčme.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Syntaxe:\n" -+" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <adresse>[/<lg_prefixe>]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <adresse>[/<lg_prefixe>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Masque:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<adresse>]] [[-]pointopoint [<adresse>]]\n" - --#: ../ifconfig.c:201 --#, c-format --msgid " inet6 addr: %s/%d" --msgstr " adr inet6: %s/%d" -+#: ../ifconfig.c:207 -+#, fuzzy, c-format -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <adresse>] [dstaddr <adresse>] [tunnel <adresse>]\n" - --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Scope:" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <adresse>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Lien" -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Site" -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - - #: ../ifconfig.c:215 --msgid "Compat" --msgstr "Compat" -+#, c-format -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" - --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Hôte" -+#: ../ifconfig.c:217 -+#, fuzzy, c-format -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen longueur]\n" - --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Inconnu" -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:236 -+#: ../ifconfig.c:222 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " adr IPX/Ethernet II:%s\n" -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:224 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " adr IPX/Ethernet SNAP:%s\n" -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Type de matériel.\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:225 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " adr IPX/Ethernet 802.2:%s\n" -+msgid " List of possible hardware types:\n" -+msgstr " Liste des types de matériels possibles:\n" - --#: ../ifconfig.c:245 -+#. 1 = ARPable -+#: ../ifconfig.c:227 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " adr IPX/Ethernet 802.3:%s\n" -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=famille d'Adresses. Défaut: %s\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:228 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " adr EtherTalk Phase 2:%s\n" -+msgid " List of possible address families:\n" -+msgstr " Liste des familles d'adresses possibles:\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:303 - #, c-format --msgid " econet addr:%s\n" --msgstr " adr econet:%s\n" -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[PAS INDICATEURS] " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Type de média inconnu.\n" - --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST " -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK " -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresse %s invalide.\n" - --#: ../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 " -- --#: ../ifconfig.c:302 --#, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metric:%d" -- --#: ../ifconfig.c:306 --#, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -- --#: ../ifconfig.c:320 --#, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n" -- --#: ../ifconfig.c:325 --#, c-format --msgid " compressed:%lu\n" --msgstr " compressés:%lu\n" -- --#: ../ifconfig.c:329 --#, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "" --"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n" -- --#: ../ifconfig.c:333 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid " collisions:%lu " --msgstr " collisions:%lu " -- --#: ../ifconfig.c:335 --#, c-format --msgid "compressed:%lu " --msgstr "compressés:%lu " -- --#: ../ifconfig.c:337 --#, c-format --msgid "txqueuelen:%d " --msgstr "lg file transmission:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "Interruption:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Adresse de base:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Mémoire:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "Canal DMA:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "Pas de support de INET6 sur ce systčme.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: interface inconnue: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Syntaxe:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <adresse>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <adresse>[/<lg_prefixe>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <adresse>[/<lg_prefixe>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<adresse>]] [[-]pointopoint [<adresse>]]\n" -- --#: ../ifconfig.c:433 --#, fuzzy --msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" --msgstr " [netmask <adresse>] [dstaddr <adresse>] [tunnel <adresse>]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill <NN>] [keepalive <NN>]\n" --msgstr " [outfill <NN>] [keepalive <NN>]\n" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <adresse>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\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 <type>]\n" -- --#: ../ifconfig.c:443 --#, fuzzy --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen longueur]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Type de matériel.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Liste des types de matériels possibles:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=famille d'Adresses. Défaut: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Liste des familles d'adresses possibles:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Type de média inconnu.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: adresse %s invalide.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Pas de support de INET6 sur ce systčme.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Suppression d'adresses pas supporté par ce systčme.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Pas de support de INET sur ce systčme.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Pas de support de ECONET sur ce systčme.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, 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 "" --"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez ętre root.)\n" -+msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez ętre root.)\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 "" - "(Tous les processus ne peuvent ętre identifiés, les infos sur les processus\n" --"non possédés ne seront pas affichées, vous devez ętre root pour les voir " --"toutes.)\n" -+"non possédés ne seront pas affichées, vous devez ętre root pour les voir toutes.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "sockets NET/ROM actives\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 "" --"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q " --"Recv-Q\n" -+"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q Recv-" -+"Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:465 -+#: ../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 "CLOSE" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "attention, ligne igmp6 en erreur %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:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: famille d'adresses pas supportée %d !\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 "attention, ligne igmp6 en erreur %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Sockets AX.25 actives\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "attention, ligne tcp en erreur.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "off (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, fuzzy, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "unkn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "attention, ligne udp en erreur.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "INCONNU" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "attention, ligne raw en erreur.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "attention, ligne unix en erreur.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "LIBRE" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "ENCONNEXION" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "CONNECTE" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "ENDECONNEXION" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Sockets du domaine UNIX actives" - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(serveurs et établies)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(seulement serveurs)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(sans serveurs)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -994,32 +906,36 @@ - "\n" - "Proto RefCpt Indicatrs Type Etat I-Node" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Chemin\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM SENT" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECOVERY" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Sockets AX.25 actives\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " -@@ -1029,55 +945,53 @@ - "Proto Recv-Q Send-Q Adresse locale Adresse distante " - "Etat" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr "Utilisatr" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr "" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[PAS INDICATEURS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Table d'interfaces noyau\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, 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 "" - "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Indic\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "informations d'interface manquantes" - --#: ../netstat.c:1425 -+#: ../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 "" --"syntaxe: netstat [-veenNcCF] [<Af>] -r netstat " --"{-V|--version|-h|--help}\n" -+"syntaxe: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Socket> ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1085,27 +999,30 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route affiche la table de routage\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces affiche la table d'interfaces\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups affiche les membres d'un groupe multicast\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" --msgstr "" --" -s, --statistics affiche les statistiques réseau (comme " --"SNMP)\n" -+msgstr " -s, --statistics affiche les statistiques réseau (comme SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1113,23 +1030,41 @@ - " -M, --masquerade affiche les connexions masquées\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic résoud les noms matériels\n" - --#: ../netstat.c:1439 ../route.c:88 --#, fuzzy -+#: ../netstat.c:1509 ../route.c:88 -+#, fuzzy, c-format - msgid " -e, --extend display other/more information\n" - msgstr "" - " -e, --extend affiche d'autres/plus d'informations\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs affiche le nom du programme/PID des " - "sockets\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1137,32 +1072,31 @@ - " -c, --continuous listing continu\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" --msgstr "" --" -l, --listening affiche les sockets du serveur ŕ l'écoute\n" -+msgstr " -l, --listening affiche les sockets du serveur ŕ l'écoute\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" --msgstr "" --" -a, --all, --listening affiche toutes les prises (défaut: " --"connectés)\n" -+msgstr " -a, --all, --listening affiche toutes les prises (défaut: connectés)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers affiche les timers\n" - --#: ../netstat.c:1445 ../route.c:89 --#, fuzzy -+#: ../netstat.c:1515 ../route.c:89 -+#, fuzzy, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" --msgstr "" --" -F, --fib affiche la Forwarding Infomation Base " --"(défaut)\n" -+msgstr " -F, --fib affiche la Forwarding Infomation Base (défaut)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1170,110 +1104,118 @@ - " -C, --cache affiche le cache de routage au lieu de FIB\n" - "\n" - --#: ../netstat.c:1448 -+#: ../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 "" --" <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" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Liste les familles d'adresses possibles (supportant le routage):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Connexions Internet actives " - --#: ../netstat.c:1673 -+#: ../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 "" - "\n" --"Proto Recv-Q Send-Q Adresse locale Adresse distante Etat " --" " -+"Proto Recv-Q Send-Q Adresse locale Adresse distante " -+"Etat " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Utilisatr Inode " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Timer" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Ce noyau ne supporte pas RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "pas d'entrée RARP pour %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: mauvaise adresse matériel\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: erreur de format ŕ %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: hôte inconnu\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "" --"Usage: rarp -a liste les entrées en cache.\n" -+msgstr "Usage: rarp -a liste les entrées en cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" --msgstr "" --" rarp -d <hostname> supprime l'entrée du cache.\n" -+msgstr " rarp -d <hostname> supprime l'entrée du cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" --msgstr "" --" rarp [<HW>] -s <hostname> <adrmat> ajoute l'entrée au cache.\n" -+msgstr " rarp [<HW>] -s <hostname> <adrmat> ajoute l'entrée au cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" --msgstr "" --" rarp -f ajoute les entrées depuis " --"/etc/ethers.\n" -+msgstr " rarp -f ajoute les entrées depuis /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1281,24 +1223,26 @@ - " rarp -V affiche la version.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: combinaison d'options illégales.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: %s: type de matériel inconnu.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" - msgstr "" - "Syntaxe: route [-nNvee] [-FC] [<AF>] Liste les tables de routage " - "noyau\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1307,15 +1251,15 @@ - "pour 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>] Utilisation détaillée pour l'AF " --"spécifié.\n" -+msgstr " route {-h|--help} [<AF>] Utilisation détaillée pour l'AF spécifié.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1325,16 +1269,23 @@ - "termine.\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Utiliser '-A <af>' ou '--<af>' Défaut: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 --#, fuzzy -+#, fuzzy, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V\n" - -@@ -1343,474 +1294,763 @@ - 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 "" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr "" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr "" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr "" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr "" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr "" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "" - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - #, fuzzy - msgid "unknown" - msgstr "Inconnu" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr "" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr "" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr "" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr "" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "Histogramme d'entrée ICMP" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "Histogramme de sortie ICMP" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Réacheminement est %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "TTL par défaut est %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "%d paquets totaux reçus" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "%d avec en-tęte invalides" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d avec adresses invalides" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d réacheminées" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d avec protocole inconnu" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d paquets entrant jetés" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d paquets entrant délivrés" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d requętes envoyées" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d paquets sortant jetés" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d jetés pour cause de route manquante" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d fragments jetés aprčs timeout" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d nécessitant un réassemblage" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d paquets réassemblés correctement" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d paquets mal réassemblés" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d fragments reçus correctement" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "%d fragments en échec" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d fragments créés" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "%d messages ICMP reçus" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "%d messages d'entrée ICMP en échec" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "destination injoignable: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "timeout en transmission: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "mauvais paramčtre: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "Source Quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "Redirections: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "requętes echo: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "réponses echo: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "requętes datées: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "réponses datées: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "requętes de masque d'adresse: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "réponses de masque d'adresses" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "réponses de masque d'adresse: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d messages ICMP envoyés" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "%d messages ICMP en échec" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "temps dépassé: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "Source Quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "redirection: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "requęte echo: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "requętes datées: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "réponses datées: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "requętes de masque d'adresse: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "réponses de masque d'adresse: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "algorithme RTO est %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "%d ouvertures de connexions actives" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "%d ouvertures de connexions passives" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "%d tentatives de connexion échouées" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "%d réinitialisations de connexions reçues" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "%d connexions établies" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "%d segments reçus" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "%d segments envoyés" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "%d segments retransmis" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "%d mauvais segments reçus." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "%d réinitialisations envoyées" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "%d paquets reçus" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "%d paquets reçus pour un port inconnu" - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "%d erreurs en réception de paquets" - --#: ../statistics.c:137 -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" -+msgstr "%d paquets envoyés" -+ -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d SYN-Cookies reçus" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d SYN-Cookies reçus" -+ -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d SYN-Cookies reçus incorrects" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d paquets supprimés de la file hors service" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d ICMP paquets jetés car hors de la fenętre" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d paquets ICMP jetés car la socket a été vérouillée" -+ -+#: ../statistics.c:160 - #, c-format --msgid "%d packets sent" -+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:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" - msgstr "%d paquets envoyés" - --#: ../statistics.c:142 -+#: ../statistics.c:170 - #, c-format --msgid "%d SYN cookies sent" -+msgid "%u delayed acks further delayed because of locked socket" - msgstr "" - --#: ../statistics.c:143 -+#: ../statistics.c:172 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d SYN-Cookies reçus" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:173 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d SYN-Cookies reçus incorrects" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:175 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires" -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:176 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "%u packets directly queued to recvmsg prequeue." - msgstr "" --"%d paquets supprimés de la file de réception en raison de tampon de sockets " --"plein" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 - #, c-format --msgid "%d packets pruned from out-of-order queue" -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" - msgstr "%d paquets supprimés de la file hors service" - --#: ../statistics.c:152 -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "%d paquets reçus" -+ -+#: ../statistics.c:184 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" --"%d paquets jetés de la file hors service en raison de tampon de sockets plein" - --#: ../statistics.c:154 -+#: ../statistics.c:186 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d ICMP paquets jetés car hors de la fenętre" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%d paquets reçus pour un port inconnu" -+ -+#: ../statistics.c:189 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d paquets ICMP jetés car la socket a été vérouillée" -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d mauvais segments reçus." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d réinitialisations envoyées" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d segments retransmis" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d segments retransmis" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d paquets mal réassemblés" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d paquets reçus" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d paquets totaux reçus" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d réinitialisations de connexions reçues" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "activée" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "désactivée" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "titre inconnu %s\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "erreur d'analyse de /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "ne peut ouvrir /proc/net/snmp" - -@@ -1824,89 +2064,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Ne peut changer la discipline de ligne ŕ `%s'.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "Domaine UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Trop d'arguments de familles d'adresses.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Famille d'adresses inconnue `%s'.\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 "[INDEFINI]" -- --#: ../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): adresse arcnet invalide !\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): restant : ignoré !\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): le restant ŕ la poubelle !\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Adresse Ash malformée" - -+#: ../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/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[INDEFINI]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Signal d'appel invalide" -@@ -1916,22 +2162,21 @@ - msgstr "Signal d'appel trop long" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 pas configuré sur ce systčme.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Table de routage AX.25 du noyau\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Destination Iface Utilisation\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Table de routage pour `ddp' pas encore supporté.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1947,153 +2192,171 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): le restant ŕ la poubelle !\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): adresse fddi invalide!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): restant ignoré !\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): le restant ŕ la poubelle !\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 "Famille d'adresses `%s' non supportée.\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 "Pas de routage pour la famille d'adresses `%s'.\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): adresse hippi invalide!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): restant ignoré !\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): le restant ŕ la poubelle !\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Boucle locale" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "IP ligne série" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "IP ligne série - VJ " - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "IP ligne série - 6 bits" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "IP ligne série - 6 bits VJ" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "IP ligne série adaptative" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Protocole Point-ŕ-Point" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Périphériue d'accčs Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-dans-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - #, fuzzy - msgid "IrLAP" - msgstr "LAPB" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: famille d'adresses non suportée %d !\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "INCONNU" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pas configuré sur ce systčme.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Table de routage IPv6 du noyau\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Destination Prochain Hop " --" Indic Metric Ref Utilis. Iface\n" -+"Destination Prochain " -+"Hop Indic Metric Ref Utilis. Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache voisin IPv6 du noyau\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2101,39 +2364,45 @@ - "Voisin Adresse MAT Iface Indic " - "Ref Etat\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" --msgstr "" --"Voisin Adresse MAT Iface Indic " --"Ref Etat Bloqué(sec) Détuit(sec)\n" -+msgstr "Voisin Adresse MAT Iface Indic Ref Etat Bloqué(sec) Détuit(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Syntaxe: inet6_route [-vF] del Cible\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 Cible [gw Gw] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush PAS supporté\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Flush de table de routage `inet6' pas supporté\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) pas configuré sur ce systčme.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Table de routage IP du noyau\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2142,26 +2411,26 @@ - "Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destination Passerelle Genmask Indic MSS Fenętre irtt " --"Iface\n" -+msgstr "Destination Passerelle Genmask Indic MSS Fenętre irtt Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" --msgstr "" --"Destination Passerelle Genmask Indic Metric Ref Use " --"Iface MSS Fenętre irtt\n" -+msgstr "Destination Passerelle Genmask Indic Metric Ref Use Iface MSS Fenętre irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "cache de routage IP du noyau\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2170,30 +2439,28 @@ - "Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Source Destination Passerelle Indic MSS Fenętre irtt " --"Iface\n" -+msgstr "Source Destination Passerelle Indic MSS Fenętre irtt Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" --msgstr "" --"Source Destination Passerelle Indic Metric Ref Use " --"Iface MSS Fenętre irtt HH Arp\n" -+msgstr "Source Destination Passerelle Indic Metric Ref Use Iface MSS Fenętre 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 "" --"Source Destination Passerelle Flags Metric Ref Use " --"Iface MSS Fenętre irtt TOS HHRef HHUptod SpecDst\n" -+msgstr "Source Destination Passerelle Flags Metric Ref Use Iface MSS Fenętre irtt TOS HHRef HHUptod SpecDst\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" -@@ -2201,29 +2468,34 @@ - "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric 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} Cible[/prefix] [gw Gw] [metric 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} Cible[/prefix] [metric 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 PAS supporté\n" - -@@ -2233,15 +2505,17 @@ - msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: MSS invalide.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: fenętre invalide.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: rtt initial invalide.\n" - -@@ -2256,75 +2530,92 @@ - msgstr "route: netmask bogué %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: netmask ne correspond pas ŕ l'adresse de route\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Flush de table de routage `inet' pas supporté\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Modification de cache de routage `inet' pas supporté\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX pas configuré sur ce systčme.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Table de routage IPX du noyau\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Destination Réseau Routeur Noeud Routeur\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX: ceci doit ętre écrit\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "Entrées IP Masquerade\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot expire source destination ports\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 expire initseq delta precd source destination " --" ports\n" -+"prot expire initseq delta precd source " -+"destination ports\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM pas configuré sur ce systčme.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Table de routage NET/ROM du noyau\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Destination Mnemoniq Qualité Voisin Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "utilisation netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: ceci doit ętre écrit\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Désolé, utilisez pppd !\n" - -@@ -2333,49 +2624,314 @@ - msgstr "L'adresse de noeud doit avoir 10 chiffres" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE pas configuré sur ce systčme.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Table de routage ROSE du noyau\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): adresse token-ring invalide !\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): restant : ignoré !\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): restant ŕ la poubelle !\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "attention: pas de socket inet disponible: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Périphérique non trouvé" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr "" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[PAS INDICATEURS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Lien encap:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "HWaddr %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Media:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s adr:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Masque:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " adr inet6: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Scope:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Lien" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Site" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Hôte" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Inconnu" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " adr IPX/Ethernet II:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " adr IPX/Ethernet SNAP:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " adr IPX/Ethernet 802.2:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " adr IPX/Ethernet 802.3:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " adr EtherTalk Phase 2:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " adr econet:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[PAS INDICATEURS] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metric:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " compressés:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " collisions:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "compressés:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "lg file transmission:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Interruption:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Adresse de base:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Mémoire:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Canal DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Pas de famille d'adresses utilisable trouvée.\n" - -@@ -2399,29 +2955,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argument incorrect: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "" - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr "" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Ne peut créer une socket" - -@@ -2436,6 +2995,7 @@ - msgstr "" - - #: ../slattach.c:192 -+#, fuzzy, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: tty_lock: (%s): %s\n" - -@@ -2454,59 +3014,88 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: nom trop long\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: ne peut activer le mode RAW !\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: ne peut passer ŕ %s bps!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr "" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, fuzzy, c-format - msgid " interface %s\n" - msgstr "%s: interface inconnue: %s\n" - - #~ msgid "" --#~ " This comand can get or set the hostname or the NIS domainname. You can\n" --#~ msgstr "" --#~ " Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine " --#~ "NIS. Vous pouvez\n" -+#~ " arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " -+#~ "<-''-\n" -+#~ msgstr " arp [-v] [<MAT>] [-i <if>] -s <hôte> <adrmat> [netmask <nm>] pub <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: interface inconnue: %s\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "réponses de masque d'adresses" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "titre inconnu %s\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n" -+ -+#~ msgid "" -+#~ " This comand can get or set the hostname or the NIS domainname. You " -+#~ "can\n" -+#~ msgstr " Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n" - - #~ msgid "" - #~ " also get the DNS domain or the FQDN (fully qualified domain name).\n" - #~ msgstr "" --#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n" -+#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain " -+#~ "name).\n" - - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" --#~ msgstr "" --#~ " Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous " --#~ "pouvez changer le\n" -+#~ msgstr " Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n" - - #~ msgid "" - #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" ---- net-tools-1.60.orig/po/net-tools.pot -+++ net-tools-1.60/po/net-tools.pot -@@ -1,253 +1,275 @@ - # 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: 2007-06-30 12:28+0900\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:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "" - --#: ../arp.c:208 ../arp.c:222 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "" - --#: ../arp.c:240 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "" - --#: ../arp.c:244 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:253 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:283 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "" - --#: ../arp.c:291 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "" - --#: ../arp.c:388 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "" - --#: ../arp.c:404 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:417 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:438 -+#: ../arp.c:448 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" - msgstr "" - --#: ../arp.c:468 -+#: ../arp.c:476 -+msgid "<from_interface>" -+msgstr "" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:485 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:491 -+#: ../arp.c:501 -+#, c-format - msgid "<incomplete> " - msgstr "" - --#: ../arp.c:497 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:514 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:593 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "" - --#: ../arp.c:597 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:599 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "" - --#: ../arp.c:614 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " - "cache\n" - msgstr "" - --#: ../arp.c:615 -+#: ../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.c:616 -+#: ../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.c:617 -+#: ../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.c:618 --msgid "" --" arp [-v] [<HW>] [-i <if>] -s <hostname> <hwaddr> [netmask <nm>] pub " --"<-''-\n" --msgstr "" -- --#: ../arp.c:619 -+#: ../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.c:621 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr "" - --#: ../arp.c:622 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr "" - --#: ../arp.c:623 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr "" - --#: ../arp.c:624 ../netstat.c:1490 ../route.c:86 -+#: ../arp.c:635 ../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:636 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr "" - --#: ../arp.c:626 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - --#: ../arp.c:627 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read <hwaddr> from given device\n" - msgstr "" - --#: ../arp.c:628 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr "" - --#: ../arp.c:629 -+#: ../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 "" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:642 ../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:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr "" - --#: ../arp.c:666 ../arp.c:751 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "" - --#: ../arp.c:670 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "" - --#: ../arp.c:705 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "" - --#: ../arp.c:715 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "" - --#: ../arp.c:724 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "" - --#: ../arp.c:743 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "" - --#: ../arp.c:756 -+#: ../arp.c:767 - #, 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:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "" - --#: ../hostname.c:90 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "" - --#: ../hostname.c:95 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "" -@@ -262,103 +284,119 @@ - msgid "%s: you must be root to change the domain name\n" - msgstr "" - --#: ../hostname.c:132 -+#: ../hostname.c:131 - #, c-format - msgid "Resolving `%s' ...\n" - msgstr "" - --#: ../hostname.c:138 -+#: ../hostname.c:137 - #, c-format - msgid "Result: h_name=`%s'\n" - msgstr "" - --#: ../hostname.c:143 -+#: ../hostname.c:142 - #, c-format - msgid "Result: h_aliases=`%s'\n" - msgstr "" - --#: ../hostname.c:148 -+#: ../hostname.c:147 - #, c-format - msgid "Result: h_addr_list=`%s'\n" - msgstr "" - --#: ../hostname.c:210 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "" - --#: ../hostname.c:224 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - --#: ../hostname.c:225 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - --#: ../hostname.c:227 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr "" - --#: ../hostname.c:229 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr "" - --#: ../hostname.c:230 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr "" - --#: ../hostname.c:231 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" - msgstr "" - --#: ../hostname.c:232 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - msgstr "" - --#: ../hostname.c:233 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr "" - --#: ../hostname.c:234 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr "" - --#: ../hostname.c:235 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr "" - --#: ../hostname.c:236 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - --#: ../hostname.c:237 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr "" - --#: ../hostname.c:238 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr "" - --#: ../hostname.c:240 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr "" - --#: ../hostname.c:242 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" - --#: ../hostname.c:244 -+#: ../hostname.c:242 -+#, 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" -@@ -367,587 +405,706 @@ - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - --#: ../hostname.c:340 -+#: ../hostname.c:338 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" - msgstr "" - --#: ../hostname.c:341 -+#: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - --#: ../hostname.c:342 -+#: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - --#: ../hostname.c:359 -+#: ../hostname.c:357 - #, c-format - msgid "gethostname()=`%s'\n" - msgstr "" - --#: ../hostname.c:376 -+#: ../hostname.c:374 - #, c-format - msgid "getdomainname()=`%s'\n" - msgstr "" - --#: ../hostname.c:391 -+#: ../hostname.c:389 - #, c-format - msgid "getnodename()=`%s'\n" - msgstr "" - --#: ../ifconfig.c:108 -+#: ../ifconfig.c:107 -+#, 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:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, 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:303 - #, c-format - msgid "ifconfig: option `%s' not recognised.\n" - msgstr "" - --#: ../ifconfig.c:280 ../ifconfig.c:925 -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format - msgid "ifconfig: `--help' gives usage information.\n" - msgstr "" - --#: ../ifconfig.c:355 -+#: ../ifconfig.c:380 -+#, c-format - msgid "Unknown media type.\n" - msgstr "" - --#: ../ifconfig.c:647 -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:684 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - --#: ../ifconfig.c:656 -+#: ../ifconfig.c:693 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "" - --#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "" - --#: ../ifconfig.c:743 ../ifconfig.c:834 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "" - --#: ../ifconfig.c:755 ../ifconfig.c:845 -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format - msgid "Bad address.\n" - msgstr "" - --#: ../ifconfig.c:848 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "" - --#: ../ifconfig.c:920 -+#: ../ifconfig.c:957 -+#, c-format - msgid "ifconfig: Cannot set address for this protocol family.\n" - msgstr "" - --#: ../ifconfig.c:946 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "" - --#: ../ifconfig.c:954 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "" - --#: ../netstat.c:430 -+#: ../ifconfig.c:1021 -+#, 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 -+#: ../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 "" - --#: ../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 +1143,28 @@ - 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 +1181,50 @@ - 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 +1234,75 @@ - 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 +1316,27 @@ - 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 +1346,12 @@ - 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 "" - -@@ -1563,12 +1758,12 @@ - - #: ../statistics.c:178 - #, c-format --msgid "%u packets directly received from backlog" -+msgid "%u of bytes directly received from backlog" - msgstr "" - - #: ../statistics.c:180 - #, c-format --msgid "%u packets directly received from prequeue" -+msgid "%u of bytes directly received from prequeue" - msgstr "" - - #: ../statistics.c:182 -@@ -1578,7 +1773,7 @@ - - #: ../statistics.c:183 - #, c-format --msgid "%u packets header predicted" -+msgid "%u packet headers predicted" - msgstr "" - - #: ../statistics.c:184 -@@ -1591,19 +1786,209 @@ - msgid "Ran %u times out of system memory during packet sending" - msgstr "" - --#: ../statistics.c:253 -+#: ../statistics.c:188 -+#, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, c-format -+msgid "%u bad SACKs received" -+msgstr "" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, c-format -+msgid "%u retransmits lost" -+msgstr "" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, c-format -+msgid "%u fast retransmits" -+msgstr "" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "" -+ -+#: ../statistics.c:210 -+#, c-format -+msgid "%u sack retransmits failed" -+msgstr "" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, c-format -+msgid "%u DSACKs received" -+msgstr "" -+ -+#: ../statistics.c:216 -+#, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "" -+ -+#: ../statistics.c:217 -+#, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "" -+ -+#: ../statistics.c:218 -+#, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "" -+ -+#: ../statistics.c:219 -+#, c-format -+msgid "%u connections reset due to early user close" -+msgstr "" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "" -+ -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "" - --#: ../statistics.c:253 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "" - --#: ../statistics.c:336 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "" - --#: ../statistics.c:349 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "" - -@@ -1617,7 +2002,7 @@ - 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 +2018,11 @@ - 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 +2034,7 @@ - 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 +2042,21 @@ - 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,6 +2081,7 @@ - msgstr "" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "" - -@@ -1712,22 +2100,21 @@ - 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,90 +2170,94 @@ - 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/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" -@@ -1877,131 +2268,157 @@ - msgstr "" - - #: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "" - - #: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "" - - #: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" - - #: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "" - - #: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" - msgstr "" - - #: ../lib/inet6_gr.c:157 -+#, 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 +2428,17 @@ - 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 +2453,90 @@ - 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 +2545,314 @@ - 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:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "" - --#: ../lib/interface.c:316 -+#: ../lib/interface.c:325 - #, 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:571 - msgid "Device not found" - msgstr "" - --#: ../lib/interface.c:560 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "" - --#: ../lib/interface.c:593 -+#: ../lib/interface.c:608 - msgid " - no statistics available -" - msgstr "" - --#: ../lib/interface.c:597 -+#: ../lib/interface.c:612 -+#, c-format - msgid "[NO FLAGS]" - msgstr "" - --#: ../lib/interface.c:673 -+#: ../lib/interface.c:688 - #, c-format - msgid "%-9.9s Link encap:%s " - msgstr "" - --#: ../lib/interface.c:678 -+#: ../lib/interface.c:693 - #, c-format - msgid "HWaddr %s " - msgstr "" - --#: ../lib/interface.c:681 -+#: ../lib/interface.c:696 - #, c-format - msgid "Media:%s" - msgstr "" - --#: ../lib/interface.c:683 -+#: ../lib/interface.c:698 -+#, c-format - msgid "(auto)" - msgstr "" - --#: ../lib/interface.c:690 -+#: ../lib/interface.c:705 - #, c-format - msgid " %s addr:%s " - msgstr "" - --#: ../lib/interface.c:693 -+#: ../lib/interface.c:708 - #, c-format - msgid " P-t-P:%s " - msgstr "" - --#: ../lib/interface.c:696 -+#: ../lib/interface.c:711 - #, c-format - msgid " Bcast:%s " - msgstr "" - --#: ../lib/interface.c:698 -+#: ../lib/interface.c:713 - #, c-format - msgid " Mask:%s\n" - msgstr "" - --#: ../lib/interface.c:715 -+#: ../lib/interface.c:730 - #, c-format - msgid " inet6 addr: %s/%d" - msgstr "" - --#: ../lib/interface.c:717 -+#: ../lib/interface.c:732 -+#, c-format - msgid " Scope:" - msgstr "" - --#: ../lib/interface.c:720 -+#: ../lib/interface.c:735 -+#, c-format - msgid "Global" - msgstr "" - --#: ../lib/interface.c:723 -+#: ../lib/interface.c:738 -+#, c-format - msgid "Link" - msgstr "" - --#: ../lib/interface.c:726 -+#: ../lib/interface.c:741 -+#, c-format - msgid "Site" - msgstr "" - --#: ../lib/interface.c:729 -+#: ../lib/interface.c:744 -+#, c-format - msgid "Compat" - msgstr "" - --#: ../lib/interface.c:732 -+#: ../lib/interface.c:747 -+#, c-format - msgid "Host" - msgstr "" - --#: ../lib/interface.c:735 -+#: ../lib/interface.c:750 -+#, c-format - msgid "Unknown" - msgstr "" - --#: ../lib/interface.c:750 -+#: ../lib/interface.c:765 - #, c-format - msgid " IPX/Ethernet II addr:%s\n" - msgstr "" - --#: ../lib/interface.c:753 -+#: ../lib/interface.c:768 - #, c-format - msgid " IPX/Ethernet SNAP addr:%s\n" - msgstr "" - --#: ../lib/interface.c:756 -+#: ../lib/interface.c:771 - #, c-format - msgid " IPX/Ethernet 802.2 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:759 -+#: ../lib/interface.c:774 - #, c-format - msgid " IPX/Ethernet 802.3 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:769 -+#: ../lib/interface.c:784 - #, c-format - msgid " EtherTalk Phase 2 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:778 -+#: ../lib/interface.c:793 - #, c-format - msgid " econet addr:%s\n" - msgstr "" - --#: ../lib/interface.c:785 -+#: ../lib/interface.c:800 -+#, c-format - msgid "[NO FLAGS] " - msgstr "" - --#: ../lib/interface.c:787 -+#: ../lib/interface.c:802 -+#, c-format - msgid "UP " - msgstr "" - --#: ../lib/interface.c:789 -+#: ../lib/interface.c:804 -+#, c-format - msgid "BROADCAST " - msgstr "" - --#: ../lib/interface.c:791 -+#: ../lib/interface.c:806 -+#, c-format - msgid "DEBUG " - msgstr "" - --#: ../lib/interface.c:793 -+#: ../lib/interface.c:808 -+#, c-format - msgid "LOOPBACK " - msgstr "" - --#: ../lib/interface.c:795 -+#: ../lib/interface.c:810 -+#, c-format - msgid "POINTOPOINT " - msgstr "" - --#: ../lib/interface.c:797 -+#: ../lib/interface.c:812 -+#, c-format - msgid "NOTRAILERS " - msgstr "" - --#: ../lib/interface.c:799 -+#: ../lib/interface.c:814 -+#, c-format - msgid "RUNNING " - msgstr "" - --#: ../lib/interface.c:801 -+#: ../lib/interface.c:816 -+#, c-format - msgid "NOARP " - msgstr "" - --#: ../lib/interface.c:803 -+#: ../lib/interface.c:818 -+#, c-format - msgid "PROMISC " - msgstr "" - --#: ../lib/interface.c:805 -+#: ../lib/interface.c:820 -+#, c-format - msgid "ALLMULTI " - msgstr "" - --#: ../lib/interface.c:807 -+#: ../lib/interface.c:822 -+#, c-format - msgid "SLAVE " - msgstr "" - --#: ../lib/interface.c:809 -+#: ../lib/interface.c:824 -+#, c-format - msgid "MASTER " - msgstr "" - --#: ../lib/interface.c:811 -+#: ../lib/interface.c:826 -+#, c-format - msgid "MULTICAST " - msgstr "" - --#: ../lib/interface.c:814 -+#: ../lib/interface.c:829 -+#, c-format - msgid "DYNAMIC " - msgstr "" - - #. DONT FORGET TO ADD THE FLAGS IN ife_print_short --#: ../lib/interface.c:817 -+#: ../lib/interface.c:832 - #, c-format - msgid " MTU:%d Metric:%d" - msgstr "" - --#: ../lib/interface.c:821 -+#: ../lib/interface.c:836 - #, c-format - msgid " Outfill:%d Keepalive:%d" - msgstr "" - --#: ../lib/interface.c:835 -+#: ../lib/interface.c:850 - #, c-format - msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" - msgstr "" - --#: ../lib/interface.c:840 -+#: ../lib/interface.c:855 - #, c-format - msgid " compressed:%lu\n" - msgstr "" - --#: ../lib/interface.c:852 -+#: ../lib/interface.c:895 - #, c-format - msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" - msgstr "" - --#: ../lib/interface.c:856 -+#: ../lib/interface.c:899 - #, c-format - msgid " collisions:%lu " - msgstr "" - --#: ../lib/interface.c:858 -+#: ../lib/interface.c:901 - #, c-format - msgid "compressed:%lu " - msgstr "" - --#: ../lib/interface.c:860 -+#: ../lib/interface.c:903 - #, c-format - msgid "txqueuelen:%d " - msgstr "" - --#: ../lib/interface.c:862 -+#: ../lib/interface.c:905 - #, c-format - msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "" - --#: ../lib/interface.c:873 -+#: ../lib/interface.c:916 - #, c-format - msgid "Interrupt:%d " - msgstr "" - - #. Only print devices using it for - #. I/O maps --#: ../lib/interface.c:876 -+#: ../lib/interface.c:919 - #, c-format - msgid "Base address:0x%x " - msgstr "" - --#: ../lib/interface.c:878 -+#: ../lib/interface.c:921 - #, c-format - msgid "Memory:%lx-%lx " - msgstr "" - --#: ../lib/interface.c:881 -+#: ../lib/interface.c:924 - #, c-format - msgid "DMA chan:%x " - msgstr "" - - #: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "" - -@@ -2413,14 +2877,17 @@ - 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 +2916,7 @@ - msgstr "" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "" - -@@ -2468,18 +2936,22 @@ - 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 +2961,7 @@ - msgstr "" - - #: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "" - ---- net-tools-1.60.orig/po/cs.po -+++ net-tools-1.60/po/cs.po -@@ -5,7 +5,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools-1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\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" -@@ -13,96 +14,110 @@ - "Content-Type: text/plain; charset=iso-8859-2\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 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 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" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %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 třeba hardwarová adresa\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\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: 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 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: poloľku na řádku %u databáze ethernetových adres %s nelze nastavit!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresa\t\t\t HWtyp\t HWadresa\t Příz Maska\t\t Rozhraní\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "<from_interface>" -+msgstr " rozhraní %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - 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í>" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %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 "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á poloľka\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\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 " -@@ -112,49 +127,46 @@ - " arp [-vn] [<HW>] [-i <if> [-a] [<počítač>] <-Zobrazí ARP " - "cache\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, 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 <počítač> [pub][nopub] <-Smaľe poloľku " - "ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, fuzzy, 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> <-Přidá poloľku " - "ze\n" - " souboru\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, 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 <počítač> <hwadr> [temp][nopub] <-Přidá " - "poloľku\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> [sí»mask <čís>] <-''-\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, 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 <počítač> <if> [sí»mask <čís>] pub " - "<-''-\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -162,126 +174,134 @@ - " -a zobrazí jmna 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 poloľku\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\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:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" - " -v, --verbose bude vypisovat podrobné zprávy\n" - " o činnosti\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr "" - " -n, --numeric nebude převádět číselné adresy\n" - " na kanonická jména\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. 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 zadaného zařízení\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, fuzzy, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -r, --route vypíąe směrovací tabulku\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, fuzzy, 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é poloľky ze souboru\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" - msgstr "" - " <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:183 -+#, c-format - msgid " List of possible hardware types (which support 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í podporován!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\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: 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: neznámá třída adres %s.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\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: 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" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%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: 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:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "jméno %s je přílią dlouhé\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Nastavuji jméno počítače na `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: jméno počítače můľe změnit pouze superuľivatel\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Nastavuji jméno domény na `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: jméno domény můľe změnit pouze superuľivatel\n" -@@ -306,26 +326,29 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Výsledek: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: `%s' nelze otevřít\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Pouľití:\n" - " hostname [-v] {jméno|-F soubor} nastaví jméno počítače (ze " - "souboru)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {jméno|-F soubor} nastaví jméno NIS domény (ze\n" - " souboru)\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" -@@ -333,11 +356,13 @@ - " nodename [-v] {jméno|-F soubor} nastaví jméno DECnet uzlu (ze\n" - " souboru)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, 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] vypíąe formátované jméno\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -345,7 +370,8 @@ - " hostname [-v] vypíąe jméno počítače\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -353,7 +379,8 @@ - " hostname -V|--version|-h|--help vypíąe informace a skončí\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -361,35 +388,43 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short krátké jméno počítače\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias přezdívky\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address adresy odpovídající jménu počítače\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long dlouhé jméno počítače (kanonické)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain jméno DNS domény\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis jméno NIS/YP domény\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node jméno DECnet uzlu\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -397,7 +432,8 @@ - " -F, --file čte jméno počítače či nis domény ze souboru\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, 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" -@@ -412,6 +448,7 @@ - msgstr "%s: Tímto příkazem nelze DNS jméno domény změnit\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -421,6 +458,7 @@ - "změnit\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - "DNS jméno domény (je součástí kanonického jména počítače) v souboru\n" -@@ -441,349 +479,223 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Zapouzdření:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+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ŘZ\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "HWadr %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: chyba při získávání informací o rozhraní %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Médium:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Tento systém nepodporuje INET.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: chyba při získávání informací o rozhraní %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"Pouľití:\n" -+" ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <adresa>[/<délka prefixu>]]\n" - --# V ostatních katalozích se překládá Broadcast -> vąesměrové vysílání. --# Tudiľ bcast -> Vąesměr :) --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Vąesměr:%s " -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <adresa>[/<délka prefixu>]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr "Maska:%s\n" -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<adresa>]] [[-]pointopoint [<adresa>]]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6-adr: %s/%d" -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <adresa>] [dstaddr <adresa>] [tunnel <adresa>]\n" - --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Rozsah:" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <NN>] [keepalive <NN>]\n" - --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Globál" -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <adresa>] [metric <NN>] [mtu <NN>]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Linka" -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Stanoviątě" -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - - #: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilita" -+#, c-format -+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:218 --msgid "Host" --msgstr "Počítač" -+#: ../ifconfig.c:217 -+#, c-format -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen délka]\n" - --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Neznám." -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:236 -+#: ../ifconfig.c:222 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II adr: %s\n" -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:224 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP adr:%s\n" -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=Hardwarový Typ.\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:225 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 adr:%s\n" -+msgid " List of possible hardware types:\n" -+msgstr " Seznam moľných hardwarových typů:\n" - --#: ../ifconfig.c:245 -+#. 1 = ARPable -+#: ../ifconfig.c:227 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 adr:%s\n" -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=třída adres. Implicitní: %s\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:228 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 adr:%s\n" -+msgid " List of possible address families:\n" -+msgstr " Seznam moľných tříd adres:\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:303 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet adr:%s\n" -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --# Hic sunt leones ... --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[®ÁDNÉ PŘÍZNAKY]" -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:272 --msgid "UP " --msgstr "AKTIVOVÁNO " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Neznámý typ média.\n" - --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "V©ESMĚROVÉ_VYSÍLÁNÍ " -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "SMYČKA " -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --# ?? --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "BĚ®Í " -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NEARP " -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISK " -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "Tento systém nepodporuje INET6.\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#: ../ifconfig.c:780 ../ifconfig.c:871 -+#, c-format -+msgid "Interface %s not initialized\n" -+msgstr "" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -- --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -- --#: ../ifconfig.c:302 --#, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metrika:%d" -- --#: ../ifconfig.c:306 --#, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -- --#: ../ifconfig.c:320 --#, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "přijmutých paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu rámců:%lu\n" -- --#: ../ifconfig.c:325 --#, c-format --msgid " compressed:%lu\n" --msgstr " komprimováno:%lu\n" -- --# carrier? --#: ../ifconfig.c:329 --#, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "odeslaných paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu přenos:%lu\n" -- --#: ../ifconfig.c:333 --#, c-format --msgid " collisions:%lu " --msgstr " kolizí:%lu " -- --#: ../ifconfig.c:335 --#, c-format --msgid "compressed:%lu " --msgstr "komprimováno:%lu " -- --#: ../ifconfig.c:337 --#, c-format --msgid "txqueuelen:%d " --msgstr "délka odchozí fronty:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "Přeruąení:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Vstupně/Výstupní port:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Pamě»:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "Kanál DMA:%x " -- --#: ../ifconfig.c:384 ../ifconfig.c:405 --#, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: rozhraní %s není známo\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n" --msgstr "" --"Pouľití:\n" --" ifconfig [-a] [-i] [-v] <rozhraní> [[<AF>] <adresa>]\n" -- --#: ../ifconfig.c:425 --msgid " [add <address>[/<prefixlen>]]\n" --msgstr " [add <adresa>[/<délka prefixu>]]\n" -- --#: ../ifconfig.c:427 --msgid " [del <address>[/<prefixlen>]]\n" --msgstr " [del <adresa>[/<délka prefixu>]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" --msgstr " [[-]broadcast [<adresa>]] [[-]pointopoint [<adresa>]]\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" -- --#: ../ifconfig.c:438 --msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" --msgstr " [hw <HW> <adresa>] [metric <NN>] [mtu <NN>]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\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:443 --msgid " [txqueuelen <NN>]\n" --msgstr " [txqueuelen délka]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" --msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " <HW>=Hardware Type.\n" --msgstr " <HW>=Hardwarový Typ.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Seznam moľných hardwarových typů:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " <AF>=Address family. Default: %s\n" --msgstr " <AF>=třída adres. Implicitní: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Seznam moľných tříd adres:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Neznámý typ média.\n" -- --#: ../ifconfig.c:881 -+#: ../ifconfig.c:885 - #, c-format --msgid "%s: invalid %s address.\n" --msgstr "%s: adresa %s je nesprávná.\n" -- --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Tento systém nepodporuje INET6.\n" -- --#: ../ifconfig.c:983 - msgid "Address deletion not supported on this system.\n" - msgstr "Tento systém nepodporuje mazání adres.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Tento systém nepodporuje INET.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Nevím, jak nastavit adresu třídy %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Tento systém nepodporuje ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Nevím, jak nastavit adresu třídy %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, 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" -@@ -792,7 +704,8 @@ - "jste\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" -@@ -801,199 +714,223 @@ - "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:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "NASLOUCHÁ" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN ODESLÁN" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC ODESLÁN" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "SPOJENO" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\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 "" --"Uľivatel Cíl Zdroj Zařízení Stav Vr/Vs Odch-F " --"Přích-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:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Chyba při čtení dat z %s\n" - - # následující raději ponechat v originále ?! --#: ../netstat.c:465 -+#: ../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 "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" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "ZAVíRÁ" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %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:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\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 "varování, nesmyslný igmp řádek %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktivní AX.25 sokety\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Cíl Zdroj Zaříz Stav Vr/Vs Odhod-F Přích-F\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "varování, nesmyslný tcp řádek.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "vyp (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, fuzzy, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "nezn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "varování, nesmyslný udp řádek.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "NEZNÁM" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "varování, nesmyslný 'raw' řádek.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "varování, netstat 'unix' řádek.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "NEALOKOVÁN" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "SPOJUJE" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "SPOJEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "ODPOJUJE" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Aktivní sokety domény UNIX " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(servery a navázaná spojení)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(pouze servery)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(w/o servery)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -1001,90 +938,92 @@ - "\n" - "Proto Čítač Příznaky Typ Stav I-Uzel" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Cesta\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM ODESLÁN" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "OBNOVA" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktivní AX.25 sokety\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Cíl Zdroj Zaříz Stav Vr/Vs Odhod-F Přích-F\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "chyba při čtení dat z %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Aktivní IPX sokety\n" --"Proto Přích-F Odch-F Lokál adresa Vzdálená adresa " --" Stav" -+"Proto Přích-F Odch-F Lokál adresa Vzdálená " -+"adresa Stav" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Uľivatel" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "SPOJEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "NEZ." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - statistická data nejsou dostupná -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[®ÁDNÉ PŘÍZNAKY]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tabulka rozhraní v jádru\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, 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 "" - "Rozhr MTU Met PŘ-OK PŘ-CHYB PŘ-ZAH PŘ-PŘT OD-OK OD-CHYB OD-ZAH OD-PŘT " - "PŘZ\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "chybí informace o rozhraní" - --#: ../netstat.c:1425 -+#: ../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 "" --"Pouľití: netstat [--veenNcCF] [<TA>] -r netstat " --"{-V|--version|-h|--help}\n" -+"Pouľití: netstat [--veenNcCF] [<TA>] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [<Socket> ...]\n" - msgstr " netstat [-vnNcaeol] [<Soket> ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1092,27 +1031,32 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route vypíąe směrovací tabulku\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces vypíąe tabulku rozhraní\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups vypíąe členství v multicast skupinách\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics vypíąe statistiku sí»ové aktivity (jako " - "SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1120,20 +1064,45 @@ - " -M, --masquerade vypíąe maskovaná spojení\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr "" -+" -n, --numeric nebude převádět číselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr "" -+" -n, --numeric nebude převádět číselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr "" -+" -n, --numeric nebude převádět číselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic převede hw jména\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend vypíąe podrobnějąí informace\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs vypíąe PID/jméno programu pro sokety\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1141,23 +1110,27 @@ - " -c, --continuous nepřeruąovaný výpis\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - " -l, --listening vypíąe sokety, na nichľ je nasloucháno\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening vypíąe vąechny sokety (implicitně: " - "spojené)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers zobrazí časovače\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -1165,112 +1138,126 @@ - " -F, --fib zobrazí Forwarding Infomation Base\n" - " (implicitní)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" - msgstr " -C, --cache místo FIB zobrazí směrovací cache\n" - --#: ../netstat.c:1448 -+#: ../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 "" --" <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " <AF>=Use '-A <af>' or '--<af>' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" - msgstr " <AF>=Pouľijte '-A <af>' or '--<af>' Implicitní: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Seznam moľných tříd adres (podporujících směrování):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktivní Internetová spojení " - --#: ../netstat.c:1673 -+#: ../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 "" - "\n" - "Proto Přích-F Odch-F Místní Adresa Vzdálená Adresa Stav " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Uľivatel I-uzel " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Časovač" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "Členství v IPv4 skupinách\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Rozhraní Čítač Skupina\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Toto jádro nepodporuje RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "pro %s neexistuje RARP poloľka.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "hardwarová adresa %s je nesprávná\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: soubor %s:%s nelze otevřít.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: syntaktická chyba na řádku %2$u souboru %1$s\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: počítač %s není znám\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: nelze nastavit poloľku z řádku %2$u souboru %1$s\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "Pouľití: rarp -a vypíąe poloľky z cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d <hostname> delete entry from cache.\n" - msgstr " rarp -d <jméno> smaľe poloľku z cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" - msgstr "" - " rarp [<HW>] -s <jméno> <hwadr> přidá poloľku do cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f přidá poloľky z /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1279,24 +1266,26 @@ - "programu.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "Kombinace přepínačů %s je nesprávná.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\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 "" - "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" -@@ -1305,14 +1294,16 @@ - "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>] 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" -@@ -1321,15 +1312,23 @@ - " route {-V|--version} Vypíąe označení verze a autora\n" - " programu.\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>=Pouľijte '-A <af>' or '--<af>' Implicitní: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\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 +1337,30 @@ - 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 "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 } ] [ 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" - --#: ../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 ZAŘÍZENÍ ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1364,450 +1368,737 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\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" - --#: ../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" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\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 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 navzájem vylučují\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\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 vzdálený %s místní %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Neznám." - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\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 " 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" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\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, 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 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" - --#: ../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:47 - msgid "ICMP input histogram:" - msgstr "histogram ICMP vstupu:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "histogram ICMP výstupu:" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Předávání je %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Implicitní TTL je %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "celkem přijmutých paketů: %d" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "s nesprávnými hlavičkami: %d" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "s nesprávnými adresami: %d" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "předáno: %d" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "s neznámým protokolem: %d" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "počet zahozených příchozích paketů: %d" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "počet doručených příchozích paketů: %d" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "počet odeslaných poľadavků: %d" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "počet zahozených odchozích paketů: %d" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "zahozeno kvůli chybějící cestě: %d" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "počet fragmentů zahozených po vyprąení času: %d" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "počet nutných znovusestavení: %d" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "počet v pořádku znovu sestavených paketů: %d" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "počet paketů, jeľ se nepodařilo znovu sestavit: %d" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "počet v pořádku přijmutých fragmentů: %d" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "počet chybných fragmentů: %d" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "počet vytvořených fragmentů: %d" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "počet přijmutých ICMP zpráv: %d" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "počet chybných příchozích ICMP zpráv: %d" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "adresát nedostupný: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "vyprąel čas při přenosu: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "chybné parametry: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "řízení toku dat: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "změna cesty: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "ľádost o echo: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "odpověď na ľádost o echo: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "ľádost o čas: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "odpověď na ľádost o čas: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "ľádost o masku podsítě: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "odpovědi na ľádost o masku podsítě" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "odpověď na ľádost o masku podsítě: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "počet odeslaných ICMP zpráv: %d" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "počet chybných ICMP zpráv: %d" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "vyprąení ľivotnosti: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "řízení toku dat: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "změna cesty: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "ľádost o echo: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "ľádost o čas: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "odpověď na ľádost o čas: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "ľádost o masku podsítě: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "odpověď na ľádost o masku podsítě: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "RTO algoritmus je %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "počet aktivně navázaných spojení: %d" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "počet pasivně navázaných spojení: %d" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "počet neúspěąných pokusů o spojení: %d" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "počet přijmutých resetů: %d" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "počet navázaných spojení: %d" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "počet přijmutých segmentů: %d" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "počet odeslaných segmentů: %d" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "počet přenesených segmentů: %d" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "počet chybných příchozích segmentů: %d." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "počet odeslaných resetů: %d" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "počet přijmutých paketů: %d" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "počet paketů přijmutých pro neznámý port: %d." - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "počet chyb při příjmu paketů: %d" - --#: ../statistics.c:137 --#, c-format --msgid "%d packets sent" -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" - msgstr "počet odeslaných paketů: %d" - --#: ../statistics.c:142 --#, c-format --msgid "%d SYN cookies sent" -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" - msgstr "počet odeslaných SYN cookies: %d" - --#: ../statistics.c:143 --#, c-format --msgid "%d SYN cookies received" -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" - msgstr "počet přijmutých SYN cookies: %d" - --#: ../statistics.c:144 --#, c-format --msgid "%d invalid SYN cookies received" -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" - msgstr "počet chybných příchozích SYN cookies: %d" - --#: ../statistics.c:146 --#, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" - msgstr "počet resetů přijmutých pro sokety ve stavu SYN_PŘÍCH: %d" - --#: ../statistics.c:148 --#, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" - msgstr "počet paketů odstraněných z fronty kvůli přetečení bufferu soketu: %d" - - #. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 --#, c-format --msgid "%d packets pruned from out-of-order queue" -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" - msgstr "počet paketů odstraněných z fronty mimo-pořadí: %d" - --#: ../statistics.c:152 --#, c-format -+#: ../statistics.c:154 -+#, fuzzy, c-format - msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" - msgstr "" - "počet paketů zahozených z fronty mimo-pořadí kvůli přetečení bufferu soketu: " - "%d" - --#: ../statistics.c:154 --#, c-format --msgid "%d ICMP packets dropped because they were out-of-window" -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" - msgstr "počet ICMP paketů zahozených, protoľe byly mimo-okno: %d" - --#: ../statistics.c:156 --#, c-format --msgid "%d ICMP packets dropped because socket was locked" -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" - msgstr "počet ICMP paketů zahozených kvůli zamčenému soketu: %d" - -+#: ../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:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" -+msgstr "počet odeslaných paketů: %d" -+ -+#: ../statistics.c:170 -+#, c-format -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" -+ -+#: ../statistics.c:172 -+#, c-format -+msgid "Quick ack mode was activated %u times" -+msgstr "" -+ -+#: ../statistics.c:173 -+#, c-format -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" -+ -+#: ../statistics.c:175 -+#, c-format -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" -+ -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" -+ -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "počet paketů odstraněných z fronty mimo-pořadí: %d" -+ -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "počet přijmutých paketů: %d" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u packets header predicted and directly queued to user" -+msgstr "" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" -+ -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "počet paketů přijmutých pro neznámý port: %d." -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "počet chybných příchozích segmentů: %d." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "počet odeslaných resetů: %d" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "počet přenesených segmentů: %d" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "počet přenesených segmentů: %d" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "počet paketů, jeľ se nepodařilo znovu sestavit: %d" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "počet paketů odstraněných z fronty kvůli přetečení bufferu soketu: %d" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "počet přijmutých paketů: %d" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "celkem přijmutých paketů: %d" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "počet přijmutých resetů: %d" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "počet přijmutých resetů: %d" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "počet přijmutých resetů: %d" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "počet přijmutých resetů: %d" -+ - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "zapnuto" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "vypnuto" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "titulek %s je neznámý\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "chyba při zpracování /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "/proc/net/snmp nelze otevřít" - -@@ -1821,89 +2112,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Linkovou disciplínu nelze na `%s' změnit.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "NEZNÁM" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "Doména UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Nezadávejte více neľ jednu třídu adres.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Bylo zadáno přílią mnoho tříd adres.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Třída adres `%s' není známa.\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]" -- --#: ../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" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\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): nadbytečné znaky!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - 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:129 ../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 "Nesprávný volací znak" -@@ -1913,22 +2210,21 @@ - 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 systému nakonfigurováno.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\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 "Adresát Rozhraní Uľití\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Směrovací tabulka pro `ddp' není zatím podporována.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1944,153 +2240,171 @@ - msgid "in_ether(%s): trailing junk!\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" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\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): 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 "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 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" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\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): nadbytečné znaky!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Místní smyčka" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "IP po sériové lince" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "Vj IP po sériové lince" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6bitový IP po sériové lince" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "6bitový VJ IP po sériové lince" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptivní IP po sériové lince" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Point-to-Point Protokol" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Přístupové zařízení Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "Token Ring 16/4 Mb/s" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - #, fuzzy - msgid "16/4 Mbps Token Ring (New)" - msgstr "Token Ring 16/4 Mb/s" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: třída adres %d není podporována!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+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 systému nakonfigurováno.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Směrovací tabulka v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Adresát Daląí Směrovač " --" Přízn Metrika Odkaz Uľit Rozhraní\n" -+"Adresát Daląí " -+"Směrovač Přízn Metrika Odkaz Uľit Rozhraní\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache sousedů v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2098,7 +2412,8 @@ - "Soused HW Adresa Rozhraní Přízn " - "Odkazy Stav\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" -@@ -2107,30 +2422,37 @@ - "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 "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 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Í podporováno\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\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 systému nakonfigurováno.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\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" -@@ -2139,6 +2461,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2147,6 +2470,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" -@@ -2155,10 +2479,12 @@ - "Rozhraní MSS Okno irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\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" -@@ -2167,6 +2493,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2175,6 +2502,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" -@@ -2183,6 +2511,7 @@ - "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" -@@ -2190,7 +2519,8 @@ - "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" -@@ -2198,29 +2528,34 @@ - "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} 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} 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Í podporováno\n" - -@@ -2230,15 +2565,17 @@ - msgstr "route: %s: sí» nelze pouľít jako bránu!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: Nesprávné NSS.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Nesprávné okno.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: Nesprávné zahajovací rtt.\n" - -@@ -2253,75 +2590,92 @@ - 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: sí»ová maska nevyhovuje adrese cesty\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\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 "Směrovací cache `inet' nelze měnit\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX není na tomto systému nakonfigurováno.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Směrovací tabulka v jádru pro IPX\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\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 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í 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 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 předchd zdroj cíl " --" 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 systému nakonfigurováno.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\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 "Cíl Mnemonika Kvalita Soused Rozhraní\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\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 potřeba uloľit\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Tímto programem nelze PPP spustit.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Lituji, pouľijte pppd!\n" - -@@ -2330,49 +2684,319 @@ - 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 systému nakonfigurováno.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\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): 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): 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): nadbytečné znaky!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %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 "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - 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 při získávání informací o rozhraní %s\n" - --#: ../lib/sockets.c:59 -+#: ../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:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Zapouzdření:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "HWadr %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Médium:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s adr:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+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 :) -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Vąesměr:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr "Maska:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6-adr: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Rozsah:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Globál" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Linka" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Stanoviątě" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Kompatibilita" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Počítač" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Neznám." -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/Ethernet II adr: %s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/Ethernet SNAP adr:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/Ethernet 802.2 adr:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/Ethernet 802.3 adr:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " EtherTalk Phase 2 adr:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " econet adr:%s\n" -+ -+# Hic sunt leones ... -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[®ÁDNÉ PŘÍZNAKY]" -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "AKTIVOVÁNO " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "V©ESMĚROVÉ_VYSÍLÁNÍ " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "SMYČKA " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+# ?? -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "BĚ®Í " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NEARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISK " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metrika:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "přijmutých paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu rámců:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " komprimováno:%lu\n" -+ -+# carrier? -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "odeslaných paketů:%lu chyb:%lu zahozeno:%lu přetečení:%lu přenos:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " kolizí:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "komprimováno:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "délka odchozí fronty:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Přeruąení:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Vstupně/Výstupní port:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Pamě»:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Kanál DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Nebyla nalezena ľádná pouľitelná třída adres.\n" - -@@ -2396,29 +3020,32 @@ - msgid "ip: argument is wrong: %s\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 Ř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 Ř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 "třída %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " uľivatelé %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Soket nelze vytvořit" - -@@ -2433,6 +3060,7 @@ - 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" - -@@ -2451,44 +3079,77 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "jméno %s je přílią dlouhé\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: reľim RAW nelze nastavit!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, 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:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: reľim 8N1 nelze nastavit!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "protokol %s spuątěn" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " na %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr " rozhraní %s\n" - - #~ msgid "" --#~ " This comand can read or set the hostname or the NIS domainname. You can\n" -+#~ " 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 "%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 "" -+#~ " This comand can read or set the hostname or the NIS domainname. You " -+#~ "can\n" - #~ msgstr "" - #~ " Tento program zjią»uje a nastavuje jméno počítače či NIS domény. Můľe " - #~ "také\n" -@@ -2500,7 +3161,8 @@ - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" - #~ msgstr "" --#~ " Pokud nepouľíváte bind či NIS pro vyhledávání jmen počítačů, pak můľete\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" ---- net-tools-1.60.orig/po/ja.po -+++ net-tools-1.60/po/ja.po -@@ -0,0 +1,3133 @@ -+# Net-tool Japanese locale data -+# Kenshi Muto <kmuto@debian.org>, 2007. -+# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1999. -+# -+msgid "" -+msgstr "" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" -+"PO-Revision-Date: 2007-07-04 20:47+0900\n" -+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n" -+"Language-Team: Japanese\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8-bit\n" -+ -+#: ../arp.c:112 ../arp.c:279 -+#, c-format -+msgid "arp: need host name\n" -+msgstr "arp: ă›ă‚ąăĺŤăŚĺż…č¦ă§ă™\n" -+ -+#: ../arp.c:215 ../arp.c:230 -+#, c-format -+msgid "No ARP entry for %s\n" -+msgstr "%să®ARPエăłăăŞăŚă‚ă‚Šăľă›ă‚“\n" -+ -+#: ../arp.c:248 -+#, c-format -+msgid "arp: cant get HW-Address for `%s': %s.\n" -+msgstr "arp: '%s'ă®ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă‚’取得ă§ăŤăľă›ă‚“: %s.\n" -+ -+#: ../arp.c:252 -+#, c-format -+msgid "arp: protocol type mismatch.\n" -+msgstr "arp: ă—ăăă‚łă«ă‚żă‚¤ă—ăŚé©ĺă—ăľă›ă‚“.\n" -+ -+#: ../arp.c:261 -+#, c-format -+msgid "arp: device `%s' has HW address %s `%s'.\n" -+msgstr "arp: ă‡ăイス`%s'ăŻăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą%s `%s'ă§ă™.\n" -+ -+#: ../arp.c:293 -+#, c-format -+msgid "arp: need hardware address\n" -+msgstr "arp: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąăŚĺż…č¦ă§ă™\n" -+ -+#: ../arp.c:301 -+#, c-format -+msgid "arp: invalid hardware address\n" -+msgstr "arp: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąăŚä¸Ťé©ĺ˝“ă§ă™\n" -+ -+#: ../arp.c:398 -+#, c-format -+msgid "arp: cannot open etherfile %s !\n" -+msgstr "arp: etheră•ă‚ˇă‚¤ă«%săŚé–‹ă‘ăľă›ă‚“!\n" -+ -+#: ../arp.c:414 -+#, c-format -+msgid "arp: format error on line %u of etherfile %s !\n" -+msgstr "arp: %u行(ă•ă‚ˇă‚¤ă«%s)ă«ă•ă‚©ăĽăžăăエă©ăĽăŚă‚ă‚Šăľă™!\n" -+ -+#: ../arp.c:427 -+#, c-format -+msgid "arp: cannot set entry on line %u of etherfile %s !\n" -+msgstr "arp: etheră•ă‚ˇă‚¤ă«%u行(%s)ă®ă‚¨ăłăăŞă‚’č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../arp.c:448 -+#, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "アă‰ă¬ă‚ą HWタイ㗠HWアă‰ă¬ă‚ą ă•ă©ă‚° ăžă‚ąă‚Ż イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../arp.c:476 -+msgid "<from_interface>" -+msgstr "<起点イăłă‚żă•ă‚§ăĽă‚ą>" -+ -+#: ../arp.c:478 -+msgid "(incomplete)" -+msgstr "(不完全)" -+ -+# translatable? -+#: ../arp.c:495 -+#, c-format -+msgid "%s (%s) at " -+msgstr "%s (%s) at " -+ -+#: ../arp.c:501 -+#, c-format -+msgid "<incomplete> " -+msgstr "<不完全> " -+ -+#: ../arp.c:507 -+#, c-format -+msgid "netmask %s " -+msgstr "ăŤăăăžă‚ąă‚Ż %s " -+ -+# translatable? -+#: ../arp.c:524 -+#, c-format -+msgid "on %s\n" -+msgstr "on %s\n" -+ -+#: ../arp.c:605 -+#, c-format -+msgid "Entries: %d\tSkipped: %d\tFound: %d\n" -+msgstr "エăłăăŞ: %d\tă‚ąă‚ăă—: %d\t発見: %d\n" -+ -+#: ../arp.c:609 -+#, c-format -+msgid "%s (%s) -- no entry\n" -+msgstr "%s (%s) -- エăłăăŞăŞă—\n" -+ -+#: ../arp.c:611 -+#, c-format -+msgid "arp: in %d entries no match found.\n" -+msgstr "arp: %dă®ă‚¨ăłăăŞä¸, 一致ă™ă‚‹ă‚‚ă®ăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“.\n" -+ -+#: ../arp.c:626 -+#, c-format -+msgid "" -+"Usage:\n" -+" arp [-vn] [<HW>] [-i <if>] [-a] [<hostname>] <-Display ARP " -+"cache\n" -+msgstr "" -+"使用法:\n" -+" arp [-vn] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>]\n" -+" [-a] [<ă›ă‚ąăĺŤ>] ‥‥ ARPă‚ăŁăă‚·ăĄă®čˇ¨" -+"示\n" -+ -+#: ../arp.c:627 -+#, c-format -+msgid "" -+" arp [-v] [-i <if>] -d <host> [pub] <-Delete ARP " -+"entry\n" -+msgstr " arp [-v] [-i <イăłă‚żă•ă‚§ăĽă‚ą>] -d <ă›ă‚ąăĺŤ> [pub] ‥‥ARPエăłăăŞă‚’削除\n" -+ -+#: ../arp.c:628 -+#, c-format -+msgid "" -+" arp [-vnD] [<HW>] [-i <if>] -f [<filename>] <-Add entry from " -+"file\n" -+msgstr "" -+" arp [-vnD] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>] \n" -+" -f <ă•ă‚ˇă‚¤ă«ĺŤ> ‥‥ă•ă‚ˇă‚¤ă«ă‹ă‚‰ă‚¨ăłăăŞă‚’čż˝ĺŠ \n" -+ -+#: ../arp.c:629 -+#, c-format -+msgid "" -+" arp [-v] [<HW>] [-i <if>] -s <host> <hwaddr> [temp] <-Add " -+"entry\n" -+msgstr "" -+" arp [-v] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>]\n" -+" -s <ă›ă‚ąăĺŤ> <ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą> [temp] ‥‥エăłăăŞă‚’čż˝ĺŠ \n" -+ -+# FIXME:What does '' mean? -+#: ../arp.c:630 -+#, c-format -+msgid "" -+" arp [-v] [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub " -+"<-''-\n" -+"\n" -+msgstr "" -+" arp [-v] [<HW>] [-i <イăłă‚żă•ă‚§ăĽă‚ą>] -Ds <ă›ă‚ąăĺŤ>\n" -+" <イăłă‚żă•ă‚§ăĽă‚ą> [netmask <ăŤăăăžă‚ąă‚Ż>] pub ‥‥ ă€\n" -+ -+#: ../arp.c:632 -+#, c-format -+msgid "" -+" -a display (all) hosts in alternative (BSD) " -+"style\n" -+msgstr "" -+" -a ć–°ă—ă„(BSD)スタイă«ă§ă‚¨ăłăăŞă•ă‚Śăźĺ…¨ă›ă‚ąăを表示" -+"ă™ă‚‹\n" -+ -+#: ../arp.c:633 -+#, c-format -+msgid " -s, --set set a new ARP entry\n" -+msgstr " -s, --set 新規ARPエăłăăŞă‚’č¨ĺ®šă™ă‚‹\n" -+ -+#: ../arp.c:634 -+#, c-format -+msgid " -d, --delete delete a specified entry\n" -+msgstr " -d, --delete 指定エăłăăŞă‚’削除ă™ă‚‹\n" -+ -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format -+msgid " -v, --verbose be verbose\n" -+msgstr " -v, --verbose 詳細表示を行ăŞă†\n" -+ -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format -+msgid " -n, --numeric don't resolve names\n" -+msgstr " -n, --numeric ĺŤĺ‰Ťă®ă¬ă‚ľă«ă–ă‚’ă—ăŞă„\n" -+ -+#: ../arp.c:637 -+#, c-format -+msgid "" -+" -i, --device specify network interface (e.g. eth0)\n" -+msgstr " -i, --device ăŤăăăŻăĽă‚Żă‚¤ăłă‚żă•ă‚§ăĽă‚ąă®ćŚ‡ĺ®š(äľ‹ eth0)\n" -+ -+#: ../arp.c:638 -+#, c-format -+msgid " -D, --use-device read <hwaddr> from given device\n" -+msgstr "" -+" -D, --use-device 与ăられăźă‡ăイスă‹ă‚‰\n" -+" <HWアă‰ă¬ă‚ą>ă‚’čŞăżčľĽă‚€\n" -+ -+#: ../arp.c:639 -+#, c-format -+msgid " -A, -p, --protocol specify protocol family\n" -+msgstr " -A, -p, --protocol ă—ăăă‚łă«ă•ă‚ˇăźăŞă‚’指定ă™ă‚‹\n" -+ -+#: ../arp.c:640 -+#, c-format -+msgid "" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" -+"\n" -+msgstr " -f, --file /etc/ethersă•ă‚ˇă‚¤ă«ă‹ă‚‰ć–°č¦Źă‚¨ăłăăŞă‚’čŞăżčľĽă‚€\n\n" -+ -+#: ../arp.c:642 ../rarp.c:182 -+#, c-format -+msgid " <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n" -+msgstr " <HW>=ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă‚żă‚¤ă—を指定ă™ă‚‹ă«ăŻ'-H <hw>'を使ăŁă¦ä¸‹ă•ă„。標準: %s\n" -+ -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format -+msgid " List of possible hardware types (which support ARP):\n" -+msgstr " (ARPをサăťăĽăă—ăź)指定可č˝ăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă®ăŞă‚ąă:\n" -+ -+#: ../arp.c:677 ../arp.c:762 -+#, c-format -+msgid "%s: hardware type not supported!\n" -+msgstr "%s: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ăŚă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“!\n" -+ -+#: ../arp.c:681 -+#, c-format -+msgid "%s: address family not supported!\n" -+msgstr "%s: アă‰ă¬ă‚ąă•ă‚ˇăźăŞăŚă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“!\n" -+ -+#: ../arp.c:716 -+#, c-format -+msgid "arp: -N not yet supported.\n" -+msgstr "arp: -NăŻăľă サăťăĽăă—ă¦ă„ăľă›ă‚“.\n" -+ -+#: ../arp.c:726 -+#, c-format -+msgid "arp: %s: unknown address family.\n" -+msgstr "arp: %s: 不ćŽăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă§ă™.\n" -+ -+#: ../arp.c:735 -+#, c-format -+msgid "arp: %s: unknown hardware type.\n" -+msgstr "arp: %s: 不ćŽăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă§ă™.\n" -+ -+#: ../arp.c:754 -+#, c-format -+msgid "arp: %s: kernel only supports 'inet'.\n" -+msgstr "arp: %s: ă‚«ăĽăŤă«ăŻ'inet'以外ăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“.\n" -+ -+#: ../arp.c:767 -+#, c-format -+msgid "arp: %s: hardware type without ARP support.\n" -+msgstr "arp: %s: ARPサăťăĽăă®ăŞă„ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă§ă™.\n" -+ -+#: ../hostname.c:71 -+#, c-format -+msgid "Setting nodename to `%s'\n" -+msgstr "ăŽăĽă‰ĺŤă‚’`%s'ă¸č¨ĺ®šă—ăľă—ăź\n" -+ -+#: ../hostname.c:76 -+#, c-format -+msgid "%s: you must be root to change the node name\n" -+msgstr "%s: ăŽăĽă‰ĺŤă®ĺ¤‰ć›´ăŻă«ăĽăă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“\n" -+ -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 -+#, c-format -+msgid "%s: name too long\n" -+msgstr "%s: ĺŤĺ‰ŤăŚé•·ă™ăŽăľă™\n" -+ -+#: ../hostname.c:91 -+#, c-format -+msgid "Setting hostname to `%s'\n" -+msgstr "ă›ă‚ąăĺŤă‚’`%s'ă¸č¨ĺ®šă—ăľă—ăź\n" -+ -+#: ../hostname.c:96 -+#, c-format -+msgid "%s: you must be root to change the host name\n" -+msgstr "%s: ă›ă‚ąăĺŤă®ĺ¤‰ć›´ăŻă«ăĽăă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“\n" -+ -+#: ../hostname.c:109 -+#, c-format -+msgid "Setting domainname to `%s'\n" -+msgstr "ă‰ăˇă‚¤ăłă‚’`%s'ă¸č¨ĺ®šă—ăľă—ăź\n" -+ -+#: ../hostname.c:114 -+#, c-format -+msgid "%s: you must be root to change the domain name\n" -+msgstr "%s: ă‰ăˇă‚¤ăłĺŤă®ĺ¤‰ć›´ăŻă«ăĽăă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“\n" -+ -+#: ../hostname.c:131 -+#, c-format -+msgid "Resolving `%s' ...\n" -+msgstr "`%s'ă‚’ă¬ă‚ľă«ă–ä¸ ...\n" -+ -+#: ../hostname.c:137 -+#, c-format -+msgid "Result: h_name=`%s'\n" -+msgstr "çµćžś: h_name=`%s'\n" -+ -+#: ../hostname.c:142 -+#, c-format -+msgid "Result: h_aliases=`%s'\n" -+msgstr "çµćžś: h_aliases=`%s'\n" -+ -+#: ../hostname.c:147 -+#, c-format -+msgid "Result: h_addr_list=`%s'\n" -+msgstr "çµćžś: h_addr_list=`%s'\n" -+ -+#: ../hostname.c:208 -+#, c-format -+msgid "%s: can't open `%s'\n" -+msgstr "%s: `%s'ă‚’é–‹ă‘ăľă›ă‚“\n" -+ -+#: ../hostname.c:222 -+#, c-format -+msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" -+msgstr "使用法: hostname [-v] {ă›ă‚ąăĺŤ|-F ă•ă‚ˇă‚¤ă«} (ă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹)ă›ă‚ąăĺŤă®č¨ĺ®š\n" -+ -+#: ../hostname.c:223 -+#, c-format -+msgid "" -+" domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" -+msgstr " domainname [-v] {NISă‰ăˇă‚¤ăł|-F ă•ă‚ˇă‚¤ă«} (ă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹)NISă‰ăˇă‚¤ăłĺŤă®č¨ĺ®š\n" -+ -+#: ../hostname.c:225 -+#, c-format -+msgid "" -+" nodename [-v] {nodename|-F file} set DECnet node name (from " -+"file)\n" -+msgstr "" -+"nodename [-v] {ăŽăĽă‰ĺŤ|-F ă•ă‚ˇă‚¤ă«} (ă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹)DECnetăŽăĽă‰ĺŤă®č¨ĺ®š\n" -+ -+#: ../hostname.c:227 -+#, 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" -+ -+#: ../hostname.c:228 -+#, c-format -+msgid "" -+" hostname [-v] display hostname\n" -+"\n" -+msgstr "" -+" hostname [-v] ă›ă‚ąăĺŤă®ĺ‡şĺŠ›\n" -+"\n" -+ -+#: ../hostname.c:229 -+#, c-format -+msgid "" -+" hostname -V|--version|-h|--help print info and exit\n" -+"\n" -+msgstr "" -+" hostname -V|--version|-h|--help 諸ć…ĺ ±ă‚’ĺ‡şĺŠ›ă—ă¦çµ‚了\n" -+"\n" -+"\n" -+ -+#: ../hostname.c:230 -+#, c-format -+msgid "" -+" dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" -+"\n" -+msgstr " dnsdomainname=ă›ă‚ąăĺŤ -d, {yp,nis,}domainname=ă›ă‚ąăĺŤ -y\n\n" -+ -+#: ../hostname.c:231 -+#, c-format -+msgid " -s, --short short host name\n" -+msgstr " -s, --short çźç¸®ă›ă‚ąăĺŤ\n" -+ -+#: ../hostname.c:232 -+#, c-format -+msgid " -a, --alias alias names\n" -+msgstr " -a, --alias エイăŞă‚˘ă‚ąĺŤ\n" -+ -+#: ../hostname.c:233 -+#, c-format -+msgid " -i, --ip-address addresses for the hostname\n" -+msgstr " -i, --ip-address ă›ă‚ąăĺŤă«ĺŻľă™ă‚‹ă‚˘ă‰ă¬ă‚ą\n" -+ -+#: ../hostname.c:234 -+#, c-format -+msgid " -f, --fqdn, --long long host name (FQDN)\n" -+msgstr " -f, --fqdn, --long ăăłă‚°ă›ă‚ąăĺŤ(FQDN)\n" -+ -+#: ../hostname.c:235 -+#, c-format -+msgid " -d, --domain DNS domain name\n" -+msgstr " -d, --domain DNSă‰ăˇă‚¤ăłĺŤ\n" -+ -+#: ../hostname.c:236 -+#, c-format -+msgid " -y, --yp, --nis NIS/YP domainname\n" -+msgstr " -y, --yp, --nis NIS/YPă‰ăˇă‚¤ăłĺŤ\n" -+ -+#: ../hostname.c:238 -+#, c-format -+msgid " -n, --node DECnet node name\n" -+msgstr " -n, --node DECnetăŽăĽă‰ĺŤ\n" -+ -+#: ../hostname.c:240 -+#, c-format -+msgid "" -+" -F, --file read hostname or NIS domainname from given file\n" -+"\n" -+msgstr " -F, --file 指定ă®ă•ă‚ˇă‚¤ă«ă‹ă‚‰ă›ă‚ąăĺŤă‹NISă‰ăˇă‚¤ăłĺŤă‚’čŞăżčľĽă‚€\n\n" -+ -+#: ../hostname.c:242 -+#, 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" -+" Unless you are using bind or NIS for host lookups you can change the\n" -+" FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" -+" part of the FQDN) in the /etc/hosts file.\n" -+msgstr "" -+" ă“ă®ă‚łăžăłă‰ă§ăŻă€ă›ă‚ąăĺŤăľăźăŻNISă‰ăˇă‚¤ăłĺŤă‚’čŞăżčľĽăżăľăźăŻč¨ĺ®šă§ăŤăľă™ă€‚\n" -+" DNSă‰ăˇă‚¤ăłăľăźăŻFDN(完全修飾ă‰ăˇă‚¤ăłĺŤ)ă‚’čŞăżčľĽă‚€ă“ă¨ă‚‚ă§ăŤăľă™ă€‚\n" -+" ă›ă‚ąăĺŤă®ĺŹ‚ç…§ă«BindăŠă‚ăł, NISも使わăŞă„ĺ ´ĺ, /etc/hostsă•ă‚ˇă‚¤ă«ă«ă‚ă‚‹\n" -+" FQDNă‚„, (FQDNă®ä¸€é¨ĺ†ă®)ă‰ăˇă‚¤ăłĺŤă‚’変更ă§ăŤăľă™.\n" -+ -+#: ../hostname.c:338 -+#, c-format -+msgid "%s: You can't change the DNS domain name with this command\n" -+msgstr "%s: ă“ă®ă‚łăžăłă‰ă§ăŻDNSă‰ăˇă‚¤ăłĺŤăŻĺ¤‰ć›´ă§ăŤăľă›ă‚“.\n" -+ -+#: ../hostname.c:339 -+#, c-format -+msgid "" -+"\n" -+"Unless you are using bind or NIS for host lookups you can change the DNS\n" -+msgstr "" -+"\n" -+"ă›ă‚ąăĺŤă®ĺŹ‚ç…§ă«BindăŠă‚ăł, NISも使わăŞă„ĺ ´ĺă€/etc/hostsă•ă‚ˇă‚¤ă«\n" -+ -+#: ../hostname.c:340 -+#, c-format -+msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" -+msgstr "ă«ă‚ă‚‹FQDNă‚„, (FQDNă®ä¸€é¨ĺ†ă®)ă‰ăˇă‚¤ăłĺŤă‚’変更ă§ăŤăľă™.\n" -+ -+#: ../hostname.c:357 -+#, c-format -+msgid "gethostname()=`%s'\n" -+msgstr "gethostname()=`%s'\n" -+ -+#: ../hostname.c:374 -+#, c-format -+msgid "getdomainname()=`%s'\n" -+msgstr "getdomainname()=`%s'\n" -+ -+#: ../hostname.c:389 -+#, c-format -+msgid "getnodename()=`%s'\n" -+msgstr "getnodename()=`%s'\n" -+ -+#: ../ifconfig.c:107 -+#, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR ă•ă©ă‚°\n" -+ -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: イăłă‚żă•ă‚§ăĽă‚ąă•ă©ă‚°ă®ĺŹ–ĺľ—ä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź:%s\n" -+ -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format -+msgid "No support for INET on this system.\n" -+msgstr "INETăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:193 -+#, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: イăłă‚żă•ă‚§ăĽă‚ąă•ă©ă‚°ă®ă†ă‚ąăä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź: %s\n" -+ -+#: ../ifconfig.c:202 -+#, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n" -+msgstr "" -+"使用法:\n" -+" ifconfig [-a] [-v] [-s] <イăłă‚żă•ă‚§ăĽă‚ą> [[<AF>] <アă‰ă¬ă‚ą>]\n" -+ -+#: ../ifconfig.c:204 -+#, c-format -+msgid " [add <address>[/<prefixlen>]]\n" -+msgstr " [add <アă‰ă¬ă‚ą>[/<ă—ă¬ă•ă‚Łăă‚Żă‚ąé•·>]]\n" -+ -+#: ../ifconfig.c:205 -+#, c-format -+msgid " [del <address>[/<prefixlen>]]\n" -+msgstr " [del <アă‰ă¬ă‚ą>[/<ă—ă¬ă•ă‚Łăă‚Żă‚ąé•·>]]\n" -+ -+#: ../ifconfig.c:206 -+#, c-format -+msgid " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" -+msgstr " [[-]broadcast [<アă‰ă¬ă‚ą>]] [[-]pointopoint [<アă‰ă¬ă‚ą>]]\n" -+ -+#: ../ifconfig.c:207 -+#, c-format -+msgid " [netmask <address>] [dstaddr <address>] [tunnel <address>]\n" -+msgstr " [netmask <アă‰ă¬ă‚ą>] [dstaddr <アă‰ă¬ă‚ą>] [tunnel <アă‰ă¬ă‚ą>]\n" -+ -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill <NN>] [keepalive <NN>]\n" -+msgstr " [outfill <数値>] [keepalive <数値>]\n" -+ -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw <HW> <address>] [metric <NN>] [mtu <NN>]\n" -+msgstr " [hw <HW> <アă‰ă¬ă‚ą>] [metric <数値>] [mtu <数値>]\n" -+ -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+ -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" -+ -+#: ../ifconfig.c:215 -+#, c-format -+msgid " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n" -+msgstr " [mem_start <開始アă‰ă¬ă‚ą>] [io_addr <IOアă‰ă¬ă‚ą>] [irq <番号>] [media <タイă—>]\n" -+ -+#: ../ifconfig.c:217 -+#, c-format -+msgid " [txqueuelen <NN>]\n" -+msgstr " [txqueuelen <TXă‚ăĄăĽé•·>]\n" -+ -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" -+ -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr " [up|down] ...\n\n" -+ -+#: ../ifconfig.c:224 -+#, c-format -+msgid " <HW>=Hardware Type.\n" -+msgstr " <HW>=ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—.\n" -+ -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " ĺ©ç”¨ĺŹŻč˝ăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ă®ăŞă‚ąă:\n" -+ -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " <AF>=Address family. Default: %s\n" -+msgstr " <AF>=アă‰ă¬ă‚ąă•ă‚ˇăźăŞ. 標準: %s\n" -+ -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " ĺ©ç”¨ĺŹŻč˝ăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă®ăŞă‚ąă:\n" -+ -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "ifconfig: ă‚Şă—ă‚·ă§ăł`%s'を解é‡ă§ăŤăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "ifconfig: `--help'ă§ä˝żç”¨ćł•ă‚’見られăľă™.\n" -+ -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "不ćŽăŞăˇă‡ă‚Łă‚˘ă‚żă‚¤ă—ă§ă™.\n" -+ -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă promiscă˘ăĽă‰ă§ă™...ćらăŹä»–ă®ă‚˘ă—ăŞă‚±ăĽă‚·ă§ăłăŚĺ®źčˇŚä¸ă§ăŻă‚ă‚Šăľă›ă‚“ă‹?\n" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă MULTICASTă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă ALLMULTIă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă DYNAMICă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă BROADCASTă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "č¦ĺ‘Š: イăłă‚żă•ă‚§ăĽă‚ą%săŻăľă POINTOPOINTă˘ăĽă‰ă§ă™.\n" -+ -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă‚żă‚¤ă—`%s'ăŻă‚˘ă‰ă¬ă‚ąă‚’č¨ĺ®šă™ă‚‹ăŹăłă‰ă©ă‚’ćŚăŁă¦ă„ăľă›ă‚“. 失敗ă—ăľă—ăź.\n" -+ -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: 不é©ĺ‡ăŞă‚˘ă‰ă¬ă‚ąă§ă™(%s).\n" -+ -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "INET6ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:780 ../ifconfig.c:871 -+#, c-format -+msgid "Interface %s not initialized\n" -+msgstr "イăłă‚żă•ă‚§ăĽă‚ą%săŻĺťćśźĺŚ–ă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format -+msgid "Bad address.\n" -+msgstr "不é©ĺ‡ăŞă‚˘ă‰ă¬ă‚ąă§ă™.\n" -+ -+#: ../ifconfig.c:885 -+#, c-format -+msgid "Address deletion not supported on this system.\n" -+msgstr "アă‰ă¬ă‚ąĺ‰Šé™¤ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:957 -+#, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "ifconfig:ă“ă®ă—ăăă‚łă«ă•ă‚ˇăźăŞă«ă‚˘ă‰ă¬ă‚ąă‚’č¨ĺ®šă§ăŤăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:983 -+#, c-format -+msgid "No support for ECONET on this system.\n" -+msgstr "ECONETăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../ifconfig.c:991 -+#, c-format -+msgid "Don't know how to set addresses for family %d.\n" -+msgstr "ă•ă‚ˇăźăŞ%dă®ă‚˘ă‰ă¬ă‚ąă®č¨ĺ®šć–ąćł•ăŚä¸ŤćŽă§ă™.\n" -+ -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "č¦ĺ‘Š: ĺ°‘ăŞăŹă¨ă‚‚1ă¤ă®ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź. (%d)\n" -+ -+#: ../netstat.c:434 -+#, c-format -+msgid "" -+"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" -+msgstr "(\"-p\"ă®ć…ĺ ±ă‚’čŞăżčľĽă‚ăľă›ă‚“ă§ă—ăź: geteuid()=%d ă—ă‹ă—ă«ăĽăă§ă‚ă‚‹ăąăŤă§ă™.)\n" -+ -+#: ../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 "" -+"(一é¨ă®ă—ăセスăŚčĺĄă•ă‚Śăľă™ăŚ, 所有ă—ă¦ă„ăŞă„ă—ăセスă®ć…ĺ ±ăŻ\n" -+"表示ă•ă‚Śăľă›ă‚“。ăťă‚Śă‚‰ĺ…¨ă¦ă‚’見るă«ăŻă«ăĽăă«ăŞă‚‹ĺż…č¦ăŚă‚ă‚Šăľă™.)\n" -+ -+# translatable? -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 -+msgid "LISTENING" -+msgstr "LISTENING" -+ -+# translatable? -+#: ../netstat.c:446 -+msgid "CONN SENT" -+msgstr "CONN SENT" -+ -+# translatable? -+#: ../netstat.c:447 ../netstat.c:1268 -+msgid "DISC SENT" -+msgstr "DISC SENT" -+ -+# translatable? -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 -+msgid "ESTABLISHED" -+msgstr "ESTABLISHED" -+ -+#: ../netstat.c:470 -+#, c-format -+msgid "Active NET/ROM sockets\n" -+msgstr "稼ĺŤä¸ă®NET/ROMソケăă\n" -+ -+#: ../netstat.c:471 -+#, c-format -+msgid "" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "ă¦ăĽă‚¶ ĺŹ—äżˇĺ… ç™şäżˇĺ… ă‡ăイス 状態 Vr/Vs é€äżˇ-Q 受信-Q\n" -+ -+#: ../netstat.c:481 ../netstat.c:1308 -+#, c-format -+msgid "Problem reading data from %s\n" -+msgstr "%să‹ă‚‰ă®ă‡ăĽă‚żă®čŞăżčľĽăżă«ĺ•ŹéˇŚ\n" -+ -+# translatable? -+#: ../netstat.c:516 -+msgid "SYN_SENT" -+msgstr "SYN_SENT" -+ -+# translatable? -+#: ../netstat.c:517 -+msgid "SYN_RECV" -+msgstr "SYN_RECV" -+ -+# translatable? -+#: ../netstat.c:518 -+msgid "FIN_WAIT1" -+msgstr "FIN_WAIT1" -+ -+# translatable? -+#: ../netstat.c:519 -+msgid "FIN_WAIT2" -+msgstr "FIN_WAIT2" -+ -+# translatable? -+#: ../netstat.c:520 -+msgid "TIME_WAIT" -+msgstr "TIME_WAIT" -+ -+# translatable? -+#: ../netstat.c:521 -+msgid "CLOSE" -+msgstr "CLOSE" -+ -+# translatable? -+#: ../netstat.c:522 -+msgid "CLOSE_WAIT" -+msgstr "CLOSE_WAIT" -+ -+# translatable? -+#: ../netstat.c:523 -+msgid "LAST_ACK" -+msgstr "LAST_ACK" -+ -+# translatable? -+#: ../netstat.c:524 -+msgid "LISTEN" -+msgstr "LISTEN" -+ -+# translatable? -+#: ../netstat.c:525 -+msgid "CLOSING" -+msgstr "CLOSING" -+ -+#: ../netstat.c:596 -+#, c-format -+msgid "warning, got bogus igmp6 line %d.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®igmp6ă©ă‚¤ăł%dă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../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: サăťăĽăă—ă¦ăŞă„アă‰ă¬ă‚ąă•ă‚ˇăźăŞ%dă§ă™!\n" -+ -+# c-format -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 -+#, c-format -+msgid "warning, got bogus igmp line %d.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®igmpă©ă‚¤ăł%dă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:677 -+#, c-format -+msgid "Active X.25 sockets\n" -+msgstr "稼ĺŤä¸ă®X.25ソケăă\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 "ĺŹ—äżˇĺ… ç™şäżˇĺ… ă‡ăイス LCI 状態 Vr/Vs é€äżˇ-Q 受信-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format -+msgid "warning, got bogus tcp line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®TCPă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 -+#, c-format -+msgid "off (0.00/%ld/%d)" -+msgstr "ă‚Şă• (0.00/%ld/%d)" -+ -+#: ../netstat.c:804 -+#, c-format -+msgid "on (%2.2f/%ld/%d)" -+msgstr "ă‚Şăł (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:809 -+#, c-format -+msgid "keepalive (%2.2f/%ld/%d)" -+msgstr "ă‚ăĽă—アă©ă‚¤ă– (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:814 -+#, c-format -+msgid "timewait (%2.2f/%ld/%d)" -+msgstr "時間待㡠(%2.2f/%ld/%d)" -+ -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 -+#, c-format -+msgid "unkn-%d (%2.2f/%ld/%d)" -+msgstr "不ćŽ-%d (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:894 -+#, c-format -+msgid "warning, got bogus udp line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®UDPă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 -+msgid "UNKNOWN" -+msgstr "不ćŽ" -+ -+#: ../netstat.c:958 ../netstat.c:1080 -+#, c-format -+msgid "on%d (%2.2f/%ld/%d)" -+msgstr "ă‚Şăł%d (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:1046 -+#, c-format -+msgid "warning, got bogus raw line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®Rawă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+#: ../netstat.c:1128 -+#, c-format -+msgid "warning, got bogus unix line.\n" -+msgstr "č¦ĺ‘Š, ĺ˝ă®unixă©ă‚¤ăłă‚’ĺľ—ăľă—ăź.\n" -+ -+# translatable? -+#: ../netstat.c:1155 -+msgid "STREAM" -+msgstr "STREAM" -+ -+# translatable? -+#: ../netstat.c:1159 -+msgid "DGRAM" -+msgstr "DGRAM" -+ -+# translatable? -+#: ../netstat.c:1163 -+msgid "RAW" -+msgstr "RAW" -+ -+# translatable? -+#: ../netstat.c:1167 -+msgid "RDM" -+msgstr "RDM" -+ -+# translatable? -+#: ../netstat.c:1171 -+msgid "SEQPACKET" -+msgstr "SEQPACKET" -+ -+# translatable? -+#: ../netstat.c:1180 -+msgid "FREE" -+msgstr "FREE" -+ -+# translatable? -+#: ../netstat.c:1196 -+msgid "CONNECTING" -+msgstr "CONNECTING" -+ -+# translatable? -+#: ../netstat.c:1200 -+msgid "CONNECTED" -+msgstr "CONNECTED" -+ -+# translatable? -+#: ../netstat.c:1204 -+msgid "DISCONNECTING" -+msgstr "DISCONNECTING" -+ -+#: ../netstat.c:1235 -+#, c-format -+msgid "Active UNIX domain sockets " -+msgstr "稼ĺŤä¸ă®UNIXă‰ăˇă‚¤ăłă‚˝ă‚±ăă " -+ -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format -+msgid "(servers and established)" -+msgstr "(サăĽăă¨ç˘şç«‹)" -+ -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format -+msgid "(only servers)" -+msgstr "(サăĽăă®ăż)" -+ -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format -+msgid "(w/o servers)" -+msgstr "(w/oサăĽă)" -+ -+#: ../netstat.c:1245 -+#, c-format -+msgid "" -+"\n" -+"Proto RefCnt Flags Type State I-Node" -+msgstr "" -+"\n" -+"Proto RefCnt ă•ă©ă‚° タイ㗠状態 IăŽăĽă‰" -+ -+#: ../netstat.c:1247 -+#, c-format -+msgid " Path\n" -+msgstr " ă‘ă‚ą\n" -+ -+# translatable? -+#: ../netstat.c:1267 -+msgid "SABM SENT" -+msgstr "SABM SENT" -+ -+# translatable? -+#: ../netstat.c:1270 -+msgid "RECOVERY" -+msgstr "RECOVERY" -+ -+#: ../netstat.c:1284 -+#, c-format -+msgid "Active AX.25 sockets\n" -+msgstr "稼ĺŤä¸ă®AX.25ソケăă\n" -+ -+#: ../netstat.c:1285 -+#, c-format -+msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" -+msgstr "ĺŹ—äżˇĺ… ç™şäżˇĺ… ă‡ăイス 状態 Vr/Vs é€äżˇ-Q 受信-Q\n" -+ -+#: ../netstat.c:1328 -+#, c-format -+msgid "problem reading data from %s\n" -+msgstr "%să‹ă‚‰ă®ă‡ăĽă‚żčŞăżčľĽăżä¸ă«ĺ•ŹéˇŚ\n" -+ -+#: ../netstat.c:1379 -+#, c-format -+msgid "" -+"Active IPX sockets\n" -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State" -+msgstr "" -+"稼ĺŤä¸ă®IPXソケăă\n" -+"Proto 受信-Q é€äżˇ-Q 内é¨ă‚˘ă‰ă¬ă‚ą 外é¨ă‚˘ă‰ă¬ă‚ą 状" -+"ć…‹" -+ -+#: ../netstat.c:1381 -+#, c-format -+msgid " User" -+msgstr " ă¦ăĽă‚¶" -+ -+# translatable? -+#: ../netstat.c:1415 -+msgid "ESTAB" -+msgstr "ESTAB" -+ -+# translatable? -+#: ../netstat.c:1423 -+msgid "UNK." -+msgstr "UNK." -+ -+#: ../netstat.c:1461 -+#, c-format -+msgid "Kernel Interface table\n" -+msgstr "ă‚«ăĽăŤă«ă‚¤ăłă‚żă•ă‚§ăĽă‚ąă†ăĽă–ă«\n" -+ -+#: ../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 " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR ă•ă©ă‚°\n" -+ -+#: ../netstat.c:1469 -+msgid "missing interface information" -+msgstr "イăłă‚żă•ă‚§ăĽă‚ąć…ĺ ±ăŚč¶łă‚Šăľă›ă‚“" -+ -+#: ../netstat.c:1492 -+#, c-format -+msgid "" -+"usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--" -+"help}\n" -+msgstr "" -+"使用法: netstat [-veenNcCF] [<アă‰ă¬ă‚ąă•ă‚ˇăźăŞ>] -r\n" -+" netstat {-V|--version|-h|--help}\n" -+ -+#: ../netstat.c:1493 -+#, c-format -+msgid " netstat [-vnNcaeol] [<Socket> ...]\n" -+msgstr " netstat [-vnNcaeol] [<ソケăă> ...]\n" -+ -+#: ../netstat.c:1494 -+#, c-format -+msgid "" -+" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" -+"\n" -+msgstr " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n" -+ -+#: ../netstat.c:1496 -+#, c-format -+msgid " -r, --route display routing table\n" -+msgstr " -r, --routing 経路ă†ăĽă–ă«ă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1497 -+#, c-format -+msgid " -i, --interfaces display interface table\n" -+msgstr " -i, --interfaces イăłă‚żă•ă‚§ăĽă‚ąă†ăĽă–ă«ă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1498 -+#, c-format -+msgid " -g, --groups display multicast group memberships\n" -+msgstr " -g, --groups ăžă«ăă‚ăŁă‚ąăă»ă‚°ă«ăĽă—ăˇăłăă‚·ăă—ă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1499 -+#, c-format -+msgid "" -+" -s, --statistics display networking statistics (like SNMP)\n" -+msgstr "" -+" -s, --statistics (SNMPă®ă‚ă†ă«)ăŤăăăŻăĽă‚Żçµ±č¨ă‚’表示\n" -+ -+#: ../netstat.c:1501 -+#, c-format -+msgid "" -+" -M, --masquerade display masqueraded connections\n" -+"\n" -+msgstr "" -+" -M, --masquerade ăžă‚ąă‚«ă¬ăĽă‰ćŽĄç¶šă®čˇ¨ç¤ş\n" -+"\n" -+ -+#: ../netstat.c:1505 -+#, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " --numeric-hosts ă›ă‚ąăĺŤă‚’ă¬ă‚ľă«ă–ă—ăŞă„\n" -+ -+#: ../netstat.c:1506 -+#, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " --numeric-ports ăťăĽăĺŤă‚’ă¬ă‚ľă«ă–ă—ăŞă„\n" -+ -+#: ../netstat.c:1507 -+#, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " --numeric-users ă¦ăĽă‚¶ĺŤă‚’ă¬ă‚ľă«ă–ă—ăŞă„\n" -+ -+#: ../netstat.c:1508 -+#, c-format -+msgid " -N, --symbolic resolve hardware names\n" -+msgstr " -N, --symbolic ăŹăĽă‰ă‚¦ă‚§ă‚˘ĺŤă‚’ă¬ă‚ľă«ă–ă™ă‚‹\n" -+ -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format -+msgid " -e, --extend display other/more information\n" -+msgstr " -e, --extend ä»–ă®ć…ĺ ±ă‚„ĺ¤šăŹă®ć…ĺ ±ă‚’čˇ¨ç¤şă™ă‚‹\n" -+ -+#: ../netstat.c:1510 -+#, c-format -+msgid " -p, --programs display PID/Program name for sockets\n" -+msgstr " -p, --programs ソケăăă®PID/ă—ăă‚°ă©ă ĺŤă‚’表示ă™ă‚‹\n" -+ -+#: ../netstat.c:1511 -+#, c-format -+msgid "" -+" -c, --continuous continuous listing\n" -+"\n" -+msgstr "" -+" -c, --continous 継続的ăŞčˇ¨ç¤ş\n" -+"\n" -+ -+#: ../netstat.c:1512 -+#, c-format -+msgid " -l, --listening display listening server sockets\n" -+msgstr " -l, --listening サăĽăă®listenソケăăă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1513 -+#, c-format -+msgid "" -+" -a, --all, --listening display all sockets (default: connected)\n" -+msgstr " -a, --all, --listening ĺ…¨ă¦ă®ć…ĺ ±ă‚’čˇ¨ç¤ş (標準: connected)\n" -+ -+#: ../netstat.c:1514 -+#, c-format -+msgid " -o, --timers display timers\n" -+msgstr " -o, --timers タイăžă®čˇ¨ç¤ş\n" -+ -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format -+msgid "" -+" -F, --fib display Forwarding Information Base " -+"(default)\n" -+msgstr " -F, --fib ă•ă‚©ăŻăĽă‰ć…ĺ ±ă™ăĽă‚ąă‚’表示ă™ă‚‹(標準)\n" -+ -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format -+msgid "" -+" -C, --cache display routing cache instead of FIB\n" -+"\n" -+msgstr " -C, --cache FIBă®ă‹ă‚Źă‚Šă«çµŚč·Żă‚ăŁăă‚·ăĄă‚’表示ă™ă‚‹\n\n" -+ -+#: ../netstat.c:1518 -+#, c-format -+msgid "" -+" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" -+msgstr "" -+" <ソケăă>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" -+ -+#: ../netstat.c:1519 -+#, c-format -+msgid " <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>='-6|-4'ăľăźăŻ'-A <af>'ăľăźăŻ'--<af>'ă‚’ĺ©ç”¨; 標準: %s\n" -+ -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format -+msgid " List of possible address families (which support routing):\n" -+msgstr " (ă«ăĽă†ă‚Łăłă‚°ă‚’サăťăĽăă—ăź)ĺ©ç”¨ĺŹŻč˝ăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă®ăŞă‚ąă:\n" -+ -+#: ../netstat.c:1753 -+#, c-format -+msgid "Active Internet connections " -+msgstr "稼ĺŤä¸ă®ă‚¤ăłă‚żăĽăŤăă接続 " -+ -+#: ../netstat.c:1763 -+#, c-format -+msgid "" -+"\n" -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " -+msgstr "" -+"\n" -+"Proto 受信-Q é€äżˇ-Q 内é¨ă‚˘ă‰ă¬ă‚ą 外é¨ă‚˘ă‰ă¬ă‚ą 状" -+"ć…‹ " -+ -+#: ../netstat.c:1765 -+#, c-format -+msgid " User Inode " -+msgstr " ă¦ăĽă‚¶ IăŽăĽă‰ " -+ -+#: ../netstat.c:1768 -+#, c-format -+msgid " Timer" -+msgstr "タイăž" -+ -+#: ../netstat.c:1798 -+#, c-format -+msgid "IPv4 Group Memberships\n" -+msgstr "IPv4ă‚°ă«ăĽă—ăˇăłăă‚·ăă—\n" -+ -+#: ../netstat.c:1799 -+#, c-format -+msgid "Interface RefCnt Group\n" -+msgstr "イăłă‚żă•ă‚§ăĽă‚ą 参照Cnt ă‚°ă«ăĽă—\n" -+ -+#: ../rarp.c:44 -+msgid "This kernel does not support RARP.\n" -+msgstr "ă“ă®ă‚«ăĽăŤă«ăŻRARPをサăťăĽăă—ă¦ă„ăľă›ă‚“.\n" -+ -+#: ../rarp.c:83 -+#, c-format -+msgid "no RARP entry for %s.\n" -+msgstr "%să®RARPエăłăăŞăŚă‚ă‚Šăľă›ă‚“.\n" -+ -+#: ../rarp.c:96 -+#, c-format -+msgid "%s: bad hardware address\n" -+msgstr "%s: 不ćŁăŞăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ąă§ă™\n" -+ -+#: ../rarp.c:128 -+#, c-format -+msgid "rarp: cannot open file %s:%s.\n" -+msgstr "rarp: ă•ă‚ˇă‚¤ă«%să‚’é–‹ă‘ăľă›ă‚“:%s.\n" -+ -+#: ../rarp.c:140 -+#, c-format -+msgid "rarp: format error at %s:%u\n" -+msgstr "rarp: %s:%u行ă«ă•ă‚©ăĽăžăăエă©ăĽăŚă‚ă‚Šăľă™\n" -+ -+#: ../rarp.c:144 ../rarp.c:289 -+#, c-format -+msgid "rarp: %s: unknown host\n" -+msgstr "rarp: %s: 不ćŽăŞă›ă‚ąăă§ă™\n" -+ -+#: ../rarp.c:147 -+#, c-format -+msgid "rarp: cannot set entry from %s:%u\n" -+msgstr "rarp: %s:%u行ă‹ă‚‰ă‚¨ăłăăŞă‚’č¨ĺ®šă§ăŤăľă›ă‚“\n" -+ -+#: ../rarp.c:176 -+#, c-format -+msgid "Usage: rarp -a list entries in cache.\n" -+msgstr "" -+"使用法: rarp -a ă‚ăŁăă‚·ăĄă‚¨ăłăăŞă®čˇ¨ç¤ş.\n" -+ -+#: ../rarp.c:177 -+#, c-format -+msgid " rarp -d <hostname> delete entry from cache.\n" -+msgstr "" -+" rarp -d <ă›ă‚ąăĺŤ> ă‚ăŁăă‚·ăĄă‹ă‚‰ă‚¨ăłăăŞă‚’削除ă™" -+"ă‚‹.\n" -+ -+#: ../rarp.c:178 -+#, c-format -+msgid " rarp [<HW>] -s <hostname> <hwaddr> add entry to cache.\n" -+msgstr "" -+" rarp [<HW>] -s <ă›ă‚ąăĺŤ> <ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą>\n" -+" ă‚ăŁăă‚·ăĄă¸ă‚¨ăłăăŞă‚’čż˝ĺŠ .\n" -+ -+#: ../rarp.c:179 -+#, c-format -+msgid "" -+" rarp -f add entries from /etc/ethers.\n" -+msgstr "" -+" rarp -f /etc/ethersă‹ă‚‰ă‚¨ăłăăŞčż˝ĺŠ .\n" -+ -+#: ../rarp.c:180 -+#, c-format -+msgid "" -+" rarp -V display program version.\n" -+"\n" -+msgstr " rarp -V ăăĽă‚¸ă§ăłć…ĺ ±ă®ĺ‡şĺŠ›.\n" -+ -+#: ../rarp.c:238 -+#, c-format -+msgid "%s: illegal option mix.\n" -+msgstr "%s: ă‚Şă—ă‚·ă§ăłă®çµ„ĺă›ăŚé–“é•ăŁă¦ă„ăľă™.\n" -+ -+#: ../rarp.c:269 -+#, c-format -+msgid "rarp: %s: unknown hardware type.\n" -+msgstr "rarp: %s: ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—ăŚä¸ŤćŽă§ă™.\n" -+ -+#: ../route.c:80 -+#, c-format -+msgid "" -+"Usage: route [-nNvee] [-FC] [<AF>] List kernel routing tables\n" -+msgstr "使用法:route [-nNvee] [-FC] [アă‰ă¬ă‚ąă•ă‚ˇăźăŞ] ă‚«ăĽăŤă«çµŚč·Żă†ăĽă–ă«ă®čˇ¨ç¤ş.\n" -+ -+#: ../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}‥‥\n" -+"\t\t\t\t アă‰ă¬ă‚ąă•ă‚ˇăźăŞă®çµŚč·Żă†ăĽă–ă«ă®č¨ĺ®š.\n" -+"\n" -+ -+#: ../route.c:83 -+#, c-format -+msgid "" -+" route {-h|--help} [<AF>] Detailed usage syntax for " -+"specified AF.\n" -+msgstr "" -+" route {-h|--help} [アă‰ă¬ă‚ąă•ă‚ˇăźăŞ]\n" -+" アă‰ă¬ă‚ąă•ă‚ˇăźăŞç‰ąĺ®šă®ć–‡ćł•ă®čެćŽ.\n" -+ -+#: ../route.c:84 -+#, c-format -+msgid "" -+" route {-V|--version} Display version/author and " -+"exit.\n" -+"\n" -+msgstr " route {-V|--version} ăăĽă‚¸ă§ăł/作者ć…ĺ ±ă®ĺ‡şĺŠ›ă¨çµ‚了.\n\n" -+ -+#: ../route.c:92 -+#, c-format -+msgid " <AF>=Use '-A <af>' or '--<af>'; default: %s\n" -+msgstr " <AF>='-A <af>'ăľăźăŻ'--<af>'ă‚’ĺ©ç”¨; 標準: %s\n" -+ -+#: ../plipconfig.c:66 -+#, c-format -+msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" -+msgstr "使用法: plipconfig [-a] [-i] [-v] イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../plipconfig.c:67 -+#, c-format -+msgid " [nibble NN] [trigger NN]\n" -+msgstr " [nibble 数値] [trigger 数値]\n" -+ -+#: ../plipconfig.c:68 -+#, c-format -+msgid " plipconfig -V | --version\n" -+msgstr " plipconfig -V | --version\n" -+ -+# translatable? -+#: ../plipconfig.c:74 -+#, c-format -+msgid "%s\tnibble %lu trigger %lu\n" -+msgstr "%s\tnibble %lu trigger %lu\n" -+ -+#: ../iptunnel.c:85 -+#, c-format -+msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" -+msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n" -+ -+#: ../iptunnel.c:86 -+#, c-format -+msgid "" -+" [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" -+msgstr " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" -+ -+#: ../iptunnel.c:87 -+#, c-format -+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:88 -+#, c-format -+msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" -+ -+#: ../iptunnel.c:89 -+#, c-format -+msgid "" -+" iptunnel -V | --version\n" -+"\n" -+msgstr " iptunnel -V | --version\n\n" -+ -+#: ../iptunnel.c:90 -+#, c-format -+msgid "Where: NAME := STRING\n" -+msgstr "ć„Źĺ‘ł: NAME := STRING\n" -+ -+#: ../iptunnel.c:91 -+#, c-format -+msgid " ADDR := { IP_ADDRESS | any }\n" -+msgstr " ADDR := { IP_ADDRESS | any }\n" -+ -+#: ../iptunnel.c:92 -+#, c-format -+msgid " TOS := { NUMBER | inherit }\n" -+msgstr " TOS := { NUMBER | inherit }\n" -+ -+#: ../iptunnel.c:93 -+#, c-format -+msgid " TTL := { 1..255 | inherit }\n" -+msgstr " TTL := { 1..255 | inherit }\n" -+ -+#: ../iptunnel.c:94 -+#, c-format -+msgid " KEY := { DOTTED_QUAD | NUMBER }\n" -+msgstr " KEY := { DOTTED_QUAD | NUMBER }\n" -+ -+#: ../iptunnel.c:332 -+#, c-format -+msgid "Keys are not allowed with ipip and sit.\n" -+msgstr "ă‚ăĽăŻipipăŠă‚ăłsită§ăŻč¨±ĺŹŻă•ă‚Śăľă›ă‚“.\n" -+ -+#: ../iptunnel.c:352 -+#, c-format -+msgid "Broadcast tunnel requires a source address.\n" -+msgstr "ă–ăăĽă‰ă‚ăŁă‚ąăăăłăŤă«ăŻç™şäżˇĺ…アă‰ă¬ă‚ąăŚĺż…č¦ă§ă™.\n" -+ -+#: ../iptunnel.c:367 -+#, c-format -+msgid "ttl != 0 and noptmudisc are incompatible\n" -+msgstr "ttl != 0ăŠă‚ăłnoptmudiscăŻçź›ç›ľă—ăľă™\n" -+ -+#: ../iptunnel.c:379 -+#, c-format -+msgid "cannot determine tunnel mode (ipip, gre or sit)\n" -+msgstr "ăăłăŤă«ă˘ăĽă‰ă‚’決定ă§ăŤăľă›ă‚“(ipip, greăľăźăŻsit)\n" -+ -+#: ../iptunnel.c:417 -+#, c-format -+msgid "%s: %s/ip remote %s local %s " -+msgstr "%s: %s/ip ăŞă˘ăĽă%s ăăĽă‚«ă«%s " -+ -+#: ../iptunnel.c:421 -+msgid "unknown" -+msgstr "不ćŽ" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:453 -+#, c-format -+msgid " Drop packets out of sequence.\n" -+msgstr " ă‚·ăĽă‚±ăłă‚ąă‹ă‚‰ĺ¤–ă‚Śăźă‘ケăăă‚’ă‰ăăă—.\n" -+ -+#: ../iptunnel.c:455 -+#, c-format -+msgid " Checksum in received packet is required.\n" -+msgstr " 受信ă‘ケăăă®ăェăクサă ăŻĺż…é ă§ă™.\n" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:457 -+#, c-format -+msgid " Sequence packets on output.\n" -+msgstr " é€äżˇă®ă‚·ăĽă‚±ăłă‚ąă‘ケăă.\n" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:459 -+#, c-format -+msgid " Checksum output packets.\n" -+msgstr " é€äżˇă‘ケăăă®ăェăクサă .\n" -+ -+#: ../iptunnel.c:487 -+#, c-format -+msgid "Wrong format of /proc/net/dev. Sorry.\n" -+msgstr "/proc/net/devăŚä¸ŤćŁăŞă•ă‚©ăĽăžăăă§ă™. ă™ăżăľă›ă‚“.\n" -+ -+#: ../iptunnel.c:500 -+#, c-format -+msgid "Failed to get type of [%s]\n" -+msgstr "[%s]ă®ă‚żă‚¤ă—ă®ĺŹ–ĺľ—ă«ĺ¤±ć•—\n" -+ -+#: ../iptunnel.c:516 -+#, c-format -+msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" -+msgstr "RX: ă‘ケăă ăイă エă©ăĽ CsumErrs outOfSeq ăžă«ăă‚ăŁă‚ąă\n" -+ -+#: ../iptunnel.c:519 -+#, c-format -+msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" -+msgstr "TX: ă‘ケăă ăイă エă©ăĽ DeadLoop NoRoute ăăă•ă‚ˇăŞă—\n" -+ -+#: ../statistics.c:47 -+msgid "ICMP input histogram:" -+msgstr "ICMP入力ă’ă‚ąăă‚°ă©ă :" -+ -+#: ../statistics.c:48 -+msgid "ICMP output histogram:" -+msgstr "ICMP出力ă’ă‚ąăă‚°ă©ă :" -+ -+#: ../statistics.c:65 -+#, c-format -+msgid "Forwarding is %s" -+msgstr "ă•ă‚©ăŻăĽă‰ăŻ%să§ă™" -+ -+#: ../statistics.c:66 -+#, c-format -+msgid "Default TTL is %u" -+msgstr "標準TTLăŻ%uă§ă™" -+ -+#: ../statistics.c:67 -+#, c-format -+msgid "%u total packets received" -+msgstr "ĺč¨%uă‘ケăăを受信" -+ -+#: ../statistics.c:68 -+#, c-format -+msgid "%u with invalid headers" -+msgstr "不é©ĺ˝“ăŞăăă€ăŚ%u" -+ -+#: ../statistics.c:69 -+#, c-format -+msgid "%u with invalid addresses" -+msgstr "不é©ĺ˝“ăŞă‚˘ă‰ă¬ă‚ąăŚ%u" -+ -+#: ../statistics.c:70 -+#, c-format -+msgid "%u forwarded" -+msgstr "%uă®č»˘é€" -+ -+#: ../statistics.c:71 -+#, c-format -+msgid "%u with unknown protocol" -+msgstr "%uă®ä¸ŤćŽăŞă—ăăă‚łă«" -+ -+#: ../statistics.c:72 -+#, c-format -+msgid "%u incoming packets discarded" -+msgstr "%uă®ĺŹ—信ă‘ケăăă‚’ç ´ćŁ„" -+ -+#: ../statistics.c:73 -+#, c-format -+msgid "%u incoming packets delivered" -+msgstr "%uă®ĺŹ—信ă‘ケăăă‚’é…Ťé€" -+ -+#: ../statistics.c:74 -+#, c-format -+msgid "%u requests sent out" -+msgstr "%uă®č¦ć±‚ă‚’é€äżˇ" -+ -+#. ? -+#: ../statistics.c:75 -+#, c-format -+msgid "%u outgoing packets dropped" -+msgstr "%uă®é€äżˇă‘ケăăă‚’ă‰ăăă—" -+ -+#: ../statistics.c:76 -+#, c-format -+msgid "%u dropped because of missing route" -+msgstr "不ćŽăŞçµŚč·Żă§%uă‚’ă‰ăăă—" -+ -+#: ../statistics.c:77 -+#, c-format -+msgid "%u fragments dropped after timeout" -+msgstr "タイă アウă後ă«%uă®ă•ă©ă‚°ăˇăłăă‚’ă‰ăăă—" -+ -+#: ../statistics.c:78 -+#, c-format -+msgid "%u reassemblies required" -+msgstr "%uă®ĺ†Ťć§‹çŻ‰ăŚĺż…č¦" -+ -+#. ? -+#: ../statistics.c:79 -+#, c-format -+msgid "%u packets reassembled ok" -+msgstr "%uă‘ケăăă®ĺ†Ťć§‹çŻ‰ă«ć功" -+ -+#: ../statistics.c:80 -+#, c-format -+msgid "%u packet reassembles failed" -+msgstr "%uă‘ケăăă®ĺ†Ťć§‹çŻ‰ă«ĺ¤±ć•—" -+ -+#: ../statistics.c:81 -+#, c-format -+msgid "%u fragments received ok" -+msgstr "%uă•ă©ă‚°ăˇăłăă®ĺŹ—信ă«ć功" -+ -+#: ../statistics.c:82 -+#, c-format -+msgid "%u fragments failed" -+msgstr "%uă•ă©ă‚°ăˇăłăă§ĺ¤±ć•—" -+ -+#: ../statistics.c:83 -+#, c-format -+msgid "%u fragments created" -+msgstr "%uă•ă©ă‚°ăˇăłăを生ć" -+ -+#: ../statistics.c:88 -+#, c-format -+msgid "%u ICMP messages received" -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸ĺŹ—信" -+ -+#: ../statistics.c:89 -+#, c-format -+msgid "%u input ICMP message failed." -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸ĺ…ĄĺŠ›ĺ¤±ć•—." -+ -+#: ../statistics.c:90 ../statistics.c:103 -+#, c-format -+msgid "destination unreachable: %u" -+msgstr "é€äżˇĺ…ĺ°é”不可: %u" -+ -+#: ../statistics.c:91 -+#, c-format -+msgid "timeout in transit: %u" -+msgstr "é€äżˇć™‚é–“ă‚ŞăĽă: %u" -+ -+#: ../statistics.c:92 ../statistics.c:105 -+#, c-format -+msgid "wrong parameters: %u" -+msgstr "謝ăŁăźă‘ă©ăˇăĽă‚ż: %u" -+ -+#. ? -+#: ../statistics.c:93 -+#, c-format -+msgid "source quenches: %u" -+msgstr "発信ĺ…ć¶ć»…: %u" -+ -+#: ../statistics.c:94 -+#, c-format -+msgid "redirects: %u" -+msgstr "ăŞă€ă‚¤ă¬ă‚Żă: %u" -+ -+#: ../statistics.c:95 -+#, c-format -+msgid "echo requests: %u" -+msgstr "エコăĽč¦ć±‚: %u" -+ -+#: ../statistics.c:96 ../statistics.c:109 -+#, c-format -+msgid "echo replies: %u" -+msgstr "エコăĽĺżśç”: %u" -+ -+#: ../statistics.c:97 -+#, c-format -+msgid "timestamp request: %u" -+msgstr "タイă ă‚ąă‚żăłă—č¦ć±‚: %u" -+ -+#: ../statistics.c:98 -+#, c-format -+msgid "timestamp reply: %u" -+msgstr "タイă ă‚ąă‚żăłă—ĺżśç”: %u" -+ -+#: ../statistics.c:99 -+#, c-format -+msgid "address mask request: %u" -+msgstr "アă‰ă¬ă‚ąăžă‚ąă‚Żč¦ć±‚: %u" -+ -+#. ? -+#: ../statistics.c:100 ../statistics.c:113 -+#, c-format -+msgid "address mask replies: %u" -+msgstr "アă‰ă¬ă‚ąăžă‚ąă‚Żĺżśç”: %u" -+ -+#. ? -+#: ../statistics.c:101 -+#, c-format -+msgid "%u ICMP messages sent" -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸é€äżˇ" -+ -+#: ../statistics.c:102 -+#, c-format -+msgid "%u ICMP messages failed" -+msgstr "%uă®ICMPăˇăă‚»ăĽă‚¸ĺ¤±ć•—" -+ -+#: ../statistics.c:104 -+#, c-format -+msgid "time exceeded: %u" -+msgstr "時間ĺ‡ă‚Ś: %u" -+ -+#. ? -+#: ../statistics.c:106 -+#, c-format -+msgid "source quench: %u" -+msgstr "発信ĺ…ć¶ć»…: %u" -+ -+#: ../statistics.c:107 -+#, c-format -+msgid "redirect: %u" -+msgstr "ăŞă€ă‚¤ă¬ă‚Żă: %u" -+ -+#: ../statistics.c:108 -+#, c-format -+msgid "echo request: %u" -+msgstr "エコăĽč¦ć±‚: %u" -+ -+#: ../statistics.c:110 -+#, c-format -+msgid "timestamp requests: %u" -+msgstr "タイă ă‚ąă‚żăłă—č¦ć±‚: %u" -+ -+#: ../statistics.c:111 -+#, c-format -+msgid "timestamp replies: %u" -+msgstr "タイă ă‚ąă‚żăłă—ĺżśç”: %u" -+ -+#: ../statistics.c:112 -+#, c-format -+msgid "address mask requests: %u" -+msgstr "アă‰ă¬ă‚ąăžă‚ąă‚Żč¦ć±‚: %u" -+ -+#: ../statistics.c:118 -+#, c-format -+msgid "RTO algorithm is %s" -+msgstr "RTOアă«ă‚´ăŞă‚şă ăŻ%să§ă™" -+ -+#: ../statistics.c:122 -+#, c-format -+msgid "%u active connections openings" -+msgstr "%uă®č˝ĺ‹•ćŽĄç¶šé–‹ĺ§‹" -+ -+#: ../statistics.c:123 -+#, c-format -+msgid "%u passive connection openings" -+msgstr "%uă®ĺŹ—動接続開始" -+ -+#: ../statistics.c:124 -+#, c-format -+msgid "%u failed connection attempts" -+msgstr "%uă®ćŽĄç¶šč©¦čˇŚĺ¤±ć•—" -+ -+#: ../statistics.c:125 -+#, c-format -+msgid "%u connection resets received" -+msgstr "%uă®ćŽĄç¶šăŞă‚»ăă受信" -+ -+#: ../statistics.c:126 -+#, c-format -+msgid "%u connections established" -+msgstr "%uă®ćŽĄç¶šç˘şç«‹" -+ -+#: ../statistics.c:127 -+#, c-format -+msgid "%u segments received" -+msgstr "%uセグăˇăłăă®ĺŹ—信" -+ -+#: ../statistics.c:128 -+#, c-format -+msgid "%u segments send out" -+msgstr "%uセグăˇăłăă®é€äżˇ" -+ -+#: ../statistics.c:129 -+#, c-format -+msgid "%u segments retransmited" -+msgstr "%uセグăˇăłăă®ĺ†Ťč»˘é€" -+ -+#: ../statistics.c:130 -+#, c-format -+msgid "%u bad segments received." -+msgstr "%uă®ä¸ŤćŁă‚»ă‚°ăˇăłă受信." -+ -+#: ../statistics.c:131 -+#, c-format -+msgid "%u resets sent" -+msgstr "%uă®ăŞă‚»ăăé€äżˇ" -+ -+#: ../statistics.c:136 -+#, c-format -+msgid "%u packets received" -+msgstr "%uă‘ケăă受信" -+ -+#: ../statistics.c:137 -+#, c-format -+msgid "%u packets to unknown port received." -+msgstr "不ćŽăŞăťăĽăă‹ă‚‰ă®%uă‘ケăăă®ĺŹ—信." -+ -+#: ../statistics.c:138 -+#, c-format -+msgid "%u packet receive errors" -+msgstr "%uă®ă‘ケăă受信エă©ăĽ" -+ -+#: ../statistics.c:139 -+#, c-format -+msgid "%u packets sent" -+msgstr "%uă®ă‘ケăăă‚’é€äżˇ" -+ -+#: ../statistics.c:144 -+#, c-format -+msgid "%u SYN cookies sent" -+msgstr "%uă®SYNă‚Żăă‚ăĽă‚’é€äżˇ" -+ -+#: ../statistics.c:145 -+#, c-format -+msgid "%u SYN cookies received" -+msgstr "%uă®SYNă‚Żăă‚ăĽă‚’受信" -+ -+#: ../statistics.c:146 -+#, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%uă®ä¸Ťé©ĺ˝“ăŞSYNă‚Żăă‚ăĽă‚’受信" -+ -+#: ../statistics.c:148 -+#, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%uă®ćśŞĺ®Śćă®SYN_RECVソケăăă«ĺŻľă™ă‚‹ăŞă‚»ăăを受信" -+ -+#: ../statistics.c:150 -+#, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%uă®ă‘ケăăをソケăăăăă•ă‚ˇă‚ŞăĽăă©ăłă®ăźă‚受信ă‚ăĄăĽă‹ă‚‰é™¤ĺ¤–" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%uă®ă‘ケăăを受信ă‚ăĄăĽă‹ă‚‰é™¤ĺ¤–" -+ -+#: ../statistics.c:154 -+#, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%uă®ă‘ケăăăŚă‚˝ă‚±ăăăăă•ă‚ˇă‚ŞăĽăăĽă©ăłă®ăźă‚out-of-orderă‚ăĄăĽă‹ă‚‰ă‰ăăă—" -+ -+#: ../statistics.c:156 -+#, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%uă®ICMPă‘ケăăăŚout-of-windowă®ăźă‚ă‰ăăă—" -+ -+#: ../statistics.c:158 -+#, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%uă®ICMPă‘ケăăをソケăăă®ăăă‚Żă«ă‚ăŁă¦ă‰ăăă—" -+ -+# FIXME: what does it mean? -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "%uă®TCPソケăăăŚă•ă‚ˇăĽă‚ąăタイăžă§ă®ć™‚é–“ĺľ…ăˇă‚’完了" -+ -+# FIXME -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "%uă®ć™‚é–“ĺľ…ăˇă‚˝ă‚±ăăăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă§ĺ†Ťĺ©ç”¨" -+ -+# FIXME -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "%uă®TCPソケăăăŚă‚ąăăĽă‚żă‚¤ăžă§ă®ć™‚é–“ĺľ…ăˇă‚’完了" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "%uă®ĺŹ—動的接続ăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă®ăźă‚ă«ć‹’ĺ¦" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "%uă®č˝ĺ‹•çš„接続ăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă®ăźă‚ă«ć‹’ĺ¦" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "%uă®ă‘ケăăăŚă‚żă‚¤ă ă‚ąă‚żăłă—ă®ăźă‚ă«ćŽĄç¶šç˘şç«‹ă‚’ć‹’ĺ¦" -+ -+#: ../statistics.c:169 -+#, c-format -+msgid "%u delayed acks sent" -+msgstr "%uă®é…延ackă‚’é€äżˇ" -+ -+# FIXME -+#: ../statistics.c:170 -+#, c-format -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "%uă®é…延ackăŚăăă‚Żă•ă‚Śăźă‚˝ă‚±ăăă®ăźă‚ă«ă•ă‚‰ă«é…延" -+ -+#: ../statistics.c:172 -+#, c-format -+msgid "Quick ack mode was activated %u times" -+msgstr "クイăă‚Żackă˘ăĽă‰ăŚ%u回稼ĺŤ" -+ -+# FIXME -+#: ../statistics.c:173 -+#, c-format -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "ソケăăă®ăŞă‚ąăłă‚ăĄăĽăŚ%u回オăĽăă•ăăĽ" -+ -+# FIXME -+#: ../statistics.c:175 -+#, c-format -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "%uă®ă‚˝ă‚±ăăăŞă‚ąăłSYNăŚç„ˇč¦–" -+ -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "%uă‘ケăăă‚’recvmsgă—ă¬ă‚ăĄăĽă«ç›´ćŽĄă‚ăĄăĽ." -+ -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "%uăイăă‚’ăăă‚Żăă‚°ă‹ă‚‰ç›´ćŽĄĺŹ—信" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "%uăイăă‚’ă—ă¬ă‚ăĄăĽă‹ă‚‰ç›´ćŽĄĺŹ—信" -+ -+#: ../statistics.c:182 -+#, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "%uă®ă‘ケăăă‚’ă—ă¬ă‚ăĄăĽă‹ă‚‰ă‰ăăă—" -+ -+#: ../statistics.c:183 -+#, c-format -+msgid "%u packet headers predicted" -+msgstr "%uă®ă‘ケăăăăă€ă‚’äşć¸¬" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u packets header predicted and directly queued to user" -+msgstr "%uă®ă‘ケăăăăă€ă‚’äşć¸¬ă—ă¦ă¦ăĽă‚¶ă«ç›´ćŽĄă‚ăĄăĽ" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "%u回ă®ă‘ケăăé€äżˇä¸ă®ă‚·ă‚ąă†ă ăˇă˘ăŞă‚ăµă‚Ś" -+ -+#: ../statistics.c:188 -+#, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "ă‡ăĽă‚żă‚’ĺ«ăľăŞă„%uă®ć‰żčŞŤă®ĺŹ—信" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "%uă®äşć¸¬ć‰żčŞŤ" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "é«é€źăŞĺ†Ťé€ă«ă‚ă‚‹ă‘ケăăăă‚ąă®%u回ă®ĺ›žĺľ©" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "SACKă‡ăĽă‚żă«ă‚ă‚‹ă‘ケăăăă‚ąă®%u回ă®ĺ›žĺľ©" -+ -+#: ../statistics.c:192 -+#, c-format -+msgid "%u bad SACKs received" -+msgstr "%uă®ä¸ŤćŁăŞSACKを受信" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "FACKを使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "SACKを使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "タイă ă‚ąă‚żăłă—を使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+# FIXME:what does it mean? -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "é«é€źĺ†Ťé€ă‚’使ăŁăź%u回ă®ć¤śĺ‡şă•ă‚Śăźä¸¦ăąć›żă" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’完全ă«ĺ›žĺľ©" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "Hoeă’ăĄăĽăŞă‚ąă†ă‚Łăクを使ăŁă¦%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’é¨ĺ†çš„ă«ĺ›žĺľ©" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "DSACKを使ăŁă¦%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’回復" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "é¨ĺ†ack後ă«%uă®čĽ»čĽłă‚¦ă‚Łăłă‰ă‚¦ă‚’回復" -+ -+#: ../statistics.c:201 -+#, c-format -+msgid "%u retransmits lost" -+msgstr "%uă®ĺ†Ťé€ăă‚ąă" -+ -+# FIXME -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "é«é€źĺ†Ťé€ĺľŚă®%uă®ă‚żă‚¤ă アウă" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "SACKĺľ©ĺ…後ă®%uă®ă‚żă‚¤ă アウă" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "状態ăă‚ąă§ă®%uă®ă‚żă‚¤ă アウă" -+ -+#: ../statistics.c:205 -+#, c-format -+msgid "%u fast retransmits" -+msgstr "%uă®é«é€źĺ†Ťé€" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "%uă®č»˘é€ĺ†Ťé€" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "ă‚ąăăĽă‚ąă‚żăĽăă§ă®%uă®ĺ†Ťé€" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "%uă®ăťă®ä»–ă®TCPタイă アウă" -+ -+# FIXME -+#: ../statistics.c:209 -+#, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%dă®é«é€źĺ†Ťé€ĺ¤±ć•—" -+ -+#: ../statistics.c:210 -+#, c-format -+msgid "%u sack retransmits failed" -+msgstr "%uă®sack再é€ĺ¤±ć•—" -+ -+# FIXME -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "直接処ç†ă«ăŻé…ă™ăŽă‚‹ă¨ă‚ąă‚±ă‚¸ăĄăĽă«ă•ă‚Śăź%u回ă®ă¬ă‚·ăĽă" -+ -+# FIXME -+#: ../statistics.c:212 -+#, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%uă®ă‘ケăăを低ソケăăăăă•ă‚ˇă®ăźă‚ă«ĺŹ—信ă‚ăĄăĽă‹ă‚‰é™¤ĺ¤–" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "%uă®DSACKを古ă„ă‘ケăăă¨ă—ă¦é€äżˇ" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "%uă®DSACKă‚’é †ĺşŹĺ¤–ă‘ケăăă¨ă—ă¦é€äżˇ" -+ -+#: ../statistics.c:215 -+#, c-format -+msgid "%u DSACKs received" -+msgstr "%uă®DSACKを受信" -+ -+#: ../statistics.c:216 -+#, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%uă®DSACKă‚’é †ĺşŹĺ¤–ă‘ケăăă¨ă—ă¦ĺŹ—信" -+ -+#: ../statistics.c:217 -+#, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "äşćśźă›ă¬SYNă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ăŞă‚»ăă" -+ -+#: ../statistics.c:218 -+#, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "äşćśźă›ă¬ă‡ăĽă‚żă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ăŞă‚»ăă" -+ -+#: ../statistics.c:219 -+#, c-format -+msgid "%u connections reset due to early user close" -+msgstr "ć—©ćśźă®ă¦ăĽă‚¶ă®ă‚ŻăăĽă‚şă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ăŞă‚»ăă" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "ăˇă˘ăŞă®ĺ¶ç´„ă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ä¸ć˘" -+ -+#: ../statistics.c:221 -+#, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "タイă アウăă®ăźă‚ă«%uă®ćŽĄç¶šă‚’ä¸ć˘" -+ -+# FIXME -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "ă¦ăĽă‚¶ă®é•·ćśźă‚żă‚¤ă アウăă§ă®ă‚ŻăăĽă‚şĺľŚă«%uă®ćŽĄç¶šăŚä¸ć˘" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "ăˇă˘ăŞä¸Ťč¶łă®ăźă‚ă«RSTă®é€äżˇăŚ%u回不č˝" -+ -+# FIXME -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "TCPăŚĺ°‘ăŞă„ăˇă˘ăŞă§%u回実行" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "%uă®TCPă‡ăĽă‚żăŚă‚¤ă™ăłăă‚’ăă‚ą" -+ -+#: ../statistics.c:292 -+msgid "enabled" -+msgstr "有効" -+ -+#: ../statistics.c:292 -+msgid "disabled" -+msgstr "無効" -+ -+#: ../statistics.c:375 -+msgid "error parsing /proc/net/snmp" -+msgstr "/proc/net/snmpă®ĺ‡¦ç†ä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź" -+ -+#: ../statistics.c:388 -+msgid "cannot open /proc/net/snmp" -+msgstr "/proc/net/snmpă‚’é–‹ă‘ăľă›ă‚“" -+ -+#: ../lib/activate.c:69 -+#, c-format -+msgid "Hardware type `%s' not supported.\n" -+msgstr "ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚żă‚¤ă—`%s'ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/activate.c:73 -+#, c-format -+msgid "Cannot change line discipline to `%s'.\n" -+msgstr "`%s'ă®line disciplineを変更ă§ăŤăľă›ă‚“.\n" -+ -+#: ../lib/af.c:153 ../lib/hw.c:161 -+msgid "UNSPEC" -+msgstr "不ćŽăŞăŤăă" -+ -+#: ../lib/af.c:155 -+msgid "UNIX Domain" -+msgstr "UNIXă‰ăˇă‚¤ăł" -+ -+#: ../lib/af.c:158 -+msgid "DARPA Internet" -+msgstr "DARPAイăłă‚żăĽăŤăă" -+ -+#: ../lib/af.c:161 -+msgid "IPv6" -+msgstr "IPv6" -+ -+#: ../lib/af.c:164 ../lib/hw.c:182 -+msgid "AMPR AX.25" -+msgstr "AMPR AX.25" -+ -+#: ../lib/af.c:167 ../lib/hw.c:188 -+msgid "AMPR NET/ROM" -+msgstr "AMPR NET/ROM" -+ -+#: ../lib/af.c:170 -+msgid "Novell IPX" -+msgstr "Novell IPX" -+ -+#: ../lib/af.c:173 -+msgid "Appletalk DDP" -+msgstr "アăă—ă«ăăĽă‚ŻDDP" -+ -+#: ../lib/af.c:176 ../lib/hw.c:223 -+msgid "Econet" -+msgstr "エコăŤăă" -+ -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "CCITT X.25" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 -+msgid "AMPR ROSE" -+msgstr "AMPR ROSE" -+ -+#: ../lib/af.c:185 ../lib/hw.c:173 -+msgid "Ash" -+msgstr "Ash" -+ -+#: ../lib/af.c:243 -+#, c-format -+msgid "Please don't supply more than one address family.\n" -+msgstr "複数ă®ă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă‚’ă—ăŞă„ă§ä¸‹ă•ă„.\n" -+ -+#: ../lib/af.c:304 -+#, c-format -+msgid "Too much address family arguments.\n" -+msgstr "アă‰ă¬ă‚ąă•ă‚ˇăźăŞă®ĺĽ•ć•°ăŚĺ¤šă™ăŽăľă™.\n" -+ -+#: ../lib/af.c:315 -+#, c-format -+msgid "Unknown address family `%s'.\n" -+msgstr "不ćŽăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞă§ă™ `%s'.\n" -+ -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 -+#, c-format -+msgid "in_arcnet(%s): invalid arcnet address!\n" -+msgstr "in_arcnet(%s): 不é©ĺ˝“ăŞARCNETアă‰ă¬ă‚ąă§ă™!\n" -+ -+#: ../lib/arcnet.c:97 -+#, c-format -+msgid "in_arcnet(%s): trailing : ignored!\n" -+msgstr "in_arcnet(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/arcnet.c:109 -+#, c-format -+msgid "in_arcnet(%s): trailing junk!\n" -+msgstr "in_arcnet(%s): trailing junk!\n" -+ -+#: ../lib/ash.c:81 -+#, c-format -+msgid "Malformed Ash address" -+msgstr "異常ăŞAshアă‰ă¬ă‚ąă§ă™" -+ -+#: ../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/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[č¨ĺ®šăŞă—]" -+ -+#: ../lib/ax25.c:97 ../lib/netrom.c:100 -+msgid "Invalid callsign" -+msgstr "不é©ĺ˝“ăŞă‚łăĽă«ă‚µă‚¤ăłă§ă™" -+ -+#: ../lib/ax25.c:110 ../lib/netrom.c:113 -+msgid "Callsign too long" -+msgstr "ă‚łăĽă«ă‚µă‚¤ăłăŚé•·ă™ăŽăľă™" -+ -+#: ../lib/ax25_gr.c:47 -+#, c-format -+msgid "AX.25 not configured in this system.\n" -+msgstr "AX.25ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻč¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/ax25_gr.c:50 -+#, c-format -+msgid "Kernel AX.25 routing table\n" -+msgstr "ă‚«ăĽăŤă« AX.25経路ă†ăĽă–ă«\n" -+ -+#. xxx -+#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format -+msgid "Destination Iface Use\n" -+msgstr "é€äżˇĺ…サイă Iface 使用数\n" -+ -+#: ../lib/ether.c:74 ../lib/ether.c:91 -+#, c-format -+msgid "in_ether(%s): invalid ether address!\n" -+msgstr "in_ether(%s): 不é©ĺ˝“ăŞă‚¤ăĽă‚µă‚˘ă‰ă¬ă‚ą!\n" -+ -+#: ../lib/ether.c:105 -+#, c-format -+msgid "in_ether(%s): trailing : ignored!\n" -+msgstr "in_ether(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/ether.c:117 -+#, c-format -+msgid "in_ether(%s): trailing junk!\n" -+msgstr "in_ether(%s): trailing junk!\n" -+ -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 -+#, c-format -+msgid "in_fddi(%s): invalid fddi address!\n" -+msgstr "in_fddi(%s): 不é©ĺ˝“ăŞfddiアă‰ă¬ă‚ą!\n" -+ -+#: ../lib/fddi.c:111 -+#, c-format -+msgid "in_fddi(%s): trailing : ignored!\n" -+msgstr "in_fddi(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/fddi.c:123 -+#, c-format -+msgid "in_fddi(%s): trailing junk!\n" -+msgstr "in_fddi(%s): trailing junk!\n" -+ -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 -+#, c-format -+msgid "Address family `%s' not supported.\n" -+msgstr "アă‰ă¬ă‚ąă•ă‚ˇăźăŞ`%s'ăŻă‚µăťăĽăă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 -+#, c-format -+msgid "No routing for address family `%s'.\n" -+msgstr "アă‰ă¬ă‚ąă•ă‚ˇăźăŞ`%s'ă¸ă®çµŚč·ŻăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“.\n" -+ -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 -+#, c-format -+msgid "in_hippi(%s): invalid hippi address!\n" -+msgstr "in_hippi(%s): 不é©ĺ˝“ăŞhippiアă‰ă¬ă‚ąă§ă™!\n" -+ -+#: ../lib/hippi.c:111 -+#, c-format -+msgid "in_hippi(%s): trailing : ignored!\n" -+msgstr "in_hippi(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/hippi.c:122 -+#, c-format -+msgid "in_hippi(%s): trailing junk!\n" -+msgstr "in_hippi(%s): trailing junk!\n" -+ -+#: ../lib/hw.c:160 -+msgid "Local Loopback" -+msgstr "ăăĽă‚«ă«ă«ăĽă—ăăă‚Ż" -+ -+#: ../lib/hw.c:163 -+msgid "Serial Line IP" -+msgstr "ă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:164 -+msgid "VJ Serial Line IP" -+msgstr "VJă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:165 -+msgid "6-bit Serial Line IP" -+msgstr "6ă“ăăă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:166 -+msgid "VJ 6-bit Serial Line IP" -+msgstr "VJ 6ă“ăăă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:167 -+msgid "Adaptive Serial Line IP" -+msgstr "Adaptiveă‚·ăŞă‚˘ă«ă©ă‚¤ăłIP" -+ -+#: ../lib/hw.c:170 -+msgid "Ethernet" -+msgstr "イăĽă‚µăŤăă" -+ -+# translatable? -+#: ../lib/hw.c:176 -+msgid "Fiber Distributed Data Interface" -+msgstr "Fiber Distributed Data Interface" -+ -+#: ../lib/hw.c:179 -+msgid "HIPPI" -+msgstr "HIPPI" -+ -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "ジェăŤăŞăă‚ŻX.25" -+ -+#: ../lib/hw.c:194 -+msgid "IPIP Tunnel" -+msgstr "IPIPăăłăŤă«" -+ -+#: ../lib/hw.c:197 -+msgid "Point-to-Point Protocol" -+msgstr "Point-to-Pointă—ăăă‚łă«" -+ -+#: ../lib/hw.c:200 -+msgid "(Cisco)-HDLC" -+msgstr "(Cisco)-HDLC" -+ -+#: ../lib/hw.c:201 -+msgid "LAPB" -+msgstr "LAPB" -+ -+#: ../lib/hw.c:204 -+msgid "ARCnet" -+msgstr "ARCăŤăă" -+ -+#: ../lib/hw.c:207 -+msgid "Frame Relay DLCI" -+msgstr "ă•ă¬ăĽă ăŞă¬ăĽDLCI" -+ -+#: ../lib/hw.c:208 -+msgid "Frame Relay Access Device" -+msgstr "ă•ă¬ăĽă ăŞă¬ăĽă‚˘ă‚Żă‚»ă‚ąă‡ăイス" -+ -+#: ../lib/hw.c:211 -+msgid "IPv6-in-IPv4" -+msgstr "IPv6-in-IPv4" -+ -+#: ../lib/hw.c:214 -+msgid "IrLAP" -+msgstr "IrLAP" -+ -+#: ../lib/hw.c:217 -+msgid "16/4 Mbps Token Ring" -+msgstr "16/4 MbpsăăĽă‚ŻăłăŞăłă‚°" -+ -+#: ../lib/hw.c:219 -+msgid "16/4 Mbps Token Ring (New)" -+msgstr "16/4 MbpsăăĽă‚ŻăłăŞăłă‚°(ć–°)" -+ -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "ジェăŤăŞăă‚ŻEUI-64" -+ -+#: ../lib/inet.c:153 ../lib/inet6.c:79 -+#, c-format -+msgid "rresolve: unsupport address family %d !\n" -+msgstr "rresolve: アă‰ă¬ă‚ąă•ă‚ˇăźăŞ%dをサăťăĽăă—ă¦ă„ăľă›ă‚“!\n" -+ -+#: ../lib/inet6.c:131 -+msgid "[UNKNOWN]" -+msgstr "[不ćŽ]" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format -+msgid "INET6 (IPv6) not configured in this system.\n" -+msgstr "INET6(IPv6)ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ă§ăŤă‚‹ă‚ă†č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/inet6_gr.c:74 -+#, c-format -+msgid "Kernel IPv6 routing table\n" -+msgstr "ă‚«ăĽăŤă«IPv6 経路ă†ăĽă–ă«\n" -+ -+#: ../lib/inet6_gr.c:76 -+#, c-format -+msgid "" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "é€äżˇĺ…サイă 次回ă›ăă— ă•ă©ă‚° Metric Ref 使用数 イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet6_gr.c:150 -+#, c-format -+msgid "Kernel IPv6 Neighbour Cache\n" -+msgstr "ă‚«ăĽăŤă«IPv6 近隣ăŤăăăŻăĽă‚Żă®ă‚ăŁăă‚·ăĄ\n" -+ -+#: ../lib/inet6_gr.c:153 -+#, c-format -+msgid "" -+"Neighbour HW Address Iface Flags " -+"Ref State\n" -+msgstr "" -+"近隣サイă ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą Iface ă•ă©ă‚° " -+"Ref 状態\n" -+ -+#: ../lib/inet6_gr.c:157 -+#, c-format -+msgid "" -+"Neighbour HW Address Iface Flags " -+"Ref State Stale(sec) Delete(sec)\n" -+msgstr "" -+"近隣サイă ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą Iface ă•ă©ă‚° " -+"Ref 状態 Stale[秒] Delete[秒]\n" -+ -+#: ../lib/inet6_sr.c:46 -+#, c-format -+msgid "Usage: inet6_route [-vF] del Target\n" -+msgstr "使用法: inet6_route [-vF] del ă‚żăĽă‚˛ăă\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 ă‚żăĽă‚˛ăă \n" -+" [gw ゲăĽăウェイ] [metric ăˇăăŞăă‚Ż]\n" -+" [[dev] イăłă‚żă•ă‚§ăĽă‚ą]\n" -+ -+#: ../lib/inet6_sr.c:48 -+#, c-format -+msgid " inet6_route [-FC] flush NOT supported\n" -+msgstr " inet6_route [-FC] flush サăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet6_sr.c:188 -+#, c-format -+msgid "Flushing `inet6' routing table not supported\n" -+msgstr "`inet6'経路ă†ăĽă–ă«ă®ă•ă©ăă‚·ăĄăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“\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)ăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ă§ăŤă‚‹ă‚ă†ă«č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/inet_gr.c:53 -+#, c-format -+msgid "Kernel IP routing table\n" -+msgstr "ă‚«ăĽăŤă«IP経路ă†ăĽă–ă«\n" -+ -+#: ../lib/inet_gr.c:56 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags Metric Ref Use " -+"Iface\n" -+msgstr "受信ĺ…サイă ゲăĽăウェイ ăŤăăăžă‚ąă‚Ż ă•ă©ă‚° Metric Ref 使用数 イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:59 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags MSS Window irtt " -+"Iface\n" -+msgstr "受信ĺ…サイă ゲăĽăウェイ ăŤăăăžă‚ąă‚Ż ă•ă©ă‚° MSS Window irtt イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:62 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags Metric Ref Use " -+"Iface MSS Window irtt\n" -+msgstr "" -+"受信ĺ…サイă ゲăĽăウェイ ăŤăăăžă‚ąă‚Ż ă•ă©ă‚° Metric Ref 使用数 " -+"Iface MSS Window irtt\n" -+ -+#: ../lib/inet_gr.c:237 -+#, c-format -+msgid "Kernel IP routing cache\n" -+msgstr "ă‚«ăĽăŤă«IP経路ă‚ăŁăă‚·ăĄ\n" -+ -+#: ../lib/inet_gr.c:258 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface\n" -+msgstr "発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° Metric Ref 使用数 イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:261 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags MSS Window irtt " -+"Iface\n" -+msgstr "発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° MSS Window irtt イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/inet_gr.c:266 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface MSS Window irtt HH Arp\n" -+msgstr "" -+"発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° Metric Ref 使用数 " -+"Iface MSS Window 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 "" -+"発信ĺ…サイă 受信ĺ…サイă ゲăĽăウェイ ă•ă©ă‚° Metric Ref 使用数 " -+"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -+ -+#: ../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 "" -+"使用法:inet_route [-vF] del {-host|-net} 受信ĺ…[/ă—ă¬ă•ă‚Łăă‚Żă‚ą]\n" -+" [gw ゲăĽăウェイ] [metric ăˇăăŞăă‚Ż]\n" -+" [[dev] イăłă‚żă•ă‚§ăĽă‚ą]\n" -+ -+#: ../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} 受信ĺ…[/ă—ă¬ă•ă‚Łăă‚Żă‚ą]\n" -+" [gw ゲăĽăウェイ] [metric ăˇăăŞăă‚Ż]\n" -+ -+#: ../lib/inet_sr.c:53 -+#, c-format -+msgid "" -+" [netmask N] [mss Mss] [window W] [irtt I]\n" -+msgstr " [netmask ăŤăăăžă‚ąă‚Ż] [mss Mss] [window W] [irtt I]\n" -+ -+#: ../lib/inet_sr.c:54 -+#, c-format -+msgid " [mod] [dyn] [reinstate] [[dev] If]\n" -+msgstr " [mod] [dyn] [reinstate] [[dev] イăłă‚żă•ă‚§ăĽă‚ą]\n" -+ -+#: ../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} 受信ĺ…[/ă—ă¬ă•ă‚Łăă‚Żă‚ą]\n" -+" [metric ăˇăăŞăă‚Ż] reject\n" -+ -+#: ../lib/inet_sr.c:56 -+#, c-format -+msgid " inet_route [-FC] flush NOT supported\n" -+msgstr " inet_route [-FC] flush サăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:158 -+#, c-format -+msgid "route: %s: cannot use a NETWORK as gateway!\n" -+msgstr "route: %s: NETWORKをゲăĽăウェイă¨ă—ă¦ä˝żăăľă›ă‚“!\n" -+ -+#: ../lib/inet_sr.c:174 -+#, c-format -+msgid "route: Invalid MSS/MTU.\n" -+msgstr "route: MSS/MTUăŚä¸Ťé©ĺ˝“ă§ă™.\n" -+ -+#: ../lib/inet_sr.c:187 -+#, c-format -+msgid "route: Invalid window.\n" -+msgstr "route: windowăŚä¸Ťé©ĺ˝“ă§ă™.\n" -+ -+#: ../lib/inet_sr.c:203 -+#, c-format -+msgid "route: Invalid initial rtt.\n" -+msgstr "route: ĺťćśźrttăŚä¸Ťé©ĺ˝“ă§ă™.\n" -+ -+#: ../lib/inet_sr.c:261 -+#, c-format -+msgid "route: netmask %.8x doesn't make sense with host route\n" -+msgstr "route: ăŤăăăžă‚ąă‚Ż%.8xăŚă›ă‚ąă経路を検出ă—ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:265 -+#, c-format -+msgid "route: bogus netmask %s\n" -+msgstr "route: ĺ˝ă®ăŤăăăžă‚ąă‚Ż`%s'ă§ă™\n" -+ -+#: ../lib/inet_sr.c:270 -+#, c-format -+msgid "route: netmask doesn't match route address\n" -+msgstr "route: ăŤăăăžă‚ąă‚ŻăŚçµŚč·Żă‚˘ă‰ă¬ă‚ąă¨ä¸€č‡´ă—ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:306 -+#, c-format -+msgid "Flushing `inet' routing table not supported\n" -+msgstr "`inet'経路ă†ăĽă–ă«ă®ă•ă©ăă‚·ăĄăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/inet_sr.c:310 -+#, c-format -+msgid "Modifying `inet' routing cache not supported\n" -+msgstr "`inet'経路ă†ăĽă–ă«ă®ĺ¤‰ć›´ăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/ipx_gr.c:52 -+#, c-format -+msgid "IPX not configured in this system.\n" -+msgstr "IPXăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻč¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/ipx_gr.c:56 -+#, c-format -+msgid "Kernel IPX routing table\n" -+msgstr "ă‚«ăĽăŤă«IPX経路ă†ăĽă–ă«\n" -+ -+#. xxx -+#: ../lib/ipx_gr.c:57 -+#, c-format -+msgid "Destination Router Net Router Node\n" -+msgstr "é€äżˇĺ…サイă ă«ăĽă‚ż ăŤăă ă«ăĽă‚żăŽăĽă‰\n" -+ -+#: ../lib/ipx_sr.c:33 -+#, c-format -+msgid "IPX: this needs to be written\n" -+msgstr "IPX: ă“ă‚ŚăŻć›¸ăŤčľĽăżăŚĺż…č¦ă§ă™\n" -+ -+#: ../lib/masq_info.c:198 -+#, c-format -+msgid "IP masquerading entries\n" -+msgstr "IPăžă‚ąă‚«ă¬ăĽă‰ エăłăăŞ\n" -+ -+#: ../lib/masq_info.c:201 -+#, c-format -+msgid "prot expire source destination ports\n" -+msgstr "ă—ăă expire 発信ĺ…サイă é€äżˇĺ…サイă ăťăĽă\n" -+ -+#: ../lib/masq_info.c:204 -+#, c-format -+msgid "" -+"prot expire initseq delta prevd source " -+"destination ports\n" -+msgstr "" -+"ă—ăă expire ĺťćśźseq delta prevd 発信ĺ…サイă 受信ĺ…サイ" -+"ă ăťăĽă\n" -+ -+#: ../lib/netrom_gr.c:48 -+#, c-format -+msgid "NET/ROM not configured in this system.\n" -+msgstr "NET/ROMăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ĺŹŻč˝ăŞă‚ă†ă«č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“.\n" -+ -+#: ../lib/netrom_gr.c:51 -+#, c-format -+msgid "Kernel NET/ROM routing table\n" -+msgstr "ă‚«ăĽăŤă«NET/ROM経路ă†ăĽă–ă«\n" -+ -+#: ../lib/netrom_gr.c:52 -+#, c-format -+msgid "Destination Mnemonic Quality Neighbour Iface\n" -+msgstr "受信ĺ…サイă ă‹ăĽă˘ă‹ăă‚Ż ĺ“質 近隣サイă イăłă‚żă•ă‚§ăĽă‚ą\n" -+ -+#: ../lib/netrom_sr.c:34 -+#, c-format -+msgid "netrom usage\n" -+msgstr "netrom使用法\n" -+ -+#: ../lib/netrom_sr.c:44 -+#, c-format -+msgid "NET/ROM: this needs to be written\n" -+msgstr "NET/ROM: ă“ă‚ŚăŻć›¸ăŤčľĽăżăŚĺż…č¦ă§ă™\n" -+ -+#: ../lib/ppp.c:44 -+#, c-format -+msgid "You cannot start PPP with this program.\n" -+msgstr "ă“ă®ă—ăă‚°ă©ă ă§ăŻPPPを開始ă§ăŤăľă›ă‚“. \n" -+ -+#: ../lib/ppp_ac.c:38 -+#, c-format -+msgid "Sorry, use pppd!\n" -+msgstr "申ă—訳ă‚ă‚Šăľă›ă‚“ăŚ, pppdを使ăŁă¦ä¸‹ă•ă„!\n" -+ -+#: ../lib/rose.c:87 -+msgid "Node address must be ten digits" -+msgstr "ăŽăĽă‰ă‚˘ă‰ă¬ă‚ąăŻ10進数ă§ăŞă‘ă‚Śă°ăŞă‚Šăľă›ă‚“" -+ -+#: ../lib/rose_gr.c:51 -+#, c-format -+msgid "ROSE not configured in this system.\n" -+msgstr "ROSEăŻă“ă®ă‚·ă‚ąă†ă ă§ăŻĺ©ç”¨ĺŹŻč˝ăŞă‚ă†ă«č¨ĺ®šă•ă‚Śă¦ă„ăľă›ă‚“\n" -+ -+#: ../lib/rose_gr.c:54 -+#, c-format -+msgid "Kernel ROSE routing table\n" -+msgstr "ă‚«ăĽăŤă«ROSE経路ă†ăĽă–ă«\n" -+ -+#: ../lib/tr.c:86 ../lib/tr.c:101 -+#, c-format -+msgid "in_tr(%s): invalid token ring address!\n" -+msgstr "in_tr(%s): 不é©ĺ˝“ăŞăăĽă‚ŻăłăŞăłă‚°ă‚˘ă‰ă¬ă‚ąă§ă™!\n" -+ -+#: ../lib/tr.c:113 -+#, c-format -+msgid "in_tr(%s): trailing : ignored!\n" -+msgstr "in_tr(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/tr.c:125 -+#, c-format -+msgid "in_tr(%s): trailing junk!\n" -+msgstr "in_tr(%s): trailing junk!\n" -+ -+#: ../lib/interface.c:176 -+#, c-format -+msgid "warning: no inet socket available: %s\n" -+msgstr "č¦ĺ‘Š: InetソケăăăŻĺ©ç”¨ă§ăŤăľă›ă‚“: %s\n" -+ -+#: ../lib/interface.c:325 -+#, c-format -+msgid "Warning: cannot open %s (%s). Limited output.\n" -+msgstr "č¦ĺ‘Š: %să‚’é–‹ă‘ăľă›ă‚“(%s). é™ĺ®šă•ă‚Śăźĺ‡şĺŠ›ă§ă™.\n" -+ -+#. Give better error message for this case. -+#: ../lib/interface.c:571 -+msgid "Device not found" -+msgstr "ă‡ăイスăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“" -+ -+#: ../lib/interface.c:575 -+#, c-format -+msgid "%s: error fetching interface information: %s\n" -+msgstr "%s: イăłă‚żă•ă‚§ăĽă‚ąć…ĺ ±ă‚’ĺŹ–ĺľ—ä¸ă«ă‚¨ă©ăĽăŚç™şç”źă—ăľă—ăź: %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - çµ±č¨ć…ĺ ±ă‚’ĺ©ç”¨ă§ăŤăľă›ă‚“ -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[ă•ă©ă‚°ăŞă—]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s ăŞăłă‚Żć–ąćł•:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "ăŹăĽă‰ă‚¦ă‚§ă‚˘ă‚˘ă‰ă¬ă‚ą %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "ăˇă‡ă‚Łă‚˘:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(自動)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %sアă‰ă¬ă‚ą:%s" -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " ă–ăăĽă‰ă‚ăŁă‚ąă:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " ăžă‚ąă‚Ż:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6アă‰ă¬ă‚ą: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " 範囲:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "ă‚°ăăĽăă«" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "ăŞăłă‚Ż" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "サイă" -+ -+# translatable? -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "ă›ă‚ąă" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "不ćŽ" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăăIIアă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăăSNAPアă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăă802.2アă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/イăĽă‚µăŤăă802.3アă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " イăĽă‚µăăĽă‚Ż ă•ă‚§ăĽă‚ş2アă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " エコăŤăăアă‰ă¬ă‚ą:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[ă•ă©ă‚°ăŞă—]" -+ -+# translatable? -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+# translatable? -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+# translatable? -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+# translatable? -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+# translatable? -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+# translatable? -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+# translatable? -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+# translatable? -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+# translatable? -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+# translatable? -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+# translatable? -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+# translatable? -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+# translatable? -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+# translatable? -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d ăˇăăŞăă‚Ż:%d" -+ -+# translatable? -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d ă‚ăĽă—アă©ă‚¤ă–:%d" -+ -+#: ../lib/interface.c:850 -+#, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "RXă‘ケăă:%llu エă©ăĽ:%lu ćŤĺ¤±:%lu ă‚ŞăĽăă©ăł:%lu ă•ă¬ăĽă :%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " 圧縮:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "TXă‘ケăă:%llu エă©ăĽ:%lu ćŤĺ¤±:%lu ă‚ŞăĽăă©ăł:%lu ă‚ăŁăŞă‚˘:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " 衝çŞ(Collisions):%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "圧縮:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "TXă‚ăĄăĽé•·:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "RXăイă:%llu (%lu.%lu %s) TXăイă:%llu (%lu.%lu %s)\n" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "割り込ăż:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "ă™ăĽă‚ąă‚˘ă‰ă¬ă‚ą:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "ăˇă˘ăŞ:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "DMAăェイăł:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format -+msgid "No usable address families found.\n" -+msgstr "ĺ©ç”¨ĺŹŻč˝ăŞă‚˘ă‰ă¬ă‚ąă•ă‚ˇăźăŞăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“.\n" -+ -+#: ../lib/util-ank.c:229 -+#, c-format -+msgid "ip: %s is invalid inet address\n" -+msgstr "ip: %săŻä¸Ťé©ĺ‡ăŞInetアă‰ă¬ă‚ąă§ă™.\n" -+ -+#: ../lib/util-ank.c:238 -+#, c-format -+msgid "ip: %s is invalid inet prefix\n" -+msgstr "ip: %săŻä¸Ťé©ĺ‡ăŞInetă—ă¬ă•ă‚Łăă‚Żă‚ąă§ă™\n" -+ -+#: ../lib/util-ank.c:248 -+#, c-format -+msgid "ip: %s is invalid IPv4 address\n" -+msgstr "ip: %săŻä¸Ťé©ĺ‡ăŞIPv4アă‰ă¬ă‚ąă§ă™.\n" -+ -+#: ../lib/util-ank.c:256 -+#, c-format -+msgid "ip: argument is wrong: %s\n" -+msgstr "ip: 引数ăŚé–“é•ăŁă¦ă„ăľă™: %s\n" -+ -+#: ../ipmaddr.c:61 -+#, c-format -+msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" -+msgstr "使用法: ipmaddr [ add | del ] ăžă«ăă‚ăŁă‚ąăアă‰ă¬ă‚ą dev ć–‡ĺ—ĺ—\n" -+ -+#: ../ipmaddr.c:62 -+#, c-format -+msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" -+msgstr " ipmaddr show [ dev ć–‡ĺ—ĺ— ] [ ipv4 | ipv6 | link | all ]\n" -+ -+#: ../ipmaddr.c:63 -+#, c-format -+msgid " ipmaddr -V | -version\n" -+msgstr " ipmaddr -V | -version\n" -+ -+#: ../ipmaddr.c:263 -+#, c-format -+msgid "family %d " -+msgstr "ă•ă‚ˇăźăŞ %d " -+ -+#: ../ipmaddr.c:272 -+#, c-format -+msgid " users %d" -+msgstr " ă¦ăĽă‚¶ %d" -+ -+#: ../ipmaddr.c:358 -+msgid "Cannot create socket" -+msgstr "ソケăăを作ćă§ăŤăľă›ă‚“" -+ -+#: ../slattach.c:180 -+#, c-format -+msgid "slattach: /dev/%s already locked!\n" -+msgstr "slattach: /dev/%s ăŻă™ă§ă«ăăă‚Żă•ă‚Śă¦ă„ăľă™!\n" -+ -+#: ../slattach.c:186 -+#, c-format -+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: PIDă•ă‚ˇă‚¤ă«ă‚’書ăŤčľĽă‚ăľă›ă‚“\n" -+ -+#: ../slattach.c:202 -+#, c-format -+msgid "slattach: tty_lock: UUCP user %s unknown!\n" -+msgstr "slattach: tty_lock: UUCPă¦ăĽă‚¶%săŻä¸ŤćŽă§ă™!\n" -+ -+#: ../slattach.c:430 -+#, c-format -+msgid "slattach: tty_hangup(DROP): %s\n" -+msgstr "slattach: tty_hangup(DROP): %s\n" -+ -+#: ../slattach.c:437 -+#, c-format -+msgid "slattach: tty_hangup(RAISE): %s\n" -+msgstr "slattach: tty_hangup(RAISE): %s\n" -+ -+#: ../slattach.c:468 -+#, c-format -+msgid "slattach: tty name too long\n" -+msgstr "slattach: ttyĺŤăŚé•·ă™ăŽăľă™\n" -+ -+#: ../slattach.c:498 -+#, c-format -+msgid "slattach: tty_open: cannot get current state!\n" -+msgstr "slattach: tty_open: 現在ă®çŠ¶ć…‹ă‚’得られăľă›ă‚“!\n" -+ -+#: ../slattach.c:505 -+#, c-format -+msgid "slattach: tty_open: cannot get current line disc!\n" -+msgstr "slattach: tty_open: 現在ă®ă©ă‚¤ăłă»ă‡ă‚Łă‚ąă‚Żă‚’得られăľă›ă‚“!\n" -+ -+#: ../slattach.c:513 -+#, c-format -+msgid "slattach: tty_open: cannot set RAW mode!\n" -+msgstr "slattach: tty_open: RAWă˘ăĽă‰ă‚’č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../slattach.c:520 -+#, c-format -+msgid "slattach: tty_open: cannot set %s bps!\n" -+msgstr "slattach: tty_open: %s bpsă‚’č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../slattach.c:530 -+#, c-format -+msgid "slattach: tty_open: cannot set 8N1 mode!\n" -+msgstr "slattach: tty_open: 8N1ă˘ăĽă‰ă¸č¨ĺ®šă§ăŤăľă›ă‚“!\n" -+ -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+ -+#: ../slattach.c:704 -+#, c-format -+msgid "%s started" -+msgstr "%sを開始ă—ăľă—ăź" -+ -+#: ../slattach.c:705 -+#, c-format -+msgid " on %s" -+msgstr "(%s上)" -+ -+#: ../slattach.c:706 -+#, c-format -+msgid " interface %s\n" -+msgstr " イăłă‚żă•ă‚§ăĽă‚ą %s\n" ---- net-tools-1.60.orig/ipmaddr.c -+++ net-tools-1.60/ipmaddr.c -@@ -291,13 +291,15 @@ - 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 +309,10 @@ - } 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--; - } ---- net-tools-1.60.orig/Makefile -+++ net-tools-1.60/Makefile -@@ -76,7 +76,7 @@ - NET_LIB_PATH = lib - NET_LIB_NAME = net-tools - --PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif -+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif # hostname - - -include config.make - ifeq ($(HAVE_IP_TOOLS),1) -@@ -88,7 +88,7 @@ - - # 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 -+COPTS = -D_GNU_SOURCE -O2 -Wall # -g -I/usr/inet6/include - ifeq ($(origin LOPTS), undefined) - LOPTS = - endif -@@ -116,6 +116,18 @@ - CFLAGS = $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) - LDFLAGS = $(LOPTS) -L$(NET_LIB_PATH) - -+INSTALL = install -+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -+ -+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -g -+endif -+ -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+INSTALL_PROGRAM += -s -+endif -+ -+ - SUBDIRS = man/ $(NET_LIB_PATH)/ - - ifeq ($(origin CC), undefined) -@@ -223,29 +235,29 @@ - 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 -+ $(INSTALL_PROGRAM) arp ${BASEDIR}/sbin -+# $(INSTALL_PROGRAM) hostname ${BASEDIR}/bin -+ $(INSTALL_PROGRAM) ifconfig ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) nameif ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) netstat ${BASEDIR}/bin -+ $(INSTALL_PROGRAM) plipconfig $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) rarp ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) route ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) slattach $(BASEDIR)/sbin - ifeq ($(HAVE_IP_TOOLS),1) -- install -m 0755 ipmaddr $(BASEDIR)/sbin -- install -m 0755 iptunnel $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) ipmaddr $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) iptunnel $(BASEDIR)/sbin - endif - ifeq ($(HAVE_MII),1) -- install -m 0755 mii-tool $(BASEDIR)/sbin --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 --ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename -+ $(INSTALL_PROGRAM) mii-tool $(BASEDIR)/sbin - 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 -+#ifeq ($(HAVE_AFDECnet),1) -+# ln -fs hostname $(BASEDIR)/bin/nodename -+#endif - - savebin: - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ ---- net-tools-1.60.orig/README -+++ net-tools-1.60/README -@@ -10,7 +10,7 @@ - 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. -@@ -24,10 +24,14 @@ - - INSTALLING Installation instructions. - -- COPYING Your free copy of the GNU Public License. -- - TODO Some things that need to be done. - -+The Homepage (including CVS repository, release downloads and a form to -+request enhancements) is hosted by BerliOS Developer. Please consider to -+join the project if you want to contribute: -+ -+ http://net-tools.berlios.de/ -+ - - Notes - ----- ---- net-tools-1.60.orig/arp.c -+++ net-tools-1.60/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.25 2005/12/04 02:57:15 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de> - * -@@ -100,9 +100,10 @@ - { - 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 @@ - 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 @@ - 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 @@ - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - req.arp_flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -177,11 +179,11 @@ - usage(); - if (strcmp(*args, "255.255.255.255") != 0) { - strcpy(host, *args); -- if (ap->input(0, host, &sa) < 0) { -+ 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 @@ - } - usage(); - } -+ -+ // if neighter priv nor pub is given, work on both - if (flags == 0) - flags = 3; - - strcpy(req.arp_dev, device); - -- 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); - } -@@ -260,7 +268,8 @@ - { - 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 @@ - 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 @@ - continue; - } - if (!strcmp(*args, "dontpub")) { --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - flags |= ATF_DONTPUB; - #else - ENOSUPP("arp", "ATF_DONTPUB"); -@@ -326,7 +336,7 @@ - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -346,11 +356,11 @@ - usage(); - if (strcmp(*args, "255.255.255.255") != 0) { - strcpy(host, *args); -- if (ap->input(0, host, &sa) < 0) { -+ 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; - } -@@ -445,11 +455,11 @@ - 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 @@ - - 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 { -@@ -486,7 +496,7 @@ - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("* "); -+ printf("<from_interface> "); - else - printf(_("<incomplete> ")); - } else { -@@ -499,12 +509,12 @@ - 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 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]; -@@ -532,14 +543,15 @@ - - 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) { -@@ -575,10 +587,10 @@ - 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 = "?"; - } -@@ -612,11 +624,10 @@ - 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, _(" -s, --set set a new ARP entry\n")); ---- net-tools-1.60.orig/config.in -+++ net-tools-1.60/config.in -@@ -49,16 +49,16 @@ - * - 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 - * - * - * Device Hardware types. -@@ -71,21 +71,23 @@ - bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y - bool 'Token ring (generic) support' HAVE_HWTR y - 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 -+ - * - * - * 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 ---- net-tools-1.60.orig/hostname.c -+++ net-tools-1.60/hostname.c -@@ -9,20 +9,19 @@ - * 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> -@@ -78,6 +79,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ break; - } - exit(1); - } -@@ -97,7 +99,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -116,7 +117,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -173,7 +173,6 @@ - *p = '\0'; - printf("%s\n", hp->h_name); - break; -- default: - } - } - -@@ -326,11 +325,12 @@ - break; - case 'V': - version(); -+ break; // not reached - case '?': - case 'h': - default: - usage(); -- -+ break; // not reached - }; - - ---- net-tools-1.60.orig/ifconfig.c -+++ net-tools-1.60/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.57 2002/12/10 00:56:41 ecki Exp $ - * - * Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> - * and others. Copyright 1993 MicroWalt Corporation -@@ -88,7 +88,6 @@ - char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)"; - - 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 */ -@@ -105,7 +104,7 @@ - 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 Met 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); -@@ -127,7 +126,7 @@ - - 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 +158,7 @@ - - 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 +171,35 @@ - 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")); -@@ -208,7 +233,7 @@ - static void version(void) - { - fprintf(stderr, "%s\n%s\n", Release, Version); -- exit(0); -+ exit(E_USAGE); - } - - static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa) -@@ -222,18 +247,19 @@ - strerror(errno)); - err = 1; - } -- return 0; -+ return err; - } - - int main(int argc, char **argv) - { - struct sockaddr sa; -+ struct sockaddr samask; - struct sockaddr_in sin; - 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 -@@ -388,6 +414,8 @@ - } - 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 +426,8 @@ - } - 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 +438,8 @@ - } - if (!strcmp(*spp, "-allmulti")) { - goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI); -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -430,6 +462,8 @@ - if (!strcmp(*spp, "-dynamic")) { - goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC); - spp++; -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name); - continue; - } - #endif -@@ -486,6 +520,8 @@ - - if (!strcmp(*spp, "-broadcast")) { - goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST); -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -493,7 +529,10 @@ - if (*++spp != NULL) { - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host); - goterr = 1; - spp++; - continue; -@@ -515,7 +554,10 @@ - usage(); - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host); - goterr = 1; - spp++; - continue; -@@ -535,13 +577,16 @@ - usage(); - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ 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; - } -@@ -613,6 +658,8 @@ - if (!strcmp(*spp, "-pointopoint")) { - goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); - spp++; -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); - continue; - } - if (!strcmp(*spp, "pointopoint")) { -@@ -620,7 +667,10 @@ - spp++; - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa)) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host); - goterr = 1; - spp++; - continue; -@@ -661,8 +711,12 @@ - memcpy((char *) &ifr.ifr_hwaddr, (char *) &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,12 +735,15 @@ - 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.herror) -+ inet6_aftype.herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host); - goterr = 1; - spp++; - continue; -@@ -771,7 +828,7 @@ - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); - if (inet6_aftype.input(1, host, -@@ -800,6 +857,8 @@ - } - 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)); -@@ -859,7 +918,7 @@ - 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) { -@@ -903,7 +962,7 @@ - /* 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 +970,8 @@ - if (didnetmask) - usage(); - -- goterr = set_netmask(skfd, &ifr, &sa); -- didnetmask++; -+ // remeber to set the netmask from samask later -+ neednetmask = 1; - break; - } - } -@@ -921,9 +980,11 @@ - exit(1); - } - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -- fprintf(stderr, _("ifconfig: `--help' gives usage information.\n")); -- exit(1); -+ 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)); - { -@@ -980,6 +1041,14 @@ - 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); - } - ---- net-tools-1.60.orig/netstat.c -+++ net-tools-1.60/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.55 2007/12/01 19:00:40 ecki Exp $ - * - * Authors: Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de> - * Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> -@@ -94,6 +94,7 @@ - #include "sockets.h" - #include "interface.h" - #include "util.h" -+#include "proc.h" - - #define PROGNAME_WIDTH 20 - -@@ -153,7 +154,7 @@ - FILE *procinfo; - - #define INFO_GUTS1(file,name,proc) \ -- procinfo = fopen((file), "r"); \ -+ procinfo = proc_fopen((file)); \ - if (procinfo == NULL) { \ - if (errno != ENOENT) { \ - perror((file)); \ -@@ -174,7 +175,7 @@ - #if HAVE_AFINET6 - #define INFO_GUTS2(file,proc) \ - lnr = 0; \ -- procinfo = fopen((file), "r"); \ -+ procinfo = proc_fopen((file)); \ - if (procinfo != NULL) { \ - do { \ - if (fgets(buffer, sizeof(buffer), procinfo)) \ -@@ -216,7 +217,7 @@ - - static struct prg_node { - struct prg_node *next; -- int inode; -+ unsigned long inode; - char name[PROGNAME_WIDTH]; - } *prg_hash[PRG_HASH_SIZE]; - -@@ -249,7 +250,7 @@ - /* 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) - { - unsigned hi = PRG_HASHIT(inode); - struct prg_node **pnp,*pn; -@@ -272,7 +273,7 @@ - strcpy(pn->name,name); - } - --static const char *prg_cache_get(int inode) -+static const char *prg_cache_get(unsigned long inode) - { - unsigned hi=PRG_HASHIT(inode); - struct prg_node *pn; -@@ -295,16 +296,18 @@ - prg_cache_loaded=0; - } - --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; -@@ -313,37 +316,41 @@ - 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; -+ 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; -+ 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; -+ unsigned long inode; - const char *cs,*cmdlp; - DIR *dirproc=NULL,*dirfd=NULL; - struct dirent *direproc,*direfd; -@@ -386,11 +393,9 @@ - lnamelen=readlink(line,lname,sizeof(lname)-1); - 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 >= -@@ -450,7 +455,7 @@ - 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); -@@ -527,15 +532,15 @@ - - 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(" %-16s",prg_cache_get(inode)); - if (flag_opt) -- printf("%s", timers); -+ printf(" %s", timers); - putchar('\n'); - } - -@@ -646,7 +651,7 @@ - #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 +662,7 @@ - "ESTABLISHED", - "RECOVERY" - }; -- if(!(f=fopen(_PATH_PROCNET_X25, "r"))) -+ if(!(f=proc_fopen(_PATH_PROCNET_X25))) - { - if (errno != ENOENT) { - perror(_PATH_PROCNET_X25); -@@ -705,6 +710,7 @@ - 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 *protname; - struct aftype *ap; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; -@@ -719,12 +725,13 @@ - 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 %512s\n", - &d, local_addr, &local_port, rem_addr, &rem_port, &state, - &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -+ protname = "tcp6"; - /* Demangle what the kernel gives us */ - sscanf(local_addr, "%08X%08X%08X%08X", - &in6.s6_addr32[0], &in6.s6_addr32[1], -@@ -740,6 +747,7 @@ - remaddr.sin6_family = AF_INET6; - #endif - } else { -+ protname = "tcp"; - sscanf(local_addr, "%X", - &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); - sscanf(rem_addr, "%X", -@@ -813,8 +821,8 @@ - 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", -+ protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state])); - - finish_this_one(uid,inode,timers); - } -@@ -831,6 +839,7 @@ - char buffer[8192], local_addr[64], rem_addr[64]; - char *udp_state, timers[64], more[512]; - int num, local_port, rem_port, d, state, timer_run, uid, timeout; -+ char *protname; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; - char addr6[INET6_ADDRSTRLEN]; -@@ -847,13 +856,14 @@ - - 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 %512s\n", - &d, local_addr, &local_port, - rem_addr, &rem_port, &state, - &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -+ protname="udp6"; - sscanf(local_addr, "%08X%08X%08X%08X", - &in6.s6_addr32[0], &in6.s6_addr32[1], - &in6.s6_addr32[2], &in6.s6_addr32[3]); -@@ -868,6 +878,7 @@ - remaddr.sin6_family = AF_INET6; - #endif - } else { -+ protname="udp"; - sscanf(local_addr, "%X", - &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); - sscanf(rem_addr, "%X", -@@ -953,8 +964,8 @@ - retr, timeout); - break; - } -- printf("udp %6ld %6ld %-23s %-23s %-12s", -- rxq, txq, local_addr, rem_addr, udp_state); -+ printf("%-4s %6ld %6ld %-23s %-23s %-11s", -+ protname, rxq, txq, local_addr, rem_addr, udp_state); - - finish_this_one(uid,inode,timers); - } -@@ -971,6 +982,7 @@ - char buffer[8192], local_addr[64], rem_addr[64]; - char timers[64], more[512]; - int num, local_port, rem_port, d, state, timer_run, uid, timeout; -+ char *protname; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; - char addr6[INET6_ADDRSTRLEN]; -@@ -987,12 +999,13 @@ - - 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 %512s\n", - &d, local_addr, &local_port, rem_addr, &rem_port, &state, - &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -+ protname = "raw6"; - sscanf(local_addr, "%08X%08X%08X%08X", - &in6.s6_addr32[0], &in6.s6_addr32[1], - &in6.s6_addr32[2], &in6.s6_addr32[3]); -@@ -1007,6 +1020,7 @@ - remaddr.sin6_family = AF_INET6; - #endif - } else { -+ protname = "raw"; - sscanf(local_addr, "%X", - &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); - sscanf(rem_addr, "%X", -@@ -1074,8 +1088,8 @@ - retr, timeout); - break; - } -- printf("raw %6ld %6ld %-23s %-23s %-12d", -- rxq, txq, local_addr, rem_addr, state); -+ printf("%-4s %6ld %6ld %-23s %-23s %-11d", -+ protname, rxq, txq, local_addr, rem_addr, state); - - finish_this_one(uid,inode,timers); - } -@@ -1099,9 +1113,9 @@ - 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 +1123,14 @@ - 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)) { -@@ -1208,9 +1222,9 @@ - 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); -@@ -1229,7 +1243,7 @@ - printf(_("(w/o servers)")); - } - -- printf(_("\nProto RefCnt Flags Type State I-Node")); -+ printf(_("\nProto RefCnt Flags Type State I-Node ")); - print_progname_banner(); - printf(_(" Path\n")); /* xxx */ - -@@ -1256,7 +1270,7 @@ - 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 +1364,37 @@ - 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) { -+ fstat(fileno(f), &s); -+ if (!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) -@@ -1381,7 +1414,7 @@ - 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"); - return (-1); - } - nc = 0; -@@ -1391,7 +1424,7 @@ - sscanf(st, "%X", &dport); /* net byt order */ - dport = ntohs(dport); - } else { -- EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error"); -+ EINTERN("netstat.c", "ipx soket format error in destination port"); - return (-1); - } - } else -@@ -1449,7 +1482,7 @@ - } - 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 Met 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 +1490,7 @@ - exit(1); - } - if (flag_cnt) -- free_interface_list(); -+ if_cache_free(); - else { - close(skfd); - skfd = -1; -@@ -1503,7 +1536,7 @@ - fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); - - 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, _(" <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 +1547,7 @@ - (int argc, char *argv[]) { - int i; - int lop; -- struct option longopts[] = -+ static struct option longopts[] = - { - AFTRANS_OPTS, - {"version", 0, 0, 'V'}, -@@ -1556,7 +1589,7 @@ - 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, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -1624,6 +1657,14 @@ - 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 */ -@@ -1741,10 +1782,11 @@ - } - printf(_("\nProto Recv-Q Send-Q Local Address Foreign Address State ")); /* xxx */ - if (flag_exp > 1) -- printf(_(" User Inode ")); -- print_progname_banner(); -+ printf(_(" User Inode ")); -+ if (flag_prg) -+ printf(_(" PID/Program name")); - if (flag_opt) -- printf(_(" Timer")); /* xxx */ -+ printf(_(" Timer")); - printf("\n"); - #else - if (flag_arg) { -@@ -1845,6 +1887,7 @@ - } - #endif - } -+ - if (!flag_cnt || i) - break; - sleep(1); ---- net-tools-1.60.orig/route.c -+++ net-tools-1.60/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> - * -@@ -142,7 +142,7 @@ - } - - /* 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 +176,14 @@ - 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': ---- net-tools-1.60.orig/statistics.c -+++ net-tools-1.60/statistics.c -@@ -1,6 +1,6 @@ - /* - * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. -- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $ -+ * $Id: statistics.c,v 1.20 2007/12/01 18:44:56 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 -@@ -11,6 +11,7 @@ - #include <string.h> - #include "config.h" - #include "intl.h" -+#include "proc.h" - - /* #define WARN 1 */ - -@@ -172,19 +173,59 @@ - { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number }, - { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"), - opt_number }, -- { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number }, -+ { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number }, - { "TCPPrequeued", N_("%u 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 }, -+ { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number }, -+ { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"), -+ opt_number }, - { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number }, -- { "TCPHPHits", N_("%u packets header predicted"), number }, -+ { "TCPHPHits", N_("%u packet headers predicted"), number }, - { "TCPHPHitsToUser", N_("%u packets header predicted and " - "directly queued to user"), opt_number }, - { "SockMallocOOM", N_("Ran %u times out of system memory during " - "packet sending"), opt_number }, -+ { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number }, -+ { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number }, -+ { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number }, -+ { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number }, -+ { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number }, -+ { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number }, -+ { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number }, -+ { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number }, -+ { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number }, -+ { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, -+ { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number }, -+ { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number }, -+ { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number }, -+ { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number }, -+ { "TCPRenoFailures", N_("%u timeouts after reno fast retransmit"), opt_number }, -+ { "TCPSackFailures", N_("%u timeouts after SACK recovery"), opt_number }, -+ { "TCPLossFailures", N_("%u timeouts in loss state"), opt_number }, -+ { "TCPFastRetrans", N_("%u fast retransmits"), opt_number }, -+ { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, -+ { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number }, -+ { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number }, -+ { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number }, -+ { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number }, -+ { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number }, -+ { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number }, -+ { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number }, -+ { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number }, -+ { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number }, -+ { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number }, -+ { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number }, -+ { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number }, -+ { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number }, -+ { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number }, -+ { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number }, -+ { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number }, -+ { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, -+ { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, -+ { "TCPLoss", N_("%u TCP data loss events"), opt_number }, -+ { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), -+ opt_number }, -+ { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number }, - }; - - struct tabtab { -@@ -222,7 +263,8 @@ - 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: %d\n", states[state].indent, "", title, val); - return; - } - type = ent->type; -@@ -289,14 +331,17 @@ - return &dummytab; - } - --void process_fd(FILE *f) -+int process_fd(FILE *f) - { -- 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, ':'); -@@ -330,11 +375,10 @@ - sp = p + 1; - } - } -- return; -+ return 0; - - formaterr: -- perror(_("error parsing /proc/net/snmp")); -- return; -+ return -1; - } - - -@@ -344,22 +388,25 @@ - - 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) < 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) <0) -+ fprintf(stderr, _("Problem while parsing /proc/net/netstat\n")); - - if (ferror(f)) - perror("/proc/net/netstat"); ---- net-tools-1.60.orig/nameif.c -+++ net-tools-1.60/nameif.c -@@ -3,7 +3,7 @@ - * Writen 2000 by Andi Kleen. - * 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 $ -+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $ - */ - #ifndef _GNU_SOURCE - #define _GNU_SOURCE -@@ -117,7 +117,8 @@ - } - - struct change { -- struct change *next,**pprev; -+ struct change *next; -+ int found; - char ifname[IFNAMSIZ+1]; - unsigned char mac[6]; - }; -@@ -139,10 +140,7 @@ - ch->ifname, pos); - if (parsemac(p,ch->mac) < 0) - complain(_("cannot parse MAC `%s' at %s"), p, pos); -- if (clist) -- clist->pprev = &ch->next; - ch->next = clist; -- ch->pprev = &clist; - clist = ch; - return 0; - } -@@ -177,7 +175,7 @@ - if (*p == '\0') - continue; - n = strcspn(p, " \t"); -- if (n > IFNAMSIZ) -+ if (n > IFNAMSIZ-1) - complain(_("interface name too long at line %d"), line); - memcpy(ch->ifname, p, n); - ch->ifname[n] = 0; -@@ -200,7 +198,7 @@ - - void usage(void) - { -- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); -+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); - exit(1); - } - -@@ -277,21 +275,21 @@ - ch = lookupmac(mac); - if (!ch) - continue; -- -- *ch->pprev = ch->next; -+ -+ 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) { - struct change *ch = clist; - clist = clist->next; -- warning(_("interface '%s' not found"), ch->ifname); -+ if (!ch->found) -+ warning(_("interface '%s' not found"), ch->ifname); - free(ch); - } - ---- net-tools-1.60.orig/mii-tool.c -+++ net-tools-1.60/mii-tool.c -@@ -29,8 +29,7 @@ - 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"; -+static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)"; - - #include <unistd.h> - #include <stdlib.h> -@@ -46,16 +45,19 @@ - #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 "version.h" - - #define MAX_ETH 8 /* Maximum # of interfaces */ - - /* Table of known MII's */ --static struct { -+static const struct { - u_short id1, id2; - char *name; - } mii_id[] = { -@@ -74,6 +76,9 @@ - { 0x0181, 0x4410, "Quality QS6612" }, - { 0x0282, 0x1c50, "SMSC 83C180" }, - { 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])) - -@@ -137,40 +142,48 @@ - - 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", {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} }, -+ -+ { "1000baseT-HD", {0, MII_BMCR2_1000HALF} }, -+ { "1000baseT-FD", {0, MII_BMCR2_1000FULL} }, -+ { "1000baseT", {0, MII_BMCR2_1000HALF|MII_BMCR2_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; -+ !(mask & ~MII_AN_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 +192,24 @@ - - /*--------------------------------------------------------------------*/ - --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 & MII_BMCR_SPEED1000) { -+ if (mask2 & MII_BMCR2_1000HALF) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-HD"); -+ if (best) goto out; -+ } -+ if (mask2 & MII_BMCR2_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 +218,7 @@ - if (best) break; - } - } -+ out: - if (mask & (1<<5)) - strcat(buf, " flow-control"); - return buf; -@@ -201,15 +228,15 @@ - { - char buf[100]; - 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++) -+ for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++) - mii_val[i] = mdio_read(sock, i); - -- 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; - } -@@ -217,6 +244,7 @@ - /* Descriptive rename. */ - bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR]; - advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR]; -+ bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000]; - - sprintf(buf, "%s: ", ifr.ifr_name); - if (bmcr & MII_BMCR_AN_ENA) { -@@ -224,7 +252,7 @@ - if (advert & lkpar) { - strcat(buf, (lkpar & MII_AN_ACK) ? - "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, "); -@@ -234,8 +262,10 @@ - } - } else { - sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ", -- (bmcr & MII_BMCR_100MBIT) ? "100" : "10", -- (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); -+ ((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2) -+ ? "1000" -+ : (bmcr & MII_BMCR_100MBIT) ? "100" : "10", -+ (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); - } - strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); - -@@ -296,12 +326,13 @@ - if (bmsr & MII_BMSR_REMOTE_FAULT) - 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)); -+ printf("\n capabilities:%s", media_list(bmsr >> 6, bmcr2, 0)); -+ printf("\n advertising: %s", media_list(advert, lpa2 >> 2, 0)); - if (lkpar & MII_AN_ABILITY_MASK) -- printf("\n link partner:%s", media_list(lkpar, 0)); -+ printf("\n link partner:%s", media_list(lkpar, bmcr2, 0)); - printf("\n"); - } -+ fflush(stdout); - return 0; - } - -@@ -329,7 +360,7 @@ - printf("resetting the transceiver...\n"); - mdio_write(skfd, MII_BMCR, MII_BMCR_RESET); - } -- if (nway_advertise) { -+ if (nway_advertise > 0) { - mdio_write(skfd, MII_ANAR, nway_advertise | 1); - opt_restart = 1; - } -@@ -379,27 +410,38 @@ - /*--------------------------------------------------------------------*/ - - 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] [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" -+"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", Version, RELEASE); -+ exit(5); /* 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 +453,10 @@ - } - /* 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 +464,7 @@ - } - - if (opt_version) -- printf(version); -+ version(); - - /* Open a basic socket. */ - if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { -@@ -426,6 +472,9 @@ - exit(-1); - } - -+ if (verbose > 1) -+ printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY); -+ - /* No remaining args means show all interfaces. */ - if (optind == argc) { - ret = 1; ---- net-tools-1.60.orig/debian/changelog -+++ net-tools-1.60/debian/changelog -@@ -0,0 +1,277 @@ -+net-tools (1.60-19) unstable; urgency=low -+ -+ * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes Bug #435690) -+ * fixed interface name truncation (Closes Bug #405521) -+ Thank you Csaba Szep. -+ * fixed pt error string (Closes: Bug#403033) -+ * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens. -+ * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs. -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 02 Dec 2007 06:27:41 +0100 -+ -+net-tools (1.60-18) unstable; urgency=low -+ -+ * Thanks for the l10n NMU to Kenshi Muto -+ * fixed hostname compile problems -+ * better error handling and speedup for proc file reading -+ * improved mii-tool (more media types) -+ * fixed string length contraint in ipmaddr -+ * fixed ipx /proc/net (alternate naming) -+ * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete -+ * expanded arp(8) (en) 2007-12-01 -+ * added -4 and -6 to netstat(8) 02 October 2003 -+ * formatting fixed rarp(8)+slattach(8) [en] -+ * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr] -+ * fixed slattach -L to not require HW handshake anymore -+ * netstat -n: show v4inv6 mapped addressses as v4 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 02 Dec 2007 03:28:17 +0100 -+ -+net-tools (1.60-17.2) unstable; urgency=low -+ -+ * l10n NMU -+ * Set conflict against ja-trans which has obsolete Japanese -+ translations only for net-tools. (closes: #447327) -+ -+ -- Kenshi Muto <kmuto@debian.org> Sat, 20 Oct 2007 18:00:34 +0900 -+ -+net-tools (1.60-17.1) unstable; urgency=low -+ -+ * l10n NMU -+ * Updated net-tools.pot. -+ * Updated Japanese translation (closes: Bug#432338) -+ * Updated German translation (closes: #313808) -+ -+ -- Kenshi Muto <kmuto@debian.org> Thu, 11 Oct 2007 19:44:26 +0900 -+ -+net-tools (1.60-17) unstable; urgency=medium -+ -+ * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 04 Dec 2005 05:47:05 +0100 -+ -+net-tools (1.60-16) unstable; urgency=low -+ -+ * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa) -+ * inet.c: portability fix for 64bit. -+ * comment cleanups to aliagn with 1.65 cvs -+ * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 24 Oct 2005 22:05:38 +0200 -+ -+net-tools (1.60-15) unstable; urgency=low -+ -+ * minor formating fix to ifconfig(8) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 30 Jun 2005 21:49:52 +0200 -+ -+net-tools (1.60-14) unstable; urgency=low -+ -+ * added iptables(8) in ifconfig(8) (thanks Toralf Förster) -+ * more usage updates in ifconfig.8 (used upstream HEAD=1.11) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 30 Jun 2005 20:51:18 +0200 -+ -+net-tools (1.60-13) unstable; urgency=low Thu, 30 Jun 2005 20:49:57 +0200 -+ -+ * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678) -+ * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. -+ * resort media type array to match kernel (Closes: Bug#199920) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Tue, 17 May 2005 01:28:51 +0200 -+ -+net-tools (1.60-12) unstable; urgency=low -+ -+ * make TR hw address type work for new kernel (Closes: Bug #79462, #203400) -+ * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426) -+ * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 16 May 2005 06:33:48 +0200 -+ -+net-tools (1.60-11) unstable; urgency=low -+ -+ * spelling fixes (Closes: Bug #305640, #305638, 305637) -+ * nameif.c avoid overflow by malicious kernel -+ * avoid overflow of the TX-OK Column (Closes: Bug #308922) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 14 May 2005 01:48:45 +0200 -+ -+net-tools (1.60-10) unstable; urgency=low -+ -+ * typo fix in po/de.po for german arp command output (Closes: Bug #176151) -+ * added diagnostics messages to mii-tool.8 (Closes: Bug #239229) -+ * new version of nstrcmp (Closes: Bug #226503) -+ * enable EUI64 support -+ * stadanrds version 3.6.1 (no changes) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Fri, 23 Apr 2004 00:57:20 +0200 -+ -+net-tools (1.60-9) unstable; urgency=medium -+ -+ * debian/changelog: fixed in last entry fixed bug from 197925 to 197924 -+ * include linux/sockios.h for SIOCGMIIPHY definition (new style) -+ which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648) -+ NOTE: this will now require root to work, it will also not work on -+ older kernels. -+ * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 29 Dec 2003 13:42:20 +0100 -+ -+net-tools (1.60-8) unstable; urgency=medium -+ -+ * lib/interface.c: backed off change which skipped reading ioctl -+ interfacelist, if _proc interfacelist was ok, which does not work, -+ because alias interfaces are only in ioctl list available. It is -+ also falling back to the original lib/nstrcml.c because the -+ comparision if : is present does not work. -+ (Closes: bug #197924, #197582, #197269) -+ * bumped standards version (no changes) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 28 Jun 2003 02:56:38 +0200 -+ -+net-tools (1.60-7) unstable; urgency=low -+ -+ * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576) -+ from Eduardo Pereira Habkost -+ * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols -+ * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut -+ * netstat.c: cvs version adds fix for inode -+ signedness (Closes: #134600, #78932) -+ * ifconfig: removed -i from usage (Closes: #181528) -+ * make gcc 3.3 happy: added ull unsigned long long prefix to constant -+ * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs -+ * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs -+ * lib/interface.c: cvs fix for column run-into (Closes: #161080) -+ * lib/irda.c,lib/ipx.c: cvs update -+ * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig -+ * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb) -+ * lib/interface: fixed memory globbering -+ (Closes: #135744, #149579, #185187) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 12 Jun 2003 05:44:38 +0200 -+ -+net-tools (1.60-6) unstable; urgency=low -+ -+ * took route.c from upstream cvs: allow -6 and -4 option -+ * took statistics.c from upstream cvs: more complete netstat -S -+ * took README from upstream cvs: fix COPYING file title and removed -+ the line (Closes: #102139) -+ * took arp.c from upstream: fixed name "PUB", better not found handling, -+ implicite proxy arp mac changed from '*' to '<from_interface>', -+ usage line made shorter -+ * added mii-tool in control file (Closes: #172473) -+ * fixed description of binary multiple in man page (Closes: #182487) -+ * fixed interpunctation in netstat(8) (Closes: #191660) -+ * fixed compile warning in inet_sr.c by removing empty default: label in -+ switch -+ -+ -- Bernd Eckenfels <ecki@debian.org> Wed, 28 May 2003 22:35:12 +0200 -+ -+net-tools (1.60-5) unstable; urgency=low -+ -+ * thanks Andrew for the 4.1 NMU -+ * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209) -+ * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995) -+ * Fix segfault in mii-tool by using cvs version (Closes: #139027) -+ * fixed plural of authors to make lintian happy (I JOIN YOU :) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Wed, 28 May 2003 22:04:14 +0200 -+ -+net-tools (1.60-4.1) unstable; urgency=low -+ -+ * NMU -+ * Apply nameif patch from Matt Domsch. (Closes: #178209) -+ -+ -- Andrew Suffield <asuffield@debian.org> Wed, 9 Apr 2003 21:44:09 +0100 -+ -+net-tools (1.60-4) unstable; urgency=medium -+ -+ * fixed (upstream) spurious newline in ifconfig -+ Thanks Jonathen, Closes: Bug #109379 -+ * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167) -+ * this is done by including lib/interfaces.c from upstream cvs -+ * also added ifconfig man page from upstream cvs -+ * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 24 Nov 2001 06:26:37 +0100 -+ -+net-tools (1.60-3) unstable; urgency=medium -+ -+ * fixed upstream error where counters in ifconfig/netstat -i are 0 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 10 Nov 2001 18:12:13 +0100 -+ -+net-tools (1.60-2) unstable; urgency=low -+ -+ * Fixed the following bug: (Closes: #117837) -+ * inserted ifconfig.c from upstream cvs to do this -+ * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking -+ -+ -- Bernd Eckenfels <ecki@debian.org> Thu, 1 Nov 2001 02:51:33 +0100 -+ -+net-tools (1.60-1) unstable; urgency=low -+ -+ * New upstream -+ * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282) -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 16 Apr 2001 02:28:12 +0200 -+ -+net-tools (1.59-1) unstable; urgency=low -+ -+ * added Build Dependencies (closes bug: #89083) -+ * new upstream version -+ * removed dh_suidregister and a few comments from rules file -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sun, 18 Mar 2001 03:00:33 +0100 -+ -+net-tools (1.58-2) unstable; urgency=low -+ -+ * backported ifconfig change from 1.59 to avoid closing socket too early -+ on some systems (depending on the protocols installed). -+ Closes Bug: #85688, #85743 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Tue, 13 Feb 2001 01:39:59 +0100 -+ -+net-tools (1.58-1) unstable; urgency=low -+ -+ * new upstream version -+ * removed local man pages for now (Closes: bug #83894) -+ * install nameif in /sbin -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 10 Feb 2001 21:50:30 +0100 -+ -+net-tools (1.57-2) unstable; urgency=high -+ -+ * rebuild, this is believed to closes: #75825 -+ -+ -- Bernd Eckenfels <ecki@debian.org> Sat, 30 Dec 2000 22:43:01 +0100 -+ -+net-tools (1.57-1) unstable; urgency=low -+ -+ * new debian maintainer (thanks Anthony for the Work!) -+ * new upstream version -+ -+ -- Bernd Eckenfels <ecki@debian.org> Mon, 14 Aug 2000 02:40:13 +0200 -+ -+net-tools (1.54-3) unstable; urgency=low -+ -+ * Argggh. Don't use that horrible dh_installmanpages hack. (Closes: -+ Bug#68925, Bug#68879) -+ -+ -- Anthony Towns <ajt@debian.org> Sun, 13 Aug 2000 00:12:05 +1000 -+ -+net-tools (1.54-2) unstable; urgency=low -+ -+ * Reapply slattach patch from netbase 3.16-3. -+ -+ -- Anthony Towns <ajt@debian.org> Thu, 10 Aug 2000 11:32:58 +1000 -+ -+net-tools (1.54-1) unstable; urgency=low -+ -+ * Split from netbase. -+ -+ -- Anthony Towns <ajt@debian.org> Mon, 17 Jul 2000 07:34:12 +1000 -+ -+Local variables: -+mode: debian-changelog -+End: ---- net-tools-1.60.orig/debian/copyright -+++ net-tools-1.60/debian/copyright -@@ -0,0 +1,18 @@ -+This debian package is maintained by Bernd Eckenfels <ecki@debian.org> since -+Mon, 14 Aug 2000 02:42:13 +0200. Debian Informations will be uploaded -+upstream, too. -+ -+This package was debianized by Anthony Towns <ajt@debian.org> on -+Mon, 17 Jul 2000 07:34:12 +1000. It was originally part of the netbase -+package. -+ -+It was downloaded from http://www.tazenda.demon.co.uk/phil/net-tools/ -+ -+Upstream Authors: Phil Blundell <philb@gnu.org>, -+ Bernd Eckenfels <net-tools@lina.inka.de> -+ -+Copyright: -+ -+Distributed under the terms of the GNU General Public License version 2, -+as published by the Free Software Foundation. On Debian systems you can -+find a copy of this license in /usr/share/common-licenses/GPL. ---- net-tools-1.60.orig/debian/dirs -+++ net-tools-1.60/debian/dirs -@@ -0,0 +1 @@ -+usr/sbin ---- net-tools-1.60.orig/debian/config.make -+++ net-tools-1.60/debian/config.make -@@ -0,0 +1,36 @@ -+I18N=1 -+HAVE_AFUNIX=1 -+HAVE_AFINET=1 -+HAVE_AFINET6=1 -+HAVE_AFIPX=1 -+HAVE_AFATALK=1 -+HAVE_AFAX25=1 -+HAVE_AFNETROM=1 -+HAVE_AFROSE=1 -+HAVE_AFX25=1 -+HAVE_AFECONET=1 -+HAVE_AFDECnet=1 -+HAVE_AFASH=1 -+HAVE_HWETHER=1 -+HAVE_HWARC=1 -+HAVE_HWSLIP=1 -+HAVE_HWPPP=1 -+HAVE_HWTUNNEL=1 -+HAVE_HWSTRIP=1 -+HAVE_HWTR=1 -+HAVE_HWAX25=1 -+HAVE_HWROSE=1 -+HAVE_HWNETROM=1 -+HAVE_HWX25=1 -+HAVE_HWFR=1 -+HAVE_HWSIT=1 -+HAVE_HWFDDI=1 -+HAVE_HWHIPPI=1 -+HAVE_HWASH=1 -+HAVE_HWHDLCLAPB=1 -+HAVE_HWIRDA=1 -+HAVE_HWEC=1 -+HAVE_EUI64=1 -+HAVE_FW_MASQUERADE=1 -+HAVE_IP_TOOLS=1 -+HAVE_MII=1 ---- net-tools-1.60.orig/debian/control -+++ net-tools-1.60/debian/control -@@ -0,0 +1,21 @@ -+Source: net-tools -+Section: net -+Priority: important -+Build-Depends: debhelper, gettext -+Maintainer: Bernd Eckenfels <ecki@debian.org> -+Standards-Version: 3.6.1 -+ -+Package: net-tools -+Architecture: any -+Depends: ${shlibs:Depends} -+Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2) -+Conflicts: ja-trans (<= 0.8-2) -+Description: The NET-3 networking toolkit -+ This package includes the important tools for controlling the network -+ subsystem of the Linux kernel. This includes arp, ifconfig, netstat, -+ rarp, nameif and route. Additionally, this package contains utilities -+ relating to particular network hardware types (plipconfig, slattach, -+ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr). -+ . -+ In the upstream package 'hostname' and friends are included. Those are -+ not installed by this package, since there is a special "hostname*.deb". ---- net-tools-1.60.orig/debian/rules -+++ net-tools-1.60/debian/rules -@@ -0,0 +1,74 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=1 -+ -+configure: configure-stamp -+configure-stamp: -+ dh_testdir -+ touch configure-stamp -+ -+build: configure-stamp build-stamp -+build-stamp: -+ dh_testdir -+ cp debian/config.h config.h -+ cp debian/config.make config.make -+ $(MAKE) -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp configure-stamp -+ -$(MAKE) clobber -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) update BASEDIR=`pwd`/debian/tmp -+ mv debian/tmp/sbin/arp debian/tmp/usr/sbin/arp -+ # we don't want man pages for domainname and friends... (yet) -+ rm -rf debian/tmp/usr/share/man/*/man1/ debian/tmp/usr/share/man/man1/ -+ # we don't install local manpages until policy is clear -+ rm -rf debian/tmp/usr/share/man/*_*/ -+ -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+# dh_testversion -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+ dh_installcron -+# dh_installmanpages -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+# dh_makeshlibs -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -- -isp -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- net-tools-1.60.orig/debian/config.h -+++ net-tools-1.60/debian/config.h -@@ -0,0 +1,75 @@ -+/* -+* config.h Automatically generated configuration includefile -+* -+* NET-TOOLS A collection of programs that form the base set of the -+* NET-3 Networking Distribution for the LINUX operating -+* system. -+* -+* DO NOT EDIT DIRECTLY -+* -+*/ -+ -+/* -+ * -+ * Internationalization -+ * -+ * The net-tools package has currently been translated to French, -+ * German and Brazilian Portugese. Other translations are, of -+ * course, welcome. Answer `n' here if you have no support for -+ * internationalization on your system. -+ * -+ */ -+#define I18N 1 -+ -+/* -+ * -+ * Protocol Families. -+ * -+ */ -+#define HAVE_AFUNIX 1 -+#define HAVE_AFINET 1 -+#define HAVE_AFINET6 1 -+#define HAVE_AFIPX 1 -+#define HAVE_AFATALK 1 -+#define HAVE_AFAX25 1 -+#define HAVE_AFNETROM 1 -+#define HAVE_AFROSE 1 -+#define HAVE_AFX25 1 -+#define HAVE_AFECONET 1 -+#define HAVE_AFDECnet 1 -+#define HAVE_AFASH 1 -+ -+/* -+ * -+ * Device Hardware types. -+ * -+ */ -+#define HAVE_HWETHER 1 -+#define HAVE_HWARC 1 -+#define HAVE_HWSLIP 1 -+#define HAVE_HWPPP 1 -+#define HAVE_HWTUNNEL 1 -+#define HAVE_HWSTRIP 1 -+#define HAVE_HWTR 1 -+#define HAVE_HWAX25 1 -+#define HAVE_HWROSE 1 -+#define HAVE_HWNETROM 1 -+#define HAVE_HWX25 1 -+#define HAVE_HWFR 1 -+#define HAVE_HWSIT 1 -+#define HAVE_HWFDDI 1 -+#define HAVE_HWHIPPI 1 -+#define HAVE_HWASH 1 -+#define HAVE_HWHDLCLAPB 1 -+#define HAVE_HWIRDA 1 -+#define HAVE_HWEC 1 -+#define HAVE_HWEUI64 1 -+ -+/* -+ * -+ * Other Features. -+ * -+ */ -+#define HAVE_FW_MASQUERADE 1 -+#define HAVE_IP_TOOLS 1 -+#define HAVE_MII 1 ---- net-tools-1.60.orig/debian/docs -+++ net-tools-1.60/debian/docs -@@ -0,0 +1,3 @@ -+README -+README.ipv6 -+TODO diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 424199144..1fa74c832 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # Slackware build script for util-linux VERSION=${VERSION:-$(echo util-linux*.tar.?z* | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-5} -ADJTIMEXVERS=1.23 +ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 ZIPTOOLVERS=1.4.0 @@ -70,8 +70,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Disabled login and init stuff from being built, as this is provided by -# shadow and sysvinit +# Disabled login stuff from being built, as this is provided by shadow # # /sbin/elvtune is not built, as configure says it only works with 2.2 and # 2.4 kernels @@ -85,7 +84,19 @@ find . \ # Changing the fdisk -l output (this was done prior to util-linux-ng) broke # our installation scripts, so we have changed the name of partition type # 83 back to "Linux swap": -zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 || exit 1 +zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1 + +# Fix loop encryption: +zcat $CWD/0001-mount-old-fix-encryption-usage.patch.gz | patch -p1 --verbose || exit 1 + +# Fix fdisk granularity on 512 byte sector size devices: +zcat $CWD/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch.gz | patch -p1 --verbose || exit 1 + +# 20120814 bkw: fix "column --separator <anything>" segfault +zcat $CWD/column-fix_long_opts.diff.gz | patch -p1 --verbose || exit 1 + +# Regenerate, since patch 0001 hits mount/Makefile.am: +./autogen.sh CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,9 +110,9 @@ CFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-arch \ --enable-agetty \ - --disable-init \ --enable-kill \ --disable-last \ + --enable-line \ --enable-mesg \ --enable-partx \ --enable-raw \ @@ -114,8 +125,10 @@ CFLAGS="$SLKCFLAGS" \ --enable-use-tty-group \ --enable-libblkid \ --enable-libmount \ + --enable-libmount-mount \ --enable-libuuid \ --disable-uuidd \ + --enable-ddate \ --build=$ARCH-slackware-linux \ || exit 1 @@ -180,11 +193,10 @@ cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz # Add just the hostname utilities from net-tools, so that anyone # installing just the A series will not have a hostname (null): cd $TMP || exit 1 -rm -rf net-tools-1.60 -tar xvf $CWD/net-tools-1.60.tar.xz -cd net-tools-1.60 -zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 || exit -zcat $CWD/net-tools.diff.gz | patch -p1 || exit +rm -rf net-tools-1.60.20120726git +tar xvf $CWD/net-tools-1.60.20120726git.tar.xz +cd net-tools-1.60.20120726git +zcat $CWD/net-tools.config.h.gz > config.h make make hostname strip hostname @@ -209,7 +221,7 @@ rm -rf adjtimex-$ADJTIMEXVERS tar xvf $CWD/adjtimex_${ADJTIMEXVERS}.orig.tar.gz || exit 1 cd adjtimex-$ADJTIMEXVERS || exit 1 chown -R root:root . -zcat $CWD/adjtimex_1.23-1.diff.gz | patch -p1 || exit 1 +zcat $CWD/adjtimex_1.29-2.2.diff.gz | patch -p1 || exit 1 CFLAGS=-O2 ./configure --prefix=/usr || exit 1 make || exit 1 strip adjtimex diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild index 27af8245e..672290d31 100755 --- a/source/a/xfsprogs/xfsprogs.SlackBuild +++ b/source/a/xfsprogs/xfsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/source/a/xz/slack-desc b/source/a/xz/slack-desc index af549b358..053792254 100644 --- a/source/a/xz/slack-desc +++ b/source/a/xz/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| xz: xz (compression utility based on the LZMA algorithm) xz: -xz: LZMA is a general purporse compression algorithm designed by Igor +xz: LZMA is a general purpose compression algorithm designed by Igor xz: Pavlov as part of 7-Zip. It provides high compression ratio while xz: keeping the decompression speed fast. XZ Utils are an attempt to make xz: LZMA compression easy to use on free (as in freedom) operating diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index dd996f489..7c60ce6cf 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Permission to use, copy, modify, and distribute this software for @@ -154,3 +154,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz +# Move temporary stuff to /tmp, so that it won't get forgotten +# in the shuffle: + +cp -a $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz /tmp +rm -rf /tmp/xz-tmp* +mv /xz-tmp* /tmp + |
