diff -Nru procps-3.3.12/aclocal.m4 procps-3.3.15/aclocal.m4
--- procps-3.3.12/aclocal.m4 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/aclocal.m4 2018-05-19 22:05:40.000000000 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -296,7 +296,7 @@
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -311,7 +311,7 @@
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -327,14 +327,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -386,7 +386,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -417,7 +417,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -608,7 +608,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -684,7 +684,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -881,7 +881,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -902,7 +902,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -923,7 +923,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -973,7 +973,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1012,7 +1012,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1041,7 +1041,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1088,7 +1088,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1107,7 +1107,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1188,7 +1188,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1248,7 +1248,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1276,7 +1276,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1295,7 +1295,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -Nru procps-3.3.12/config.guess procps-3.3.15/config.guess
--- procps-3.3.12/config.guess 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/config.guess 2018-05-19 22:05:40.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2016-04-02'
+timestamp='2018-02-24'
# 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
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# 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
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to .
@@ -39,7 +39,7 @@
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2018 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."
@@ -107,9 +107,9 @@
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
+ ,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ eval "$set_cc_for_build"
+ cat <<-EOF > "$dummy.c"
#include
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +149,20 @@
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,27 +176,30 @@
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ # to ELF recently (or will in the future) and ABI.
+ case "$UNAME_MACHINE_ARCH" in
+ earm*)
+ os=netbsdelf
+ ;;
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval "$set_cc_for_build"
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -205,10 +215,10 @@
;;
esac
# Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -216,46 +226,55 @@
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "$machine-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
exit ;;
*:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ exit ;;
+ *:MidnightBSD:*:*)
+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
+ echo "$UNAME_MACHINE"-unknown-sortix
exit ;;
+ *:Redox:*:*)
+ echo "$UNAME_MACHINE"-unknown-redox
+ exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -307,28 +326,19 @@
# A Tn.n version is a released field test version.
# 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`
+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
# 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
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo "$UNAME_MACHINE"-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo "$UNAME_MACHINE"-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -340,7 +350,7 @@
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
+ echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -367,19 +377,19 @@
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 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/[^.]*//'`
+ 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/[^.]*//'`
+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
+ echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
+ 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.
@@ -392,13 +402,13 @@
SUN_ARCH=x86_64
fi
fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 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
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -407,25 +417,25 @@
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
;;
sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
+ echo sparc-sun-sunos"$UNAME_RELEASE"
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
+ echo sparc-auspex-sunos"$UNAME_RELEASE"
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -436,44 +446,44 @@
# 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}
+ echo m68k-atari-mint"$UNAME_RELEASE"
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}
+ echo m68k-milan-mint"$UNAME_RELEASE"
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
+ echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint"$UNAME_RELEASE"
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ echo m68k-apple-machten"$UNAME_RELEASE"
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
+ echo powerpc-apple-machten"$UNAME_RELEASE"
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
+ echo mips-dec-ultrix"$UNAME_RELEASE"
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
+ echo vax-dec-ultrix"$UNAME_RELEASE"
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
+ echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -482,23 +492,23 @@
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
+ echo mips-mips-riscos"$UNAME_RELEASE"
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -524,17 +534,17 @@
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+ [ "$TARGET_BINARY_INTERFACE"x = x ]
then
- echo m88k-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dgux"$UNAME_RELEASE"
else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo i586-dg-dgux"$UNAME_RELEASE"
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -551,7 +561,7 @@
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -563,14 +573,14 @@
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include
main()
@@ -581,7 +591,7 @@
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
echo "$SYSTEM_NAME"
else
@@ -595,7 +605,7 @@
exit ;;
*: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
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -604,18 +614,18 @@
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -630,28 +640,28 @@
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ case "$UNAME_MACHINE" in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
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
+ 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
+ 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
fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ if [ "$HP_ARCH" = "" ]; then
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
#include
@@ -684,13 +694,13 @@
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = hppa2.0w ]
+ if [ "$HP_ARCH" = hppa2.0w ]
then
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -709,15 +719,15 @@
HP_ARCH=hppa64
fi
fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include
int
main ()
@@ -742,11 +752,11 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -755,7 +765,7 @@
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -763,9 +773,9 @@
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo "$UNAME_MACHINE"-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo "$UNAME_MACHINE"-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -790,127 +800,109 @@
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
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/ /_/'`
+ 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/ /_/'`
+ 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}
+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
+ case "$UNAME_PROCESSOR" in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
+ echo "$UNAME_MACHINE"-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
+ echo "$UNAME_MACHINE"-pc-mingw64
exit ;;
*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
+ echo "$UNAME_MACHINE"-pc-mingw32
exit ;;
*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ echo "$UNAME_MACHINE"-pc-msys
exit ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
+ echo "$UNAME_MACHINE"-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix${UNAME_RELEASE}
+ echo i586-pc-interix"$UNAME_RELEASE"
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix"$UNAME_RELEASE"
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ 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
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
+ echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ echo "$UNAME_MACHINE"-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -924,63 +916,63 @@
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
+ 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-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
k1om:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -994,64 +986,74 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-unknown-linux-"$LIBC"
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-"$LIBC"
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-"$LIBC"
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-"$LIBC"
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-"$LIBC"
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-unknown-linux-"$LIBC"
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpcle-unknown-linux-"$LIBC"
+ exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+ else
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ fi
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1065,34 +1067,34 @@
# 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.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
+ echo "$UNAME_MACHINE"-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo "$UNAME_MACHINE"-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo "$UNAME_MACHINE"-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
+ echo "$UNAME_MACHINE"-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos"$UNAME_RELEASE"
exit ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ i*86:*:4.*:*)
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1102,12 +1104,12 @@
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1117,9 +1119,9 @@
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv32
+ echo "$UNAME_MACHINE"-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1139,9 +1141,9 @@
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1161,9 +1163,9 @@
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; }
+ && { 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; } ;;
+ && { 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; } ;;
@@ -1172,28 +1174,28 @@
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; }
+ && { 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; }
+ && { 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; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
+ echo mips-dde-sysv"$UNAME_RELEASE"
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1204,7 +1206,7 @@
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
+ echo "$UNAME_MACHINE"-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1224,23 +1226,23 @@
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
+ echo "$UNAME_MACHINE"-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
+ echo m68k-apple-aux"$UNAME_RELEASE"
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
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 ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1259,49 +1261,56 @@
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
+ echo sx4-nec-superux"$UNAME_RELEASE"
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
+ echo sx5-nec-superux"$UNAME_RELEASE"
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
+ echo sx6-nec-superux"$UNAME_RELEASE"
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
+ echo sx7-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
+ echo sx8-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
+ echo sx8r-nec-superux"$UNAME_RELEASE"
exit ;;
SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux${UNAME_RELEASE}
+ echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
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
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1312,7 +1321,7 @@
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1320,19 +1329,25 @@
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
+ NEO-*:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
+ echo nse-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSR-*:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk"$UNAME_RELEASE"
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
+ NSV-*:NONSTOP_KERNEL:*:*)
+ echo nsv-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1341,7 +1356,7 @@
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
@@ -1352,7 +1367,7 @@
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo "$UNAME_MACHINE"-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1373,14 +1388,14 @@
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/[-(].*//'`
+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
+ case "$UNAME_MACHINE" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1389,37 +1404,48 @@
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
exit ;;
i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+ echo "$UNAME_MACHINE"-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
+ echo "$UNAME_MACHINE"-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
+ echo "$UNAME_MACHINE"-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
esac
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <&2 < in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
config.guess timestamp = $timestamp
@@ -1438,16 +1464,16 @@
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff -Nru procps-3.3.12/config.h.in procps-3.3.15/config.h.in
--- procps-3.3.12/config.h.in 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/config.h.in 2018-05-19 22:05:40.000000000 +0000
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* provide extra precision under memory fields for top */
+#undef BOOST_MEMORY
+
/* provide extra precision under %CPU and %MEM for top */
#undef BOOST_PERCNT
@@ -273,9 +276,6 @@
. */
#undef MAJOR_IN_SYSMACROS
-/* disable extra precision under memory fields for top */
-#undef NOBOOST_MEMS
-
/* disable NUMA/Node support in top */
#undef NUMA_DISABLE
@@ -334,6 +334,9 @@
/* Version number of package */
#undef VERSION
+/* enable elogind support */
+#undef WITH_ELOGIND
+
/* enable systemd support */
#undef WITH_SYSTEMD
diff -Nru procps-3.3.12/config.sub procps-3.3.15/config.sub
--- procps-3.3.12/config.sub 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/config.sub 2018-05-19 22:05:40.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2016-03-30'
+timestamp='2018-02-22'
# 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
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@
# 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
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -67,7 +67,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2018 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."
@@ -94,7 +94,7 @@
*local*)
# First pass through any local machine types.
- echo $1
+ echo "$1"
exit ;;
* )
@@ -112,24 +112,24 @@
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
android-linux)
os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
;;
*)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+ if [ "$basic_machine" != "$1" ]
+ then os=`echo "$1" | sed 's/.*-/-/'`
else os=; fi
;;
esac
@@ -178,44 +178,44 @@
;;
-sco6)
os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
@@ -227,10 +227,7 @@
os=-lynxos
;;
-ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
;;
-psos*)
os=-psos
@@ -263,7 +260,7 @@
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
- | i370 | i860 | i960 | ia64 \
+ | i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
@@ -299,8 +296,9 @@
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
+ | pdp10 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -314,7 +312,7 @@
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
- | we32k \
+ | wasm32 \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -335,7 +333,7 @@
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
ms1)
basic_machine=mt-unknown
@@ -364,7 +362,7 @@
;;
# Object if more than one company name word.
*-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -387,7 +385,7 @@
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
+ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
@@ -428,6 +426,7 @@
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -444,6 +443,7 @@
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
+ | wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -457,7 +457,7 @@
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
- basic_machine=i386-unknown
+ basic_machine=i386-pc
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -491,7 +491,7 @@
basic_machine=x86_64-pc
;;
amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
@@ -536,7 +536,7 @@
os=-linux
;;
blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
@@ -544,13 +544,13 @@
os=-cnk
;;
c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
@@ -639,10 +639,18 @@
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
+ e500v[12])
+ basic_machine=powerpc-unknown
+ os=$os"spe"
+ ;;
+ e500v[12]-*)
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -732,9 +740,6 @@
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
- hppa-next)
- os=-nextstep3
- ;;
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
@@ -747,26 +752,26 @@
basic_machine=i370-ibm
;;
i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
- i386-vsta | vsta)
+ vsta)
basic_machine=i386-unknown
os=-vsta
;;
@@ -785,19 +790,16 @@
os=-sysv
;;
leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
magnum | m3230)
basic_machine=mips-mips
os=-sysv
@@ -829,10 +831,10 @@
os=-mint
;;
mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
;;
mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
@@ -851,7 +853,7 @@
os=-msdos
;;
ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i686-pc
@@ -893,7 +895,7 @@
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -938,6 +940,12 @@
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsv-tandem)
+ basic_machine=nsv-tandem
+ ;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -970,7 +978,7 @@
os=-linux
;;
parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
@@ -986,7 +994,7 @@
basic_machine=i386-pc
;;
pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
@@ -1001,16 +1009,16 @@
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
@@ -1020,23 +1028,23 @@
ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ps2)
basic_machine=i386-ibm
@@ -1090,17 +1098,10 @@
sequent)
basic_machine=i386-sequent
;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
sh5el)
basic_machine=sh5le-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
+ simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -1119,7 +1120,7 @@
os=-sysv4
;;
strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
sun2)
basic_machine=m68000-sun
@@ -1241,6 +1242,9 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ x64)
+ basic_machine=x86_64-pc
+ ;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1249,20 +1253,12 @@
basic_machine=xps100-honeywell
;;
xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1291,10 +1287,6 @@
vax)
basic_machine=vax-dec
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
pdp11)
basic_machine=pdp11-dec
;;
@@ -1304,9 +1296,6 @@
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)
- basic_machine=sparc-sun
- ;;
cydra)
basic_machine=cydra-cydrome
;;
@@ -1326,7 +1315,7 @@
# Make sure to match an already-canonicalized machine name.
;;
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
esac
@@ -1334,10 +1323,10 @@
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
*-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
;;
*-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
;;
*)
;;
@@ -1348,8 +1337,8 @@
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
@@ -1360,18 +1349,19 @@
-solaris)
os=-solaris2
;;
- -svr4*)
- os=-sysv4
- ;;
-unixware*)
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
+ # es1800 is here to avoid being matched by es* (a different OS)
+ -es1800*)
+ os=-ose
+ ;;
+ # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
+ # 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* | -cnk* | -sunos | -sunos[34]*\
@@ -1381,25 +1371,26 @@
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+ | -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1416,12 +1407,12 @@
-nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ -sim | -xray | -os68k* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
@@ -1430,10 +1421,10 @@
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
@@ -1444,12 +1435,6 @@
-wince*)
os=-wince
;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
-utek*)
os=-bsd
;;
@@ -1474,7 +1459,7 @@
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1496,7 +1481,7 @@
-oss*)
os=-sysv3
;;
- -svr4)
+ -svr4*)
os=-sysv4
;;
-svr3)
@@ -1511,24 +1496,28 @@
-ose*)
os=-ose
;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
- -aros*)
- os=-aros
- ;;
-zvmoe)
os=-zvmoe
;;
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
-ios)
@@ -1538,7 +1527,7 @@
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
esac
@@ -1628,12 +1617,12 @@
sparc-* | *-sun)
os=-sunos4.1.1
;;
+ pru-*)
+ os=-elf
+ ;;
*-be)
os=-beos
;;
- *-haiku)
- os=-haiku
- ;;
*-ibm)
os=-aix
;;
@@ -1673,7 +1662,7 @@
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
@@ -1688,9 +1677,6 @@
i370-*)
os=-mvs
;;
- *-next)
- os=-nextstep3
- ;;
*-gould)
os=-sysv
;;
@@ -1800,15 +1786,15 @@
vendor=stratus
;;
esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
;;
esac
-echo $basic_machine$os
+echo "$basic_machine$os"
exit
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff -Nru procps-3.3.12/configure procps-3.3.15/configure
--- procps-3.3.12/configure 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/configure 2018-05-19 22:05:40.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for procps-ng 3.3.12.
+# Generated by GNU Autoconf 2.69 for procps-ng 3.3.15.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='procps-ng'
PACKAGE_TARNAME='procps-ng'
-PACKAGE_VERSION='3.3.12'
-PACKAGE_STRING='procps-ng 3.3.12'
+PACKAGE_VERSION='3.3.15'
+PACKAGE_STRING='procps-ng 3.3.15'
PACKAGE_BUGREPORT='procps@freelists.org'
PACKAGE_URL='https://gitlab.com/procps-ng/procps'
@@ -650,10 +650,15 @@
BUILD_KILL_TRUE
BUILD_PIDOF_FALSE
BUILD_PIDOF_TRUE
+WITH_ELOGIND_FALSE
+WITH_ELOGIND_TRUE
+ELOGIND_LIBS
+ELOGIND_CFLAGS
WITH_SYSTEMD_FALSE
WITH_SYSTEMD_TRUE
SYSTEMD_LIBS
SYSTEMD_CFLAGS
+WATCH_NCURSES_CFLAGS
WATCH_NCURSES_LIBS
NCURSESW_LIBS
NCURSESW_CFLAGS
@@ -674,6 +679,7 @@
MSGFMT
USE_NLS
MKINSTALLDIRS
+usrbin_execdir
POW_LIB
LIBOBJS
LT_SYS_LIBRARY_PATH
@@ -815,6 +821,7 @@
enable_libselinux
with_ncurses
with_systemd
+with_elogind
enable_pidof
enable_kill
enable_skill
@@ -845,7 +852,9 @@
NCURSESW_CFLAGS
NCURSESW_LIBS
SYSTEMD_CFLAGS
-SYSTEMD_LIBS'
+SYSTEMD_LIBS
+ELOGIND_CFLAGS
+ELOGIND_LIBS'
# Initialize some variables set by options.
@@ -1396,7 +1405,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures procps-ng 3.3.12 to adapt to many kinds of systems.
+\`configure' configures procps-ng 3.3.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1467,7 +1476,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of procps-ng 3.3.12:";;
+ short | recursive ) echo "Configuration of procps-ng 3.3.15:";;
esac
cat <<\_ACEOF
@@ -1497,7 +1506,7 @@
--enable-examples add example files to installation
--enable-sigwinch reduce impact of x-windows resize operations on top
--enable-wide-percent provide extra precision under %CPU and %MEM for top
- --disable-wide-memory disable extra precision under memory fields for top
+ --enable-wide-memory provide extra precision under memory fields for top
--disable-modern-top disable new startup defaults, return to original top
--disable-numa disable NUMA/Node support in top
--enable-w-from enable w from field by default
@@ -1521,6 +1530,7 @@
--without-libintl-prefix don't search for libintl in includedir and libdir
--without-ncurses build only applications not needing ncurses
--with-systemd enable systemd support
+ --with-elogind enable elogind support
Some influential environment variables:
CC C compiler command
@@ -1550,6 +1560,10 @@
C compiler flags for SYSTEMD, overriding pkg-config
SYSTEMD_LIBS
linker flags for SYSTEMD, overriding pkg-config
+ ELOGIND_CFLAGS
+ C compiler flags for ELOGIND, overriding pkg-config
+ ELOGIND_LIBS
+ linker flags for ELOGIND, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1618,7 +1632,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-procps-ng configure 3.3.12
+procps-ng configure 3.3.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2174,7 +2188,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by procps-ng $as_me 3.3.12, which was
+It was created by procps-ng $as_me 3.3.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3040,7 +3054,7 @@
# Define the identity of the package.
PACKAGE='procps-ng'
- VERSION='3.3.12'
+ VERSION='3.3.15'
cat >>confdefs.h <<_ACEOF
@@ -14897,6 +14911,8 @@
if (*(data + i) != *(data3 + i))
return 14;
close (fd);
+ free (data);
+ free (data3);
return 0;
}
_ACEOF
@@ -15100,6 +15116,27 @@
fi
+usrbin_execdir='${exec_prefix}/bin'
+
+
+if test "x$host_os" = xcygwin
+then
+ prefix=/usr
+ sysconfdir=/etc
+ libexecdir=/usr/lib
+ localstatedir=/var
+ datadir=/usr/share
+ mandir=/usr/share/man
+ infodir=/usr/share/info
+
+
+
+
+
+
+
+fi
+
MKINSTALLDIRS=
@@ -17171,6 +17208,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
WATCH_NCURSES_LIBS="$NCURSESW_LIBS"
+ WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"
fi
else
WATCH_NCURSES_LIBS="$NCURSES_LIBS"
@@ -17180,6 +17218,7 @@
+
# Check whether --with-systemd was given.
if test "${with_systemd+set}" = set; then :
withval=$with_systemd;
@@ -17295,6 +17334,127 @@
fi
+
+# Check whether --with-elogind was given.
+if test "${with_elogind+set}" = set; then :
+ withval=$with_elogind;
+else
+ with_elogind=no
+
+fi
+
+# Do not allow elogind if systemd is wanted and found
+if test "x$with_systemd" != "xno"; then :
+ with_elogind=no
+fi
+
+if test "x$with_elogind" != "xno"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND" >&5
+$as_echo_n "checking for ELOGIND... " >&6; }
+
+if test -n "$ELOGIND_CFLAGS"; then
+ pkg_cv_ELOGIND_CFLAGS="$ELOGIND_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ELOGIND_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$ELOGIND_LIBS"; then
+ pkg_cv_ELOGIND_LIBS="$ELOGIND_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ELOGIND_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ELOGIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1`
+ else
+ ELOGIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ELOGIND_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (libelogind) were not met:
+
+$ELOGIND_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables ELOGIND_CFLAGS
+and ELOGIND_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables ELOGIND_CFLAGS
+and ELOGIND_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ ELOGIND_CFLAGS=$pkg_cv_ELOGIND_CFLAGS
+ ELOGIND_LIBS=$pkg_cv_ELOGIND_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+$as_echo "#define WITH_ELOGIND 1" >>confdefs.h
+
+
+fi
+ if test x$with_elogind != xno; then
+ WITH_ELOGIND_TRUE=
+ WITH_ELOGIND_FALSE='#'
+else
+ WITH_ELOGIND_TRUE='#'
+ WITH_ELOGIND_FALSE=
+fi
+
+
# AC_ARG_ENABLEs
# Check whether --enable-pidof was given.
if test "${enable_pidof+set}" = set; then :
@@ -17412,13 +17572,13 @@
if test "${enable_wide_memory+set}" = set; then :
enableval=$enable_wide_memory;
else
- enable_wide_memory=yes
+ enable_wide_memory=no
fi
-if test "x$enable_wide_memory" = xno; then
+if test "x$enable_wide_memory" = xyes; then
-$as_echo "#define NOBOOST_MEMS 1" >>confdefs.h
+$as_echo "#define BOOST_MEMORY 1" >>confdefs.h
fi
@@ -17712,6 +17872,10 @@
as_fn_error $? "conditional \"WITH_SYSTEMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WITH_ELOGIND_TRUE}" && test -z "${WITH_ELOGIND_FALSE}"; then
+ as_fn_error $? "conditional \"WITH_ELOGIND\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILD_PIDOF_TRUE}" && test -z "${BUILD_PIDOF_FALSE}"; then
as_fn_error $? "conditional \"BUILD_PIDOF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18133,7 +18297,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by procps-ng $as_me 3.3.12, which was
+This file was extended by procps-ng $as_me 3.3.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18200,7 +18364,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-procps-ng config.status 3.3.12
+procps-ng config.status 3.3.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -19332,7 +19496,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
diff -Nru procps-3.3.12/configure.ac procps-3.3.15/configure.ac
--- procps-3.3.12/configure.ac 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/configure.ac 2018-05-19 22:05:40.000000000 +0000
@@ -69,6 +69,27 @@
AC_FUNC_REALLOC
AC_FUNC_STRTOD
+usrbin_execdir='${exec_prefix}/bin'
+AC_SUBST([usrbin_execdir])
+
+if test "x$host_os" = xcygwin
+then
+ prefix=/usr
+ sysconfdir=/etc
+ libexecdir=/usr/lib
+ localstatedir=/var
+ datadir=/usr/share
+ mandir=/usr/share/man
+ infodir=/usr/share/info
+ AC_SUBST([prefix])
+ AC_SUBST([sysconfdir])
+ AC_SUBST([libexecdir])
+ AC_SUBST([localstatedir])
+ AC_SUBST([datadir])
+ AC_SUBST([mandir])
+ AC_SUBST([infodir])
+fi
+
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
if test -d "$srcdir/po"
@@ -134,7 +155,8 @@
])
AM_CONDITIONAL(WITH_NCURSES, true)
if test "$enable_watch8bit" = yes; then
- PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
+ [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
[AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
])
@@ -144,6 +166,7 @@
fi
AC_SUBST([NCURSES_LIBS])
AC_SUBST([WATCH_NCURSES_LIBS])
+AC_SUBST([WATCH_NCURSES_CFLAGS])
AC_ARG_WITH([systemd],
[AS_HELP_STRING([--with-systemd], [enable systemd support])],
@@ -155,6 +178,19 @@
])
AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno])
+AC_ARG_WITH([elogind],
+ [AS_HELP_STRING([--with-elogind], [enable elogind support])],
+ [], [with_elogind=no]
+)
+# Do not allow elogind if systemd is wanted and found
+AS_IF([test "x$with_systemd" != "xno"], [with_elogind=no])
+
+AS_IF([test "x$with_elogind" != "xno"], [
+ PKG_CHECK_MODULES([ELOGIND], [libelogind])
+ AC_DEFINE(WITH_ELOGIND, 1, [enable elogind support])
+])
+AM_CONDITIONAL([WITH_ELOGIND], [test x$with_elogind != xno])
+
# AC_ARG_ENABLEs
AC_ARG_ENABLE([pidof],
AS_HELP_STRING([--disable-pidof], [do not build pidof]),
@@ -199,11 +235,11 @@
fi
AC_ARG_ENABLE([wide-memory],
- AS_HELP_STRING([--disable-wide-memory], [disable extra precision under memory fields for top]),
- [], [enable_wide_memory=yes]
+ AS_HELP_STRING([--enable-wide-memory], [provide extra precision under memory fields for top]),
+ [], [enable_wide_memory=no]
)
-if test "x$enable_wide_memory" = xno; then
- AC_DEFINE(NOBOOST_MEMS, 1, [disable extra precision under memory fields for top])
+if test "x$enable_wide_memory" = xyes; then
+ AC_DEFINE(BOOST_MEMORY, 1, [provide extra precision under memory fields for top])
fi
AC_ARG_ENABLE([modern-top],
diff -Nru procps-3.3.12/debian/changelog procps-3.3.15/debian/changelog
--- procps-3.3.12/debian/changelog 2018-05-03 14:18:12.000000000 +0000
+++ procps-3.3.15/debian/changelog 2018-06-05 18:20:00.000000000 +0000
@@ -1,8 +1,115 @@
-procps (2:3.3.12-3ubuntu2) cosmic; urgency=medium
+procps (2:3.3.15-2ubuntu1) cosmic; urgency=medium
- * No-change rebuild for ncurses soname changes.
+ * Merge from Debian unstable. Remaining changes:
+ - debian/sysctl.d (Ubuntu-specific):
+ + 10-console-messages.conf: stop low-level kernel messages on console.
+ + 10-kernel-hardening.conf: add the kptr_restrict setting
+ + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
+ + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults
+ for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
+ + 10-link-restrictions.conf: even though the Ubuntu
+ kernel is built with these defaults in place, we want to make sure
+ that people running stock kernels don't miss out.
+ + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing
+ critical sync, remount, reboot functions. (LP: #194676, LP: #1025467)
+ + 10-network-security.conf: enable rp_filter.
+ + 10-ptrace.conf: describe new PTRACE setting.
+ + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
+ for armhf, and arm64.
+ + 10-qemu.conf.s390x for qemu.
+ + README: describe how this directory is supposed to work.
+ - debian/rules: Fix cross build
+ - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
+ writing, don't error out. Otherwise package upgrades can fail,
+ especially in containers.
+ - ignore_erofs.patch: Same as ignore_eaccess but for the case where
+ part of /proc is read/only.
- -- Matthias Klose Thu, 03 May 2018 14:18:12 +0000
+ -- Balint Reczey Tue, 05 Jun 2018 11:20:00 -0700
+
+procps (2:3.3.15-2) unstable; urgency=medium
+
+ * Fix link in libprocps-dev Closes: 900239
+ * Fix typo in license Closes: #899346
+
+ -- Craig Small Thu, 31 May 2018 19:42:46 +1000
+
+procps (2:3.3.15-1ubuntu1) cosmic; urgency=medium
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/sysctl.d (Ubuntu-specific):
+ + 10-console-messages.conf: stop low-level kernel messages on console.
+ + 10-kernel-hardening.conf: add the kptr_restrict setting
+ + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
+ + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults
+ for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
+ + 10-link-restrictions.conf: even though the Ubuntu
+ kernel is built with these defaults in place, we want to make sure
+ that people running stock kernels don't miss out.
+ + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing
+ critical sync, remount, reboot functions. (LP: #194676, LP: #1025467)
+ + 10-network-security.conf: enable rp_filter.
+ + 10-ptrace.conf: describe new PTRACE setting.
+ + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
+ for armhf, and arm64.
+ + 10-qemu.conf.s390x for qemu.
+ + README: describe how this directory is supposed to work.
+ - debian/rules: Fix cross build
+ - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
+ writing, don't error out. Otherwise package upgrades can fail,
+ especially in containers.
+ - ignore_erofs.patch: Same as ignore_eaccess but for the case where
+ part of /proc is read/only.
+ * Drop redundant setting of net.ipv4.tcp_syncookies=1, it is now the kernel's default
+ (LP: #1773157)
+ * Update README about new commands for reloading configuration (LP: #1719159)
+
+ -- Balint Reczey Fri, 25 May 2018 12:09:30 +0200
+
+procps (2:3.3.15-1) unstable; urgency=medium
+
+ * New upstream release Closes: #899170
+ * library: Fix integer overflow and LPE in file2strvec CVE-2018-1124
+ * library: Use size_t for alloc functions CVE-2018-1126
+ * pgrep: Fix stack-based buffer overflow CVE-2018-1125
+ * ps: Fix buffer overflow in output buffer, causing DOS CVE-2018-1123
+ * Command Name increased from 16 to 64 characters
+
+ -- Craig Small Sun, 20 May 2018 19:41:46 +1000
+
+procps (2:3.3.14-1) unstable; urgency=medium
+
+ * New upstream release
+ - pgrep: Don't segfault on non match Closes: #894917
+ * Fix init scripti, thanks GSR! Closes: #895005
+
+ -- Craig Small Tue, 10 Apr 2018 21:49:54 +1000
+
+procps (2:3.3.13-1) unstable; urgency=medium
+
+ * New upstream release
+ - doc: Document I idle state in ps.1 and top.1 Closes: #886967
+ - kill: -l space between name parses correctly Closes: #854407
+ - library: don't use vm_min_free on non Linux Closes: #831396
+ - library: don't use SIGPWR on FreeBSD Closes: #832148
+ - pkill: Return 0 only if we can kill process Closes: #852758
+ - ps: avoid eip/esp address truncations Closes: #846361
+ - top: address a wishlist man page NLS suggestion Closes: #865689
+ - watch: define HOST_NAME_MAX where not defined Closes: #830734
+ * Update sysctl.conf sysrq key comments Closes: #882121
+ * Update the init script to use new LSB features
+
+ -- Craig Small Mon, 02 Apr 2018 13:12:50 +1000
+
+procps (2:3.3.12-4) unstable; urgency=medium
+
+ * Add sysctl configuration file to protect hard and soft links
+ This mitigates CVE-2017-18078 on non-Debian kernels Closes: #889098
+ * Update Vcs to Salsa
+ * Update notes about sysrq Closes: #882121
+ * Update standards to 4.1.3
+
+ -- Craig Small Sat, 10 Feb 2018 10:59:11 +1100
procps (2:3.3.12-3ubuntu1) bionic; urgency=medium
diff -Nru procps-3.3.12/debian/compat procps-3.3.15/debian/compat
--- procps-3.3.12/debian/compat 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/compat 2018-06-05 18:20:00.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru procps-3.3.12/debian/control procps-3.3.15/debian/control
--- procps-3.3.12/debian/control 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/control 2018-06-05 18:20:00.000000000 +0000
@@ -1,21 +1,22 @@
Source: procps
Section: admin
-Priority: important
+Priority: optional
Maintainer: Ubuntu Developers
XSBC-Original-Maintainer: Craig Small
-Build-Depends: debhelper (>= 9.20120115),
+Build-Depends: debhelper (>= 11),
dh-exec (>= 0.3),
libncurses5-dev, libncursesw5-dev,
dejagnu,
libnuma-dev [amd64 i386 ia64 mips mipsel mips64 mips64el powerpc ppc64el],
- dh-autoreconf, pkg-config,
+ pkg-config,
libsystemd-dev (>= 209) [linux-any]
-Standards-Version: 3.9.8
-Vcs-Git: git://git.debian.org/collab-maint/procps.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/procps.git;a=summary
+Standards-Version: 4.1.3
+Vcs-Browser: https://salsa.debian.org/debian/procps
+Vcs-Git: https://salsa.debian.org/debian/procps.git
Homepage: https://gitlab.com/procps-ng/procps
Package: procps
+Priority: important
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-10), init-system-helpers (>= 1.29~)
@@ -32,7 +33,7 @@
It contains free, kill, pkill, pgrep, pmap, ps, pwdx, skill, slabtop,
snice, sysctl, tload, top, uptime, vmstat, w, and watch.
-Package: libprocps6
+Package: libprocps7
Architecture: any
Multi-Arch: same
Section: libs
@@ -50,8 +51,7 @@
Architecture: any
Multi-Arch: same
Section: libdevel
-Priority: optional
-Depends: libprocps6 (=${binary:Version}), ${misc:Depends}
+Depends: libprocps7 (=${binary:Version}), ${misc:Depends}
Conflicts: libproc-dev, libprocps0-dev, libprocps1-dev,
libprocps3-dev, libprocps4-dev
Replaces: libproc-dev, libprocps0-dev, libprocps1-dev,
diff -Nru procps-3.3.12/debian/copyright procps-3.3.15/debian/copyright
--- procps-3.3.12/debian/copyright 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/copyright 2018-06-05 18:20:00.000000000 +0000
@@ -48,7 +48,7 @@
Files: debian/*
Copyright: 1997-2015 Craig Small
- 1996-1197 Helmut Geyer
+ 1996-1997 Helmut Geyer
License: GPL-2.0+
License: GPL-2.0+
diff -Nru procps-3.3.12/debian/libprocps6.install procps-3.3.15/debian/libprocps6.install
--- procps-3.3.12/debian/libprocps6.install 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/libprocps6.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so.* lib/${DEB_HOST_MULTIARCH}/
diff -Nru procps-3.3.12/debian/libprocps7.install procps-3.3.15/debian/libprocps7.install
--- procps-3.3.12/debian/libprocps7.install 1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.15/debian/libprocps7.install 2018-06-05 18:20:00.000000000 +0000
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so.* lib/${DEB_HOST_MULTIARCH}/
diff -Nru procps-3.3.12/debian/libprocps-dev.links procps-3.3.15/debian/libprocps-dev.links
--- procps-3.3.12/debian/libprocps-dev.links 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/libprocps-dev.links 2018-06-05 18:20:00.000000000 +0000
@@ -1,2 +1,2 @@
#! /usr/bin/dh-exec
-lib/${DEB_HOST_MULTIARCH}/libprocps.so.6 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so
+lib/${DEB_HOST_MULTIARCH}/libprocps.so.7 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so
diff -Nru procps-3.3.12/debian/patches/832148_no_sigpwr procps-3.3.15/debian/patches/832148_no_sigpwr
--- procps-3.3.12/debian/patches/832148_no_sigpwr 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/patches/832148_no_sigpwr 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-Description: No SIGPWR on FreeBSD
- Removes warning and definition for SIGPWR on FreeBSD as it doesn't
- exist there anyhow.
-Author: Jon Boden
-Bug-Debian: https://bugs.debian.org/832148
-Reviewed-by: Craig Small
-Last-Update: 2016-08-28
---- a/proc/sig.c
-+++ b/proc/sig.c
-@@ -56,7 +56,7 @@
- #endif
-
- /* It seems the SPARC libc does not know the kernel supports SIGPWR. */
--#ifndef SIGPWR
-+#if defined(__linux__) && !defined(SIGPWR)
- # warning Your header files lack SIGPWR. (assuming it is number 29)
- # define SIGPWR 29
- #endif
-@@ -84,7 +84,9 @@
- {"PIPE", SIGPIPE},
- {"POLL", SIGPOLL}, /* IO */
- {"PROF", SIGPROF},
-+#ifdef SIGPWR
- {"PWR", SIGPWR},
-+#endif
- {"QUIT", SIGQUIT},
- {"SEGV", SIGSEGV},
- #ifdef SIGSTKFLT
diff -Nru procps-3.3.12/debian/patches/fix_checks procps-3.3.15/debian/patches/fix_checks
--- procps-3.3.12/debian/patches/fix_checks 1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.15/debian/patches/fix_checks 2018-06-05 18:20:00.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Fix some of the tests
+ Some of the tests failed in the pbuilder
+ For the ps one, the tty of a process is a bit strange, confusing the testsuite
+ The pgrep one, there is some odd buffering going on, reording makes the tests
+ pass
+Author: Craig Small
+Origin: Debian
+Reviewed-by: Craig Small
+Last-Update: 2018-02-10
+--- a/testsuite/config/unix.exp
++++ b/testsuite/config/unix.exp
+@@ -152,5 +152,9 @@
+ return ""
+ }
+ regexp "/dev/(.+)" $raw_tty > tty
++ if { $tty == "tty" } {
++ warning "TTY is tty"
++ return ""
++ }
+ return $tty
+ }
diff -Nru procps-3.3.12/debian/patches/ps_checks procps-3.3.15/debian/patches/ps_checks
--- procps-3.3.12/debian/patches/ps_checks 1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.15/debian/patches/ps_checks 2018-06-05 18:20:00.000000000 +0000
@@ -0,0 +1,13 @@
+Index: procps/testsuite/ps.test/ps_output.exp
+===================================================================
+--- procps.orig/testsuite/ps.test/ps_output.exp
++++ procps/testsuite/ps.test/ps_output.exp
+@@ -23,7 +23,7 @@ set ps_class "\[A-Z?-\]\\s*"
+
+ set flag_match {
+ "%cpu,pcpu,%mem,pmem" "%CPU\\s+%CPU\\s+%MEM\\s+%MEM\\s+\(\\d+\.\\d+\\s*\){4}$"
+- "blocked,sig_block,sigmask,caught,sigcatch,sig_catch" "\(BLOCKED\\s+\){3}\(CAUGHT\\s+\){2}CATCHED\\s+\(\[0-9a-f\]+\\s*\){6}$"
++ "blocked,sig_block,sigmask,caught,sigcatch,sig_catch" "\(BLOCKED\\s+\){3}\(CAUGHT\\s+\){2}CATCHED\\s+\(\[0-9a-f\]+\\s*\)+$"
+ "bsdstart,start,lstart" "\\s*START\\s+STARTED\\s+STARTED\\s+\(\\s*\(\[A-Z\]\[a-z\]{2} \\d+|\\d+:\\d{2}\)\\s+\(\[A-Z\]\[a-z\]{2} \\d+|\\d+:\\d{2}:\\d{2}\)\\s+\[A-Z\]\[a-z\]{2} \[A-Z\]\[a-z\]{2}\\s+\\d+ \\d{2}:\\d{2}:\\d{2} \\d{4}\\s*\)+$"
+ "bsdtime,cputime,etime,etimes" "\\s*TIME\\s+TIME\\s+ELAPSED\\s+ELAPSED\\s*\(\\s*\\d+:\\d{2}\\s+\\d{2}:\\d{2}:\\d{2}\\s+\(\\d{2}:\)?\\d{2}:\\d{2}\\s+\\d+\\s*\)+$"
+ "user,ruser,group,rgroup,uid,ruid,gid,rgid" "\\s*USER\\s+RUSER\\s+GROUP\\s+RGROUP\\s+UID\\s+RUID\\s+GID\\s+RGID\\s+\(\(\\s*\[A-Za-z0-9_+-\]+\\s+\){4}\(\\d+\\s+\){4}\\s*\)+$"
diff -Nru procps-3.3.12/debian/patches/remove_strtod_tests procps-3.3.15/debian/patches/remove_strtod_tests
--- procps-3.3.12/debian/patches/remove_strtod_tests 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/patches/remove_strtod_tests 2018-06-05 18:20:00.000000000 +0000
@@ -1,10 +1,10 @@
--- a/lib/test_strtod_nol.c
+++ b/lib/test_strtod_nol.c
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
int i;
double val;
+ return EXIT_SUCCESS; // always success
for(i=0; tests[i].string != NULL; i++) {
- if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
- tests[i].result) {
+ val = strtod_nol_or_err(tests[i].string, "Cannot parse number");
+ if(fabs(tests[i].result - val) > DBL_EPSILON) {
diff -Nru procps-3.3.12/debian/patches/series procps-3.3.15/debian/patches/series
--- procps-3.3.12/debian/patches/series 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/patches/series 2018-06-05 18:20:00.000000000 +0000
@@ -1,3 +1,4 @@
+fix_checks
remove_strtod_tests
watch_hostname_max_define
disable_sched_test
@@ -5,4 +6,4 @@
pmap_test
ignore_eaccess.patch
ignore_erofs.patch
-832148_no_sigpwr
+ps_checks
diff -Nru procps-3.3.12/debian/patches/watch_hostname_max_define procps-3.3.15/debian/patches/watch_hostname_max_define
--- procps-3.3.12/debian/patches/watch_hostname_max_define 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/patches/watch_hostname_max_define 2018-06-05 18:20:00.000000000 +0000
@@ -1,9 +1,9 @@
--- a/watch.c
+++ b/watch.c
-@@ -62,6 +62,10 @@
- # define isprint(x) ( (x>=' '&&x<='~') || (x>=0xa0) )
+@@ -61,6 +61,10 @@
#endif
+
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 64
+#endif
diff -Nru procps-3.3.12/debian/procps.init.linux procps-3.3.15/debian/procps.init.linux
--- procps-3.3.12/debian/procps.init.linux 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/procps.init.linux 2018-06-05 18:20:00.000000000 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
-# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf
-#
-# written by Elrond
-
+# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing.
+if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
+ set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script
+fi
### BEGIN INIT INFO
# Provides: procps
# Required-Start: mountkernfs $local_fs
@@ -14,41 +14,21 @@
# Short-Description: Configure kernel parameters at boottime
# Description: Loads kernel parameters that are specified in /etc/sysctl.conf
### END INIT INFO
+#
+# written by Elrond
-PATH=/sbin:/bin
-
-SYSCTL=/sbin/sysctl
-
-test -x $SYSCTL || exit 0
-
-. /lib/lsb/init-functions
+DESC="Setting kernel variables"
+DAEMON=/sbin/sysctl
+PIDFILE=none
# Comment this out for sysctl to print every item changed
QUIET_SYSCTL="-q"
-# Check for existance of the default file and exit if not there,
-# Closes #52839 for the boot-floppy people
-if [ -f /etc/default/rcS ] ; then
- . /etc/default/rcS
-fi
-
-set -e
-
-case "$1" in
- start|restart|force-reload|reload)
- log_action_begin_msg "Setting kernel variables"
- STATUS=0
- $SYSCTL $QUIET_SYSCTL --system || STATUS=$?
- log_action_end_msg $STATUS
- ;;
- stop)
- ;;
- status)
- ;;
- *)
- echo "Usage: /etc/init.d/procps {start|stop|restart|reload|force-reload|status}" >&2
- exit 3
- ;;
-esac
+do_start_cmd() {
+ STATUS=0
+ $DAEMON $QUIET_SYSCTL --system || STATUS=$?
+ return $STATUS
+}
-exit 0
+do_stop() { return 0; }
+do_status() { return 0; }
diff -Nru procps-3.3.12/debian/procps.install procps-3.3.15/debian/procps.install
--- procps-3.3.12/debian/procps.install 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/procps.install 2018-06-05 18:20:00.000000000 +0000
@@ -2,6 +2,8 @@
# I think that just means linux
debian/sysctl.conf etc
etc/sysctl.d/*
+debian/protect-links.conf etc/sysctl.d
+debian/README.sysctl etc/sysctl.d
bbin/* bin
bin/* usr/bin
sbin/sysctl sbin
diff -Nru procps-3.3.12/debian/protect-links.conf procps-3.3.15/debian/protect-links.conf
--- procps-3.3.12/debian/protect-links.conf 1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.15/debian/protect-links.conf 2018-06-05 18:20:00.000000000 +0000
@@ -0,0 +1,8 @@
+###################################################################
+# Protected links
+#
+# Protects against creating or following links under certain conditions
+# Debian kernels have both set to 1 (restricted)
+# See https://www.kernel.org/doc/Documentation/sysctl/fs.txt
+fs.protected_hardlinks = 1
+fs.protected_symlinks = 1
diff -Nru procps-3.3.12/debian/README.sysctl procps-3.3.15/debian/README.sysctl
--- procps-3.3.12/debian/README.sysctl 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/README.sysctl 2018-06-05 18:20:00.000000000 +0000
@@ -11,3 +11,6 @@
/etc/sysctl.d/local.conf but as long as you follow the rules for the names
of the file, anything will work. See sysctl.conf(8) man page for details
of the format.
+
+After making any changes, please run "service procps reload" (or, from
+a Debian package maintainer script "deb-systemd-invoke restart procps.service").
diff -Nru procps-3.3.12/debian/rules procps-3.3.15/debian/rules
--- procps-3.3.12/debian/rules 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/rules 2018-06-05 18:20:00.000000000 +0000
@@ -7,10 +7,10 @@
DEBROOT=$(CURDIR)/debian/tmp
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
configure_flags += --host=$(DEB_HOST_GNU_TYPE)
CROSS = PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config \
@@ -27,10 +27,7 @@
endif
%:
- dh $@ --with autoreconf
-
-override_dh_auto_clean:
- dh_auto_clean
+ dh $@
override_dh_auto_configure:
$(CROSS) ./configure \
@@ -56,7 +53,7 @@
# Build up sysctl.d
install -d $(DEBROOT)/etc/sysctl.d/
- install --mode 644 -o root -g root debian/sysctl.d/*.conf debian/sysctl.d/README $(DEBROOT)/etc/sysctl.d/
+ install --mode 644 -o root -g root debian/sysctl.d/*.conf $(DEBROOT)/etc/sysctl.d/
ifneq (,$(wildcard debian/sysctl.d/*.conf.$(DEB_HOST_ARCH)))
# If a non-arch-specific default exists, install the arch-specific
# version of the conf in place of it, otherwise, build up a general
@@ -117,5 +114,5 @@
endif
override_dh_makeshlibs:
- dh_makeshlibs -V 'libprocps6'
+ dh_makeshlibs -V 'libprocps7 (>=2:3.3.15-1)'
diff -Nru procps-3.3.12/debian/sysctl.conf procps-3.3.15/debian/sysctl.conf
--- procps-3.3.12/debian/sysctl.conf 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/sysctl.conf 2018-06-05 18:20:00.000000000 +0000
@@ -61,17 +61,8 @@
###################################################################
# Magic system request Key
-# 0=disable, 1=enable all
-# Debian kernels have this set to 0 (disable the key)
-# See https://www.kernel.org/doc/Documentation/sysrq.txt
+# 0=disable, 1=enable all, >1 bitmask of sysrq functions
+# See https://www.kernel.org/doc/html/latest/admin-guide/sysrq.html
# for what other values do
-#kernel.sysrq=1
+#kernel.sysrq=438
-###################################################################
-# Protected links
-#
-# Protects against creating or following links under certain conditions
-# Debian kernels have both set to 1 (restricted)
-# See https://www.kernel.org/doc/Documentation/sysctl/fs.txt
-#fs.protected_hardlinks=0
-#fs.protected_symlinks=0
diff -Nru procps-3.3.12/debian/sysctl.d/10-network-security.conf procps-3.3.15/debian/sysctl.d/10-network-security.conf
--- procps-3.3.12/debian/sysctl.d/10-network-security.conf 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/sysctl.d/10-network-security.conf 2018-06-05 18:20:00.000000000 +0000
@@ -4,9 +4,3 @@
net.ipv4.conf.default.rp_filter=1
net.ipv4.conf.all.rp_filter=1
-# Turn on SYN-flood protections. Starting with 2.6.26, there is no loss
-# of TCP functionality/features under normal conditions. When flood
-# protections kick in under high unanswered-SYN load, the system
-# should remain more stable, with a trade off of some loss of TCP
-# functionality/features (e.g. TCP Window scaling).
-net.ipv4.tcp_syncookies=1
diff -Nru procps-3.3.12/debian/sysctl.d/README procps-3.3.15/debian/sysctl.d/README
--- procps-3.3.12/debian/sysctl.d/README 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/sysctl.d/README 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-This directory contains settings similar to those found in /etc/sysctl.conf.
-In general, files in the 10-*.conf range come from the procps package and
-serve as system defaults. Other packages install their files in the
-30-*.conf range, to override system defaults. End-users can use 60-*.conf
-and above, or use /etc/sysctl.conf directly, which overrides anything in
-this directory.
-
-After making any changes, please run "service procps start" (or, from
-a Debian package maintainer script "invoke-rc.d procps start").
diff -Nru procps-3.3.12/debian/watch procps-3.3.15/debian/watch
--- procps-3.3.12/debian/watch 2018-01-17 22:35:48.000000000 +0000
+++ procps-3.3.15/debian/watch 2018-06-05 18:20:00.000000000 +0000
@@ -2,5 +2,10 @@
# Rename this file to "watch" and then you can run the "uscan" command
# to check for upstream updates and more.
# Site Directory Pattern Version Script
-version=3
-http://procps.sourceforge.net/download.html procps-(.*)\.tar\.gz
+#version=3
+#http://procps.sourceforge.net/download.html procps-(.*)\.tar\.gz
+version=4
+opts=filenamemangle=s/.*\/(\d\S+)\/archive\.tar\.gz/procps-$1\.tar\.gz/g \
+ https://gitlab.com/procps-ng/procps/tags?sort=updated_desc .*v([0-9.]+)/archive\.tar\.gz
+
+
diff -Nru procps-3.3.12/depcomp procps-3.3.15/depcomp
--- procps-3.3.12/depcomp 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/depcomp 2018-05-19 22:05:40.000000000 +0000
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# 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
@@ -786,6 +786,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -Nru procps-3.3.12/free.c procps-3.3.15/free.c
--- procps-3.3.12/free.c 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/free.c 2018-05-19 22:05:40.000000000 +0000
@@ -130,17 +130,10 @@
snprintf(buf, sizeof(buf), "%lld", ((long long int)size) * 1024);
return buf;
}
- if (args.exponent == 2) {
- if (!(flags & FREE_SI))
- snprintf(buf, sizeof(buf), "%ld", size);
- else
- snprintf(buf, sizeof(buf), "%ld", (long int)(size / 0.9765625));
- return buf;
- }
- if (args.exponent > 2) {
+ if (args.exponent > 1) {
/* In desired scale. */
snprintf(buf, sizeof(buf), "%ld",
- (long int)(size / power(base, args.exponent - 2))
+ (long int)((size * 1024.0) / power(base, args.exponent-1))
);
return buf;
}
@@ -155,30 +148,30 @@
return buf;
break;
case 2:
-
+ case 3:
+ case 4:
+ case 5:
+ case 6:
if (!(flags & FREE_SI)) {
- if (4 >= snprintf(buf, sizeof(buf), "%ld%c", size, *up))
+ if (5 >=
+ snprintf(buf, sizeof(buf), "%.1f%ci",
+ (float)((size / 1024) * base / power(base, i - 2)), *up))
+ return buf;
+ if (5 >=
+ snprintf(buf, sizeof(buf), "%ld%ci",
+ (long)((size / 1024) * base / power(base, i - 2)), *up))
return buf;
} else {
if (4 >=
+ snprintf(buf, sizeof(buf), "%.1f%c",
+ (float)((size / 1024) * base / power(base, i - 2)), *up))
+ return buf;
+ if (4 >=
snprintf(buf, sizeof(buf), "%ld%c",
- (long)(size / 0.9765625), *up))
+ (long)((size / 1024) * base / power(base, i - 2)), *up))
return buf;
}
break;
- case 3:
- case 4:
- case 5:
- case 6:
- if (4 >=
- snprintf(buf, sizeof(buf), "%.1f%c",
- (float)(size / power(base, i - 2)), *up))
- return buf;
- if (4 >=
- snprintf(buf, sizeof(buf), "%ld%c",
- (long)(size / power(base, i - 2)), *up))
- return buf;
- break;
case 7:
break;
}
@@ -202,7 +195,6 @@
int main(int argc, char **argv)
{
int c, flags = 0, unit_set = 0;
- char *endptr;
struct commandline_arguments args;
/*
diff -Nru procps-3.3.12/include/Makefile.in procps-3.3.15/include/Makefile.in
--- procps-3.3.12/include/Makefile.in 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/include/Makefile.in 2018-05-19 22:05:40.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -172,6 +172,8 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ELOGIND_CFLAGS = @ELOGIND_CFLAGS@
+ELOGIND_LIBS = @ELOGIND_LIBS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GMSGFMT = @GMSGFMT@
@@ -233,6 +235,7 @@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+WATCH_NCURSES_CFLAGS = @WATCH_NCURSES_CFLAGS@
WATCH_NCURSES_LIBS = @WATCH_NCURSES_LIBS@
WITH_WATCH8BIT = @WITH_WATCH8BIT@
XGETTEXT = @XGETTEXT@
@@ -289,6 +292,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+usrbin_execdir = @usrbin_execdir@
dist_noinst_HEADERS = \
c.h \
fileutils.h \
diff -Nru procps-3.3.12/include/strutils.h procps-3.3.15/include/strutils.h
--- procps-3.3.12/include/strutils.h 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/include/strutils.h 2018-05-19 22:05:40.000000000 +0000
@@ -7,6 +7,6 @@
extern long strtol_or_err(const char *str, const char *errmesg);
extern double strtod_or_err(const char *str, const char *errmesg);
-double strtod_nol_or_err(char *str, const char *errmesg);
+extern double strtod_nol_or_err(char *str, const char *errmesg);
#endif
diff -Nru procps-3.3.12/lib/strutils.c procps-3.3.15/lib/strutils.c
--- procps-3.3.12/lib/strutils.c 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/lib/strutils.c 2018-05-19 22:05:40.000000000 +0000
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include
+#include
#include
#include
@@ -71,9 +73,9 @@
*/
double strtod_nol_or_err(char *str, const char *errmesg)
{
- double num;
+ long double num;
const char *cp, *radix;
- double mult;
+ long double mult;
int negative = 0;
if (str != NULL && *str != '\0') {
@@ -95,29 +97,29 @@
mult=0.1;
while(isdigit(*radix)) {
radix++;
- mult *= 10;
+ mult *= 10.0;
}
while(isdigit(*cp)) {
- num += (*cp - '0') * mult;
- mult /= 10;
+ num += (long double)(*cp - '0') * mult;
+ mult /= 10.0;
cp++;
}
/* got the integers */
if (*cp == '\0')
- return (negative?-num:num);
+ return (double)(negative?-num:num);
if (*cp != '.' && *cp != ',')
error(EXIT_FAILURE, EINVAL, "%s: '%s'", errmesg, str);
cp++;
mult = 0.1;
while(isdigit(*cp)) {
- num += (*cp - '0') * mult;
- mult /= 10;
+ num += (long double)(*cp - '0') * mult;
+ mult /= 10.0;
cp++;
}
if (*cp == '\0')
- return (negative?-num:num);
+ return (double)(negative?-num:num);
}
error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str);
- return 0;
+ return (double)0;
}
diff -Nru procps-3.3.12/lib/test_strtod_nol.c procps-3.3.15/lib/test_strtod_nol.c
--- procps-3.3.12/lib/test_strtod_nol.c 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/lib/test_strtod_nol.c 2018-05-19 22:05:40.000000000 +0000
@@ -1,4 +1,5 @@
-
+#include
+#include
#include
#include
#include "strutils.h"
@@ -33,8 +34,8 @@
double val;
for(i=0; tests[i].string != NULL; i++) {
- if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
- tests[i].result) {
+ val = strtod_nol_or_err(tests[i].string, "Cannot parse number");
+ if(fabs(tests[i].result - val) > DBL_EPSILON) {
fprintf(stderr, "FAIL: strtod_nol_or_err(\"%s\") != %f\n",
tests[i].string, tests[i].result);
return EXIT_FAILURE;
diff -Nru procps-3.3.12/ltmain.sh procps-3.3.15/ltmain.sh
--- procps-3.3.12/ltmain.sh 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/ltmain.sh 2018-05-19 22:05:40.000000000 +0000
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-0.1"
+VERSION="2.4.6 Debian-2.4.6-2.1"
package_revision=2.4.6
@@ -64,7 +64,7 @@
# libraries, which are installed to $pkgauxdir.
# Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2015-10-12.13; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
@@ -580,16 +580,16 @@
{
$debug_cmd
- func_quote_for_eval "$2"
- eval "$1+=\\ \$func_quote_for_eval_result"
+ func_quote_arg pretty "$2"
+ eval "$1+=\\ \$func_quote_arg_result"
}'
else
func_append_quoted ()
{
$debug_cmd
- func_quote_for_eval "$2"
- eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ func_quote_arg pretty "$2"
+ eval "$1=\$$1\\ \$func_quote_arg_result"
}
fi
@@ -1091,85 +1091,181 @@
}
-# func_quote_for_eval ARG...
-# --------------------------
-# Aesthetically quote ARGs to be evaled later.
-# This function returns two values:
-# i) func_quote_for_eval_result
-# double-quoted, suitable for a subsequent eval
-# ii) func_quote_for_eval_unquoted_result
-# has all characters that are still active within double
-# quotes backslashified.
-func_quote_for_eval ()
+# func_quote_portable EVAL ARG
+# ----------------------------
+# Internal function to portably implement func_quote_arg. Note that we still
+# keep attention to performance here so we as much as possible try to avoid
+# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
+func_quote_portable ()
{
$debug_cmd
- func_quote_for_eval_unquoted_result=
- func_quote_for_eval_result=
- while test 0 -lt $#; do
- case $1 in
- *[\\\`\"\$]*)
- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
- *)
- _G_unquoted_arg=$1 ;;
- esac
- if test -n "$func_quote_for_eval_unquoted_result"; then
- func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
- else
- func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ func_quote_portable_result=$2
+
+ # one-time-loop (easy break)
+ while true
+ do
+ if $1; then
+ func_quote_portable_result=`$ECHO "$2" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
+ break
fi
- case $_G_unquoted_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and variable expansion
- # for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- _G_quoted_arg=\"$_G_unquoted_arg\"
+ # Quote for eval.
+ case $func_quote_portable_result in
+ *[\\\`\"\$]*)
+ case $func_quote_portable_result in
+ *[\[\*\?]*)
+ func_quote_portable_result=`$ECHO "$func_quote_portable_result" | $SED "$sed_quote_subst"`
+ break
+ ;;
+ esac
+
+ func_quote_portable_old_IFS=$IFS
+ for _G_char in '\' '`' '"' '$'
+ do
+ # STATE($1) PREV($2) SEPARATOR($3)
+ set start "" ""
+ func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
+ IFS=$_G_char
+ for _G_part in $func_quote_portable_result
+ do
+ case $1 in
+ quote)
+ func_append func_quote_portable_result "$3$2"
+ set quote "$_G_part" "\\$_G_char"
+ ;;
+ start)
+ set first "" ""
+ func_quote_portable_result=
+ ;;
+ first)
+ set quote "$_G_part" ""
+ ;;
+ esac
+ done
+ done
+ IFS=$func_quote_portable_old_IFS
;;
- *)
- _G_quoted_arg=$_G_unquoted_arg
- ;;
+ *) ;;
esac
-
- if test -n "$func_quote_for_eval_result"; then
- func_append func_quote_for_eval_result " $_G_quoted_arg"
- else
- func_append func_quote_for_eval_result "$_G_quoted_arg"
- fi
- shift
+ break
done
+
+ func_quote_portable_unquoted_result=$func_quote_portable_result
+ case $func_quote_portable_result in
+ # double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # many bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ func_quote_portable_result=\"$func_quote_portable_result\"
+ ;;
+ esac
}
-# func_quote_for_expand ARG
-# -------------------------
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
- $debug_cmd
+# func_quotefast_eval ARG
+# -----------------------
+# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG',
+# but optimized for speed. Result is stored in $func_quotefast_eval.
+if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
+ func_quotefast_eval ()
+ {
+ printf -v func_quotefast_eval_result %q "$1"
+ }
+else
+ func_quotefast_eval ()
+ {
+ func_quote_portable false "$1"
+ func_quotefast_eval_result=$func_quote_portable_result
+ }
+fi
- case $1 in
- *[\\\`\"]*)
- _G_arg=`$ECHO "$1" | $SED \
- -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
- *)
- _G_arg=$1 ;;
+
+# func_quote_arg MODEs ARG
+# ------------------------
+# Quote one ARG to be evaled later. MODEs argument may contain zero ore more
+# specifiers listed below separated by ',' character. This function returns two
+# values:
+# i) func_quote_arg_result
+# double-quoted (when needed), suitable for a subsequent eval
+# ii) func_quote_arg_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified. Available only if 'unquoted' is specified.
+#
+# Available modes:
+# ----------------
+# 'eval' (default)
+# - escape shell special characters
+# 'expand'
+# - the same as 'eval'; but do not quote variable references
+# 'pretty'
+# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might
+# later used in func_quote to get output like: 'echo "a b"' instead of
+# 'echo a\ b'. This is slower than default on some shells.
+# 'unquoted'
+# - produce also $func_quote_arg_unquoted_result which does not contain
+# wrapping double-quotes.
+#
+# Examples for 'func_quote_arg pretty,unquoted string':
+#
+# string | *_result | *_unquoted_result
+# ------------+-----------------------+-------------------
+# " | \" | \"
+# a b | "a b" | a b
+# "a b" | "\"a b\"" | \"a b\"
+# * | "*" | *
+# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\"
+#
+# Examples for 'func_quote_arg pretty,unquoted,expand string':
+#
+# string | *_result | *_unquoted_result
+# --------------+---------------------+--------------------
+# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\"
+func_quote_arg ()
+{
+ _G_quote_expand=false
+ case ,$1, in
+ *,expand,*)
+ _G_quote_expand=:
+ ;;
esac
- case $_G_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- _G_arg=\"$_G_arg\"
+ case ,$1, in
+ *,pretty,*|*,expand,*|*,unquoted,*)
+ func_quote_portable $_G_quote_expand "$2"
+ func_quote_arg_result=$func_quote_portable_result
+ func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
+ ;;
+ *)
+ # Faster quote-for-eval for some shells.
+ func_quotefast_eval "$2"
+ func_quote_arg_result=$func_quotefast_eval_result
;;
esac
+}
+
- func_quote_for_expand_result=$_G_arg
+# func_quote MODEs ARGs...
+# ------------------------
+# Quote all ARGs to be evaled later and join them into single command. See
+# func_quote_arg's description for more info.
+func_quote ()
+{
+ $debug_cmd
+ _G_func_quote_mode=$1 ; shift
+ func_quote_result=
+ while test 0 -lt $#; do
+ func_quote_arg "$_G_func_quote_mode" "$1"
+ if test -n "$func_quote_result"; then
+ func_append func_quote_result " $func_quote_arg_result"
+ else
+ func_append func_quote_result "$func_quote_arg_result"
+ fi
+ shift
+ done
}
@@ -1215,8 +1311,8 @@
_G_cmd=$1
_G_fail_exp=${2-':'}
- func_quote_for_expand "$_G_cmd"
- eval "func_notquiet $func_quote_for_expand_result"
+ func_quote_arg pretty,expand "$_G_cmd"
+ eval "func_notquiet $func_quote_arg_result"
$opt_dry_run || {
eval "$_G_cmd"
@@ -1241,8 +1337,8 @@
_G_fail_exp=${2-':'}
$opt_quiet || {
- func_quote_for_expand "$_G_cmd"
- eval "func_echo $func_quote_for_expand_result"
+ func_quote_arg expand,pretty "$_G_cmd"
+ eval "func_echo $func_quote_arg_result"
}
$opt_dry_run || {
@@ -1370,7 +1466,7 @@
#! /bin/sh
# Set a version string for this script.
-scriptversion=2014-01-07.03; # UTC
+scriptversion=2015-10-12.13; # UTC
# A portable, pluggable option parser for Bourne shell.
# Written by Gary V. Vaughan, 2010
@@ -1530,6 +1626,8 @@
{
$debug_cmd
+ _G_rc_run_hooks=false
+
case " $hookable_fns " in
*" $1 "*) ;;
*) func_fatal_error "'$1' does not support hook funcions.n" ;;
@@ -1538,16 +1636,16 @@
eval _G_hook_fns=\$$1_hooks; shift
for _G_hook in $_G_hook_fns; do
- eval $_G_hook '"$@"'
-
- # store returned options list back into positional
- # parameters for next 'cmd' execution.
- eval _G_hook_result=\$${_G_hook}_result
- eval set dummy "$_G_hook_result"; shift
+ if eval $_G_hook '"$@"'; then
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ _G_rc_run_hooks=:
+ fi
done
- func_quote_for_eval ${1+"$@"}
- func_run_hooks_result=$func_quote_for_eval_result
+ $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
}
@@ -1557,10 +1655,16 @@
## --------------- ##
# In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, remove any
-# options that you action, and then pass back the remaining unprocessed
+# full positional parameter list in your hook function, you may remove/edit
+# any options that you action, and then pass back the remaining unprocessed
# options in '_result', escaped suitably for
-# 'eval'. Like this:
+# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
+# hook's caller know that it should pay attention to
+# '_result'. Returning $EXIT_FAILURE signalizes that
+# arguments are left untouched by the hook and therefore caller will ignore the
+# result variable.
+#
+# Like this:
#
# my_options_prep ()
# {
@@ -1570,9 +1674,11 @@
# usage_message=$usage_message'
# -s, --silent don'\''t print informational messages
# '
-#
-# func_quote_for_eval ${1+"$@"}
-# my_options_prep_result=$func_quote_for_eval_result
+# # No change in '$@' (ignored completely by this hook). There is
+# # no need to do the equivalent (but slower) action:
+# # func_quote eval ${1+"$@"}
+# # my_options_prep_result=$func_quote_result
+# false
# }
# func_add_hook func_options_prep my_options_prep
#
@@ -1581,25 +1687,37 @@
# {
# $debug_cmd
#
+# args_changed=false
+#
# # Note that for efficiency, we parse as many options as we can
# # recognise in a loop before passing the remainder back to the
# # caller on the first unrecognised argument we encounter.
# while test $# -gt 0; do
# opt=$1; shift
# case $opt in
-# --silent|-s) opt_silent=: ;;
+# --silent|-s) opt_silent=:
+# args_changed=:
+# ;;
# # Separate non-argument short options:
# -s*) func_split_short_opt "$_G_opt"
# set dummy "$func_split_short_opt_name" \
# "-$func_split_short_opt_arg" ${1+"$@"}
# shift
+# args_changed=:
# ;;
-# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# *) # Make sure the first unrecognised option "$_G_opt"
+# # is added back to "$@", we could need that later
+# # if $args_changed is true.
+# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
# esac
# done
#
-# func_quote_for_eval ${1+"$@"}
-# my_silent_option_result=$func_quote_for_eval_result
+# if $args_changed; then
+# func_quote eval ${1+"$@"}
+# my_silent_option_result=$func_quote_result
+# fi
+#
+# $args_changed
# }
# func_add_hook func_parse_options my_silent_option
#
@@ -1611,16 +1729,32 @@
# $opt_silent && $opt_verbose && func_fatal_help "\
# '--silent' and '--verbose' options are mutually exclusive."
#
-# func_quote_for_eval ${1+"$@"}
-# my_option_validation_result=$func_quote_for_eval_result
+# false
# }
# func_add_hook func_validate_options my_option_validation
#
-# You'll alse need to manually amend $usage_message to reflect the extra
+# You'll also need to manually amend $usage_message to reflect the extra
# options you parse. It's preferable to append if you can, so that
# multiple option parsing hooks can be added safely.
+# func_options_finish [ARG]...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+ $debug_cmd
+
+ _G_func_options_finish_exit=false
+ if func_run_hooks func_options ${1+"$@"}; then
+ func_options_finish_result=$func_run_hooks_result
+ _G_func_options_finish_exit=:
+ fi
+
+ $_G_func_options_finish_exit
+}
+
+
# func_options [ARG]...
# ---------------------
# All the functions called inside func_options are hookable. See the
@@ -1630,17 +1764,28 @@
{
$debug_cmd
- func_options_prep ${1+"$@"}
- eval func_parse_options \
- ${func_options_prep_result+"$func_options_prep_result"}
- eval func_validate_options \
- ${func_parse_options_result+"$func_parse_options_result"}
+ _G_rc_options=false
- eval func_run_hooks func_options \
- ${func_validate_options_result+"$func_validate_options_result"}
+ for my_func in options_prep parse_options validate_options options_finish
+ do
+ if eval func_$my_func '${1+"$@"}'; then
+ eval _G_res_var='$'"func_${my_func}_result"
+ eval set dummy "$_G_res_var" ; shift
+ _G_rc_options=:
+ fi
+ done
+
+ # Save modified positional parameters for caller. As a top-level
+ # options-parser function we always need to set the 'func_options_result'
+ # variable (regardless the $_G_rc_options value).
+ if $_G_rc_options; then
+ func_options_result=$_G_res_var
+ else
+ func_quote eval ${1+"$@"}
+ func_options_result=$func_quote_result
+ fi
- # save modified positional parameters for caller
- func_options_result=$func_run_hooks_result
+ $_G_rc_options
}
@@ -1649,9 +1794,9 @@
# All initialisations required before starting the option parse loop.
# Note that when calling hook functions, we pass through the list of
# positional parameters. If a hook function modifies that list, and
-# needs to propogate that back to rest of this script, then the complete
+# needs to propagate that back to rest of this script, then the complete
# modified list must be put in 'func_run_hooks_result' before
-# returning.
+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
func_hookable func_options_prep
func_options_prep ()
{
@@ -1661,10 +1806,14 @@
opt_verbose=false
opt_warning_types=
- func_run_hooks func_options_prep ${1+"$@"}
+ _G_rc_options_prep=false
+ if func_run_hooks func_options_prep ${1+"$@"}; then
+ _G_rc_options_prep=:
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
+ fi
- # save modified positional parameters for caller
- func_options_prep_result=$func_run_hooks_result
+ $_G_rc_options_prep
}
@@ -1678,18 +1827,20 @@
func_parse_options_result=
+ _G_rc_parse_options=false
# this just eases exit handling
while test $# -gt 0; do
# Defer to hook functions for initial option parsing, so they
# get priority in the event of reusing an option name.
- func_run_hooks func_parse_options ${1+"$@"}
-
- # Adjust func_parse_options positional parameters to match
- eval set dummy "$func_run_hooks_result"; shift
+ if func_run_hooks func_parse_options ${1+"$@"}; then
+ eval set dummy "$func_run_hooks_result"; shift
+ _G_rc_parse_options=:
+ fi
# Break out of the loop if we already parsed every option.
test $# -gt 0 || break
+ _G_match_parse_options=:
_G_opt=$1
shift
case $_G_opt in
@@ -1704,7 +1855,10 @@
;;
--warnings|--warning|-W)
- test $# = 0 && func_missing_arg $_G_opt && break
+ if test $# = 0 && func_missing_arg $_G_opt; then
+ _G_rc_parse_options=:
+ break
+ fi
case " $warning_categories $1" in
*" $1 "*)
# trailing space prevents matching last $1 above
@@ -1757,15 +1911,25 @@
shift
;;
- --) break ;;
+ --) _G_rc_parse_options=: ; break ;;
-*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift
+ _G_match_parse_options=false
+ break
+ ;;
esac
+
+ $_G_match_parse_options && _G_rc_parse_options=:
done
- # save modified positional parameters for caller
- func_quote_for_eval ${1+"$@"}
- func_parse_options_result=$func_quote_for_eval_result
+
+ if $_G_rc_parse_options; then
+ # save modified positional parameters for caller
+ func_quote eval ${1+"$@"}
+ func_parse_options_result=$func_quote_result
+ fi
+
+ $_G_rc_parse_options
}
@@ -1778,16 +1942,21 @@
{
$debug_cmd
+ _G_rc_validate_options=false
+
# Display all warnings if -W was not given.
test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
- func_run_hooks func_validate_options ${1+"$@"}
+ if func_run_hooks func_validate_options ${1+"$@"}; then
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
+ _G_rc_validate_options=:
+ fi
# Bail if the options were screwed!
$exit_cmd $EXIT_FAILURE
- # save modified positional parameters for caller
- func_validate_options_result=$func_run_hooks_result
+ $_G_rc_validate_options
}
@@ -2068,7 +2237,7 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.6
+ version: $progname $scriptversion Debian-2.4.6-2.1
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
@@ -2270,6 +2439,8 @@
nonopt=
preserve_args=
+ _G_rc_lt_options_prep=:
+
# Shorthand for --mode=foo, only valid as the first argument
case $1 in
clean|clea|cle|cl)
@@ -2293,11 +2464,18 @@
uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
shift; set dummy --mode uninstall ${1+"$@"}; shift
;;
+ *)
+ _G_rc_lt_options_prep=false
+ ;;
esac
- # Pass back the list of options.
- func_quote_for_eval ${1+"$@"}
- libtool_options_prep_result=$func_quote_for_eval_result
+ if $_G_rc_lt_options_prep; then
+ # Pass back the list of options.
+ func_quote eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_result
+ fi
+
+ $_G_rc_lt_options_prep
}
func_add_hook func_options_prep libtool_options_prep
@@ -2309,9 +2487,12 @@
{
$debug_cmd
+ _G_rc_lt_parse_options=false
+
# Perform our own loop to consume as many options as possible in
# each iteration.
while test $# -gt 0; do
+ _G_match_lt_parse_options=:
_G_opt=$1
shift
case $_G_opt in
@@ -2386,15 +2567,22 @@
func_append preserve_args " $_G_opt"
;;
- # An option not handled by this hook function:
- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"} ; shift
+ _G_match_lt_parse_options=false
+ break
+ ;;
esac
+ $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
done
+ if $_G_rc_lt_parse_options; then
+ # save modified positional parameters for caller
+ func_quote eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_result
+ fi
- # save modified positional parameters for caller
- func_quote_for_eval ${1+"$@"}
- libtool_parse_options_result=$func_quote_for_eval_result
+ $_G_rc_lt_parse_options
}
func_add_hook func_parse_options libtool_parse_options
@@ -2451,8 +2639,8 @@
}
# Pass back the unparsed argument list
- func_quote_for_eval ${1+"$@"}
- libtool_validate_options_result=$func_quote_for_eval_result
+ func_quote eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_result
}
func_add_hook func_validate_options libtool_validate_options
@@ -3418,8 +3606,8 @@
esac
done
- func_quote_for_eval "$libobj"
- test "X$libobj" != "X$func_quote_for_eval_result" \
+ func_quote_arg pretty "$libobj"
+ test "X$libobj" != "X$func_quote_arg_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
&& func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
@@ -3492,8 +3680,8 @@
func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
srcfile=$func_to_tool_file_result
- func_quote_for_eval "$srcfile"
- qsrcfile=$func_quote_for_eval_result
+ func_quote_arg pretty "$srcfile"
+ qsrcfile=$func_quote_arg_result
# Only build a PIC object if we are building libtool libraries.
if test yes = "$build_libtool_libs"; then
@@ -4096,8 +4284,8 @@
case $nonopt in *shtool*) :;; *) false;; esac
then
# Aesthetically quote it.
- func_quote_for_eval "$nonopt"
- install_prog="$func_quote_for_eval_result "
+ func_quote_arg pretty "$nonopt"
+ install_prog="$func_quote_arg_result "
arg=$1
shift
else
@@ -4107,8 +4295,8 @@
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
- func_quote_for_eval "$arg"
- func_append install_prog "$func_quote_for_eval_result"
+ func_quote_arg pretty "$arg"
+ func_append install_prog "$func_quote_arg_result"
install_shared_prog=$install_prog
case " $install_prog " in
*[\\\ /]cp\ *) install_cp=: ;;
@@ -4165,12 +4353,12 @@
esac
# Aesthetically quote the argument.
- func_quote_for_eval "$arg"
- func_append install_prog " $func_quote_for_eval_result"
+ func_quote_arg pretty "$arg"
+ func_append install_prog " $func_quote_arg_result"
if test -n "$arg2"; then
- func_quote_for_eval "$arg2"
+ func_quote_arg pretty "$arg2"
fi
- func_append install_shared_prog " $func_quote_for_eval_result"
+ func_append install_shared_prog " $func_quote_arg_result"
done
test -z "$install_prog" && \
@@ -4181,8 +4369,8 @@
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
- func_quote_for_eval "$install_override_mode"
- func_append install_shared_prog " -m $func_quote_for_eval_result"
+ func_quote_arg pretty "$install_override_mode"
+ func_append install_shared_prog " -m $func_quote_arg_result"
fi
fi
@@ -4478,8 +4666,8 @@
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_quiet || {
- func_quote_for_expand "$relink_command"
- eval "func_echo $func_quote_for_expand_result"
+ func_quote_arg expand,pretty "$relink_command"
+ eval "func_echo $func_quote_arg_result"
}
if eval "$relink_command"; then :
else
@@ -5258,7 +5446,8 @@
if test \"\$libtool_execute_magic\" != \"$magic\"; then
file=\"\$0\""
- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+ func_quote_arg pretty "$ECHO"
+ qECHO=$func_quote_arg_result
$ECHO "\
# A function that is used when there is no print builtin or printf.
@@ -5268,7 +5457,7 @@
\$1
_LTECHO_EOF'
}
- ECHO=\"$qECHO\"
+ ECHO=$qECHO
fi
# Very basic option parsing. These options are (a) specific to
@@ -6611,9 +6800,9 @@
while test "$#" -gt 0; do
arg=$1
shift
- func_quote_for_eval "$arg"
- qarg=$func_quote_for_eval_unquoted_result
- func_append libtool_args " $func_quote_for_eval_result"
+ func_quote_arg pretty,unquoted "$arg"
+ qarg=$func_quote_arg_unquoted_result
+ func_append libtool_args " $func_quote_arg_result"
# If the previous option needs an argument, assign it.
if test -n "$prev"; then
@@ -7211,9 +7400,9 @@
save_ifs=$IFS; IFS=,
for flag in $args; do
IFS=$save_ifs
- func_quote_for_eval "$flag"
- func_append arg " $func_quote_for_eval_result"
- func_append compiler_flags " $func_quote_for_eval_result"
+ func_quote_arg pretty "$flag"
+ func_append arg " $func_quote_arg_result"
+ func_append compiler_flags " $func_quote_arg_result"
done
IFS=$save_ifs
func_stripname ' ' '' "$arg"
@@ -7227,10 +7416,10 @@
save_ifs=$IFS; IFS=,
for flag in $args; do
IFS=$save_ifs
- func_quote_for_eval "$flag"
- func_append arg " $wl$func_quote_for_eval_result"
- func_append compiler_flags " $wl$func_quote_for_eval_result"
- func_append linker_flags " $func_quote_for_eval_result"
+ func_quote_arg pretty "$flag"
+ func_append arg " $wl$func_quote_arg_result"
+ func_append compiler_flags " $wl$func_quote_arg_result"
+ func_append linker_flags " $func_quote_arg_result"
done
IFS=$save_ifs
func_stripname ' ' '' "$arg"
@@ -7254,8 +7443,8 @@
# -msg_* for osf cc
-msg_*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
+ func_quote_arg pretty "$arg"
+ arg=$func_quote_arg_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -7279,8 +7468,8 @@
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*|-fsanitize=*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
+ func_quote_arg pretty "$arg"
+ arg=$func_quote_arg_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
@@ -7301,15 +7490,15 @@
continue
else
# Otherwise treat like 'Some other compiler flag' below
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
+ func_quote_arg pretty "$arg"
+ arg=$func_quote_arg_result
fi
;;
# Some other compiler flag.
-* | +*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
+ func_quote_arg pretty "$arg"
+ arg=$func_quote_arg_result
;;
*.$objext)
@@ -7429,8 +7618,8 @@
*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
+ func_quote_arg pretty "$arg"
+ arg=$func_quote_arg_result
;;
esac # arg
@@ -9942,8 +10131,8 @@
for cmd in $concat_cmds; do
IFS=$save_ifs
$opt_quiet || {
- func_quote_for_expand "$cmd"
- eval "func_echo $func_quote_for_expand_result"
+ func_quote_arg expand,pretty "$cmd"
+ eval "func_echo $func_quote_arg_result"
}
$opt_dry_run || eval "$cmd" || {
lt_exit=$?
@@ -10036,8 +10225,8 @@
eval cmd=\"$cmd\"
IFS=$save_ifs
$opt_quiet || {
- func_quote_for_expand "$cmd"
- eval "func_echo $func_quote_for_expand_result"
+ func_quote_arg expand,pretty "$cmd"
+ eval "func_echo $func_quote_arg_result"
}
$opt_dry_run || eval "$cmd" || {
lt_exit=$?
@@ -10511,12 +10700,12 @@
elif eval var_value=\$$var; test -z "$var_value"; then
relink_command="$var=; export $var; $relink_command"
else
- func_quote_for_eval "$var_value"
- relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+ func_quote_arg pretty "$var_value"
+ relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
fi
done
- relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ func_quote_arg pretty,unquoted "(cd `pwd`; $relink_command)"
+ relink_command=$func_quote_arg_unquoted_result
fi
# Only actually do things if not in dry run mode.
@@ -10756,13 +10945,14 @@
elif eval var_value=\$$var; test -z "$var_value"; then
relink_command="$var=; export $var; $relink_command"
else
- func_quote_for_eval "$var_value"
- relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+ func_quote_arg pretty,unquoted "$var_value"
+ relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
fi
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ func_quote_arg pretty,unquoted "$relink_command"
+ relink_command=$func_quote_arg_unquoted_result
if test yes = "$hardcode_automatic"; then
relink_command=
fi
diff -Nru procps-3.3.12/m4/libtool.m4 procps-3.3.15/m4/libtool.m4
--- procps-3.3.12/m4/libtool.m4 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/m4/libtool.m4 2018-05-19 22:05:40.000000000 +0000
@@ -728,7 +728,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
diff -Nru procps-3.3.12/Makefile.am procps-3.3.15/Makefile.am
--- procps-3.3.12/Makefile.am 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/Makefile.am 2018-05-19 22:05:40.000000000 +0000
@@ -1,6 +1,7 @@
CYGWINFLAGS =
if CYGWIN
- CYGWINFLAGS += -lintl
+CYGWINFLAGS += -lintl
+usrbin_exec_PROGRAMS =
endif
AM_CPPFLAGS = \
@@ -21,8 +22,21 @@
AM_CFLAGS = -Iproc
LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
-transform = s/pscommand/ps/; $(program_transform_name)
+if CYGWIN
+AM_LDFLAGS = ./proc/libprocps.la $(CYGWINFLAGS)
+endif
+
+transform =
+
+if !CYGWIN
+transform += s/pscommand/ps/; $(program_transform_name)
+sbin_PROGRAMS = \
+ sysctl
+else
+transform += s/pscommand/procps/; $(program_transform_name)
+endif
+if !CYGWIN
bin_PROGRAMS = \
ps/pscommand \
free \
@@ -34,9 +48,17 @@
uptime \
vmstat \
w
-
-sbin_PROGRAMS = \
- sysctl
+else
+usrbin_exec_PROGRAMS += \
+ ps/pscommand \
+ free \
+ pgrep \
+ pkill \
+ pmap \
+ uptime \
+ vmstat \
+ w
+endif
lib_LTLIBRARIES = \
proc/libprocps.la
@@ -46,14 +68,19 @@
pgrep.1 \
pkill.1 \
pmap.1 \
- pwdx.1 \
- sysctl.8 \
- sysctl.conf.5 \
- tload.1 \
uptime.1 \
vmstat.8 \
w.1 \
+ ps/procps.1
+
+if !CYGWIN
+dist_man_MANS += \
+ pwdx.1 \
+ tload.1 \
+ sysctl.8 \
+ sysctl.conf.5 \
ps/ps.1
+endif
EXTRA_DIST = \
.version \
@@ -63,7 +90,6 @@
misc/git-version-gen \
Documentation/CodingStyle.md \
Documentation/TODO \
- sysctl.conf \
ps/HACKING \
ps/regression \
$(DIST_MAN_POTS)
@@ -73,8 +99,17 @@
Documentation/bugs.md \
Documentation/FAQ
+if !CYGWIN
+EXTRA_DIST += \
+ sysctl.conf
+endif
+
if BUILD_PIDOF
+if !CYGWIN
bin_PROGRAMS += pidof
+else
+usrbin_exec_PROGRAMS += pidof
+endif
dist_man_MANS += pidof.1
pidof_SOURCES = pidof.c lib/fileutils.c
else
@@ -82,7 +117,13 @@
endif
if BUILD_KILL
+if CYGWIN
+transform += ;s/^kill/prockill/; $(program_transform_name)
+usrbin_exec_PROGRAMS += kill
+else
bin_PROGRAMS += kill
+endif
+
dist_man_MANS += kill.1
kill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
else
@@ -90,35 +131,52 @@
endif
if WITH_NCURSES
+if !CYGWIN
bin_PROGRAMS += \
slabtop \
watch \
top/top
+else
+usrbin_exec_PROGRAMS += \
+ watch \
+ top/top
+endif
+
dist_man_MANS += \
- slabtop.1 \
watch.1 \
top/top.1
-slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
-slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
top_top_SOURCES = \
top/top.h \
top/top.c \
top/top_nls.h \
top/top_nls.c \
lib/fileutils.c
+
if CYGWIN
- top_top_SOURCES += lib/strverscmp.c
+top_top_SOURCES += lib/strverscmp.c
+else
+dist_man_MANS += \
+ slabtop.1
+slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
+slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
endif
top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
endif
if BUILD_SKILL
+if !CYGWIN
bin_PROGRAMS += \
skill \
snice
+else
+usrbin_exec_PROGRAMS += \
+ skill \
+ snice
+endif
skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
dist_man_MANS += \
@@ -134,9 +192,14 @@
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
pmap_SOURCES = pmap.c lib/fileutils.c
+if !CYGWIN
pwdx_SOURCES = pwdx.c lib/fileutils.c
pwdx_LDADD= $(CYGWINFLAGS)
-sysctl_SOURCES = sysctl.c lib/fileutils.c
+sysctl_SOURCES = \
+ sysctl.c \
+ lib/fileutils.c \
+ procio.c
+endif
tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
uptime_SOURCES = uptime.c lib/fileutils.c
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
@@ -145,9 +208,9 @@
# proc/libprocps.la
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-LIBprocps_CURRENT=6
+LIBprocps_CURRENT=8
LIBprocps_REVISION=0
-LIBprocps_AGE=0
+LIBprocps_AGE=1
proc_libprocps_la_LIBADD = $(LIB_KPARTS)
@@ -155,6 +218,10 @@
proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@
endif
+if WITH_ELOGIND
+proc_libprocps_la_LIBADD += @ELOGIND_LIBS@
+endif
+
proc_libprocps_la_LDFLAGS = \
-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
-no-undefined \
@@ -167,6 +234,8 @@
proc/devname.h \
proc/escape.c \
proc/escape.h \
+ proc/numa.c \
+ proc/numa.h \
proc/procps-private.h \
proc/procps.h \
proc/pwcache.c \
@@ -191,6 +260,7 @@
proc/alloc.h \
proc/devname.h \
proc/escape.h \
+ proc/numa.h \
proc/procps.h \
proc/pwcache.h \
proc/readproc.h \
@@ -250,9 +320,26 @@
lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
+if CYGWIN
+ skill_LDADD = $(CYGWINFLAGS)
+ kill_LDADD = $(CYGWINFLAGS)
+ free_LDADD = $(CYGWINFLAGS)
+ pgrep_LDADD = $(CYGWINFLAGS)
+ pkill_LDADD = $(CYGWINFLAGS)
+ pidof_LDADD = $(CYGWINFLAGS)
+ pmap_LDADD = $(CYGWINFLAGS)
+ snice_LDADD = $(CYGWINFLAGS)
+ tload_LDADD = $(CYGWINFLAGS)
+ uptime_LDADD = $(CYGWINFLAGS)
+ w_LDADD = $(CYGWINFLAGS)
+ vmstat_LDADD = $(CYGWINFLAGS)
+endif
+
if EXAMPLE_FILES
+if !CYGWIN
sysconf_DATA = sysctl.conf
endif
+endif
BUILT_SOURCES = $(top_srcdir)/.version
diff -Nru procps-3.3.12/Makefile.in procps-3.3.15/Makefile.in
--- procps-3.3.12/Makefile.in 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/Makefile.in 2018-05-19 22:05:40.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -91,41 +91,73 @@
build_triplet = @build@
host_triplet = @host@
@CYGWIN_TRUE@am__append_1 = -lintl
-bin_PROGRAMS = ps/pscommand$(EXEEXT) free$(EXEEXT) pgrep$(EXEEXT) \
- pkill$(EXEEXT) pmap$(EXEEXT) pwdx$(EXEEXT) tload$(EXEEXT) \
- uptime$(EXEEXT) vmstat$(EXEEXT) w$(EXEEXT) $(am__EXEEXT_1) \
- $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
-sbin_PROGRAMS = sysctl$(EXEEXT)
-@BUILD_PIDOF_TRUE@am__append_2 = pidof
-@BUILD_PIDOF_TRUE@am__append_3 = pidof.1
-@BUILD_PIDOF_FALSE@am__append_4 = pidof.1
-@BUILD_KILL_TRUE@am__append_5 = kill
-@BUILD_KILL_TRUE@am__append_6 = kill.1
-@BUILD_KILL_FALSE@am__append_7 = kill.1
-@WITH_NCURSES_TRUE@am__append_8 = \
-@WITH_NCURSES_TRUE@ slabtop \
-@WITH_NCURSES_TRUE@ watch \
-@WITH_NCURSES_TRUE@ top/top
+@CYGWIN_TRUE@usrbin_exec_PROGRAMS = ps/pscommand$(EXEEXT) \
+@CYGWIN_TRUE@ free$(EXEEXT) pgrep$(EXEEXT) pkill$(EXEEXT) \
+@CYGWIN_TRUE@ pmap$(EXEEXT) uptime$(EXEEXT) vmstat$(EXEEXT) \
+@CYGWIN_TRUE@ w$(EXEEXT) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+@CYGWIN_TRUE@ $(am__EXEEXT_8) $(am__EXEEXT_9)
+@CYGWIN_FALSE@am__append_2 = s/pscommand/ps/; $(program_transform_name)
+@CYGWIN_FALSE@sbin_PROGRAMS = sysctl$(EXEEXT)
+@CYGWIN_TRUE@am__append_3 = s/pscommand/procps/; $(program_transform_name)
+@CYGWIN_FALSE@bin_PROGRAMS = ps/pscommand$(EXEEXT) free$(EXEEXT) \
+@CYGWIN_FALSE@ pgrep$(EXEEXT) pkill$(EXEEXT) pmap$(EXEEXT) \
+@CYGWIN_FALSE@ pwdx$(EXEEXT) tload$(EXEEXT) uptime$(EXEEXT) \
+@CYGWIN_FALSE@ vmstat$(EXEEXT) w$(EXEEXT) $(am__EXEEXT_1) \
+@CYGWIN_FALSE@ $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
+@CYGWIN_FALSE@am__append_4 = \
+@CYGWIN_FALSE@ pwdx.1 \
+@CYGWIN_FALSE@ tload.1 \
+@CYGWIN_FALSE@ sysctl.8 \
+@CYGWIN_FALSE@ sysctl.conf.5 \
+@CYGWIN_FALSE@ ps/ps.1
+
+@CYGWIN_FALSE@am__append_5 = \
+@CYGWIN_FALSE@ sysctl.conf
+
+@BUILD_PIDOF_TRUE@@CYGWIN_FALSE@am__append_6 = pidof
+@BUILD_PIDOF_TRUE@@CYGWIN_TRUE@am__append_7 = pidof
+@BUILD_PIDOF_TRUE@am__append_8 = pidof.1
+@BUILD_PIDOF_FALSE@am__append_9 = pidof.1
+@BUILD_KILL_TRUE@@CYGWIN_TRUE@am__append_10 = ;s/^kill/prockill/; $(program_transform_name)
+@BUILD_KILL_TRUE@@CYGWIN_TRUE@am__append_11 = kill
+@BUILD_KILL_TRUE@@CYGWIN_FALSE@am__append_12 = kill
+@BUILD_KILL_TRUE@am__append_13 = kill.1
+@BUILD_KILL_FALSE@am__append_14 = kill.1
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@am__append_15 = \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ slabtop \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ watch \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ top/top
+
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@am__append_16 = \
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@ watch \
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@ top/top
-@WITH_NCURSES_TRUE@am__append_9 = \
-@WITH_NCURSES_TRUE@ slabtop.1 \
+@WITH_NCURSES_TRUE@am__append_17 = \
@WITH_NCURSES_TRUE@ watch.1 \
@WITH_NCURSES_TRUE@ top/top.1
-@CYGWIN_TRUE@@WITH_NCURSES_TRUE@am__append_10 = lib/strverscmp.c
-@BUILD_SKILL_TRUE@am__append_11 = \
-@BUILD_SKILL_TRUE@ skill \
-@BUILD_SKILL_TRUE@ snice
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@am__append_18 = lib/strverscmp.c
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@am__append_19 = \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ slabtop.1
+
+@BUILD_SKILL_TRUE@@CYGWIN_FALSE@am__append_20 = \
+@BUILD_SKILL_TRUE@@CYGWIN_FALSE@ skill \
+@BUILD_SKILL_TRUE@@CYGWIN_FALSE@ snice
+
+@BUILD_SKILL_TRUE@@CYGWIN_TRUE@am__append_21 = \
+@BUILD_SKILL_TRUE@@CYGWIN_TRUE@ skill \
+@BUILD_SKILL_TRUE@@CYGWIN_TRUE@ snice
-@BUILD_SKILL_TRUE@am__append_12 = \
+@BUILD_SKILL_TRUE@am__append_22 = \
@BUILD_SKILL_TRUE@ skill.1 \
@BUILD_SKILL_TRUE@ snice.1
-@BUILD_SKILL_FALSE@am__append_13 = \
+@BUILD_SKILL_FALSE@am__append_23 = \
@BUILD_SKILL_FALSE@ skill.1 \
@BUILD_SKILL_FALSE@ snice.1
-@WITH_SYSTEMD_TRUE@am__append_14 = @SYSTEMD_LIBS@
+@WITH_SYSTEMD_TRUE@am__append_24 = @SYSTEMD_LIBS@
+@WITH_ELOGIND_TRUE@am__append_25 = @ELOGIND_LIBS@
TESTS = lib/test_strtod_nol$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_5)
noinst_PROGRAMS = lib/test_strutils$(EXEEXT) \
@@ -180,19 +212,21 @@
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
- "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(procpsngdir)" \
- "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(sysconfdir)" \
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbin_execdir)" \
+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \
+ "$(DESTDIR)$(procpsngdir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(sysconfdir)" \
"$(DESTDIR)$(proc_libprocps_la_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-proc_libprocps_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+proc_libprocps_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am__dirstamp = $(am__leading_dot)dirstamp
am_proc_libprocps_la_OBJECTS = proc/alloc.lo proc/devname.lo \
- proc/escape.lo proc/pwcache.lo proc/readproc.lo proc/sig.lo \
- proc/slab.lo proc/sysinfo.lo proc/version.lo proc/wchan.lo \
- proc/whattime.lo
+ proc/escape.lo proc/numa.lo proc/pwcache.lo proc/readproc.lo \
+ proc/sig.lo proc/slab.lo proc/sysinfo.lo proc/version.lo \
+ proc/wchan.lo proc/whattime.lo
proc_libprocps_la_OBJECTS = $(am_proc_libprocps_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -202,13 +236,22 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(proc_libprocps_la_LDFLAGS) $(LDFLAGS) \
-o $@
-@BUILD_PIDOF_TRUE@am__EXEEXT_1 = pidof$(EXEEXT)
-@BUILD_KILL_TRUE@am__EXEEXT_2 = kill$(EXEEXT)
-@WITH_NCURSES_TRUE@am__EXEEXT_3 = slabtop$(EXEEXT) watch$(EXEEXT) \
-@WITH_NCURSES_TRUE@ top/top$(EXEEXT)
-@BUILD_SKILL_TRUE@am__EXEEXT_4 = skill$(EXEEXT) snice$(EXEEXT)
+@BUILD_PIDOF_TRUE@@CYGWIN_FALSE@am__EXEEXT_1 = pidof$(EXEEXT)
+@BUILD_KILL_TRUE@@CYGWIN_FALSE@am__EXEEXT_2 = kill$(EXEEXT)
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@am__EXEEXT_3 = slabtop$(EXEEXT) \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ watch$(EXEEXT) \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ top/top$(EXEEXT)
+@BUILD_SKILL_TRUE@@CYGWIN_FALSE@am__EXEEXT_4 = skill$(EXEEXT) \
+@BUILD_SKILL_TRUE@@CYGWIN_FALSE@ snice$(EXEEXT)
am__EXEEXT_5 = lib/test_strtod_nol$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+@BUILD_PIDOF_TRUE@@CYGWIN_TRUE@am__EXEEXT_6 = pidof$(EXEEXT)
+@BUILD_KILL_TRUE@@CYGWIN_TRUE@am__EXEEXT_7 = kill$(EXEEXT)
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@am__EXEEXT_8 = watch$(EXEEXT) \
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@ top/top$(EXEEXT)
+@BUILD_SKILL_TRUE@@CYGWIN_TRUE@am__EXEEXT_9 = skill$(EXEEXT) \
+@BUILD_SKILL_TRUE@@CYGWIN_TRUE@ snice$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) \
+ $(usrbin_exec_PROGRAMS)
am_free_OBJECTS = free.$(OBJEXT) lib/strutils.$(OBJEXT) \
lib/fileutils.$(OBJEXT)
free_OBJECTS = $(am_free_OBJECTS)
@@ -269,9 +312,10 @@
ps_pscommand_OBJECTS = $(am_ps_pscommand_OBJECTS)
ps_pscommand_LDADD = $(LDADD)
ps_pscommand_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
-am_pwdx_OBJECTS = pwdx.$(OBJEXT) lib/fileutils.$(OBJEXT)
+am__pwdx_SOURCES_DIST = pwdx.c lib/fileutils.c
+@CYGWIN_FALSE@am_pwdx_OBJECTS = pwdx.$(OBJEXT) lib/fileutils.$(OBJEXT)
pwdx_OBJECTS = $(am_pwdx_OBJECTS)
-pwdx_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@CYGWIN_FALSE@pwdx_DEPENDENCIES = $(am__DEPENDENCIES_2)
am__skill_SOURCES_DIST = skill.c lib/strutils.c lib/fileutils.c \
lib/nsutils.c
@BUILD_SKILL_TRUE@am_skill_OBJECTS = skill.$(OBJEXT) \
@@ -282,12 +326,14 @@
skill_LDADD = $(LDADD)
skill_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
am__slabtop_SOURCES_DIST = slabtop.c lib/strutils.c lib/fileutils.c
-@WITH_NCURSES_TRUE@am_slabtop_OBJECTS = slabtop.$(OBJEXT) \
-@WITH_NCURSES_TRUE@ lib/strutils.$(OBJEXT) \
-@WITH_NCURSES_TRUE@ lib/fileutils.$(OBJEXT)
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@am_slabtop_OBJECTS = \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ slabtop.$(OBJEXT) \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ lib/strutils.$(OBJEXT) \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ lib/fileutils.$(OBJEXT)
slabtop_OBJECTS = $(am_slabtop_OBJECTS)
am__DEPENDENCIES_3 = ./proc/libprocps.la $(am__DEPENDENCIES_2)
-@WITH_NCURSES_TRUE@slabtop_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@slabtop_DEPENDENCIES = \
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@ $(am__DEPENDENCIES_3)
am__snice_SOURCES_DIST = skill.c lib/strutils.c lib/fileutils.c \
lib/nsutils.c
@BUILD_SKILL_TRUE@am_snice_OBJECTS = skill.$(OBJEXT) \
@@ -297,7 +343,9 @@
snice_OBJECTS = $(am_snice_OBJECTS)
snice_LDADD = $(LDADD)
snice_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
-am_sysctl_OBJECTS = sysctl.$(OBJEXT) lib/fileutils.$(OBJEXT)
+am__sysctl_SOURCES_DIST = sysctl.c lib/fileutils.c procio.c
+@CYGWIN_FALSE@am_sysctl_OBJECTS = sysctl.$(OBJEXT) \
+@CYGWIN_FALSE@ lib/fileutils.$(OBJEXT) procio.$(OBJEXT)
sysctl_OBJECTS = $(am_sysctl_OBJECTS)
sysctl_LDADD = $(LDADD)
sysctl_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
@@ -330,11 +378,14 @@
w_LDADD = $(LDADD)
w_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
am__watch_SOURCES_DIST = watch.c lib/strutils.c lib/fileutils.c
-@WITH_NCURSES_TRUE@am_watch_OBJECTS = watch.$(OBJEXT) \
-@WITH_NCURSES_TRUE@ lib/strutils.$(OBJEXT) \
-@WITH_NCURSES_TRUE@ lib/fileutils.$(OBJEXT)
+@WITH_NCURSES_TRUE@am_watch_OBJECTS = watch-watch.$(OBJEXT) \
+@WITH_NCURSES_TRUE@ lib/watch-strutils.$(OBJEXT) \
+@WITH_NCURSES_TRUE@ lib/watch-fileutils.$(OBJEXT)
watch_OBJECTS = $(am_watch_OBJECTS)
@WITH_NCURSES_TRUE@watch_DEPENDENCIES = $(am__DEPENDENCIES_2)
+watch_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(watch_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -383,9 +434,10 @@
$(lib_test_nsutils_SOURCES) $(lib_test_process_SOURCES) \
$(lib_test_strtod_nol_SOURCES) $(lib_test_strutils_SOURCES) \
$(pgrep_SOURCES) $(am__pidof_SOURCES_DIST) $(pkill_SOURCES) \
- $(pmap_SOURCES) $(ps_pscommand_SOURCES) $(pwdx_SOURCES) \
- $(am__skill_SOURCES_DIST) $(am__slabtop_SOURCES_DIST) \
- $(am__snice_SOURCES_DIST) $(sysctl_SOURCES) $(tload_SOURCES) \
+ $(pmap_SOURCES) $(ps_pscommand_SOURCES) \
+ $(am__pwdx_SOURCES_DIST) $(am__skill_SOURCES_DIST) \
+ $(am__slabtop_SOURCES_DIST) $(am__snice_SOURCES_DIST) \
+ $(am__sysctl_SOURCES_DIST) $(tload_SOURCES) \
$(am__top_top_SOURCES_DIST) $(uptime_SOURCES) \
$(vmstat_SOURCES) $(w_SOURCES) $(am__watch_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -662,7 +714,7 @@
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
-transform = s/pscommand/ps/; $(program_transform_name)
+transform = $(am__append_2) $(am__append_3) $(am__append_10)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -688,6 +740,8 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ELOGIND_CFLAGS = @ELOGIND_CFLAGS@
+ELOGIND_LIBS = @ELOGIND_LIBS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GMSGFMT = @GMSGFMT@
@@ -749,6 +803,7 @@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+WATCH_NCURSES_CFLAGS = @WATCH_NCURSES_CFLAGS@
WATCH_NCURSES_LIBS = @WATCH_NCURSES_LIBS@
WITH_WATCH8BIT = @WITH_WATCH8BIT@
XGETTEXT = @XGETTEXT@
@@ -805,6 +860,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+usrbin_execdir = @usrbin_execdir@
CYGWINFLAGS = $(am__append_1)
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@ -821,19 +877,19 @@
AM_CFLAGS = -Iproc
LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
+@CYGWIN_TRUE@AM_LDFLAGS = ./proc/libprocps.la $(CYGWINFLAGS)
lib_LTLIBRARIES = \
proc/libprocps.la
-dist_man_MANS = free.1 pgrep.1 pkill.1 pmap.1 pwdx.1 sysctl.8 \
- sysctl.conf.5 tload.1 uptime.1 vmstat.8 w.1 ps/ps.1 \
- $(am__append_3) $(am__append_6) $(am__append_9) \
- $(am__append_12) proc/openproc.3 proc/readproc.3 \
- proc/readproctab.3
+dist_man_MANS = free.1 pgrep.1 pkill.1 pmap.1 uptime.1 vmstat.8 w.1 \
+ ps/procps.1 $(am__append_4) $(am__append_8) $(am__append_13) \
+ $(am__append_17) $(am__append_19) $(am__append_22) \
+ proc/openproc.3 proc/readproc.3 proc/readproctab.3
EXTRA_DIST = .version autogen.sh contrib COPYING.LIB \
misc/git-version-gen Documentation/CodingStyle.md \
- Documentation/TODO sysctl.conf ps/HACKING ps/regression \
- $(DIST_MAN_POTS) $(am__append_4) $(am__append_7) \
- $(am__append_13) proc/libprocps.sym
+ Documentation/TODO ps/HACKING ps/regression $(DIST_MAN_POTS) \
+ $(am__append_5) $(am__append_9) $(am__append_14) \
+ $(am__append_23) proc/libprocps.sym
procpsngdir = $(docdir)
dist_procpsng_DATA = \
Documentation/bugs.md \
@@ -841,13 +897,14 @@
@BUILD_PIDOF_TRUE@pidof_SOURCES = pidof.c lib/fileutils.c
@BUILD_KILL_TRUE@kill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
-@WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
-@WITH_NCURSES_TRUE@slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
@WITH_NCURSES_TRUE@watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
+@WITH_NCURSES_TRUE@watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
@WITH_NCURSES_TRUE@top_top_SOURCES = top/top.h top/top.c top/top_nls.h \
@WITH_NCURSES_TRUE@ top/top_nls.c lib/fileutils.c \
-@WITH_NCURSES_TRUE@ $(am__append_10)
+@WITH_NCURSES_TRUE@ $(am__append_18)
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
+@CYGWIN_FALSE@@WITH_NCURSES_TRUE@slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
@WITH_NCURSES_TRUE@top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
@BUILD_SKILL_TRUE@skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
@BUILD_SKILL_TRUE@snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
@@ -855,9 +912,13 @@
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
pmap_SOURCES = pmap.c lib/fileutils.c
-pwdx_SOURCES = pwdx.c lib/fileutils.c
-pwdx_LDADD = $(CYGWINFLAGS)
-sysctl_SOURCES = sysctl.c lib/fileutils.c
+@CYGWIN_FALSE@pwdx_SOURCES = pwdx.c lib/fileutils.c
+@CYGWIN_FALSE@pwdx_LDADD = $(CYGWINFLAGS)
+@CYGWIN_FALSE@sysctl_SOURCES = \
+@CYGWIN_FALSE@ sysctl.c \
+@CYGWIN_FALSE@ lib/fileutils.c \
+@CYGWIN_FALSE@ procio.c
+
tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
uptime_SOURCES = uptime.c lib/fileutils.c
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
@@ -866,10 +927,11 @@
# proc/libprocps.la
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-LIBprocps_CURRENT = 6
+LIBprocps_CURRENT = 8
LIBprocps_REVISION = 0
-LIBprocps_AGE = 0
-proc_libprocps_la_LIBADD = $(LIB_KPARTS) $(am__append_14)
+LIBprocps_AGE = 1
+proc_libprocps_la_LIBADD = $(LIB_KPARTS) $(am__append_24) \
+ $(am__append_25)
proc_libprocps_la_LDFLAGS = \
-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
-no-undefined \
@@ -882,6 +944,8 @@
proc/devname.h \
proc/escape.c \
proc/escape.h \
+ proc/numa.c \
+ proc/numa.h \
proc/procps-private.h \
proc/procps.h \
proc/pwcache.c \
@@ -906,6 +970,7 @@
proc/alloc.h \
proc/devname.h \
proc/escape.h \
+ proc/numa.h \
proc/procps.h \
proc/pwcache.h \
proc/readproc.h \
@@ -944,7 +1009,7 @@
lib_test_process_LDADD = $(CYGWINFLAGS)
lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
-@EXAMPLE_FILES_TRUE@sysconf_DATA = sysctl.conf
+@CYGWIN_FALSE@@EXAMPLE_FILES_TRUE@sysconf_DATA = sysctl.conf
BUILT_SOURCES = $(top_srcdir)/.version
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1045,6 +1110,7 @@
proc/alloc.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
proc/devname.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
proc/escape.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
+proc/numa.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
proc/pwcache.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
proc/readproc.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
proc/sig.lo: proc/$(am__dirstamp) proc/$(DEPDIR)/$(am__dirstamp)
@@ -1172,6 +1238,55 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+install-usrbin_execPROGRAMS: $(usrbin_exec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(usrbin_exec_PROGRAMS)'; test -n "$(usrbin_execdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(usrbin_execdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(usrbin_execdir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(usrbin_execdir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(usrbin_execdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-usrbin_execPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(usrbin_exec_PROGRAMS)'; test -n "$(usrbin_execdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(usrbin_execdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(usrbin_execdir)" && rm -f $$files
+
+clean-usrbin_execPROGRAMS:
+ @list='$(usrbin_exec_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
lib/$(am__dirstamp):
@$(MKDIR_P) lib
@: > lib/$(am__dirstamp)
@@ -1309,10 +1424,14 @@
w$(EXEEXT): $(w_OBJECTS) $(w_DEPENDENCIES) $(EXTRA_w_DEPENDENCIES)
@rm -f w$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(w_OBJECTS) $(w_LDADD) $(LIBS)
+lib/watch-strutils.$(OBJEXT): lib/$(am__dirstamp) \
+ lib/$(DEPDIR)/$(am__dirstamp)
+lib/watch-fileutils.$(OBJEXT): lib/$(am__dirstamp) \
+ lib/$(DEPDIR)/$(am__dirstamp)
watch$(EXEEXT): $(watch_OBJECTS) $(watch_DEPENDENCIES) $(EXTRA_watch_DEPENDENCIES)
@rm -f watch$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(watch_OBJECTS) $(watch_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(watch_LINK) $(watch_OBJECTS) $(watch_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1329,6 +1448,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgrep.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidof.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwdx.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skill.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slabtop.Po@am__quote@
@@ -1337,7 +1457,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmstat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch-watch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fileutils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/nsutils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strutils.Po@am__quote@
@@ -1347,9 +1467,12 @@
@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_process.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_strtod_nol.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_strutils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/watch-fileutils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/watch-strutils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/alloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/devname.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/escape.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/numa.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/pwcache.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/readproc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/sig.Plo@am__quote@
@@ -1393,6 +1516,48 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+watch-watch.o: watch.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -MT watch-watch.o -MD -MP -MF $(DEPDIR)/watch-watch.Tpo -c -o watch-watch.o `test -f 'watch.c' || echo '$(srcdir)/'`watch.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/watch-watch.Tpo $(DEPDIR)/watch-watch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='watch.c' object='watch-watch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -c -o watch-watch.o `test -f 'watch.c' || echo '$(srcdir)/'`watch.c
+
+watch-watch.obj: watch.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -MT watch-watch.obj -MD -MP -MF $(DEPDIR)/watch-watch.Tpo -c -o watch-watch.obj `if test -f 'watch.c'; then $(CYGPATH_W) 'watch.c'; else $(CYGPATH_W) '$(srcdir)/watch.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/watch-watch.Tpo $(DEPDIR)/watch-watch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='watch.c' object='watch-watch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -c -o watch-watch.obj `if test -f 'watch.c'; then $(CYGPATH_W) 'watch.c'; else $(CYGPATH_W) '$(srcdir)/watch.c'; fi`
+
+lib/watch-strutils.o: lib/strutils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -MT lib/watch-strutils.o -MD -MP -MF lib/$(DEPDIR)/watch-strutils.Tpo -c -o lib/watch-strutils.o `test -f 'lib/strutils.c' || echo '$(srcdir)/'`lib/strutils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/$(DEPDIR)/watch-strutils.Tpo lib/$(DEPDIR)/watch-strutils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/strutils.c' object='lib/watch-strutils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -c -o lib/watch-strutils.o `test -f 'lib/strutils.c' || echo '$(srcdir)/'`lib/strutils.c
+
+lib/watch-strutils.obj: lib/strutils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -MT lib/watch-strutils.obj -MD -MP -MF lib/$(DEPDIR)/watch-strutils.Tpo -c -o lib/watch-strutils.obj `if test -f 'lib/strutils.c'; then $(CYGPATH_W) 'lib/strutils.c'; else $(CYGPATH_W) '$(srcdir)/lib/strutils.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/$(DEPDIR)/watch-strutils.Tpo lib/$(DEPDIR)/watch-strutils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/strutils.c' object='lib/watch-strutils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -c -o lib/watch-strutils.obj `if test -f 'lib/strutils.c'; then $(CYGPATH_W) 'lib/strutils.c'; else $(CYGPATH_W) '$(srcdir)/lib/strutils.c'; fi`
+
+lib/watch-fileutils.o: lib/fileutils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -MT lib/watch-fileutils.o -MD -MP -MF lib/$(DEPDIR)/watch-fileutils.Tpo -c -o lib/watch-fileutils.o `test -f 'lib/fileutils.c' || echo '$(srcdir)/'`lib/fileutils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/$(DEPDIR)/watch-fileutils.Tpo lib/$(DEPDIR)/watch-fileutils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/fileutils.c' object='lib/watch-fileutils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -c -o lib/watch-fileutils.o `test -f 'lib/fileutils.c' || echo '$(srcdir)/'`lib/fileutils.c
+
+lib/watch-fileutils.obj: lib/fileutils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -MT lib/watch-fileutils.obj -MD -MP -MF lib/$(DEPDIR)/watch-fileutils.Tpo -c -o lib/watch-fileutils.obj `if test -f 'lib/fileutils.c'; then $(CYGPATH_W) 'lib/fileutils.c'; else $(CYGPATH_W) '$(srcdir)/lib/fileutils.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) lib/$(DEPDIR)/watch-fileutils.Tpo lib/$(DEPDIR)/watch-fileutils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib/fileutils.c' object='lib/watch-fileutils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(watch_CFLAGS) $(CFLAGS) -c -o lib/watch-fileutils.obj `if test -f 'lib/fileutils.c'; then $(CYGPATH_W) 'lib/fileutils.c'; else $(CYGPATH_W) '$(srcdir)/lib/fileutils.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -1999,7 +2164,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -2024,7 +2189,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -2042,7 +2207,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -2052,7 +2217,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -2132,7 +2297,7 @@
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(procpsngdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(proc_libprocps_la_includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbin_execdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(procpsngdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(proc_libprocps_la_includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -2182,7 +2347,7 @@
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
- clean-sbinPROGRAMS mostlyclean-am
+ clean-sbinPROGRAMS clean-usrbin_execPROGRAMS mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -2211,7 +2376,8 @@
install-dvi-am:
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
- install-sbinPROGRAMS install-sysconfDATA
+ install-sbinPROGRAMS install-sysconfDATA \
+ install-usrbin_execPROGRAMS
install-html: install-html-recursive
@@ -2256,7 +2422,8 @@
uninstall-am: uninstall-binPROGRAMS uninstall-dist_procpsngDATA \
uninstall-libLTLIBRARIES uninstall-man uninstall-pkgconfigDATA \
uninstall-proc_libprocps_la_includeHEADERS \
- uninstall-sbinPROGRAMS uninstall-sysconfDATA
+ uninstall-sbinPROGRAMS uninstall-sysconfDATA \
+ uninstall-usrbin_execPROGRAMS
uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \
uninstall-man8
@@ -2268,34 +2435,50 @@
am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
clean-checkPROGRAMS clean-cscope clean-generic \
clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
- clean-sbinPROGRAMS cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-dist_procpsngDATA install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-man1 install-man3 \
- install-man5 install-man8 install-pdf install-pdf-am \
- install-pkgconfigDATA install-proc_libprocps_la_includeHEADERS \
- install-ps install-ps-am install-sbinPROGRAMS install-strip \
- install-sysconfDATA installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
- uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-dist_procpsngDATA uninstall-libLTLIBRARIES \
- uninstall-man uninstall-man1 uninstall-man3 uninstall-man5 \
- uninstall-man8 uninstall-pkgconfigDATA \
+ clean-sbinPROGRAMS clean-usrbin_execPROGRAMS cscope \
+ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am \
+ install-dist_procpsngDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-libLTLIBRARIES \
+ install-man install-man1 install-man3 install-man5 \
+ install-man8 install-pdf install-pdf-am install-pkgconfigDATA \
+ install-proc_libprocps_la_includeHEADERS install-ps \
+ install-ps-am install-sbinPROGRAMS install-strip \
+ install-sysconfDATA install-usrbin_execPROGRAMS installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-dist_procpsngDATA \
+ uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
+ uninstall-man3 uninstall-man5 uninstall-man8 \
+ uninstall-pkgconfigDATA \
uninstall-proc_libprocps_la_includeHEADERS \
- uninstall-sbinPROGRAMS uninstall-sysconfDATA
+ uninstall-sbinPROGRAMS uninstall-sysconfDATA \
+ uninstall-usrbin_execPROGRAMS
.PRECIOUS: Makefile
+@CYGWIN_TRUE@ skill_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ kill_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ free_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ pgrep_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ pkill_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ pidof_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ pmap_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ snice_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ tload_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ uptime_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ w_LDADD = $(CYGWINFLAGS)
+@CYGWIN_TRUE@ vmstat_LDADD = $(CYGWINFLAGS)
+
$(top_srcdir)/.version:
touch $(top_srcdir)/.version
echo $(VERSION) > $@-t && mv $@-t $@
diff -Nru procps-3.3.12/man-po/de/man1/kill.1 procps-3.3.15/man-po/de/man1/kill.1
--- procps-3.3.12/man-po/de/man1/kill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/kill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for kill.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan; converted to a man page by
-.\" Michael K. Johnson
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH KILL 1 "Oktober 2011" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-kill \- ein Signal an einen Prozess senden
-.SH ÜBERSICHT
-\fBkill\fP [Optionen] [...]
-.SH BESCHREIBUNG
-Das Standardsignal für kill ist TERM. Verwenden Sie \fB\-l\fP oder \fB\-L\fP, um
-verfügbare Signale aufzulisten. Im Einzelnen sind diese Signale HUP, INT,
-KILL, STOP, CONT und 0. Andere Signale können auf drei verschiedene Arten
-angegeben werden: \fB\-9\fP, \fB\-SIGKILL\fP oder \fB\-KILL\fP. Negative Werte für
-Prozess\-IDs können zum Auswählen ganzer Prozessgruppen verwendet werden,
-siehe die PGID\-Spalte in der Ausgabe des ps\-Befehls. Eine Prozess\-ID von
-\fB\-1\fP ist speziell, sie bezieht sich auf alle Prozesse außer den
-kill\-Prozess selbst und init.
-.SH OPTIONEN
-.TP
-\fB […]\fP
-sendet ein Signal an jede der aufgelisteten
-.TP
-\fB\-\fP
-.TQ
-\fB\-s \fP
-.TQ
-\fB\-\-signal \fP
-gibt das zu sendende \fBSignal\fP an. Das Signal kann als Name oder Nummer
-angegeben werden. Das Verhalten der Signale ist in der Handbuchseite zu
-\fBsignal\fP(7) beschrieben.
-.TP
-\fB\-l\fP, \fB\-\-list\fP [\fISignal\fP]
-listet Signalnamen auf. Diese Option hat ein optionales Argument, das die
-Signalnummer in den Signalnamen umwandelt oder umgekehrt.
-.TP
-\fB\-L\fP,\fB\ \-\-table\fP
-listet alle Signalnamen in einer Tabelle auf.
-.TP
-.PD
-.SH ANMERKUNGEN
-In Ihrer Shell (dem Befehlszeileninterpreter) könnte bereits ein kill\-Befehl
-eingebaut sein. Es könnte möglich sein, dass Sie den hier beschriebenen
-Befehl als /bin/kill ausführen müssen, um den Konflikt zu lösen.
-.SH BEISPIELE
-.TP
-\fBkill \-9 \-1\fP
-würgt alle Prozesse ab, die abgewürgt werden können.
-.TP
-\fBkill \-l 11\fP
-wandelt die Nummer 11 in einen Signalnamen um.
-.TP
-\fBkill \-L\fP
-listet alle Signalauswahlen in einer Tabelle auf.
-.TP
-\fBkill 123 543 2341 3453\fP
-sendet das vorgegebene Signal SIGTERM an alle diese Prozesse
-.SH "SIEHE AUCH"
-\fBkill\fP(2), \fBkillall\fP(1), \fBnice\fP(1), \fBpkill\fP(1), \fBrenice\fP(1),
-\fBsignal\fP(7), \fBskill\fP(1)
-.SH STANDARDS
-Dieser Befehl entspricht den üblichen Standards. Der Schalter \fB\-L\fP ist
-Linux\-spezifisch.
-.SH AUTOR
-.UR albert@users.sf.net
-Albert Cahalan
-.UE
-schrieben den kill\-Befehl
-im Jahre 1999, um eine bsdutils\-Version zu ersetzen, die nicht
-standardkompatibel war. Die Version von util\-linux könnte auch korrekt
-funktionieren.
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/pgrep.1 procps-3.3.15/man-po/de/man1/pgrep.1
--- procps-3.3.12/man-po/de/man1/pgrep.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/pgrep.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-.\" Manual page for pgrep / pkill.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Copyright 2000 Kjetil Torgrim Homme
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PGREP 1 "March 2015" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-pgrep, pkill \- findet Prozesse oder sendet ein Signal auf Basis des Namens
-oder anderer Attribute
-.SH ÜBERSICHT
-\fBpgrep\fP [Optionen] Muster
-.br
-\fBpkill\fP [Optionen] Muster
-.SH BESCHREIBUNG
-\fBpgrep\fP durchsucht die gegenwärtig laufenden Prozesse und listet die
-Prozesskennungen (IDs), welche den Auswahlkriterien entsprechen, in der
-Standardausgabe auf. Übereinstimmungen sind für alle Auswahlkriterien
-erforderlich. Beispielsweise listet
-.IP
-$ pgrep \-u root sshd
-.PP
-nur die Prozesse auf, deren Name \fBsshd\fP lautet UND \fBroot\fP
-gehören. Andererseits listet
-.IP
-$ pgrep \-u root,daemon
-.PP
-jene Prozesse auf, die entweder \fBroot\fP ODER \fBdaemon\fP gehören.
-.PP
-\fBpkill\fP sendet das angegebene Signal (per Vorgabe \fBSIGTERM\fP) an jeden
-Prozess, anstatt diese in der Standardausgabe aufzulisten.
-.SH OPTIONEN
-.TP
-\fB\-\fP\fISignal\fP
-.TQ
-\fB\-\-signal\fP \fISignal\fP
-definiert das Signal, das an jeden passenden Prozess gesendet werden
-soll. Es werden entweder numerische Angaben oder der symbolische Signalname
-akzeptiert (nur für \fBpkill\fP).
-.TP
-\fB\-c\fP, \fB\-\-count\fP
-unterdrückt normale Ausgaben und gibt stattdessen die Anzahl der passenden
-Prozesse aus. Wenn keine Übereinstimmungen gefunden werden, liefert der
-Befehl einen von 0 verschiedenen Rückgabewert.
-.TP
-\fB\-d\fP, \fB\-\-delimiter\fP \fIdelimiter\fP
-legt die in der Ausgabe als Trenner für die Prozesskennungen zu verwendende
-Zeichenkette fest. Vorgabe ist ein Zeilenumbruch (gilt nur für \fBpgrep\fP).
-.TP
-\fB\-f\fP, \fB\-\-full\fP
-Das \fIMuster\fP wird normalerweise nur auf den Prozessnamen angewendet. Wenn
-\fB\-f\fP gesetzt ist, wird die vollständige Befehlszeile verwendet.
-.TP
-\fB\-g\fP, \fB\-\-pgroup\fP \fIpgrp\fP, …
-sucht nur nach passenden Prozessen, die in den Prozessgruppen\-IDs
-aufgelistet sind. Die Prozessgruppe 0 wird in die eigene Prozessgruppe von
-\fBpgrep\fP oder \fBpkill\fP übersetzt.
-.TP
-\fB\-G\fP, \fB\-\-group\fP \fIGruppen\-ID\fP, …
-berücksichtigt nur Prozesse, deren reale Gruppen\-ID aufgelistet ist. Hier
-kann entweder der numerische oder der symbolische Wert verwendet werden.
-.TP
-\fB\-i\fP, \fB\-\-ignore\-case\fP
-Match processes case\-insensitively.
-.TP
-\fB\-l\fP, \fB\-\-list\-name\fP
-listet sowohl den Prozessnamen als auch die Prozess\-ID auf (nur für
-\fBpgrep\fP).
-.TP
-\fB\-a\fP, \fB\-\-list\-full\fP
-listet sowohl die vollständige Befehlszeile als auch die Prozess\-ID auf (nur
-für \fBpgrep\fP).
-.TP
-\fB\-n\fP, \fB\-\-newest\fP
-wählt nur den neuesten (zuletzt gestarteten) aus den passenden Prozessen
-aus.
-.TP
-\fB\-o\fP, \fB\-\-oldest\fP
-wählt nur den ältesten (zuerst gestarteten) aus den passenden Prozessen aus.
-.TP
-\fB\-P\fP, \fB\-\-parent\fP \fIppid\fP, …
-sucht nur nach Prozessen, von denen die ID des übergeordneten Prozesses
-aufgelistet ist.
-.TP
-\fB\-s\fP, \fB\-\-session\fP \fISitzungs\-ID\fP, …
-sucht nur nach passenden Prozessen, die in den Prozess\-Sitzungs\-ID
-aufgelistet ist. Die Sitzungs\-ID 0 wird in die eigene Prozessgruppe von
-\fBpgrep\fP oder \fBpkill\fP übersetzt.
-.TP
-\fB\-t\fP, \fB\-\-terminal\fP \fITerminal\fP, …
-sucht nur nach passenden Prozessen, deren steuerndes Terminal aufgelistet
-ist. Der Terminalname sollte ohne das Präfix »dev« angegeben werden.
-.TP
-\fB\-u\fP, \fB\-\-euid\fP \fIeuid\fP, …
-sucht nur nach passenden Prozessen, deren effektive Benutzer\-ID aufgelistet
-ist. Sie können entweder numerische oder symbolische Werte verwenden.
-.TP
-\fB\-U\fP, \fB\-\-uid\fP \fIBenutzer\-ID\fP, …
-sucht nur nach passenden Prozessen, deren reale Benutzer\-ID aufgelistet
-ist. Sie können entweder numerische oder symbolische Werte verwenden.
-.TP
-\fB\-v\fP, \fB\-\-inverse\fP
-negiert die Anwendung der Suchkriterien. Diese Option wird üblicherweise mit
-\fBpgrep\fP verwendet. In \fBpkill\fP ist die Kurzoption deaktiviert, um die
-zufällige Anwendung dieser Option zu vermeiden.
-.TP
-\fB\-w\fP, \fB\-\-lightweight\fP
-zeigt alle Thread\-IDs anstelle der Prozess\-IDs im Kontext von \fBpgrep\fP
-an. In \fBpkill\fP ist diese Option deaktiviert.
-.TP
-\fB\-x\fP, \fB\-\-exact\fP
-sucht nur nach Prozessen, deren Namen (oder Befehlszeilen, falls \-f
-angegeben ist) \fBexakt\fP dem \fIMuster\fP entsprechen.
-.TP
-\fB\-F\fP, \fB\-\-pidfile\fP \fIDatei\fP
-liest die \fIPID\fPs aus einer Datei. Diese Option ist eher für \fBpkill\fP als
-für \fBpgrep\fP sinnvoll.
-.TP
-\fB\-L\fP, \fB\-\-logpidfile\fP
-Fehlschlag, wenn die PID\-Datei nicht gesperrt ist.
-.TP
-\fB\-\-ns \fP\fIPID\fP
-sucht nach Prozessen, die zu den gleichen Namensräumen gehören. Um Prozesse
-anderer Benutzer zu finden, sind Root\-Rechte erforderlich. In \-\-nslist
-finden Sie Informationen, wie Sie die Übereinstimmungen im Zusammenhang mit
-Namensräumen begrenzen können.
-.TP
-\fB\-\-nslist \fP\fIName\fP\fB, …\fP
-sucht nur in den angegebenen Namensräumen nach Übereinstimmungen. Verfügbare
-Namensräume: ipc, mnt, net, pid, user, uts.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an und beendet das Programm.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.PD
-.SH OPERANDEN
-.TP
-\fIMuster\fP
-gibt einen erweiterten regulären Ausdruck für die Übereinstimmungen von
-Prozessnamen oder Befehlszeilen an.
-.SH BEISPIELE
-Beispiel 1: Prozess\-ID des \fBnamed\fP\-Daemons suchen:
-.IP
-$ pgrep \-u root named
-.PP
-Beispiel 2: \fBsyslog\fP veranlassen, seine Konfigurationsdatei neu einzulesen:
-.IP
-$ pkill \-HUP syslogd
-.PP
-Beispiel 3: Detaillierte Informationen zu allen \fBxterm\fP\-Prozessen ausgeben:
-.IP
-$ ps \-fp $(pgrep \-d, \-x xterm)
-.PP
-Beispiel 4: Den Nice\-Wert für alle \fBnetscape\fP\-Prozesse erhöhen:
-.IP
-$ renice +4 $(pgrep netscape)
-.SH EXIT\-STATUS
-.PD 0
-.TP
-0
-Ein oder mehrere Prozesse entsprechen den Suchkriterien.
-.TP
-1
-Keine Prozesse gefunden.
-.TP
-2
-Syntaxfehler in der Befehlszeile.
-.TP
-3
-Schwerwiegender Fehler: Speicher ausgeschöpft usw.
-.PD
-.SH ANMERKUNGEN
-Der für die Suche verwendete Prozessname ist auf die 15 Zeichen in der
-Ausgabe von /proc/\fIProzess\-ID\fP/stat beschränkt. Verwenden Sie die Option
-\-f, um stattdessen Übereinstimmungen in der gesamten Befehlszeile zu suchen,
-/proc/\fIProzess\-ID\fP/cmdline.
-.PP
-Die laufenden \fBpgrep\fP\- oder \fBpkill\fP\-Prozesse werden niemals selbst als
-Treffer gemeldet.
-.SH FEHLER
-Die Optionen \fB\-n\fP, \fB\-o\fP und \fB\-v\fP können nicht kombiniert werden. Bitte
-informieren Sie die Entwickler, falls das für Ihre Zwecke nötig sein sollte.
-.PP
-Bereits beendete Prozesse werden gemeldet.
-
-.SH "SIEHE AUCH"
-\fBps\fP(1), \fBregex\fP(7), \fBsignal\fP(7), \fBkillall\fP(1), \fBskill\fP(1), \fBkill\fP(1),
-\fBkill\fP(2)
-.SH AUTOR
-.UR kjetilho@ifi.uio.no
-Kjetil Torgrim Homme
-.UE
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/pidof.1 procps-3.3.15/man-po/de/man1/pidof.1
--- procps-3.3.12/man-po/de/man1/pidof.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/pidof.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-'\" -*- coding: UTF-8 -*-
-.\" Copyright (C) 1998 Miquel van Smoorenburg.
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PIDOF 1 "24. Juli 2013" "" "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-pidof \- die Prozess\-ID eines laufenden Programms ermitteln
-.SH ÜBERSICHT
-\fBpidof\fP [\fB\-s\fP] [\fB\-c\fP] [\fB\-x\fP] [\fB\-o\fP \fIomitpid[,omitpid..]\fP] [\fB\-o\fP
-\fIomitpid[,omitpid..]..\fP] \fBprogram\fP [\fBProgramm..\fP]
-.SH BESCHREIBUNG
-\fBPidof\fP findet die Prozesskennungen (PIDs) der benannten Programme. Es gibt
-diese IDs in der Standardausgabe aus.
-.SH OPTIONEN
-.IP \-s
-weist das Programm an, nur eine \fIPID\fP auszugeben.
-.IP \-c
-gibt nur IDs von Prozessen zurück, die im gleichen Wurzelverzeichnis
-laufen. Diese Option wird für gewöhnliche Benutzer (ohne
-Administratorrechte) ignoriert, da diese das aktuelle Wurzelverzeichnis
-nicht nach Prozessen durchsuchen können, deren Eigentümer sie nicht sind.
-.IP \-x
-berücksichtigt auch Skripte. Das Programm gibt auch Prozess\-IDs der Shells
-zurück, die die benannten Skripte ausführen.
-.IP "\-o \fIomitpid\fP"
-weist \fIpidof\fP an, Prozesse mit den angegebenen PIDs auszulassen. Die
-spezielle PID \fB%PPID\fP kann verwendet werden, um den Elternprozess des
-\fIpidof\fP\-Programms zu bezeichnen, also die aufrufende Shell oder das
-Shell\-Skript.
-.SH EXIT\-STATUS
-.TP
-\fB0\fP
-Es wurde mindestens ein Programm mit dem angegebenen Namen gefunden.
-.TP
-\fB1\fP
-Es wurde kein Programm mit dem angegebenen Namen gefunden.
-
-.SH "SIEHE AUCH"
-\fBpgrep\fP(1), \fBpkill\fP(1)
-.SH AUTOR
-Jaromir Capik
diff -Nru procps-3.3.12/man-po/de/man1/pkill.1 procps-3.3.15/man-po/de/man1/pkill.1
--- procps-3.3.12/man-po/de/man1/pkill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/pkill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.so man1/pgrep.1
diff -Nru procps-3.3.12/man-po/de/man1/pmap.1 procps-3.3.15/man-po/de/man1/pmap.1
--- procps-3.3.12/man-po/de/man1/pmap.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/pmap.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for pmap.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan.
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PMAP 1 "September 2012" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-pmap \- meldet die Speichereinblendung eines Prozesses
-.SH ÜBERSICHT
-\fBpmap\fP [\fIOptionen\fP] \fIPID\fP […]
-.SH BESCHREIBUNG
-Der pmap\-Befehl meldet die Speichereinblendung eines oder mehrerer Prozesse.
-.SH OPTIONEN
-.TP
-\fB\-x\fP, \fB\-\-extended\fP
-zeigt das erweiterte Format an.
-.TP
-\fB\-d\fP, \fB\-\-device\fP
-zeigt das Geräteformat an.
-.TP
-\fB\-q\fP, \fB\-\-quiet\fP
-zeigt keine Kopf\- oder Fußzeilen an.
-.TP
-H
-begrenzt die Ergebnisse auf den angegebenen Adressbereich zwischen
-\fIUntergrenze\fP und \fIObergrenze\fP. Beachten Sie, dass die Argumente für
-Unter\- und Obergrenze eine einzige, durch ein Komma getrennte Zeichenkette
-sind.
-.TP
-\fB\-X\fP
-zeigt noch mehr Details als die Option \fB\-x\fP an. WARNUNG: Das Format ändert
-sich entsprechend \fI/proc/Prozess\-ID/smaps\fP.
-.TP
-\fB\-XX\fP
-zeigt alles, was der Kernel bereitstellt.
-.TP
-\fB\-p\fP, \fB\-\-show\-path\fP
-zeigt den vollständigen Pfad zu den Dateien in der Einblendungs\-Spalte an.
-.TP
-\fB\-c\fP, \fB\-\-read\-rc\fP
-liest die Standard\-Konfigurationsdatei ein.
-.TP
-\fB\-C\fP, \fB\-\-read\-rc\-from\fP \fIDatei\fP
-liest die Konfiguration aus \fIDatei\fP.
-.TP
-\fB\-n\fP, \fB\-\-create\-rc\fP
-erstellt eine neue Standardkonfiguration.
-.TP
-\fB\-N\fP, \fB\-\-create\-rc\-to\fP \fIDatei\fP
-legt eine neue Konfiguration in \fIDatei\fP an.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an und beendet das Programm.
-.SH EXIT\-STATUS
-.PP
-.RS
-.PD 0
-.TP
-\fB0\fP
-Erfolg.
-.TP
-\fB1\fP
-Fehlschlag.
-.TP
-\fB42\fP
-fand nicht alle Prozesse, nach denen gefragt wurde.
-.PD
-.RE
-.SH "SIEHE AUCH"
-\fBps\fP(1), \fBpgrep\fP(1)
-.SH STANDARDS
-Es sind keine Standards anwendbar, aber pmap ähnelt einem SunOS\-Befehl.
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/pwdx.1 procps-3.3.15/man-po/de/man1/pwdx.1
--- procps-3.3.12/man-po/de/man1/pwdx.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/pwdx.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-.\" Man page for pwdx
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Copyright 2004 Nicholas Miell.
-.\" Based on the pmap(1) man page by Albert Cahalan.
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PWDX 1 "Juni 2011" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-pwdx \- aktuelles Arbeitsverzeichnis eines Prozesses anzeigen
-.SH ÜBERSICHT
-\fBpwdx\fP [\fIOptionen\fP] \fIPID\fP […]
-.SH OPTIONEN
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformation an und beendet das Programm.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.SH "SIEHE AUCH"
-\fBps\fP(1), \fBpgrep\fP(1)
-.SH STANDARDS
-Es sind keine Standards anwendbar, aber pwdx ähnelt einem SunOS\-Befehl.
-.SH AUTOR
-.UR nmiell@gmail.com
-Nicholas Miell
-.UE
-schrieben pwdx im Jahre 2004.
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/skill.1 procps-3.3.15/man-po/de/man1/skill.1
--- procps-3.3.12/man-po/de/man1/skill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/skill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for skill and snice.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan, converted to a man page by
-.\" Michael K. Johnson
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH SKILL 1 "Oktober 2011" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-skill, snice \- ein Signal senden oder den Prozessstatus ermitteln
-.SH ÜBERSICHT
-\fBskill\fP [\fISignal\fP] [\fIOptionen\fP] \fIAusdruck\fP
-.br
-\fBsnice\fP [\fIneue Priorität\fP] [\fIOptionen\fP] \fIAusdruck\fP
-.SH BESCHREIBUNG
-Diese Dienstprogramme sind veraltet und nicht portabel. Die Befehlssyntax
-ist unzureichend dokumentiert. Bitte verwenden Sie stattdessen die Befehle
-killall, pkill und pgrep.
-.PP
-Das Standardsignal für skill ist TERM. Verwenden Sie \fB\-l\fP oder \fB\-L\fP, um
-verfügbare Signale aufzulisten. Im Einzelnen sind diese Signale HUP, INT,
-KILL, STOP, CONT und 0. Andere Signale können auf drei verschiedene Arten
-angegeben werden: \fB\-9\fP, \fB\-SIGKILL\fP oder \fB\-KILL\fP.
-.PP
-Die Vorgabepriorität für snice ist +4. Prioritätskennziffern liegen im
-Bereich von +20 (am langsamsten) und \-20 (am schnellsten). Negative
-Prioritätskennziffern sind Benutzern mit Administratorrechten vorbehalten.
-.SH OPTIONEN
-.TP
-\fB\-f\fP,\fB\ \-\-fast\fP
-Schneller Modus. Diese Option wurde nicht implementiert.
-.TP
-\fB\-i\fP,\fB\ \-\-interactive\fP
-Interaktiver Modus. Sie werden vor der Ausführung einer Aktion stets um
-Bestätigung gebeten.
-.TP
-\fB\-l\fP,\fB\ \-\-list\fP
-listet alle Signalnamen auf.
-.TP
-\fB\-L\fP,\fB\ \-\-table\fP
-listet alle Signalnamen in einer Tabelle auflisten.
-.TP
-\fB\-n\fP,\fB\ \-\-no\-action\fP
-führt keine Aktion aus. Es wird eine Simulation ausgeführt, aber keine
-Änderungen am System vorgenommen.
-.TP
-\fB\-v\fP,\fB\ \-\-verbose\fP
-Ausführlicher Modus, es wird erklärt, was geschieht.
-.TP
-\fB\-w\fP,\fB\ \-\-warnings\fP
-aktiviert Warnungen. Diese Option wurde nicht implementiert.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an.
-.PD
-.SH "OPTIONEN ZUR PROZESSAUSWAHL"
-Auswahlkriterien können sein: terminal, user, pid, command. Die
-nachfolgenden Optionen können verwendet werden, um eine korrekte
-Interpretation zu gewährleisten.
-.TP
-\fB\-t\fP, \fB\-\-tty\fP \fITTY\fP
-Der nächste Ausdruck ist ein Terminal (tty oder pty).
-.TP
-\fB\-u\fP, \fB\-\-user\fP \fIBenutzer\fP
-Der nächste Ausdruck ist ein Benutzername.
-.TP
-\fB\-p\fP, \fB\-\-pid\fP \fIPID\fP
-Der nächste Ausdruck ist eine Prozesskennung (ID).
-.TP
-\fB\-c\fP, \fB\-\-command\fP \fIBEFEHL\fP
-Der nächste Ausdruck ist ein Befehlsname.
-.TP
-\fB\-\-ns \fP\fIPID\fP
-sucht nach Prozessen, die zum gleichen Namensraum wie \fIPID\fP gehören.
-.TP
-\fB\-\-nslist \fP\fIns, …\fP
-listet die Namensräume auf, die in der Option \-\-ns berücksichtigt
-werden. Verfügbare Namensräume: ipc, mnt, net, pid, user, uts.
-.PD
-.SH SIGNALE
-Das Verhalten der Signale ist in der Handbuchseite zu \fBsignal\fP(7)
-beschrieben.
-.SH BEISPIELE
-.TP
-\fBsnice \-c seti \-c crack +7\fP
-verlangsamt die Ausführung der seti\- und crack\-Befehle.
-.TP
-\fBskill \-KILL \-t /dev/pts/*\fP
-killt Benutzer auf PTY\-Geräten.
-.TP
-\fBskill \-STOP \-u viro \-u lm \-u davem\fP
-stoppt drei Benutzer.
-.SH "SIEHE AUCH"
-\fBkill\fP(1), \fBkill\fP(2), \fBkillall\fP(1), \fBnice\fP(1), \fBpkill\fP(1),
-\fBrenice\fP(1), \fBsignal\fP(7)
-.SH STANDARDS
-Es sind keine Standards anwendbar.
-.SH AUTOR
-.UR albert@users.sf.net
-Albert Cahalan
-.UE
-schrieb skill und snice im
-Jahre 1999 als Ersatz für eine unfreie Version.
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/tload.1 procps-3.3.15/man-po/de/man1/tload.1
--- procps-3.3.12/man-po/de/man1/tload.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/tload.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-.\" -*-Nroff-*-
-.\" This page Copyright (C) 1993 Matt Welsh, mdw@tc.cornell.edu.
-.\" Freely distributable under the terms of the GPL
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH TLOAD 1 "Juni 2011" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-tload \- grafische Darstellung der durchschnittlichen Systemlast
-.SH ÜBERSICHT
-\fBtload\fP [\fIOptionen\fP] [\fITTY\fP]
-.SH BESCHREIBUNG
-\fBtload\fP gibt einen Graph der aktuellen durchschnittlichen Systemlast an das
-angegebene \fITerminal\fP aus (oder an das Terminal des tload\-Prozesses, falls
-keines angegeben wurde).
-.SH OPTIONEN
-.TP
-\fB\-s\fP, \fB\-\-scale\fP \fIZahl\fP
-ermöglicht die Angabe eines vertikalen Maßstabes für die Anzeige (in Zeichen
-zwischen den Diagrammeinheiten). Ein kleinerer Wert bezeichnet einen
-größeren Maßstab und umgekehrt.
-.TP
-\fB\-d\fP, \fB\-\-delay\fP \fISekunden\fP
-legt die Zeitspanne in \fISekunden\fP zwischen den Aktualisierungen des Graphen
-fest.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt diesen Hilfetext an.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an und beendet das Programm.
-.PP
-.SH DATEIEN
-\fI/proc/loadavg\fP zeigt Informationen zur Durchschnittslast an
-.SH "SIEHE AUCH"
-\fBps\fP(1), \fBtop\fP(1), \fBuptime\fP(1), \fBw\fP(1)
-.SH FEHLER
-Die Option \fB\-d\fP\fI Verzögerung\fP setzt das Zeitargument für
-\fBalarm\fP(2). Falls \-d 0 angegeben ist, wird der Alarm auf 0 gesetzt, wodurch
-niemals das Signal \fBSIGALRM\fP gesendet und die Anzeige aktualisiert wird.
-.SH AUTOREN
-Branko Lankester,
-.UR david@\:ods.\:com
-David Engel
-.UE , and
-.UR johnsonm@\:redhat.\:com
-Michael K. Johnson
-.UE .
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/uptime.1 procps-3.3.15/man-po/de/man1/uptime.1
--- procps-3.3.12/man-po/de/man1/uptime.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/uptime.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-.\" -*-Nroff-*-
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH UPTIME 1 "Dezember 2012" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-uptime \- feststellen, wie lange das System schon läuft
-.SH ÜBERSICHT
-\fBuptime\fP [\fIOptionen\fP]
-.SH BESCHREIBUNG
-\fBuptime\fP zeigt in einer Zeile die folgenden Informationen an: die aktuelle
-Zeit, wie lange das System bereits läuft, die Anzahl der aktuell
-angemeldeten Benutzer und die durchschnittliche Auslastung des Systems in
-den letzten 1, 5 und 15 Minuten.
-.PP
-Dies sind dieselben Informationen, die auch in der Kopfzeile des Befehls
-\fBw\fP(1) angezeigt werden.
-.PP
-Die durchschnittliche Auslastung des Systems ist die durchschnittliche
-Anzahl der Prozesse, die entweder in einem lauffähigen oder nicht
-unterbrechbaren Zustand sind. Lauffähiger Zustand bedeutet, dass ein Prozess
-entweder gerade die CPU benutzt oder darauf wartet, sie benutzen zu
-können. Der nicht unterbrechbare Zustand bedeutet, dass ein Prozess auf
-einen E/A\-Zugriff wartet, beispielsweise auf die Festplatte. Die
-Durchschnitte werden über drei Zeitintervalle gebildet. Die
-durchschnittliche Auslastung wird nicht auf die Anzahl der CPUs in einem
-System normalisiert, so dass eine Auslastung von 1 bei einem System mit
-einer CPU bedeutet, dass das System zu jeder Zeit voll ausgelastet ist. Auf
-einem System mit vier CPUs bedeutet dieselbe Auslastung, dass der Rechner
-während 75% der Zeit im Leerlauf war.
-.SH OPTIONEN
-.TP
-\fB\-p\fP, \fB\-\-pretty\fP
-Uptime im schönen Format anzeigen
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Diesen Hilfetext anzeigen
-.TP
-\fB\-s\fP, \fB\-\-since\fP
-System ist ununterbrochen in Betrieb seit, im Format »yyyy\-mm\-dd MM:HH:SS«
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformation an und beendet das Programm.
-.SH DATEIEN
-.TP
-\fI/var/run/utmp\fP
-zeigt Informationen darüber an, wer gerade angemeldet ist.
-.TP
-\fI/proc\fP
-Prozessinformationen
-.SH AUTOREN
-\fBuptime\fP wurde von
-.UR greenfie@gauss.\:rutgers.\:edu
-Larry Greenfield
-.UE
-und
-.UR johnsonm@sunsite.\:unc.\:edu
-Michael K. Johnson
-.UE
-geschrieben.
-.SH "SIEHE AUCH"
-\fBps\fP(1), \fBtop\fP(1), \fButmp\fP(5), \fBw\fP(1)
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/w.1 procps-3.3.15/man-po/de/man1/w.1
--- procps-3.3.12/man-po/de/man1/w.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/w.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-.\" -*-Nroff-*-
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH W 1 "Mai 2012" procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-w \- zeigt die angemeldeten Benutzer und deren Aktivitäten an
-.SH ÜBERSICHT
-\fBw\fP [\fIOptionen\fP] \fIBenutzer\fP […]
-.SH BESCHREIBUNG
-\fBw\fP zeigt Informationen über die aktuell am Rechner angemeldeten Benutzer
-und deren Prozesse an. Die Kopfzeile zeigt in dieser Reihenfolge die
-aktuelle Zeit, die aktive Zeit des Systems, die Anzahl der aktuell
-angemeldeten Benutzer und die durchschnittliche Auslastung des Systems in
-den letzten 1, 5 und 15 Minuten.
-.PP
-Die folgenden Einträge werden für jeden Benutzer angezeigt: der Anmeldename,
-der Name des Terminals (TTY), der entfernte Rechner, die Anmeldezeit, die
-Zeit der Untätigkeit, JCPU, PCPU und die Befehlszeile der aktuellen Prozesse
-der Benutzer.
-.PP
-Die JCPU\-Zeit ist die Zeit aller Prozesse, die an einem bestimmten Terminal
-hängen. Vergangene Hintergrundprozesse sind hier nicht enthalten, aber doch
-die aktuellen Hintergrundprozesse.
-.PP
-Die PCPU\-Zeit ist die Zeit, die vom aktuellen Prozess verwendet wird,
-benannt im Feld »what«.
-.SH BEFEHLSZEILENOPTIONEN
-.TP
-\fB\-h\fP, \fB\-\-no\-header\fP
-gibt keine Kopfzeile aus.
-.TP
-\fB\-u\fP, \fB\-\-no\-current\fP
-ignoriert den Benutzernamen, während die aktuellen Prozess\- und CPU\-Zeiten
-ermittelt werden. Um dies zu demonstrieren, geben Sie »su« und ein »w« ein
-und ein »w \-u«.
-.TP
-\fB\-s\fP, \fB\-\-short\fP
-verwendet das Kurzformat. Die Anmeldezeit und die Zeiten für JCPU oder PCPU
-werden nicht ausgegeben.
-.TP
-\fB\-f\fP, \fB\-\-from\fP
-Toggle printing the \fBfrom\fP (remote hostname) field. The default as
-released is for the \fBfrom\fP field to not be printed, although your system
-administrator or distribution maintainer may have compiled a version in
-which the \fBfrom\fP field is shown by default.
-.TP
-\fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.TP
-\fB\-i\fP, \fB\-\-ip\-addr\fP
-zeigt die IP\-Adresse anstelle des Rechnernamens im \fBfrom\fP\-Feld an.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an.
-.TP
-\fB\-o\fP, \fB\-\-old\-style\fP
-verwendet die Ausgabe im alten Stil. Für untätige Zeiten von weniger als
-einer Minute werden Leerzeichen ausgegeben.
-.TP
-\fBBenutzer\fP
-zeigt nur Informationen zum angegebenen Benutzer an.
-.SH UMGEBUNG
-.TP
-PROCPS_USERLEN
-setzt die Vorgabebreite der »Benutzername«\-Spalte außer Kraft. Vorgabe ist
-8.
-.TP
-PROCPS_FROMLEN
-setzt die Vorgabebreite der »from«\-Spalte außer Kraft. Vorgabe ist 16.
-.SH DATEIEN
-.TP
-\fI/var/run/utmp\fP
-zeigt Informationen darüber an, wer gerade angemeldet ist.
-.TP
-\fI/proc\fP
-Prozessinformationen
-.SH "SIEHE AUCH"
-\fBfree\fP(1), \fBps\fP(1), \fBtop\fP(1), \fBuptime\fP(1), \fButmp\fP(5), \fBwho\fP(1)
-.SH AUTOREN
-\fBw\fP wurde von Charles Blake fast völlig neu geschrieben, basierend auf der
-Version von
-.UR greenfie@\:gauss.\:rutgers.\:edu
-Larry Greenfield
-.UE
-und
-.UR johnsonm@\:redhat.\:com
-Michael K. Johnson
-.UE
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man1/watch.1 procps-3.3.15/man-po/de/man1/watch.1
--- procps-3.3.12/man-po/de/man1/watch.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man1/watch.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH WATCH 1 2016\-06\-03 procps\-ng "Dienstprogramme für Benutzer"
-.SH BEZEICHNUNG
-watch \- führt ein Programm in periodischen Abständen aus und zeigt die
-Ausgabe im Vollbild an
-.SH ÜBERSICHT
-\fBwatch\fP [\fIOptionen\fP] \fIBefehl\fP
-.SH BESCHREIBUNG
-\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
-first screenfull). This allows you to watch the program output change over
-time. By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
-until interrupted.
-.SH OPTIONEN
-.TP
-\fB\-d\fP, \fB\-\-differences\fP [\fIpermanent\fP]
-hebt die Unterschiede zwischen aufeinanderfolgenden Aktualisierungen
-hervor. Optionale Argumente werden gelesen, die dafür sorgen, dass die
-Hervorhebung erhalten bleibt. Dies erlaubt Ihnen zu sehen, was sich
-mindestens seit dem ersten Durchlauf geändert hat.
-.TP
-\fB\-n\fP, \fB\-\-interval\fP \fISekunden\fP
-Specify update interval. The command will not allow quicker than 0.1 second
-interval, in which the smaller values are converted. Both '.' and ',' work
-for any locales.
-.TP
-\fB\-p\fP, \fB\-\-precise\fP
-ermöglicht \fBwatch\fP zu versuchen, den \fIBefehl\fP im angegebenen \fIIntervall\fP
-(in Sekunden) auszuführen. Versuchen Sie dies mit \fBntptime\fP und beachten
-Sie, wie die Sekundenbruchteile (beinahe) gleich bleiben, während sie sich
-im Normalmodus ständig erhöhen.
-.TP
-\fB\-t\fP, \fB\-\-no\-title\fP
-schaltet die Anzeige der Kopfzeile ab, die das Intervall, den Befehl und die
-aktuelle Zeit im oberen Bereich des Bildschirms anzeigt, sowie die
-nachfolgende Leerzeile.
-.TP
-\fB\-b\fP, \fB\-\-beep\fP
-spielt einen Warnklang ab, wenn die Ausgabe des Befehls nicht Null ist.
-.TP
-\fB\-e\fP, \fB\-\-errexit\fP
-friert die Aktualisierungen bei Fehlern in der Befehlsausgabe ein und
-beendet nach Tastendruck.
-.TP
-\fB\-g\fP, \fB\-\-chgexit\fP
-beendet das Programm, wenn sich die Ausgabe des \fIBefehls\fP ändert.
-.TP
-\fB\-c\fP, \fB\-\-color\fP
-interpretiert ANSI\-Farb\- und Stilsequenzen.
-.TP
-\fB\-x\fP, \fB\-\-exec\fP
-Der \fIBefehl\fP wird an \fBsh \-c\fP übergeben, was bedeutet, dass Sie zusätzliche
-Zitatzeichen verwenden müssen, um den gewünschten Effekt zu erzielen. Die
-Option \-\-exec übergibt den Befehl direkt an \fBexec\fP(2).
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an und beendet das Programm.
-.SH EXIT\-STATUS
-.PP
-.RS
-.PD 0
-.TP
-\fB0\fP
-Erfolg.
-.TP
-\fB1\fP
-Verschiedene Fehler.
-.TP
-\fB2\fP
-Forken des zu überwachenden Prozesses ist fehlgeschlagen.
-.TP
-\fB3\fP
-Replacing child process stdout with write side pipe failed.
-.TP
-\fB4\fP
-Ausführung des Befehls ist fehlgeschlagen.
-.TP
-\fB5\fP
-Closing child process write pipe failed.
-.TP
-\fB7\fP
-Erstellung der IPC\-Pipe ist fehlgeschlagen.
-.TP
-\fB8\fP
-Das Ermitteln des Rückgabewertes des Kindprozesses mit \fBwaitpid\fP(2) ist
-fehlgeschlagen oder der Befehl wurde mit einem Fehler beendet.
-.TP
-\fBandere\fP
-Die Überwachung propagiert den Exit\-Status des Befehls als Exit\-Status des
-Kindprozesses.
-.SH ANMERKUNGEN
-POSIX option processing is used (i.e., option processing stops at the first
-non\-option argument). This means that flags after \fIcommand\fP don't get
-interpreted by \fBwatch\fP itself.
-.SH FEHLER
-Nach der Größenänderung des Terminals wird der Bildschirm bis zur nächsten
-planmäßigen Aktualisierung nicht korrekt neu gezeichnet. Alle durch
-\fB\-\-differences\fP verursachten Hervorhebungen gehen bei einer Aktualisierung
-ebenfalls verloren.
-
-Nicht darstellbare Zeichen werden aus der Programmausgabe
-entfernt. Verwenden Sie »cat \-v« als Teil der Befehlsweiterleitung, falls
-Sie diese sehen wollen.
-
-Kombinationszeichen, die in der letzten Spalte angezeigt werden sollen,
-können eine Spalte eher angezeigt werden, oder überhaupt nicht.
-
-Kombinationszeichen werden im \fI\-\-differences\fP\-Modus niemals als
-unterschiedliche Zeichen aufgefasst. Lediglich das Basiszeichen ist von
-Belang.
-
-Leere Zeilen direkt nach einer Zeile, die in der letzten Spalte endet,
-werden nicht angezeigt.
-
-\fI\-\-precise\fP mode doesn't yet have advanced temporal distortion technology
-to compensate for a \fIcommand\fP that takes more than \fIinterval\fP seconds to
-execute. \fBwatch\fP also can get into a state where it rapid\-fires as many
-executions of \fIcommand\fP as it can to catch up from a previous executions
-running longer than \fIinterval\fP (for example, \fBnetstat\fP taking ages on a
-DNS lookup).
-.SH BEISPIELE
-.PP
-Um nach Ihren Mails zu sehen, versuchen Sie
-.IP
-watch \-n 60 from
-.PP
-Um die Änderungen von Verzeichnisinhalten zu überwachen, verwenden Sie
-.IP
-watch \-d ls \-l
-.PP
-Falls Sie nur an Dateien interessiert sind, die dem Benutzer »hans« gehören,
-verwenden Sie
-.IP
-watch \-d 'ls \-l | fgrep hans'
-.PP
-Um die Wirkung von Zitatzeichen zu sehen, versuchen Sie
-.IP
-watch echo $$
-.br
-watch echo '$$'
-.br
-watch echo "'"'$$'"'"
-.PP
-To see the effect of precision time keeping, try adding \fI\-p\fP to
-.IP
-watch \-n 10 sleep 1
-.PP
-Sie können anzeigen lassen, wann der Administrator den neuesten Kernel
-installiert:
-.IP
-watch uname \-r
-.PP
-(Beachten Sie, dass \fI\-p\fP nicht unbedingt nach einem Neustart des Systems
-funktioniert, speziell im Hinblick auf \fBntpdate\fP oder anderen beim
-Systemstart die Zeit anpassenden Mechanismen.)
diff -Nru procps-3.3.12/man-po/de/man8/sysctl.8 procps-3.3.15/man-po/de/man8/sysctl.8
--- procps-3.3.12/man-po/de/man8/sysctl.8 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man8/sysctl.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,153 +0,0 @@
-.\" Copyright 1999, George Staikos (staikos@0wned.org)
-.\" This file may be used subject to the terms and conditions of the
-.\" GNU General Public License Version 2, or any later version
-.\" at your option, as published by the Free Software Foundation.
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details."
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH SYSCTL 8 "Januar 2012" procps\-ng System\-Administration
-.SH BEZEICHNUNG
-sysctl \- die Kernel\-Parameter zur Laufzeit konfigurieren
-.SH ÜBERSICHT
-\fBsysctl\fP [\fIOptionen\fP] [\fIVariable\fP[\fB=\fP\fIWert\fP]] […]
-.br
-\fBsysctl \-p\fP [\fIDatei\fP oder \fIregulärer Ausdruck\fP] […]
-.SH BESCHREIBUNG
-\fBsysctl\fP wird zur Beeinflussung der Kernelparameter zur Laufzeit
-verwendet. Die verfügbaren Parameter sind unter /proc/sys/ aufgelistet.
-Procfs wird für die \fBsysctl\fP\-Unterstützung in Linux benötigt. Sie können
-\fBsysctl\fP sowohl zum Lesen als auch zum Schreiben von sysctl\-Daten
-verwenden.
-.SH PARAMETER
-.TP
-\fIVariable\fP
-ist der Name des Schlüssels, der ausgelesen werden soll, zum Beispiel
-kernel.ostype. Als Trenner wird neben dem Punkt ».« auch der Schrägstrich
-»/« akzeptiert.
-.TP
-\fIVariable\fP=\fIWert\fP
-Um einen Schlüssel zu setzen, verwenden Sie die Form \fIVariable\fP=\fIWert\fP,
-wobei \fIVariable\fP den Schlüssel darstellt und \fIWert\fP derjenige ist, auf den
-der Schlüssel gesetzt werden soll. Falls der Wert Zitatzeichen oder Zeichen
-enthält, die von der Shell interpretiert werden, müssen Sie den Wert in
-doppelte Anführungszeichen einschließen. Dafür wird der Parameter \fB\-w\fP
-benötigt.
-.TP
-\fB\-n\fP, \fB\-\-values\fP
-unterdrückt die Ausgabe des Schlüsselnamens, wenn Werte ausgegeben werden.
-.TP
-\fB\-e\fP, \fB\-\-ignore\fP
-unterdrückt die Ausgabe von Fehlermeldungen bei unbekannten Schlüsseln.
-.TP
-\fB\-N\fP, \fB\-\-names\fP
-gibt nur die Namen aus. Dies kann bei Shells mit programmierbarer
-Vervollständigung sinnvoll sein.
-.TP
-\fB\-q\fP, \fB\-\-quiet\fP
-unterdrückt die Ausgabe der gesetzten Werte in die Standardausgabe.
-.TP
-\fB\-w\fP, \fB\-\-write\fP
-wird zum Ändern einer sysctl\-Einstellung verwendet.
-.TP
-\fB\-p\fP[\fIDATEI\fP], \fB\-\-load\fP[=\fIDATEI\fP]
-lädt die sysctl\-Einstellungen aus der angegebenen Datei oder
-/etc/sysctl.conf, falls keine angegeben ist. Bei Angabe von »\-« als
-Dateiname wird aus der Standardeingabe gelesen. Die in dieser Option an
-\fBsysctl\fP übergebenen Argumente werden als Dateien aufgefasst und in der
-angegebenen Reihenfolge gelesen. Das Dateiargument kann als regulärer
-Ausdruck angegeben werden.
-.TP
-\fB\-a\fP, \fB\-\-all\fP
-zeigt alle aktuell verfügbaren Werte an.
-.TP
-\fB\-\-deprecated\fP
-schließt veraltete Parameter in die Auflistung der Werte mit \fB\-\-all\fP ein.
-.TP
-\fB\-b\fP, \fB\-\-binary\fP
-gibt den Wert ohne neue Zeile aus.
-.TP
-\fB\-\-system\fP
-lädt die Einstellungen aus allen Konfigurationsdateien des Systems.
-.br
-/run/sysctl.d/*.conf
-.br
-/etc/sysctl.d/*.conf
-.br
-/usr/local/lib/sysctl.d/*.conf
-.br
-/usr/lib/sysctl.d/*.conf
-.br
-/lib/sysctl.d/*.conf
-.br
-/etc/sysctl.conf
-.TP
-\fB\-r\fP, \fB\-\-pattern\fP \fIMuster\fP
-wendet nur Einstellungen an, die dem \fIMuster\fP entsprechen. Das \fIMuster\fP
-verwendet eine erweiterte Syntax mit regulären Ausdrücken.
-.TP
-\fB\-A\fP
-Alias für \fB\-a\fP
-.TP
-\fB\-d\fP
-Alias für \fB\-h\fP
-.TP
-\fB\-f\fP
-Alias für \fB\-p\fP
-.TP
-\fB\-X\fP
-Alias für \fB\-a\fP
-.TP
-\fB\-o\fP
-ist wirkungslos, nur für BSD\-Kompatibilität.
-.TP
-\fB\-x\fP
-ist wirkungslos, nur für BSD\-Kompatibilität.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an und beendet das Programm.
-.SH BEISPIELE
-/sbin/sysctl \-a
-.br
-/sbin/sysctl \-n kernel.hostname
-.br
-/sbin/sysctl \-w kernel.domainname="beispiel.com"
-.br
-/sbin/sysctl \-p/etc/sysctl.conf
-.br
-/sbin/sysctl \-a \-\-pattern forward
-.br
-/sbin/sysctl \-a \-\-pattern forward$
-.br
-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
-.br
-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
-.SH "VERALTETE PARAMETER"
-Die Parameter \fBbase_reachable_time\fP und \fBretrans_time\fP sind veraltet. Der
-sysctl\-Befehl erlaubt die Änderung der Werte dieser Parameter
-nicht. Benutzer, die immer noch veraltete Kernelschnittstellen benutzen,
-sollten Werte im /proc\-Dateisystem auf andere Weise behandeln, zum Beispiel:
-.PP
-echo 256 > /proc/sys/net/ipv6/neigh/eth0/base_reachable_time
-.SH DATEIEN
-\fI/proc/sys\fP
-.br
-\fI/etc/sysctl.conf\fP
-.SH "SIEHE AUCH"
-\fBsysctl.conf\fP(5) \fBregex\fP(7)
-.SH AUTOR
-.UR staikos@0wned.org
-George Staikos
-.UE
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de/man8/vmstat.8 procps-3.3.15/man-po/de/man8/vmstat.8
--- procps-3.3.12/man-po/de/man8/vmstat.8 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de/man8/vmstat.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,208 +0,0 @@
-.\" This page Copyright (C) 1994 Henry Ware
-.\" Distributed under the GPL, Copyleft 1994.
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH VMSTAT 8 "September 2011" procps\-ng System\-Administration
-.SH BEZEICHNUNG
-vmstat \- Statistiken zum virtuellen Speicher ermitteln
-.SH ÜBERSICHT
-\fBvmstat\fP [Optionen] [\fIVerzögerung\fP [\fIAnzahl\fP]]
-.SH BESCHREIBUNG
-\fBvmstat\fP zeigt Informationen zu Prozessen, Speicher, Paging, Block\-E/A,
-Traps, Laufwerken und CPU\-Aktivität an.
-.PP
-Die erste erzeugte Meldung zeigt Durchschnittswerte seit dem letzten
-Neustart des Systems an. Weitere erzeugte Meldungen beziehen diese
-Informationen auf einen Zeitintervall, der in \fIVerzögerung\fP definiert
-ist. Die Meldungen zu Prozessen und Speicher werden unverzüglich ausgegeben.
-.SH OPTIONEN
-.TP
-\fIVerzögerung\fP
-gibt die \fIVerzögerung\fP in Sekunden an. Falls keine \fIVerzögerung\fP angegeben
-ist, wird nur ein Bericht ausgegeben, der die Durchschnittswerte seit dem
-Systemstart enthält.
-.TP
-\fIAnzahl\fP
-gibt die Anzahl der Aktualisierungen an. Wenn die \fIAnzahl\fP nicht angegeben,
-aber eine \fIVerzögerung\fP definiert ist, dann ist die Anzahl der
-Aktualisierungen unendlich.
-.TP
-\fB\-a\fP, \fB\-\-active\fP
-zeigt aktiven und inaktiven Speicher an. Dafür ist ein Kernel 2.5.41 oder
-neuer erforderlich.
-.TP
-\fB\-f\fP, \fB\-\-forks\fP
-Der Schalter \fB\-f\fP zeigt die Anzahl der Forks seit dem Systemstart an. Dies
-bezieht die Systemaufrufe »fork«, »vfork« und »clone« und entspricht der
-Gesamtzahl der erzeugten Tasks. Jeder Prozess wird durch ein oder mehrere
-Tasks repräsentiert, abhängig von der Thread\-Nutzung. Diese Anzeige wird
-nicht wiederholt.
-.TP
-\fB\-m\fP, \fB\-\-slabs\fP
-zeigt Slab\-Info an.
-.TP
-\fB\-n\fP, \fB\-\-one\-header\fP
-zeigt den Header nur einmalig anstatt periodisch an.
-.TP
-\fB\-s\fP, \fB\-\-stats\fP
-zeigt eine Tabelle der verschiedenen Ereigniszähler und Speicherstatistiken
-an. Diese Anzeige wird nicht wiederholt.
-.TP
-\fB\-d\fP, \fB\-\-disk\fP
-zeigt Plattenstatistiken an (Kernel 2.5.70 oder neuer erforderlich).
-.TP
-\fB\-D\fP, \fB\-\-disk\-sum\fP
-zeigt eine statistische Zusammenfassung der Plattenaktivitäten an.
-.TP
-\fB\-p\fP, \fB\-\-partition\fP \fIGerät\fP
-zeigt detaillierte Statistiken zu Partitionen an (Kernel 2.5.70 oder neuer
-erforderlich).
-.TP
-\fB\-S\fP, \fB\-\-unit\fP \fIZeichen\fP
-wechselt die Einheit der Ausgabe zwischen 1000 (\fIk\fP), 1024 (\fIK\fP), 1000000
-(\fIm\fP) oder 1048576 (\fIM\fP) Bytes. Beachten Sie, dass diese Änderung der
-Swap\-Felder (si/so) oder Block\-Felder (bi/bo) nicht beeinflusst.
-.TP
-\fB\-t\fP, \fB\-\-timestamp\fP
-hängt an jede Zeile einen Zeitstempel an.
-.TP
-\fB\-w\fP, \fB\-\-wide\fP
-Breiter Ausgabemodus. Dieser ist sinnvoll, wenn der vorgegebene Ausgabemodus
-unerwünschte Umbrüche in den Spalten enthält, benötigt aber mehr
-Speicher. Die Ausgabe ist breiter als 80 Zeichen pro Zeile.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-zeigt Versionsinformationen an und beendet das Programm.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-zeigt eine Hilfe an und beendet das Programm.
-.PD
-.SH "FELDBESCHREIBUNG FÜR VM\-MODUS"
-.SS Prozesse
-.nf
-r: The number of runnable processes (running or waiting for run time).
-b: The number of processes in uninterruptible sleep.
-.fi
-.PP
-.SS Speicher
-.nf
-swpd: the amount of virtual memory used.
-free: the amount of idle memory.
-buff: the amount of memory used as buffers.
-cache: the amount of memory used as cache.
-inact: the amount of inactive memory. (\-a option)
-active: the amount of active memory. (\-a option)
-.fi
-.PP
-.SS Swap
-.nf
-si: Speichermenge aus dem Auslagerungsspeicher geholt (/s).
-so: Speichermenge in den Auslagerungsspeicher geschrieben (/s).
-.fi
-.PP
-.SS IO
-.nf
-bi: von einem Blockgerät empfangene Blöcke (Blöcke/s).
-bo: an ein Blockgerät gesendete Blöcke (Blöcke/s).
-.fi
-.PP
-.SS System
-.nf
-in: Anzahl der Interrupts pro Sekunde, einschließlich der Uhr.
-cs: Anzahl der Kontext\-Switches pro Sekunde.
-.fi
-.PP
-.SS CPU
-Dies sind Prozentsätze der gesamten CPU\-Zeit.
-.nf
-us: Time spent running non\-kernel code. (user time, including nice time)
-sy: Time spent running kernel code. (system time)
-id: Time spent idle. Prior to Linux 2.5.41, this includes IO\-wait time.
-wa: Time spent waiting for IO. Prior to Linux 2.5.41, included in idle.
-st: Time stolen from a virtual machine. Prior to Linux 2.6.11, unknown.
-.fi
-.PP
-.SH "FELDBESCHREIBUNG FÜR DISK\-MODUS"
-.SS Lesevorgänge
-.nf
-total: Gesamtzahl erfolgreich abgeschlossener Lesevorgänge
-merged: gruppierte Lesevorgänge (resultierend in einem E/A\-Vorgang)
-sectors: Erfolgreich gelesene Sektoren
-ms: Zeit für Lesevorgänge in Millisekunden
-.fi
-.PP
-.SS Schreibvorgänge
-.nf
-total: Total writes completed successfully
-merged: grouped writes (resulting in one I/O)
-sectors: Sectors written successfully
-ms: milliseconds spent writing
-.fi
-.PP
-.SS IO
-.nf
-cur: E/A in Verarbeitung
-s: für E/A verbrauchte Sekunden
-.fi
-.PP
-.SH "FELDBESCHREIBUNG FÜR PARTITIONSMODUS"
-.nf
-reads: Gesamtzahl der Lesevorgänge auf dieser Partition
-read sectors: Insgesamt gelesene Sektoren auf dieser Partition
-writes : Gesamtzahl der Schreibvorgänge auf dieser Partition
-requested writes: Gesamtzahl der für diese Partition
- angeforderten Schreibvorgänge
-.fi
-.PP
-.SH "FELDBESCHREIBUNG FÜR SLAB\-MODUS"
-.nf
-cache: Cache\-Name
-num: Anzahl der gegenwärtig aktiven Objekte
-total: Gesamtzahl der verfügbaren Objekte
-size: Größe jedes Objekts
-pages: Anzahl der Seiten mit mindestens einem aktiven Objekt
-.fi
-.SH ANMERKUNGEN
-\fBvmstat \fP erfordert keine besonderen Zugriffsrechte.
-.PP
-Diese Meldungen haben den Zweck, Engstellen (»Flaschenhälse«) im System zu
-erkennen. Die Linux\-Version von \fBvmstat\fP rechnet sich dabei selbst nicht zu
-den laufenden Prozessen.
-.PP
-Alle Linux\-Blöcke sind gegenwärtig 1024 Byte groß. Ältere Kernel könnten
-Blockgrößen als 512 Byte, 2048 Byte oder 4096 Byte erkennen.
-.PP
-Seit procps 3.1.9, können Sie in vmstat Einheiten wählen (k, K, m, M). Die
-Voreinstellung ist K (1024 Bytes) im Standardmodus.
-.PP
-vmstat verwendet slabinfo 1.1
-.SH DATEIEN
-.ta
-.nf
-/proc/meminfo
-/proc/stat
-/proc/*/stat
-.fi
-.SH "SIEHE AUCH"
-\fBfree\fP(1), \fBiostat\fP(1), \fBmpstat\fP(1), \fBps\fP(1), \fBsar\fP(1), \fBtop\fP(1)
-.PP
-.SH FEHLER
-Does not tabulate the block io per device or count the number of system
-calls.
-.SH AUTOREN
-Geschrieben von
-.UR al172@yfn.\:ysu.\:edu
-Henry Ware
-.UE .
-.br
-.UR ffrederick@users.\:sourceforge.\:net
-Fabian Fr\('ed\('erick
-.UE
-(diskstat, slab, Partitionen …)
-.SH "FEHLER BERICHTEN"
-Bitte senden Sie Fehlerberichte an
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/de.po procps-3.3.15/man-po/de.po
--- procps-3.3.12/man-po/de.po 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/de.po 2018-05-19 22:05:40.000000000 +0000
@@ -13,6 +13,7 @@
"Last-Translator: Mario Blättermann \n"
"Language-Team: German \n"
"Language: de\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -Nru procps-3.3.12/man-po/fr/man1/kill.1 procps-3.3.15/man-po/fr/man1/kill.1
--- procps-3.3.12/man-po/fr/man1/kill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/kill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for kill.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan; converted to a man page by
-.\" Michael K. Johnson
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH KILL 1 "octobre 2011" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-kill \- Envoyer un signal à un processus
-.SH SYNOPSIS
-\fBkill\fP [\fIoptions\fP] \fIPID\fP [...]
-.SH DESCRIPTION
-Le \fIsignal\fP par défaut de \fBkill\fP est \fBTERM\fP. Les options \fB\-l\fP et \fB\-L\fP
-affichent les signaux disponibles. Les signaux particulièrement utiles sont
-\fBHUP\fP, \fBINT\fP, \fBKILL\fP, \fBSTOP\fP, \fBCONT\fP et \fB0\fP. Les signaux peuvent être
-indiqués de 3 façons différentes\ : \fB\-9\fP \fB\-SIGKILL\fP \fB\-KILL\fP. Une valeur de
-\fIPID\fP négative peut être utilisée pour sélectionner des groupes de
-processus tout entiers\ ; regardez la colonne PGID de la sortie de la
-commande \fBps\fP. Un \fIPID\fP de valeur \fB\-1\fP est particulier\ : il indique tous
-les processus sauf le processus \fBkill\fP lui\-même et \fBinit\fP.
-.SH OPTIONS
-.TP
-\fIPID\fP [...]
-Envoyer un signal à tous les \fIPID\fP indiqués.
-.TP
-\fB\-\fP\fIsignal\fP
-.TQ
-\fB\-s\fP \fIsignal\fP
-.TQ
-\fB\-\-signal\fP \fIsignal\fP
-Indiquer le \fIsignal\fP à envoyer. Le signal peut être indiqué en utilisant un
-nom ou un nombre. Le comportement du signal est expliqué dans la page de
-manuel \fBsignal\fP(7).
-.TP
-\fB\-l\fP, \fB\-\-list\fP [\fIsignal\fP]
-Afficher les noms de signaux. Cette option a un paramètre facultatif qui
-sera converti en nom de signal, s'il s'agit d'un numéro de signal, et vice
-versa.
-.TP
-\fB\-L\fP, \fB\-\-table\fP
-Afficher les noms de signaux en un tableau bien présenté.
-.TP
-.PD
-.SH NOTES
-Votre interpréteur de commandes possède probablement une commande kill
-interne. Vous devriez saisir /bin/kill pour exécuter la commande décrite ici
-au lieu de la commande interne.
-.SH EXEMPLES
-.TP
-\fBkill \-9 \-1\fP
-Tuer tous les processus possibles.
-.TP
-\fBkill \-l 11\fP
-Traduire le nombre 11 en nom de signal.
-.TP
-\fBkill \-L\fP
-Afficher les choix de signaux disponibles en un tableau bien présenté.
-.TP
-\fBkill 123 543 2341 3453\fP
-Envoyer le signal \fBSIGTERM\fP par défaut à tous ces processus.
-.SH "VOIR AUSSI"
-\fBkill\fP(2), \fBkillall\fP(1), \fBnice\fP(1), \fBpkill\fP(1), \fBrenice\fP(1),
-\fBsignal\fP(7), \fBskill\fP(1)
-.SH NORMES
-Cette commande est conforme aux normes. L'option \fB\-L\fP est spécifique à
-Linux.
-.SH AUTEUR
-Albert Cahalan <\fIalbert@users.sf.net\fP> a écrit kill en 1999 pour
-remplacer la version «\ bsdutils\ » qui ne suivait pas les normes. La version
-d’util\-linux devrait aussi fonctionner correctement.
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/pgrep.1 procps-3.3.15/man-po/fr/man1/pgrep.1
--- procps-3.3.12/man-po/fr/man1/pgrep.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/pgrep.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,195 +0,0 @@
-.\" Manual page for pgrep / pkill.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Copyright 2000 Kjetil Torgrim Homme
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PGREP 1 "March 2015" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-pgrep, pkill \- Rechercher ou envoyer un signal à des processus en fonction
-de leur nom et d'autres propriétés
-.SH SYNOPSIS
-\fBpgrep\fP [\fBoptions\fP] \fImotif\fP
-.br
-\fBpkill\fP [\fBoptions\fP] \fImotif\fP
-.SH DESCRIPTION
-\fBpgrep\fP parcourt les processus en cours d'exécution et affiche sur la
-sortie standard les identifiants des processus qui correspondent aux
-critères de sélection donnés. Tous les critères doivent correspondre. Par
-exemple\ :
-.IP
-$ pgrep \-u root sshd
-.PP
-n'affichera que les processus appelés \fBsshd\fP ET qui appartiennent à
-\fBroot\fP. En revanche,
-.IP
-$ pgrep \-u root,daemon
-.PP
-affichera les processus appartenant à \fBroot\fP OU à \fBdaemon\fP.
-.PP
-\fBpkill\fP enverra le signal indiqué (\fBSIGTERM\fP par défaut) à chaque
-processus au lieu de les afficher sur la sortie standard.
-.SH OPTIONS
-.TP
-\fB\-\fP\fIsignal\fP
-.TQ
-\fB\-\-signal\fP \fIsignal\fP
-Indiquer le signal à envoyer à chaque processus sélectionné. Le signal peut
-être indiqué par son numéro ou par son nom symbolique (seulement pour
-\fBpkill\fP).
-.TP
-\fB\-c\fP, \fB\-\-count\fP
-À la place de la sortie normale, afficher le nombre de processus
-correspondant aux critères. S'il n'y a pas de correspondance, c'est\-à\-dire
-si zéro est renvoyé, la commande renverra une valeur non nulle.
-.TP
-\fB\-d\fP, \fB\-\-delimiter\fP \fIdélimiteur\fP
-Déterminer la chaîne utilisée pour délimiter les PID en sortie (un saut de
-ligne par défaut) (seulement pour \fBpgrep\fP).
-.TP
-\fB\-f\fP, \fB\-\-full\fP
-Le \fImotif\fP n'est normalement comparé qu'au nom du processus. Avec \fB\-f\fP, la
-ligne de commande complète est utilisée.
-.TP
-\fB\-g\fP, \fB\-\-pgroup\fP \fIpgrp\fP,...
-Ne rechercher que des processus dans les groupes de processus donnés. Le
-groupe de processus 0 se traduit par le propre groupe de processus de
-\fBpgrep\fP ou \fBpkill\fP.
-.TP
-\fB\-G\fP, \fB\-\-group\fP \fIgid\fP,...
-Ne rechercher que des processus dont l'identifiant de groupe réel est
-donné. Les valeurs utilisées peuvent être numériques ou symboliques.
-.TP
-\fB\-i\fP, \fB\-\-ignore\-case\fP
-Match processes case\-insensitively.
-.TP
-\fB\-l\fP, \fB\-\-list\-name\fP
-Afficher le nom du processus avec le PID (seulement pour \fBpgrep\fP).
-.TP
-\fB\-a\fP, \fB\-\-list\-full\fP
-Afficher la ligne de commande complète avec le PID (seulement pour
-\fBpgrep\fP).
-.TP
-\fB\-n\fP, \fB\-\-newest\fP
-Ne sélectionner que le processus correspondant le plus récent.
-.TP
-\fB\-o\fP, \fB\-\-oldest\fP
-Ne sélectionner que le processus correspondant le plus ancien.
-.TP
-\fB\-P\fP, \fB\-\-parent\fP \fIppid\fP,...
-Ne sélectionner que les processus dont le PID parent est donné.
-.TP
-\fB\-s\fP, \fB\-\-session\fP \fIsid\fP,...
-Ne sélectionner que les processus dont l'identifiant de session est
-donné. La session 0 se traduit par le propre identifiant de session de
-\fBpgrep\fP ou \fBpkill\fP.
-.TP
-\fB\-t\fP, \fB\-\-terminal\fP \fIterm\fP,...
-Ne sélectionner que les processus dont le terminal de contrôle est donné. Le
-nom du terminal doit être indiqué sans le préfixe «\ /dev/\ ».
-.TP
-\fB\-u\fP, \fB\-\-euid\fP \fIeuid\fP,...
-Ne sélectionner que les processus dont l'UID effectif est donné. La valeur
-utilisée peut être numérique ou symbolique.
-.TP
-\fB\-U\fP, \fB\-\-uid\fP \fIuid\fP,...
-Ne sélectionner que les processus dont l'UID réel est donné. La valeur
-utilisée peut être numérique ou symbolique.
-.TP
-\fB\-v\fP, \fB\-\-inverse\fP
-Inverser la sélection. Cette option est normalement utilisée dans le
-contexte de \fBpgrep\fP. Dans le contexte de \fBpkill\fP, l'option courte est
-désactivée pour éviter qu'elle soit utilisée par accident.
-.TP
-\fB\-w\fP, \fB\-\-lightweight\fP
-Montrer tous les identifiants de processus légers («\ threads\ ») au lieu des
-PID dans le contexte de \fBpgrep\fP. Dans le contexte de \fBpkill\fP, cette option
-est désactivée.
-.TP
-\fB\-x\fP, \fB\-\-exact\fP
-Ne sélectionner que les processus dont le nom (ou la ligne de commande si
-\fB\-f\fP est utilisée) correspond \fBexactement\fP au \fImotif\fP.
-.TP
-\fB\-F\fP, \fB\-\-pidfile\fP \fIfichier\fP
-Lire les \fIPID\fP dans le fichier. Cette option est peut\-être plus utile pour
-\fBpkill\fP que \fBpgrep\fP.
-.TP
-\fB\-L\fP, \fB\-\-logpidfile\fP
-Échouer si le \fIfichier\fP de PID (consultez \fB\-F\fP) n'est pas verrouillé.
-.TP
-\fB\-\-ns\fP \fIPID\fP
-Sélectionner les processus qui appartiennent aux mêmes espaces de
-nommage. Doit être exécuté en tant que superutilisateur pour sélectionner
-les processus d’autres utilisateurs. Consultez \fB\-\-nslist\fP pour une manière
-de limiter les espaces de nommage à sélectionner.
-.TP
-\fB\-\-nslist\fP \fIen\fP[\fB,\fP\fIen\fP]...
-Ne sélectionner que les espaces de nommage fournis. Les espaces de nommage
-disponibles sont\ : ipc, mnt, net, pid, user et uts.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.PD
-.SH OPÉRANDES
-.TP
-\fImotif\fP
-Indiquer une expression rationnelle étendue utilisée pour comparer avec les
-noms de processus ou les lignes de commandes.
-.SH EXEMPLES
-Exemple\ 1\ : Trouver le PID du démon \fBnamed\fP\ :
-.IP
-$ pgrep \-u root named
-.PP
-Exemple 2\ : Faire relire son fichier de configuration par \fBsyslog\fP\ :
-.IP
-$ pkill \-HUP syslogd
-.PP
-Exemple 3\ : Donner des informations détaillées sur tous les processus
-\fBxterm\fP\ :
-.IP
-$ ps \-fp $(pgrep \-d, \-x xterm)
-.PP
-Exemple 4\ : Réduire la priorité de tous les processus \fBnetscape\fP\ :
-.IP
-$ renice +4 $(pgrep netscape)
-.SH "CODES DE RETOUR"
-.PD 0
-.TP
-0
-Un ou plusieurs processus correspondaient aux critères.
-.TP
-1
-Aucun processus ne correspondait.
-.TP
-2
-Erreur de syntaxe dans la ligne de commande.
-.TP
-3
-Erreur fatale, par exemple plus de mémoire disponible.
-.PD
-.SH NOTES
-Le nom du processus utilisé pour la sélection est limité aux 15\ caractères
-présents dans /proc/\fIpid\fP/stat. Utilisez l'option \fB\-f\fP pour sélectionner
-en fonction de la ligne de commande complète, /proc/\fIpid\fP/cmdline.
-.PP
-Le processus \fBpgrep\fP ou \fBpkill\fP qui s'exécute ne se considérera jamais
-comme correspondant aux critères.
-.SH BOGUES
-Les options \fB\-n\fP, \fB\-o\fP et \fB\-v\fP ne peuvent pas être utilisées en même
-temps. Signalez\-le si vous en avez besoin.
-.PP
-Les processus zombies sont affichés.
-
-.SH "VOIR AUSSI"
-\fBps\fP(1), \fBregex\fP(7), \fBsignal\fP(7), \fBkillall\fP(1), \fBskill\fP(1), \fBkill\fP(1),
-\fBkill\fP(2)
-.SH AUTEUR
-Kjetil Torgrim Homme <\fIkjetilho@ifi.uio.no\fP>
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/pidof.1 procps-3.3.15/man-po/fr/man1/pidof.1
--- procps-3.3.12/man-po/fr/man1/pidof.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/pidof.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-'\" -*- coding: UTF-8 -*-
-.\" Copyright (C) 1998 Miquel van Smoorenburg.
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PIDOF 1 "24 juillet 2013" "" "Commandes de l'utilisateur"
-.SH NOM
-pidof \- Afficher le PID d'un programme
-.SH SYNOPSIS
-\fBpidof\fP [\fB\-s\fP] [\fB\-c\fP] [\fB\-x\fP] [\fB\-o\fP \fIsans_pid\fP[\fB,\fP\fIsans_pid\fP ...]]
-[\fB\-o\fP \fIsans_pid\fP[\fB,\fP\fIsans_pid\fP ...]] \fBprogramme\fP [\fBprogramme\fP ...]
-.SH DESCRIPTION
-\fBpidof\fP cherche les identifiants de processus (PID) portant l'un des noms
-de programme indiqués. Il affiche ces numéros sur la sortie standard.
-.SH OPTIONS
-.IP \fB\-s\fP
-Un seul coup – \fIpidof\fP ne renverra qu'un seul \fIpid\fP.
-.IP \fB\-c\fP
-Ne renvoyer que les identifiants des processus qui sont exécutés dans le
-même répertoire racine. Cette option est ignorée pour les utilisateurs
-autres que le superutilisateur puisqu'ils ne peuvent pas vérifier le
-répertoire racine en cours des processus dont ils ne sont pas propriétaires.
-.IP \fB\-x\fP
-Scripts également — \fIpidof\fP renverra également les PID des interpréteurs de
-commandes exécutant les scripts indiqués.
-.IP "\fB\-o\fP \fIsans_pid\fP"
-Demander à \fIpidof\fP de ne pas tenir compte du PID indiqué. Le PID spécial
-\fB%PPID\fP peut décrire le processus parent du programme \fIpidof\fP,
-c'est\-à\-dire l’interpréteur de commandes ou le script appelant.
-.SH "CODES DE RETOUR"
-.TP
-\fB0\fP
-Au moins un programme a été trouvé avec le nom demandé.
-.TP
-\fB1\fP
-Aucun programme trouvé avec le nom demandé.
-
-.SH "VOIR AUSSI"
-\fBpgrep\fP(1), \fBpkill\fP(1)
-.SH AUTEUR
-Jaromir Capik <\fIjcapik@redhat.com\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/pkill.1 procps-3.3.15/man-po/fr/man1/pkill.1
--- procps-3.3.12/man-po/fr/man1/pkill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/pkill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.so man1/pgrep.1
diff -Nru procps-3.3.12/man-po/fr/man1/pmap.1 procps-3.3.15/man-po/fr/man1/pmap.1
--- procps-3.3.12/man-po/fr/man1/pmap.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/pmap.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for pmap.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan.
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PMAP 1 "septembre 2012" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-pmap \- Afficher l'empreinte mémoire d'un processus
-.SH SYNOPSIS
-\fBpmap\fP [\fIoptions\fP] \fIPID\fP [...]
-.SH DESCRIPTION
-La commande \fBpmap\fP affiche l'empreinte mémoire d'un ou plusieurs processus.
-.SH OPTIONS
-.TP
-\fB\-x\fP, \fB\-\-extended\fP
-Afficher la sortie au format étendu.
-.TP
-\fB\-d\fP, \fB\-\-device\fP
-Afficher la sortie au format périphérique.
-.TP
-\fB\-q\fP, \fB\-\-quiet\fP
-Ne pas afficher certaines lignes d'en\-tête ou de pied de page.
-.TP
-\fB\-A\fP, \fB\-\-range\fP \fIbas\fP\fB,\fP\fIhaut\fP
-Restreindre les résultats à l'intervalle d'adresses comprises entre \fIbas\fP
-et \fIhaut\fP. Remarquez que les paramètres \fIbas\fP et \fIhaut\fP sont de simples
-chaînes séparées par une virgule.
-.TP
-\fB\-X\fP
-Afficher encore plus de précisions qu'avec l'option \fB\-x\fP. Attention, le
-format change en fonction de \fI/proc/PID/smaps\fP.
-.TP
-\fB\-XX\fP
-Afficher tout ce que le noyau fournit.
-.TP
-\fB\-p\fP, \fB\-\-show\-path\fP
-Montrer le chemin complet vers les fichiers dans la colonne de
-correspondance.
-.TP
-\fB\-c\fP, \fB\-\-read\-rc\fP
-Lire la configuration par défaut.
-.TP
-\fB\-C\fP, \fB\-\-read\-rc\-from\fP \fIfichier\fP
-Lire le fichier de configuration \fIfichier\fP.
-.TP
-\fB\-n\fP, \fB\-\-create\-rc\fP
-Créer une nouvelle configuration par défaut.
-.TP
-\fB\-N\fP, \fB\-\-create\-rc\-to\fP \fIfichier\fP
-Créer une nouvelle configuration dans \fIfichier\fP.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.SH "CODES DE RETOUR"
-.PP
-.RS
-.PD 0
-.TP
-\fB0\fP
-Réussite.
-.TP
-\fB1\fP
-Échec.
-.TP
-\fB42\fP
-Les processus demandés n'ont pas tous été trouvés.
-.PD
-.RE
-.SH "VOIR AUSSI"
-\fBps\fP(1), \fBpgrep\fP(1)
-.SH NORMES
-Aucune norme n'est respectée mais \fBpmap\fP ressemble fortement à une commande
-SunOS.
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/pwdx.1 procps-3.3.15/man-po/fr/man1/pwdx.1
--- procps-3.3.12/man-po/fr/man1/pwdx.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/pwdx.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-.\" Man page for pwdx
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Copyright 2004 Nicholas Miell.
-.\" Based on the pmap(1) man page by Albert Cahalan.
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PWDX 1 "juin 2011" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-pwdx \- Afficher le répertoire de travail d'un processus
-.SH SYNOPSIS
-\fBpwdx\fP [\fIoptions\fP] \fIPID\fP [...]
-.SH OPTIONS
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher un écran d'aide puis quitter.
-.SH "VOIR AUSSI"
-\fBps\fP(1), \fBpgrep\fP(1)
-.SH NORMES
-Aucune norme n'est respectée mais \fBpwdx\fP ressemble fortement à une commande
-SunOS.
-.SH AUTEUR
-Nicholas Miell <\fInmiell@gmail.com\fP> a écrit pwdx en 2004.
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/skill.1 procps-3.3.15/man-po/fr/man1/skill.1
--- procps-3.3.12/man-po/fr/man1/skill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/skill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for skill and snice.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan, converted to a man page by
-.\" Michael K. Johnson
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH SKILL 1 "octobre 2011" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-skill, snice \- Envoyer un signal ou rendre compte de l'état d'un processus
-.SH SYNOPSIS
-\fBskill\fP [\fIsignal\fP] [\fIoptions\fP] \fIexpression\fP
-.br
-\fBsnice\fP [\fInouvelle priorité\fP] [\fIoptions\fP] \fIexpression\fP
-.SH DESCRIPTION
-Ces outils sont obsolètes et non portables. La syntaxe de la commande n'est
-pas optimale. Veuillez utiliser les commandes \fBkillall\fP, \fBpkill\fP et
-\fBpgrep\fP à la place.
-.PP
-Le \fIsignal\fP par défaut pour \fBskill\fP est \fBTERM\fP. Utilisez \fB\-l\fP ou \fB\-L\fP
-pour obtenir la liste des signaux disponibles. Parmi les plus utiles, on
-trouve \fBHUP\fP, \fBINT\fP, \fBKILL\fP, \fBSTOP\fP, \fBCONT\fP et \fB0\fP. Certains signaux
-peuvent être désignés de trois manières différentes\ : \-9 \-SIGKILL \-KILL.
-.PP
-La priorité par défaut pour snice est +4. Les indices de priorité vont de
-+20 (le plus lent) à \-20 (le plus rapide). Les indices de priorité négatifs
-sont réservés aux administrateurs.
-.SH OPTIONS
-.TP
-\fB\-f\fP,\fB\ \-\-fast\fP
-Mode rapide. Cette option n'a pas été implémentée.
-.TP
-\fB\-i\fP,\fB\ \-\-interactive\fP
-Mode interactif. Chaque action devra être validée.
-.TP
-\fB\-l\fP,\fB\ \-\-list\fP
-Afficher tous les noms de signaux.
-.TP
-\fB\-L\fP, \fB\-\-table\fP
-Afficher tous les noms de signaux en tableau bien présenté.
-.TP
-\fB\-n\fP,\fB\ \-\-no\-action\fP
-Pas d'action. Réaliser une simulation des événements qui auraient lieu mais
-sans vraiment modifier le système.
-.TP
-\fB\-v\fP,\fB\ \-\-verbose\fP
-Bavard. Expliquer ce qui est en train de se faire.
-.TP
-\fB\-w\fP,\fB\ \-\-warnings\fP
-Alertes activées. Cette option n'a pas été implémentée.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher les informations de version.
-.PD
-.SH "OPTIONS DE SÉLECTION DES PROCESSUS"
-Les critères de sélection peuvent être\ : terminal, nom d'utilisateur,
-identifiant de processus, commande. Les options ci\-dessous peuvent être
-utilisées pour s'assurer d'une interprétation correcte.
-.TP
-\fB\-t\fP, \fB\-\-tty\fP \fItty\fP
-\fItty\fP est un terminal (tty ou pty).
-.TP
-\fB\-u\fP, \fB\-\-user\fP \fIutilisateur\fP
-\fIutilisateur\fP est un nom d'utilisateur.
-.TP
-\fB\-p\fP, \fB\-\-pid\fP \fIPID\fP
-\fIPID\fP est un numéro d'identifiant de processus.
-.TP
-\fB\-c\fP, \fB\-\-command\fP \fIcommande\fP
-\fIcommande\fP est un nom de commande.
-.TP
-\fB\-\-ns\fP \fIPID\fP
-Sélectionner les processus qui appartiennent aux mêmes espaces de nommage
-que \fIPID\fP.
-.TP
-\fB\-\-nslist\fP \fIen\fP[\fB,\fP\fIen\fP]...
-Afficher les espaces de nommage qui seront considérés pour l’option
-\fB\-\-ns\fP. Les espaces de nommage disponibles sont\ : ipc, mnt, net, pid, user
-et uts.
-.PD
-.SH SIGNAUX
-Le comportement du signal est expliqué dans la page de manuel \fBsignal\fP(7).
-.SH EXEMPLES
-.TP
-\fBsnice \-c seti \-c crack +7\fP
-Ralentir les commandes seti et crack.
-.TP
-\fBskill \-KILL \-t /dev/pts/*\fP
-Tuer les utilisateurs sur les périphériques PTY.
-.TP
-\fBskill \-STOP \-u viro \-u lm \-u davem\fP
-Suspendre les trois utilisateurs en question.
-.SH "VOIR AUSSI"
-\fBkill\fP(1), \fBkill\fP(2), \fBkillall\fP(1), \fBnice\fP(1), \fBpkill\fP(1),
-\fBrenice\fP(1), \fBsignal\fP(7)
-.SH NORMES
-Aucune norme ne s'applique.
-.SH AUTEUR
-Albert Cahalan <\fIalbert@users.sf.net\fP> a écrit skill et snice en
-1999 en remplacement d'une version non libre.
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/tload.1 procps-3.3.15/man-po/fr/man1/tload.1
--- procps-3.3.12/man-po/fr/man1/tload.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/tload.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-.\" -*-Nroff-*-
-.\" This page Copyright (C) 1993 Matt Welsh, mdw@tc.cornell.edu.
-.\" Freely distributable under the terms of the GPL
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH TLOAD 1 "juin 2011" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-tload \- Représentation graphique de la charge moyenne du système
-.SH SYNOPSIS
-\fBtload\fP [\fIoptions\fP] [\fItty\fP]
-.SH DESCRIPTION
-\fBtload\fP affiche un graphe de la charge moyenne du système dans la console
-\fItty\fP (ou la console du processus de tload si aucune n'est précisée).
-.SH OPTIONS
-.TP
-\fB\-s\fP, \fB\-\-scale\fP \fIéchelle\fP
-L'option \fIéchelle\fP permet d'indiquer une échelle verticale pour l'affichage
-(en caractères entre les tirets)\ ; ainsi une plus petite valeur représente
-une plus grande échelle, et vice versa.
-.TP
-\fB\-d\fP, \fB\-\-delay\fP \fIdélai\fP
-Le \fIdélai\fP définit le délai en seconde entre les mises à jour des graphes.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.PP
-.SH FICHIERS
-\fI/proc/loadavg\fP information sur la charge moyenne
-.SH "VOIR AUSSI"
-\fBps\fP(1), \fBtop\fP(1), \fBuptime\fP(1), \fBw\fP(1)
-.SH BOGUES
-L'option \fB\-d\fP\fI délai\fP définit le paramètre de temps de la commande
-\fBalarm\fP(2)\ ; si \-d 0 est indiqué, l'alarme est désactivée, elle n'enverra
-jamais de signal \fBSIGALRM\fP bloquant ainsi la mise à jour de l'affichage.
-.SH AUTEURS
-Branko Lankester <\fIlankeste@fwi.uva.nl\fP>, David Engel
-<\fIdavid@ods.com\fP> et Michael K. Johnson
-<\fIjohnsonm@redhat.com\fP>.
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/uptime.1 procps-3.3.15/man-po/fr/man1/uptime.1
--- procps-3.3.12/man-po/fr/man1/uptime.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/uptime.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-.\" -*-Nroff-*-
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH UPTIME 1 "décembre 2012" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-uptime \- Indiquer depuis quand le système a été mis en route
-.SH SYNOPSIS
-\fBuptime\fP [\fIoptions\fP]
-.SH DESCRIPTION
-\fBuptime\fP affiche sur une ligne les informations suivantes\ : l'heure
-actuelle, la durée depuis laquelle le système fonctionne, le nombre
-d'utilisateurs actuellement connectés, et la charge système moyenne pour les
-1, 5, et 15 dernières minutes.
-.PP
-Ce sont les mêmes informations que celles contenues dans la ligne d'en\-tête
-de \fBw\fP(1).
-.PP
-La charge système moyenne est le nombre moyen de processus qui sont dans un
-état exécutable ou non interruptible. Un processus exécutable utilise le
-processeur ou est en attente pour l'utiliser. Un processus non interruptible
-est en attente pour des entrées et sorties, par exemple, attendre un
-disque. Les moyennes sont calculées sur trois intervalles de temps. La
-charge moyenne n'est pas normalisée par rapport au nombre de processeurs du
-système. Ainsi une charge moyenne de 1 signifie qu'un système monoprocesseur
-est chargé tout le temps alors qu'un système à quatre processeurs est
-inactif 75\ % du temps.
-.SH OPTIONS
-.TP
-\fB\-p\fP, \fB\-\-pretty\fP
-Afficher en format élégant
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide
-.TP
-\fB\-s\fP, \fB\-\-since\fP
-Date depuis laquelle le système est en route, au format aaaa\-mm\-jj HH:MM:SS
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter
-.SH FICHIERS
-.TP
-\fI/var/run/utmp\fP
-informations concernant les utilisateurs présents sur le système
-.TP
-\fI/proc\fP
-informations concernant les processus
-.SH AUTEURS
-\fBuptime\fP a été écrit par Larry Greenfield
-<\fIgreenfie@gauss.rutgers.edu\fP> et Michael K. Johnson
-<\fIjohnsonm@sunsite.unc.edu\fP>.
-.SH "VOIR AUSSI"
-\fBps\fP(1), \fBtop\fP(1), \fButmp\fP(5), \fBw\fP(1)
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/w.1 procps-3.3.15/man-po/fr/man1/w.1
--- procps-3.3.12/man-po/fr/man1/w.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/w.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-.\" -*-Nroff-*-
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH W 1 "mai 2012" procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-w \- Afficher les utilisateurs présents sur le système et leur activité
-.SH SYNOPSIS
-\fBw\fP [\fIoptions\fP] \fIutilisateur\fP [...]
-.SH DESCRIPTION
-\fBw\fP affiche des informations concernant les utilisateurs qui sont
-actuellement présents sur le système et leurs processus. L'en\-tête affiche,
-dans cet ordre, l'heure actuelle, depuis combien de temps le système est
-actif, combien d'utilisateurs sont actuellement présents sur le système et
-la charge moyenne du système pour la dernière, les 5 et les 15 dernières
-minutes.
-.PP
-Les entrées suivantes sont affichées pour chacun des utilisateurs\ : nom
-d'utilisateur, nom du terminal («\ tty\ »), hôte distant, temps écoulé depuis
-le début de la connexion, temps d'inactivité, JCPU, PCPU, ainsi que la ligne
-de commande de leur processus en cours.
-.PP
-Le temps JCPU est le temps utilisé par tous les processus attachés au
-tty. Il n'inclut pas les travaux terminés qui ont été exécutés en tâche de
-fond, mais il inclut les travaux en tâche de fond qui sont actuellement
-actifs.
-.PP
-Le temps PCPU est le temps utilisé par le processus actuel, le nom de ce
-processus se trouve dans la colonne dont l'intitulé est «\ WHAT\ ».
-.SH "OPTIONS DE LA LIGNE DE COMMANDE"
-.TP
-\fB\-h\fP, \fB\-\-no\-header\fP
-Ne pas afficher l'en\-tête
-.TP
-\fB\-u\fP, \fB\-\-no\-current\fP
-Ignorer le nom d'utilisateur lors de la détermination du nombre de processus
-et des temps CPU. Pour en voir l'effet, faire «\ su\ » puis «\ w\ » et «\ w \-u\ ».
-.TP
-\fB\-s\fP, \fB\-\-short\fP
-Utiliser le format court. N'afficher ni le temps de présence ni les temps
-JCPU et PCPU.
-.TP
-\fB\-f\fP, \fB\-\-from\fP
-Alterner entre l'activation et la désactivation de l'affichage du champ
-«\ FROM\ » (nom de l'hôte distant). Le comportement initial par défaut est de
-ne pas afficher le champ «\ FROM\ ». Cependant, une version affichant le champ
-«\ FROM\ » par défaut peut avoir été compilée par l'administrateur système ou
-les responsables de la distribution.
-.TP
-\fB\-\-help\fP
-Afficher l'aide et quitter.
-.TP
-\fB\-i\fP, \fB\-\-ip\-addr\fP
-Afficher l'adresse IP au lieu du nom d'hôte pour le champ «\ FROM\ ».
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher les informations de version.
-.TP
-\fB\-o\fP, \fB\-\-old\-style\fP
-Formatage de la sortie selon l'ancien style. Laisser vierges les durées
-d'inactivité de moins d'une minute.
-.TP
-\fButilisateur \fP
-N'afficher d'informations que pour l'utilisateur indiqué.
-.SH ENVIRONNEMENT
-.TP
-PROCPS_USERLEN
-Remplace la largeur par défaut de la colonne «\ USER\ ». La valeur par défaut
-est de 8.
-.TP
-PROCPS_FROMLEN
-Remplace la largeur par défaut de la colonne «\ FROM\ ». La valeur par défaut
-est de 16.
-.SH FICHIERS
-.TP
-\fI/var/run/utmp\fP
-informations concernant les utilisateurs présents sur le système
-.TP
-\fI/proc\fP
-informations concernant les processus
-.SH "VOIR AUSSI"
-\fBfree\fP(1), \fBps\fP(1), \fBtop\fP(1), \fBuptime\fP(1), \fButmp\fP(5), \fBwho\fP(1)
-.SH AUTEURS
-\fBw\fP a presque entièrement été réécrit par Charles Blake qui s'est basé sur
-une version de Larry Greenfield <\fIgreenfie@gauss.rutgers.edu\fP> et
-Michael K. Johnson <\fIjohnsonm@redhat.com\fP>.
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man1/watch.1 procps-3.3.15/man-po/fr/man1/watch.1
--- procps-3.3.12/man-po/fr/man1/watch.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man1/watch.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH WATCH 1 2016\-06\-03 procps\-ng "Commandes de l'utilisateur"
-.SH NOM
-watch \- Exécuter un programme périodiquement en affichant le résultat à
-l'écran
-.SH SYNOPSIS
-\fBwatch\fP [\fIoptions\fP] \fIcommande\fP
-.SH DESCRIPTION
-\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
-first screenfull). This allows you to watch the program output change over
-time. By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
-until interrupted.
-.SH OPTIONS
-.TP
-\fB\-d\fP, \fB\-\-differences\fP [\fIpermanent\fP]
-Surligner les différences entre les mises à jour successives. L'option lira
-un argument facultatif qui modifie la surbrillance de façon permanente,
-permettant de voir ce qui a été modifié au moins une fois depuis la première
-itération.
-.TP
-\fB\-n\fP, \fB\-\-interval\fP \fIintervalle\fP
-Specify update interval. The command will not allow quicker than 0.1 second
-interval, in which the smaller values are converted. Both '.' and ',' work
-for any locales.
-.TP
-\fB\-p\fP, \fB\-\-precise\fP
-Essayer d'exécuter \fIcommande\fP toutes les \fIintervalle\fP secondes. Essayez
-avec \fBntptime\fP et regardez comme les fractions de seconde ne changent
-quasiment pas, contrairement au mode normal où elles augmentent
-continuellement.
-.TP
-\fB\-t\fP, \fB\-\-no\-title\fP
-Cacher l'en\-tête contenant l'intervalle, la commande et la date actuelle en
-haut de l'affichage, ainsi que la ligne blanche qui suit.
-.TP
-\fB\-b\fP, \fB\-\-beep\fP
-Émettre un bip lorsque le code de retour de la commande est non nul.
-.TP
-\fB\-e\fP, \fB\-\-errexit\fP
-Geler les mises à jour en cas d'erreur de la commande et quitter après avoir
-appuyé sur une touche.
-.TP
-\fB\-g\fP, \fB\-\-chgexit\fP
-Terminer quand la sortie de \fIcommande\fP est modifiée.
-.TP
-\fB\-c\fP, \fB\-\-color\fP
-Interpréter les suites et style de couleur ANSI.
-.TP
-\fB\-x\fP, \fB\-\-exec\fP
-\fIcommande\fP est passée en paramètre à \fBsh\ \-c\fP, ce qui signifie que vous
-devrez parfois utiliser des guillemets supplémentaires pour obtenir l'effet
-désiré. Ce comportement peut être modifié avec l'option \fB\-\-exec\fP qui passe
-la commande à \fBexec\fP(2).
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.SH "CODES DE RETOUR"
-.PP
-.RS
-.PD 0
-.TP
-\fB0\fP
-Réussite.
-.TP
-\fB1\fP
-Erreurs diverses.
-.TP
-\fB2\fP
-Échec lors du dédoublement («\ fork\ ») du processus à observer.
-.TP
-\fB3\fP
-Échec de remplacement de la sortie standard du processus fils par une
-écriture vers le tube.
-.TP
-\fB4\fP
-Échec d'exécution de la commande.
-.TP
-\fB5\fP
-Échec de la fermeture d'écriture vers le tube du processus fils.
-.TP
-\fB7\fP
-Échec de la création du tube IPC.
-.TP
-\fB8\fP
-Le processus fils n'a pas pu renvoyer une valeur avec \fBwaitpid\fP(2) ou la
-commande s'est terminée en erreur.
-.TP
-\fBautre\fP
-L'observation propagera l'état du code de retour en tant que code de retour
-du fils.
-.SH NOTES
-POSIX option processing is used (i.e., option processing stops at the first
-non\-option argument). This means that flags after \fIcommand\fP don't get
-interpreted by \fBwatch\fP itself.
-.SH BOGUES
-Lors du redimensionnement d'un terminal, l'écran ne sera pas rafraîchi
-correctement avant la prochaine exécution. Les mises en évidence dues à
-\fB\-\-differences\fP sont également perdues.
-
-Les caractères non imprimables de la sortie du programme sont
-ignorés. Utilisez «\ cat \-v\ » pour les afficher.
-
-La combinaison de caractères supposés s'afficher en dernière colonne de
-l'écran risque de s'afficher dans la colonne précédente ou pas du tout.
-
-Les combinaisons de caractères ne sont jamais considérées différentes en
-mode \fI\-\-differences\fP. Seul le caractère de base est considéré.
-
-Les lignes blanches qui suivent directement une ligne s'arrêtant en dernière
-colonne ne sont pas affichées
-
-Le mode \fB\-\-precise\fP ne dispose pas encore de fonctions de temporisation
-pour compenser une \fIcommande\fP dont le temps d'exécution est supérieure à
-\fIsecondes\fP secondes. \fBwatch\fP peut également lancer en rafales autant
-d'exécution de \fIcommande\fP que possible pour rattraper une exécution
-précédente qui aurait pris plus de \fIsecondes\fP secondes à s'exécuter (par
-exemple, \fBnetstat\fP prend beaucoup de temps pour effectuer une interrogation
-DNS).
-.SH EXEMPLES
-.PP
-Pour vérifier les courriels\ :
-.IP
-watch \-n 60 from
-.PP
-Pour afficher les changements dans le contenu d'un répertoire\ :
-.IP
-watch \-d ls \-l
-.PP
-Pour n'afficher que les fichiers appartenant à arthur\ :
-.IP
-watch\ \-d 'ls\ \-l\ |\ fgrep arthur'
-.PP
-Pour vérifier l'effet des guillemets\ :
-.IP
-watch echo $$
-.br
-watch echo '$$'
-.br
-watch echo "'"'$$'"'"
-.PP
-Pour vérifier l'effet du temps de maintien de la précision, essayez en
-ajoutant \fB\-p\fP à
-.IP
-watch \-n 10 sleep 1
-.PP
-Pour vérifier que l'administrateur a installé le dernier noyau avec
-.IP
-watch uname \-r
-.PP
-Notez que \fB\-p\fP peut ne pas fonctionner entre deux redémarrages, à cause de
-\fBntpdate\fP ou d'autres programmes modifiant la date au démarrage.
diff -Nru procps-3.3.12/man-po/fr/man8/sysctl.8 procps-3.3.15/man-po/fr/man8/sysctl.8
--- procps-3.3.12/man-po/fr/man8/sysctl.8 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man8/sysctl.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-.\" Copyright 1999, George Staikos (staikos@0wned.org)
-.\" This file may be used subject to the terms and conditions of the
-.\" GNU General Public License Version 2, or any later version
-.\" at your option, as published by the Free Software Foundation.
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details."
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH SYSCTL 8 "janvier 2012" procps\-ng "Administration système"
-.SH NOM
-sysctl \- Configurer les paramètres du noyau à chaud
-.SH SYNOPSIS
-\fBsysctl\fP [\fIoptions\fP] [\fIvariable\fP[\fB=\fP\fIvaleur\fP]] [...]
-.br
-\fBsysctl \-p\fP [\fIfichier\fP | \fIexpression rationnelle\fP] [...]
-.SH DESCRIPTION
-\fBsysctl\fP est utilisé pour modifier les paramètres du noyau en cours
-d'exécution. Les paramètres utilisables sont ceux présents dans le
-répertoire /proc/sys. Procfs est nécessaire pour utiliser \fBsysctl\fP sous
-Linux. Vous pouvez utiliser \fBsysctl\fP aussi bien pour lire que pour écrire
-des paramètres.
-.SH PARAMÈTRES
-.TP
-\fIvariable\fP
-Le nom d'une clé à lire. Par exemple «\ kernel.ostype\ ». Le séparateur
-«\ /\ » est aussi accepté en lieu et place de «\ .\ ».
-.TP
-\fIvariable\fP\fB=\fP\fIvaleur\fP
-Pour saisir une clé, utilisez la forme \fIvariable\fP\fB=\fP\fIvaleur\fP, où
-\fIvariable\fP est la clé et \fIvaleur\fP la valeur à lui affecter. Si valeur
-contient des apostrophes ou des caractères interprétés par l'interpréteur de
-commande, il faut placer la valeur entre guillemets doubles. Cette forme ne
-peut être utilisée qu'avec l'option \fB\-w\fP.
-.TP
-\fB\-n\fP, \fB\-\-values\fP
-Empêcher l'affichage des clés lors de l'affichage des valeurs.
-.TP
-\fB\-e\fP, \fB\-\-ignore\fP
-Ignorer les erreurs concernant les clés inconnues.
-.TP
-\fB\-N\fP, \fB\-\-names\fP
-Afficher les options. Cela peut être utile pour les interpréteurs de
-commandes disposant d'un complètement automatique programmable.
-.TP
-\fB\-q\fP, \fB\-\-quiet\fP
-Empêcher l'affichage des valeurs dans la sortie standard.
-.TP
-\fB\-w\fP, \fB\-\-write\fP
-Permettre le changement d'un paramètre sysctl.
-.TP
-\fB\-p\fP[\fIfichier\fP], \fB\-\-load\fP[\fB=\fP\fIfichier\fP]
-Charger les paramètres sysctl depuis le \fIfichier\fP donné en paramètre ou
-depuis \fI/etc/sysctl.conf\fP si aucun fichier n'est donné. Indiquer «\ \-\ »
-comme fichier signifie que les données seront lues depuis l'entrée
-standard. L'utilisation de cette option signifiera que les arguments de
-\fBsysctl\fP sont des fichiers lus dans l'ordre indiqué. L'argument fichier
-peut être indiqué comme une expression rationnelle.
-.TP
-\fB\-a\fP, \fB\-\-all\fP
-Afficher toutes les valeurs disponibles.
-.TP
-\fB\-\-deprecated\fP
-Inclure les paramètres obsolètes à la liste de valeurs avec \fB\-\-all\fP.
-.TP
-\fB\-b\fP, \fB\-\-binary\fP
-Afficher la valeur sans retour à la ligne.
-.TP
-\fB\-\-system\fP
-Charger les réglages depuis tous les fichiers de configuration du système.
-.br
-\fI/run/sysctl.d/*.conf\fP
-.br
-\fI/etc/sysctl.d/*.conf\fP
-.br
-\fI/usr/local/lib/sysctl.d/*.conf\fP
-.br
-\fI/usr/lib/sysctl.d/*.conf\fP
-.br
-\fI/lib/sysctl.d/*.conf\fP
-.br
-\fI/etc/sysctl.conf\fP
-.TP
-\fB\-r\fP, \fB\-\-pattern\fP \fImotif\fP
-N'appliquer que les réglages qui correspondent au \fImotif\fP. Le \fImotif\fP
-utilise la syntaxe d'expression rationnelle étendue.
-.TP
-\fB\-A\fP
-Alias de \fB\-a\fP.
-.TP
-\fB\-d\fP
-Alias de \fB\-h\fP.
-.TP
-\fB\-f\fP
-Alias de \fB\-p\fP.
-.TP
-\fB\-X\fP
-Alias de \fB\-a\fP.
-.TP
-\fB\-o\fP
-Ne rien faire, pour la compatibilité BSD.
-.TP
-\fB\-x\fP
-Ne rien faire, pour la compatibilité BSD.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.SH EXEMPLES
-/sbin/sysctl \-a
-.br
-/sbin/sysctl \-n kernel.hostname
-.br
-/sbin/sysctl \-w kernel.domainname="example.com"
-.br
-/sbin/sysctl \-p/etc/sysctl.conf
-.br
-/sbin/sysctl \-a \-\-pattern forward
-.br
-/sbin/sysctl \-a \-\-pattern forward$
-.br
-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
-.br
-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
-.SH "PARAMÈTRES OBSOLÈTES"
-\fBbase_reachable_time\fP et \fBretrans_time\fP sont obsolètes. La commande
-\fBsysctl\fP ne permet pas de modifier les valeurs de ces paramètres. Les
-utilisateurs qui désirent vraiment utiliser les interfaces obsolètes du
-noyau devraient insérer autrement les valeurs dans le système de fichiers
-\fI/proc\fP. Par exemple\ :
-.PP
-echo 256 > /proc/sys/net/ipv6/neigh/eth0/base_reachable_time
-.SH FICHIERS
-\fI/proc/sys\fP
-.br
-\fI/etc/sysctl.conf\fP
-.SH "VOIR AUSSI"
-\fBsysctl.conf\fP(5), \fBregex\fP(7)
-.SH AUTEUR
-George Staikos <\fIstaikos@wnedorg\fP>
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr/man8/vmstat.8 procps-3.3.15/man-po/fr/man8/vmstat.8
--- procps-3.3.12/man-po/fr/man8/vmstat.8 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr/man8/vmstat.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,204 +0,0 @@
-.\" This page Copyright (C) 1994 Henry Ware
-.\" Distributed under the GPL, Copyleft 1994.
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH VMSTAT 8 "septembre 2011" procps\-ng "Administration système"
-.SH NOM
-vmstat \- Afficher des statistiques sur la mémoire virtuelle
-.SH SYNOPSIS
-\fBvmstat\fP [\fIoptions\fP] [\fIdélai\fP [\fItotal\fP]]
-.SH DESCRIPTION
-\fBvmstat\fP affiche des informations sur les processus, la mémoire, la
-pagination, les blocs d'entrées et sorties, les interruptions et l'activité
-du processeur et des disques.
-.PP
-Le premier rapport produit présente les moyennes depuis le dernier
-démarrage. Les rapports ultérieurs présentent un compte rendu tous les
-\fIdélai\fP. Les rapports sur les processus et la mémoire sont immédiats dans
-tous les cas de figure.
-.SH OPTIONS
-.TP
-\fIdélai\fP
-Le \fIdélai\fP en seconde entre les mises à jour. Si aucun \fIdélai\fP n'est
-précisé, seul un rapport est affiché avec les valeurs moyennes depuis le
-démarrage.
-.TP
-\fItotal\fP
-Le nombre de mises à jour. Si \fItotal\fP n'est pas indiqué, quand \fIdélai\fP est
-défini, \fItotal\fP vaut l'infini par défaut.
-.TP
-\fB\-a\fP, \fB\-\-active\fP
-Afficher la mémoire active et inactive pour les noyaux\ 2.5.41 et supérieurs.
-.TP
-\fB\-f\fP, \fB\-\-forks\fP
-L'option \fB\-f\fP affiche le nombre de processus fils depuis le démarrage du
-système, à savoir les «\ fork\ », «\ vfork\ » et les clones d'appels
-système. Cela correspond au nombre total de tâches créées. Chaque processus
-est représenté par une ou plusieurs tâches dépendant de l'utilisation des
-processus légers («\ threads\ »). Il n'y a pas de rafraîchissement.
-.TP
-\fB\-m\fP, \fB\-\-slabs\fP
-Afficher le slabinfo.
-.TP
-\fB\-n\fP, \fB\-\-one\-header\fP
-N'afficher l'en\-tête qu'une fois plutôt que périodiquement.
-.TP
-\fB\-s\fP, \fB\-\-stats\fP
-Afficher un tableau de compteurs d'événements et des statistiques sur la
-mémoire. Il s'agit d'un affichage unique.
-.TP
-\fB\-d\fP, \fB\-\-disk\fP
-Afficher des statistiques sur le disque (pour les versions\ 2.5.70 ou
-supérieures).
-.TP
-\fB\-D\fP, \fB\-\-disk\-sum\fP
-Afficher des statistiques succinctes à propos de l'activité des disques.
-.TP
-\fB\-p\fP, \fB\-\-partition\fP \fIpériphérique\fP
-Afficher des statistiques sur les partitions (pour les versions\ 2.5.70 ou
-supérieures).
-.TP
-\fB\-S\fP, \fB\-\-unit\fP \fIlettre\fP
-Modifier les unités en sortie de 1000 (\fBk\fP), 1024 (\fBK\fP), 1000000 (\fBm\fP) ou
-1048576 (\fBM\fP)\ octets. Remarquez que les champs swap (si/so) ou block
-(bi/bo) ne sont pas modifiés.
-.TP
-\fB\-t\fP, \fB\-\-timestamp\fP
-Ajouter un horodatage à toutes les lignes.
-.TP
-\fB\-w\fP, \fB\-\-wide\fP
-Mode de sortie large (utile pour les systèmes avec une grande quantité de
-mémoire, où le mode d’affichage par défaut est victime de rupture de colonne
-involontaire). La sortie est plus grande que 80\ caractères par ligne.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Afficher la version du logiciel et quitter.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Afficher l'aide et quitter.
-.PD
-.SH "DESCRIPTIONS DES CHAMPS POUR LE MODE VM"
-.SS "procs (processus)"
-.nf
-r\ : Nombre de processus exécutables (en cours ou en attente d'exécution).
-b\ : Nombre de processus en sommeil non interruptible.
-.fi
-.PP
-.SS "memory (mémoire)"
-.nf
-swpd\ : Quantité de mémoire virtuelle utilisée.
-free\ : Quantité de mémoire disponible.
-buff\ : Quantité de mémoire tampon.
-cache\ : Quantité de mémoire cache.
-inact\ : Quantité de mémoire inactive (option \-a).
-active\ : Quantité de mémoire active (option \-a).
-.fi
-.PP
-.SS "swap (espace d'échange)"
-.nf
-si\ : Quantité de mémoire paginée lue depuis le disque en ko/s.
-so\ : Quantité de mémoire paginée transférée sur disque en ko/s.
-.fi
-.PP
-.SS "io (entrées et sorties)"
-.nf
-bi\ : Blocs reçus d'un périphérique en mode bloc (blocs/s).
-bo\ : Blocs envoyés à un périphérique en mode bloc (blocs/s).
-.fi
-.PP
-.SS "system (système)"
-.nf
-in\ : Nombre d'interruptions par seconde, incluant l'horloge.
-cs\ : Nombre de bascules du contexte par seconde.
-.fi
-.PP
-.SS processeur
-Il s'agit de la répartition du temps processeur en pourcentage.
-.nf
-us\ : Temps consommé par les processus hors noyau (temps utilisateur
- incluant le temps de définition des priorités).
-sy\ : Temps consommé par le noyau (temps système).
-id\ : Temps d'inactivité. Avant Linux\ 2.5.41, le temps d'attente
- des entrées et sorties était inclus.
-wa\ : Temps d'attente des entrées et sorties. Inclus dans le temps
- d'inactivité avant Linux\ 2.5.41.
-st\ : Temps volé par une machine virtuelle. Inconnu avant Linux\ 2.6.11.
-.fi
-.PP
-.SH "DESCRIPTIONS DES CHAMPS POUR LE MODE DISQUE"
-.SS "reads (lectures)"
-.nf
-total\ : Nombre total de lectures réussies.
-merged\ : Lectures groupées (en une seule opération d'entrée ou sortie).
-sectors\ : Secteurs lus avec succès.
-ms\ : Temps de lecture en milliseconde.
-.fi
-.PP
-.SS "writes (écritures)"
-.nf
-total\ : Nombre total d'écritures terminées avec succès.
-merged\ : Écritures groupées (en une seule opération d'entrée ou sortie).
-sectors\ : Secteurs écrits avec succès.
-ms\ : Temps d'écriture en milliseconde.
-.fi
-.PP
-.SS "io (entrées et sorties)"
-.nf
-cur\ : Entrées et sorties en cours.
-s\ : Temps en seconde utilisé par les entrées et sorties.
-.fi
-.PP
-.SH "DESCRIPTIONS DES CHAMPS POUR LE MODE DE PARTITION DE DISQUE"
-.nf
-reads\ : Nombre total de lectures de la partition.
-read sectors\ : Nombre total de secteurs lus pour la partition.
-writes\ : Nombre total d'écritures sur la partition.
-requested writes\ : Nombre total de requêtes d'écriture sur la partition.
-.fi
-.PP
-.SH "DESCRIPTIONS DES CHAMPS POUR LE MODE SLAB"
-.nf
-cache\ : Nom du cache.
-num\ : Nombre d'objets actuellement actifs.
-total\ : Nombre total d'objets disponibles.
-size\ : Taille de chaque objet.
-pages\ : Nombre de pages avec au moins un objet actif.
-.fi
-.SH NOTES
-\fBvmstat\fP ne nécessite aucune permission particulière.
-.PP
-Ces comptes\-rendus tentent de fournir une aide à l'identification des
-goulots d'étranglement du système. Sous Linux, l'utilitaire \fBvmstat\fP n'est
-pas comptabilisé lui\-même comme un processus actif.
-.PP
-Sous Linux, tous les blocs comptent actuellement 1024\ octets. Les anciens
-noyaux peuvent utiliser des blocs de 512, 2048 ou 4096\ octets.
-.PP
-Depuis la version\ 3.1.9 de procps, vmstat vous permet de choisir les unités
-(k, K, m, M). La valeur par défaut est K (1024\ octets) dans le mode par
-défaut.
-.PP
-vmstat utilise le slabinfo\ 1.1
-.SH FICHIERS
-.ta
-.nf
-\fI/proc/meminfo\fP
-\fI/proc/stat\fP
-\fI/proc/*/stat\fP
-.fi
-.SH "VOIR AUSSI"
-\fBfree\fP(1), \fBiostat\fP(1), \fBmpstat\fP(1), \fBps\fP(1), \fBsar\fP(1), \fBtop\fP(1)
-.PP
-.SH BOGUES
-Le programme ne présente pas sous forme de tableau les E/S de bloc par
-périphérique ni le décompte du nombre d'appels système.
-.SH AUTEURS
-Écrit par Henry Ware <\fIal172@yfn.ysu.edu\fP>.
-.br
-Fabian Frédérick <\fIffrederick@users.sourceforge.net\fP> (diskstat,
-slab, partitions…)
-.SH BOGUES
-Signalez les bogues à <\fIprocps@freelists.org\fP>
diff -Nru procps-3.3.12/man-po/fr.po procps-3.3.15/man-po/fr.po
--- procps-3.3.12/man-po/fr.po 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/fr.po 2018-05-19 22:05:40.000000000 +0000
@@ -22,6 +22,7 @@
"Last-Translator: David Prévot \n"
"Language-Team: French \n"
"Language: fr\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -Nru procps-3.3.12/man-po/Makefile.in procps-3.3.15/man-po/Makefile.in
--- procps-3.3.12/man-po/Makefile.in 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/Makefile.in 2018-05-19 22:05:40.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -152,6 +152,8 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ELOGIND_CFLAGS = @ELOGIND_CFLAGS@
+ELOGIND_LIBS = @ELOGIND_LIBS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GMSGFMT = @GMSGFMT@
@@ -213,6 +215,7 @@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+WATCH_NCURSES_CFLAGS = @WATCH_NCURSES_CFLAGS@
WATCH_NCURSES_LIBS = @WATCH_NCURSES_LIBS@
WITH_WATCH8BIT = @WITH_WATCH8BIT@
XGETTEXT = @XGETTEXT@
@@ -269,6 +272,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+usrbin_execdir = @usrbin_execdir@
EXTRA_DIST = $(DIST_MAN_POTS) $(DIST_MAN_POS) $(DIST_translated_MANS)
base_langs = $(patsubst %.po,%,$(wildcard *.po))
top_langs = $(patsubst %.po,%,$(notdir $(wildcard top/*.po)))
diff -Nru procps-3.3.12/man-po/pl/man1/kill.1 procps-3.3.15/man-po/pl/man1/kill.1
--- procps-3.3.12/man-po/pl/man1/kill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/kill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for kill.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan; converted to a man page by
-.\" Michael K. Johnson
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH KILL 1 "październik 2011" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-kill \- wysłanie sygnału do procesu
-.SH SKŁADNIA
-\fBkill\fP [opcje] [...]
-.SH OPIS
-Domyślny sygnał to TERM. Aby uzyskać listę sygnałów, można użyć opcji \fB\-l\fP
-lub \fB\-L\fP. Przydatne sygnały to w szczególności HUP, INT, KILL, STOP, CONT
-oraz 0. Alternatywny sygnał można podać na trzy sposoby: \fB\-9\fP, \fB\-SIGKILL\fP
-oraz \fB\-KILL\fP. Ujemne wartości PID pozwalają wybrać całe grupy procesów \-
-p. kolumna PGID w wyjściu polecenia ps. PID \fB\-1\fP jest specjalny \- oznacza
-wszystkie procesy z wyjątkiem samego procesu kill oraz inita.
-.SH OPCJE
-.TP
-\fB [...]\fP
-Wysłanie sygnału to każdego podanego .
-.TP
-\fB\-\fP
-.TQ
-\fB\-s \fP
-.TQ
-\fB\-\-signal \fP
-Podanie \fBsygnału\fP do wysłania. Sygnał można określić przy użyciu nazwy lub
-numeru. Zachowanie sygnałów jest wyjaśnione na stronie podręcznika
-\fBsignal\fP(7).
-.TP
-\fB\-l\fP, \fB\-\-list\fP [\fIsygnał\fP]
-Lista nazw sygnałów. Ta opcja ma opcjonalny argument, który pozwala zamienić
-numer sygnału na jego nazwę lub odwrotnie.
-.TP
-\fB\-L\fP,\fB\ \-\-table\fP
-Lista nazw sygnałów w ładnej tabelce.
-.TP
-.PD
-.SH UWAGI
-Powłoka (interpreter linii poleceń) może mieć wbudowane polecenie kill. Aby
-uniknąć konfliktu, może zaistnieć potrzeba uruchomienia niniejszego
-polecenia jako /bin/kill.
-.SH PRZYKŁADY
-.TP
-\fBkill \-9 \-1\fP
-Zabicie wszystkich procesów, do których mamy uprawnienia.
-.TP
-\fBkill \-l 11\fP
-Zamiana numeru 11 na nazwę sygnału.
-.TP
-\fBkill \-L\fP
-Lista dostępnych sygnałów w ładnej tabelce.
-.TP
-\fBkill 123 543 2341 3453\fP
-Wysłanie domyślnego sygnału (SIGTERM) do wszystkich podanych procesów.
-.SH "ZOBACZ TAKŻE"
-\fBkill\fP(2), \fBkillall\fP(1), \fBnice\fP(1), \fBpkill\fP(1), \fBrenice\fP(1),
-\fBsignal\fP(7), \fBskill\fP(1)
-.SH STANDARDY
-To polecenie jest zgodne z odpowiednimi standardami. Flaga \fB\-L\fP jest
-specyficzna dla Linuksa.
-.SH AUTOR
-.UR albert@users.sf.net
-Albert Cahalan
-.UE
-napisał program kill w roku
-1999, aby zastąpić narzędzie z pakietu bsdutils, które nie było zgodne ze
-standardami. Narzędzie z pakietu util\-linux także może działać poprawnie.
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/pgrep.1 procps-3.3.15/man-po/pl/man1/pgrep.1
--- procps-3.3.12/man-po/pl/man1/pgrep.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/pgrep.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-.\" Manual page for pgrep / pkill.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Copyright 2000 Kjetil Torgrim Homme
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PGREP 1 "March 2015" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-pgrep, pkill \- wyszukiwanie lub wysyłanie sygnałów do procesów na podstawie
-nazwy i innych atrybutów
-.SH SKŁADNIA
-\fBpgrep\fP [opcje] wzorzec
-.br
-\fBpkill\fP [opcje] wzorzec
-.SH OPIS
-\fBpgrep\fP przeszukuje aktualnie działające procesy i wypisuje na standardowym
-wyjściu identyfikatory procesów, które pasują do wybranych
-kryteriów. Wszystkie kryteria muszą pasować. Na przykład:
-.IP
-$ pgrep \-u root sshd
-.PP
-wypisze tylko listę procesów o nazwie \fBsshd\fP ORAZ będących własnością
-\fBroota\fP. Z drugiej strony:
-.IP
-$ pgrep \-u root,daemon
-.PP
-wypisze procesy, których właścicielem jest \fBroot\fP LUB \fBdaemon\fP.
-.PP
-\fBpkill\fP zamiast wypisywania procesów wyśle do każdego podany sygnał
-(domyślnie \fBSIGTERM\fP).
-.SH OPCJE
-.TP
-\fB\-\fP\fIsygnał\fP
-.TQ
-\fB\-\-signal\fP \fIsygnał\fP
-Określenie sygnału, jaki ma być wysłany do wszystkich pasujących
-procesów. Może być numerem lub nazwą sygnału. (tylko \fBpkill\fP)
-.TP
-\fB\-c\fP, \fB\-\-count\fP
-Pominięcie zwykłego wyjścia; zamiast niego wypisanie liczby pasujących
-procesów. Jeśli nic nie zostanie policzone (np. liczba będzie zerem),
-polecenie zwróci wartość niezerową.
-.TP
-\fB\-d\fP, \fB\-\-delimiter\fP \fIseparator\fP
-Ustawienie łańcucha oddzielającego identyfikatory procesów na wyjściu
-(domyślnie nowa linia). (tylko \fBpgrep\fP)
-.TP
-\fB\-f\fP, \fB\-\-full\fP
-\fIwzorzec\fP normalnie jest dopasowywany tylko do nazwy procesu. Z ustawioną
-opcją \fB\-f\fP, wykorzystywana jest cała linia poleceń.
-.TP
-\fB\-g\fP, \fB\-\-pgroup\fP \fIpgrp\fP,...
-Dopasowanie tylko do procesów z grup o podanych identyfikatorach. Grupa
-procesów 0 jest tłumaczona na własną grupę procesów polecenia \fBpgrep\fP lub
-\fBpkill\fP.
-.TP
-\fB\-G\fP, \fB\-\-group\fP \fIgid\fP,...
-Dopasowanie tylko do procesów o podanych identyfikatorach grup
-rzeczywistych. Można użyć wartości liczbowych lub symbolicznych.
-.TP
-\fB\-i\fP, \fB\-\-ignore\-case\fP
-Match processes case\-insensitively.
-.TP
-\fB\-l\fP, \fB\-\-list\-name\fP
-Wypisanie nazw oraz identyfikatorów procesów. (tylko \fBpgrep\fP)
-.TP
-\fB\-a\fP, \fB\-\-list\-full\fP
-Wypisanie pełnych linii poleceń oraz identyfikatorów procesów. (tylko
-\fBpgrep\fP)
-.TP
-\fB\-n\fP, \fB\-\-newest\fP
-Wybór tylko najnowszych (najpóźniej uruchomionych) spośród pasujących
-procesów.
-.TP
-\fB\-o\fP, \fB\-\-oldest\fP
-Wybór tylko najstarszych (najwcześniej uruchomionych) spośród pasujących
-procesów.
-.TP
-\fB\-P\fP, \fB\-\-parent\fP \fIppid\fP,...
-Dopasowanie tylko do procesów o wymienionych identyfikatorach procesów
-rodziców.
-.TP
-\fB\-s\fP, \fB\-\-session\fP \fIsid\fP,...
-Dopasowanie tylko do procesów o wymienionych identyfikatorach sesji
-procesów. Identyfikator sesji 0 jest tłumaczony na własny procesu \fBpgrep\fP
-lub \fBpkill\fP.
-.TP
-\fB\-t\fP, \fB\-\-terminal\fP \fIterm\fP,...
-Dopasowanie tylko do procesów o wymienionych terminalach sterujących. Nazwa
-terminala powinna być podana bez przedrostka "/dev/".
-.TP
-\fB\-u\fP, \fB\-\-euid\fP \fIeuid\fP,...
-Dopasowanie tylko do procesów o wymienionych identyfikatorach użytkowników
-efektywnych. Można użyć wartości liczbowych lub symbolicznych.
-.TP
-\fB\-U\fP, \fB\-\-uid\fP \fIuid\fP,...
-Dopasowanie tylko do procesów o wymienionych identyfikatorach użytkowników
-rzeczywistych. Można użyć wartości liczbowych lub symbolicznych.
-.TP
-\fB\-v\fP, \fB\-\-inverse\fP
-Negacja dopasowania. Zwykle używana w kontekście programu \fBpgrep\fP. W
-kontekście \fBpkill\fP krótka opcja jest wyłączona, aby zapobiec przypadkowemu
-użyciu.
-.TP
-\fB\-w\fP, \fB\-\-lightweight\fP
-Wyświetlenie wszystkich identyfikatorów wątków zamiast pidów w kontekście
-programu \fBpgrep\fP. W kontekście \fBpkill\fP ta opcja jest wyłączona.
-.TP
-\fB\-x\fP, \fB\-\-exact\fP
-Dopasowanie tylko do procesów, których nazwy (lub linie poleceń, jeśli
-podano opcję \-f) pasują \fBdokładnie\fP do \fIwzorca\fP.
-.TP
-\fB\-F\fP, \fB\-\-pidfile\fP \fIplik\fP
-Odczyt \fIPID\fPów z pliku. Ta opcja jest zwykle bardziej przydatna dla
-programu \fBpkill\fP niż \fBpgrep\fP.
-.TP
-\fB\-L\fP, \fB\-\-logpidfile\fP
-Niepowodzenie, jeśli plik PID (p. opcja \-F) nie jest zablokowany.
-.TP
-\fB\-\-ns \fP\fIpid\fP
-Dopasowanie do procesów należących do tych samych przestrzeni nazw. Wymagane
-w przypadku uruchamiania przez roota, aby dopasować do procesów innych
-użytkowników. Więcej o ograniczaniu dopasowywanych przestrzeni nazw przy
-opcji \-\-nslist.
-.TP
-\fB\-\-nslist \fP\fInazwa\fP\fB,...\fP
-Dopasowanie tylko do podanych przestrzeni nazw. Dostępne przestrzenie: ipc,
-mnt, net, pid, user, uts.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji i zakończenie.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie opisu i zakończenie.
-.PD
-.SH ARGUMENTY
-.TP
-\fIwzorzec\fP
-Określenie rozszerzonego wyrażenia regularnego do dopasowania nazwy procesu
-lub linii poleceń.
-.SH PRZYKŁADY
-Przykład 1: znalezienie identyfikatora procesu demona \fBnamed\fP:
-.IP
-$ pgrep \-u root named
-.PP
-Przykład 2: wymuszenie ponownego odczytu pliku konfiguracyjnego przez
-program \fBsyslog\fP:
-.IP
-$ pkill \-HUP syslogd
-.PP
-Przykład 3: podanie szczegółowych informacji o wszystkich procesach
-\fBxterm\fP:
-.IP
-$ ps \-fp $(pgrep \-d, \-x xterm)
-.PP
-Przykład 4: zwiększenie nice wszystkich procesów \fBnetscape\fP:
-.IP
-$ renice +4 $(pgrep netscape)
-.SH "KOD WYJŚCIA"
-.PD 0
-.TP
-0
-Dopasowano jeden lub więcej procesów.
-.TP
-1
-Nie dopasowano żadnego procesu.
-.TP
-2
-Błąd składni w linii poleceń.
-.TP
-3
-Błąd krytyczny: brak pamięci itp.
-.PD
-.SH UWAGI
-Nazwa procesu używana przy dopasowaniu jest ograniczona do 15 znaków
-obecnych w wyjściu /proc/\fIpid\fP/stat. Aby dopasować do pełnej linii poleceń
-(/proc/\fIpid\fP/cmdline), należy użyć opcji \-f.
-.PP
-Działający proces \fBpgrep\fP ani \fBpkill\fP nigdy nie zgłosi siebie jako
-dopasowania.
-.SH BŁĘDY
-Opcji \fB\-n\fP, \fB\-o\fP oraz \fB\-v\fP nie można łączyć. Gdyby było to przydatne,
-proszę zawiadomić autora.
-.PP
-Zgłoszono procesy nie funkcjonujące.
-
-.SH "ZOBACZ TAKŻE"
-\fBps\fP(1), \fBregex\fP(7), \fBsignal\fP(7), \fBkillall\fP(1), \fBskill\fP(1), \fBkill\fP(1),
-\fBkill\fP(2)
-.SH AUTOR
-.UR kjetilho@ifi.uio.no
-Kjetil Torgrim Homme
-.UE
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/pidof.1 procps-3.3.15/man-po/pl/man1/pidof.1
--- procps-3.3.12/man-po/pl/man1/pidof.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/pidof.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-'\" -*- coding: UTF-8 -*-
-.\" Copyright (C) 1998 Miquel van Smoorenburg.
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PIDOF 1 "24 lip 2013" "" "Polecenia użytkownika"
-.SH NAZWA
-pidof \- wyszukiwanie identyfikatora procesu działającego programu.
-.SH SKŁADNIA
-\fBpidof\fP [\fB\-s\fP] [\fB\-c\fP] [\fB\-x\fP] [\fB\-o\fP \fIpid_wykl[,pid_wykl..]\fP] [\fB\-o\fP
-\fIpid_wykl[,pid_wykl..]..\fP] \fBprogram\fP [\fBprogram..\fP]
-.SH OPIS
-\fBPidof\fP znajduje identyfikatory procesów (pidy) programów o podanych
-nazwach i wypisuje je na standardowym wyjściu.
-.SH OPCJE
-.IP \-s
-Tryb pojedynczy \- program zwróci tylko jeden \fIpid\fP.
-.IP \-c
-Zwrócenie tylko identyfikatorów procesów działających z tym samym katalogiem
-głównym. Ta opcja jest ignorowana dla użytkowników innych niż root, ponieważ
-wtedy nie można sprawdzić katalogu głównego procesów, których nie jest się
-właścicielem.
-.IP \-x
-Także skrypty \- program zwróci także identyfikatory procesów powłok
-wykonujących skrypty o podanych nazwach.
-.IP "\-o \fIpid_wykl\fP"
-Pominięcie procesów o podanym identyfikatorze. Specjalny pid \fB%PPID\fP
-oznacza rodzica procesu programu \fIpidof\fP, czyli powłokę lub skrypt go
-uruchamiający.
-.SH "KOD WYJŚCIA"
-.TP
-\fB0\fP
-Znaleziono przynajmniej jeden program o żądanej nazwie.
-.TP
-\fB1\fP
-Nie znaleziono żadnego programu o żądanej nazwie.
-
-.SH "ZOBACZ TAKŻE"
-\fBpgrep\fP(1), \fBpkill\fP(1)
-.SH AUTOR
-Jaromir Capik
diff -Nru procps-3.3.12/man-po/pl/man1/pkill.1 procps-3.3.15/man-po/pl/man1/pkill.1
--- procps-3.3.12/man-po/pl/man1/pkill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/pkill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.so man1/pgrep.1
diff -Nru procps-3.3.12/man-po/pl/man1/pmap.1 procps-3.3.15/man-po/pl/man1/pmap.1
--- procps-3.3.12/man-po/pl/man1/pmap.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/pmap.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for pmap.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan.
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PMAP 1 "wrzesień 2012" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-pmap \- informacje o odwzorowaniu pamięci procesu
-.SH SKŁADNIA
-\fBpmap\fP [\fIopcje\fP] \fIpid\fP [...]
-.SH OPIS
-Polecenie pmap wypisuje mapę pamięci procesu lub procesów.
-.SH OPCJE
-.TP
-\fB\-x\fP, \fB\-\-extended\fP
-Wyświetlanie w formacie rozszerzonym.
-.TP
-\fB\-d\fP, \fB\-\-device\fP
-Wyświetlanie w formacie urządzeń.
-.TP
-\fB\-q\fP, \fB\-\-quiet\fP
-Bez wyświetlania linii nagłówka i stopki.
-.TP
-\fB\-A\fP, \fB\-\-range\fP \fIdolny\fP,\fIgórny\fP
-Ograniczenie wyników do podanego przedziału adresów:
-\fIdolny\fP,\fIgórny\fP. Limity dolny i górny podaje się rozdzielone przecinkiem
-jako pojedynczy argument.
-.TP
-\fB\-X\fP
-Wypisywanie jeszcze więcej szczegółów niż z opcją \fB\-x\fP. UWAGA: format
-zmienia się z \fI/proc/PID/smaps\fP
-.TP
-\fB\-XX\fP
-Wypisywanie wszystkiego, co udostępnia jądro
-.TP
-\fB\-p\fP, \fB\-\-show\-path\fP
-Wypisywanie pełnych ścieżek do plików w kolumnie odwzorowań
-.TP
-\fB\-c\fP, \fB\-\-read\-rc\fP
-Odczyt domyślnej konfiguracji
-.TP
-\fB\-C\fP, \fB\-\-read\-rc\-from\fP \fIplik\fP
-Odczyt konfiguracji z \fIpliku\fP
-.TP
-\fB\-n\fP, \fB\-\-create\-rc\fP
-Utworzenie nowej konfiguracji domyślnej
-.TP
-\fB\-N\fP, \fB\-\-create\-rc\-to\fP \fIplik\fP
-Utworzenie nowej konfiguracji w \fIpliku\fP
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie tekstu pomocy i zakończenie.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji i zakończenie.
-.SH "KOD WYJŚCIA"
-.PP
-.RS
-.PD 0
-.TP
-\fB0\fP
-Sukces.
-.TP
-\fB1\fP
-Niepowodzenie.
-.TP
-\fB42\fP
-Nie znaleziono wszystkich żądanych procesów.
-.PD
-.RE
-.SH "ZOBACZ TAKŻE"
-\fBps\fP(1), \fBpgrep\fP(1)
-.SH STANDARDY
-Polecenia pmap nie dotyczą żadne standardy, ale wygląda równie brzydko, co
-polecenie SunOS.
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/pwdx.1 procps-3.3.15/man-po/pl/man1/pwdx.1
--- procps-3.3.12/man-po/pl/man1/pwdx.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/pwdx.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-.\" Man page for pwdx
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Copyright 2004 Nicholas Miell.
-.\" Based on the pmap(1) man page by Albert Cahalan.
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH PWDX 1 "czerwiec 2011" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-pwdx \- informacja o bieżącym katalogu roboczym procesu
-.SH SKŁADNIA
-\fBpwdx\fP [\fIopcje\fP] \fIpid\fP [...]
-.SH OPCJE
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wypisanie informacji o wersji i zakończenie.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie ekranu pomocy i zakończenie.
-.SH "ZOBACZ TAKŻE"
-\fBps\fP(1), \fBpgrep\fP(1)
-.SH STANDARDY
-Polecenia pwdx nie dotyczą żadne standardy, ale wygląda równie brzydko, co
-polecenie SunOS.
-.SH AUTOR
-.UR nmiell@gmail.com
-Nicholas Miell
-.UE
-napisał pwdx w 2004 roku.
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/skill.1 procps-3.3.15/man-po/pl/man1/skill.1
--- procps-3.3.12/man-po/pl/man1/skill.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/skill.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-'\" t
-.\" (The preceding line is a note to broken versions of man to tell
-.\" them to pre-process this man page with tbl)
-.\" Man page for skill and snice.
-.\" Licensed under version 2 of the GNU General Public License.
-.\" Written by Albert Cahalan, converted to a man page by
-.\" Michael K. Johnson
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH SKILL 1 "październik 2011" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-skill, snice \- wysłanie sygnału lub informacja o stanie procesu
-.SH SKŁADNIA
-\fBskill\fP [\fIsygnał\fP] [\fIopcje\fP] \fIwyrażenie\fP
-.br
-\fBsnice\fP [\fInowy priorytet\fP] [\fIopcje\fP] \fIwyrażenie\fP
-.SH OPIS
-Niniejsze narzędzia są przestarzałe i nieprzenośne. Składnia poleceń jest
-słabo zdefiniowana. Zamiast nich lepiej używać poleceń killall, pkill oraz
-pgrep.
-.PP
-Domyśli sygnał dla programu skill to TERM. Listę dostępnych sygnałów można
-uzyskać przy użyciu \-l lub \-L. Szczególnie przydatne sygnały to HUP, INT,
-KILL, STOP, CONT oraz 0. Alternatywne sygnały można podać na trzy sposoby:
-\-9 \-SIGKILL \-KILL.
-.PP
-Domyślny priorytet dla programu snice to +4. Numery priorytetów są z
-przedziału +20 (najwolniej) do \-20 (najszybciej). Numery ujemne są
-zastrzeżone dla administratorów.
-.SH OPCJE
-.TP
-\fB\-f\fP,\fB\ \-\-fast\fP
-Tryb szybki. Ta opcja nie została zaimplementowana.
-.TP
-\fB\-i\fP,\fB\ \-\-interactive\fP
-Tryb interaktywny. Użytkownik będzie pytany o każdą akcję.
-.TP
-\fB\-l\fP,\fB\ \-\-list\fP
-Lista wszystkich nazw sygnałów.
-.TP
-\fB\-L\fP,\fB\ \-\-table\fP
-Lista wszystkich nazw sygnałów w ładnej tabelce.
-.TP
-\fB\-n\fP,\fB\ \-\-no\-action\fP
-Bez akcji; wykonanie symulacji zdarzeń, które by nastąpiły, ale bez zmian w
-systemie.
-.TP
-\fB\-v\fP,\fB\ \-\-verbose\fP
-Tryb szczegółowy; wyjaśnianie, co jest wykonywane.
-.TP
-\fB\-w\fP,\fB\ \-\-warnings\fP
-Włączenie ostrzeżeń. Ta opcja nie została zaimplementowana.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie tekstu pomocy i zakończenie.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji.
-.PD
-.SH "OPCJE WYBORU PROCESÓW"
-Kryterium wyboru może być: terminal, użytkownik, pid, polecenie. W celu
-zapewnienia właściwej interpretacji można użyć poniższych opcji.
-.TP
-\fB\-t\fP, \fB\-\-tty\fP \fItty\fP
-Następne wyrażenie jest terminalem (tty lub pty).
-.TP
-\fB\-u\fP, \fB\-\-user\fP \fIużytkownik\fP
-Następne wyrażenie jest nazwą użytkownika.
-.TP
-\fB\-p\fP, \fB\-\-pid\fP \fIpid\fP
-Następne wyrażenie jest liczbowym identyfikatorem procesu.
-.TP
-\fB\-c\fP, \fB\-\-command\fP \fIpolecenie\fP
-następne wyrażenie jest nazwą polecenia.
-.TP
-\fB\-\-ns \fP\fIpid\fP
-Dopasowanie procesów należących do tej samej przestrzeni nazw, co pid.
-.TP
-\fB\-\-nslist \fP\fIns,...\fP
-lista przestrzeni nazw uwzględnianych w opcji \-\-ns. Dostępne przestrzenie:
-ipc, mnt, net, pid, user, uts.
-.PD
-.SH SYGNAŁY
-Zachowanie sygnałów jest wyjaśnione na stronie podręcznika \fBsignal\fP(7).
-.SH PRZYKŁADY
-.TP
-\fBsnice \-c seti \-c crack +7\fP
-Spowolnienie poleceń seti oraz crack.
-.TP
-\fBskill \-KILL \-t /dev/pts/*\fP
-Zabicie użytkowników na urządzeniach PTY.
-.TP
-\fBskill \-STOP \-u viro \-u lm \-u davem\fP
-Zatrzymanie trzech użytkowników.
-.SH "ZOBACZ TAKŻE"
-\fBkill\fP(1), \fBkill\fP(2), \fBkillall\fP(1), \fBnice\fP(1), \fBpkill\fP(1),
-\fBrenice\fP(1), \fBsignal\fP(7)
-.SH STANDARDY
-Żadne standardy nie dotyczą tych poleceń.
-.SH AUTOR
-.UR albert@users.sf.net
-Albert Cahalan
-.UE
-napisał programy skill i
-snice w roku 1999 jako zamiennik wersji nie będących oprogramowaniem
-wolnodostępnym.
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/tload.1 procps-3.3.15/man-po/pl/man1/tload.1
--- procps-3.3.12/man-po/pl/man1/tload.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/tload.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-.\" -*-Nroff-*-
-.\" This page Copyright (C) 1993 Matt Welsh, mdw@tc.cornell.edu.
-.\" Freely distributable under the terms of the GPL
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH TLOAD 1 "czerwiec 2011" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-tload \- graficzna reprezentacja średniego obciążenia systemu
-.SH SKŁADNIA
-\fBtload\fP [\fIopcje\fP] [\fItty\fP]
-.SH OPIS
-\fBtload\fP wypisuje wykres bieżącego średniego obciążenia systemu na określony
-\fItty\fP (lub terminal procesu tload, jeśli nie podano żadnego).
-.SH OPCJE
-.TP
-\fB\-s\fP, \fB\-\-scale\fP \fIliczba\fP
-Opcja scale pozwala na określenie pionowej skali wyświetlania (w znakach
-między podziałką wykresu); mniejsza wartość określa większą skalę i na
-odwrót.
-.TP
-\fB\-d\fP, \fB\-\-delay\fP \fIsekundy\fP
-Opcja delay ustawia opóźnienie między odświeżeniami wykresu na podaną liczbę
-\fIsekund\fP.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie tego opisu.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji i zakończenie.
-.PP
-.SH PLIKI
-\fI/proc/loadavg\fP informacja o średnim obciążeniu
-.SH "ZOBACZ TAKŻE"
-\fBps\fP(1), \fBtop\fP(1), \fBuptime\fP(1), \fBw\fP(1)
-.SH BŁĘDY
-Opcja \fB\-d\fP\fI opóźnienie\fP ustawia czas dla funkcji \fBalarm\fP(2); jeśli podano
-\-d 0, alarm jest ustawiany na 0, co oznacza, że nigdy nie zostanie wysłany
-\fBSIGALRM\fP ani odświeżony ekran.
-.SH AUTORZY
-Branko Lankester,
-.UR david@\:ods.\:com
-David Engel
-.UE , oraz
-.UR johnsonm@\:redhat.\:com
-Michael K. Johnson
-.UE .
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/uptime.1 procps-3.3.15/man-po/pl/man1/uptime.1
--- procps-3.3.12/man-po/pl/man1/uptime.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/uptime.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-.\" -*-Nroff-*-
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH UPTIME 1 "grudzień 2012" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-uptime \- informacja, jak długo działa system.
-.SH SKŁADNIA
-\fBuptime\fP [\fIopcje\fP]
-.SH OPIS
-\fBuptime\fP w pojedynczej linii podaje następujące informacje: bieżący czas;
-czas, jak długo działa system; liczbę aktualnie zalogowanych użytkowników;
-średnie obciążenie systemu dla ostatnich 1, 5 i 15 minut.
-.PP
-Są to te same informacje, które zawiera linia nagłówka wyświetlana przez
-polecenie \fBw\fP(1).
-.PP
-Średnie obciążenie systemu to średnia liczba procesów w stanie działającym
-lub nieprzerywalnym. Proces jest w stanie działającym, kiedy używa procesora
-lub oczekuje na procesor. Proces jest w stanie nieprzerywalnym, kiedy
-oczekuje na jakiś dostęp we/wy, np. na dysk. Średnie są obliczane dla trzech
-okresów czasu. Nie są normalizowane pod kątem liczby procesorów w systemie,
-więc średnie obciążenie 1 oznacza, że system jednoprocesorowy jest obciążony
-cały czas, podczas gdy system 4\-procesorowy jest bezczynny przez 75% czasu.
-.SH OPCJE
-.TP
-\fB\-p\fP, \fB\-\-pretty\fP
-wyświetlenie czasu działania w ładnym formacie
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-wyświetlenie tego opisu
-.TP
-\fB\-s\fP, \fB\-\-since\fP
-początek czasu działania systemu w formacie rrrr\-mm\-dd GG:MM:SS
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-wyświetlenie informacji o wersji i zakończenie
-.SH PLIKI
-.TP
-\fI/var/run/utmp\fP
-informacja o tym, kto jest obecnie zalogowany
-.TP
-\fI/proc\fP
-informacje o procesach
-.SH AUTORZY
-Program \fBuptime\fP napisali
-.UR greenfie@gauss.\:rutgers.\:edu
-Larry
-Greenfield
-.UE
-oraz
-.UR johnsonm@sunsite.\:unc.\:edu
-Michael
-K. Johnson
-.UE
-.SH "ZOBACZ TAKŻE"
-\fBps\fP(1), \fBtop\fP(1), \fButmp\fP(5), \fBw\fP(1)
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/w.1 procps-3.3.15/man-po/pl/man1/w.1
--- procps-3.3.12/man-po/pl/man1/w.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/w.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-.\" -*-Nroff-*-
-.\"
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH W 1 "maj 2012" procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-w \- wyświetlanie informacji, kto jest zalogowany i co robi.
-.SH SKŁADNIA
-\fBw\fP [\fIopcje\fP] \fIużytkownik\fP [...]
-.SH OPIS
-\fBw\fP wyświetla informacje o użytkownikach obecnych na maszynie oraz ich
-procesach. Nagłówek pokazuje, w tej kolejności, aktualny czas, jak długo
-system działa, jak wielu użytkowników jest obecnie zalogowanych oraz średnie
-obciążenie systemu przez ostatnie 1, 5 oraz 15 minut.
-.PP
-Dla każdego użytkownika wyświetlane są następujące wpisy: nazwa terminala
-(tty), host zdalny, czas zalogowania, czas bezczynności, JCPU, PCPU oraz
-linia poleceń bieżącego procesu.
-.PP
-Czas JCPU to czas wykorzystany przez wszystkie procesy podłączone do
-terminala. Nie obejmuje wcześniejszych zadań w tle, ale obejmuje procesy
-obecnie działające w tle.
-.PP
-Czas PCPU to czas wykorzystany przez bieżący proces, uwidoczniony w polu
-"co".
-.SH "OPCJE LINII POLECEŃ"
-.TP
-\fB\-h\fP, \fB\-\-no\-header\fP
-Bez wypisywania nagłówka.
-.TP
-\fB\-u\fP, \fB\-\-no\-current\fP
-Ignorowanie nazwy użytkownika przy sprawdzaniu bieżącego procesu i czasów
-procesora. Różnicę można zobaczyć po wykonaniu "su", a następnie "w" oraz "w
-\-u".
-.TP
-\fB\-s\fP, \fB\-\-short\fP
-Użycie formatu krótkiego \- bez wypisywania czasu zalogowania oraz czasów
-JCPU i PCPU.
-.TP
-\fB\-f\fP, \fB\-\-from\fP
-Przełączanie wyświetlania pola \fBz\fP (nazwy hosta zdalnego). Domyślnie w
-źródłach pole \fBz\fP nie jest wypisywane, ale administrator systemu lub
-dystrybutor mógł skompilować wersję, która domyślnie pokazuje pole \fBz\fP.
-.TP
-\fB\-\-help\fP
-Wyświetlenie tekstu pomocy i zakończenie.
-.TP
-\fB\-i\fP, \fB\-\-ip\-addr\fP
-Wyświetlanie adresu IP zamiast nazwy hosta w polu \fBz\fP.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji.
-.TP
-\fB\-o\fP, \fB\-\-old\-style\fP
-Wyjście w starym stylu. Wypisywanie pustego miejsca dla czasów bezczynności
-poniżej minuty.
-.TP
-\fBużytkownik \fP
-Wyświetlanie informacji tylko o podanym użytkowniku.
-.SH ŚRODOWISKO
-.TP
-PROCPS_USERLEN
-Nadpisanie domyślnej szerokości kolumny z nazwą użytkownika. Domyślnie 8.
-.TP
-PROCPS_FROMLEN
-Nadpisanie domyślnej szerokości kolumny \fBz\fP. Domyślnie 16.
-.SH PLIKI
-.TP
-\fI/var/run/utmp\fP
-informacja o tym, kto jest obecnie zalogowany
-.TP
-\fI/proc\fP
-informacje o procesach
-.SH "ZOBACZ TAKŻE"
-\fBfree\fP(1), \fBps\fP(1), \fBtop\fP(1), \fBuptime\fP(1), \fButmp\fP(5), \fBwho\fP(1)
-.SH AUTORZY
-Program \fBw\fP został przepisany prawie w całości przez Charlesa Blake'a w
-oparciu o wersję, którą napisali
-.UR greenfie@\:gauss.\:rutgers.\:edu
-Larry Greenfield
-.UE
-oraz
-.UR johnsonm@\:redhat.\:com
-Michael
-K. Johnson
-.UE
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man1/watch.1 procps-3.3.15/man-po/pl/man1/watch.1
--- procps-3.3.12/man-po/pl/man1/watch.1 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man1/watch.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH WATCH 1 2016\-06\-03 procps\-ng "Polecenia użytkownika"
-.SH NAZWA
-watch \- regularne uruchamianie programu z wyświetlaniem wyjścia na pełnym
-ekranie
-.SH SKŁADNIA
-\fBwatch\fP [\fIopcje\fP] \fIpolecenie\fP
-.SH OPIS
-\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
-first screenfull). This allows you to watch the program output change over
-time. By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
-until interrupted.
-.SH OPCJE
-.TP
-\fB\-d\fP, \fB\-\-differences\fP [\fItrwale\fP]
-Podświetlanie różnic między kolejnymi uaktualnieniami. Opcja może mieć
-opcjonalny argument, który zmienia podświetlenie na trwałe, pozwalające
-zobaczyć, co zmieniło się przynajmniej raz od pierwszej iteracji.
-.TP
-\fB\-n\fP, \fB\-\-interval\fP \fIsekundy\fP
-Specify update interval. The command will not allow quicker than 0.1 second
-interval, in which the smaller values are converted. Both '.' and ',' work
-for any locales.
-.TP
-\fB\-p\fP, \fB\-\-precise\fP
-Próba uruchamiania \fIpolecenia\fP co podaną liczbę \fIsekund\fP. Można wypróbować
-tę opcję z poleceniem \fBntptime\fP i obserwować, jak ułamki sekund pozostają
-(prawie) takie same, w przeciwieństwie do trybu zwykłego, gdzie stale się
-zwiększają.
-.TP
-\fB\-t\fP, \fB\-\-no\-title\fP
-Wyłączenie nagłówka pokazującego okres, polecenie oraz czas bieżący na górze
-ekranu, a także następującej po nim pustej linii.
-.TP
-\fB\-b\fP, \fB\-\-beep\fP
-Sygnał dźwiękowy w przypadku niezerowego kodu wyjścia polecenia.
-.TP
-\fB\-e\fP, \fB\-\-errexit\fP
-Zamrożenie uaktualnień po błędzie polecenia, zakończenie pracy po
-naciśnięciu klawisza.
-.TP
-\fB\-g\fP, \fB\-\-chgexit\fP
-Zakończenie, gdy wyjście \fIpolecenia\fP się zmieni.
-.TP
-\fB\-c\fP, \fB\-\-color\fP
-Interpretowanie sekwencji kolorów i stylów ANSI
-.TP
-\fB\-x\fP, \fB\-\-exec\fP
-\fIpolecenei\fP jest przekazywane do \fBsh \-c\fP, co oznacza, że może być potrzeba
-użycia dodatkowego cytowania do osiągnięcia pożądanego efektu. Z opcją
-\-\-exec polecenie jest natomiast przekazywane do funkcji \fBexec\fP(2).
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie tekstu pomocy i zakończenie.
-.TP
-\fB\-v\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji i zakończenie.
-.SH "KOD WYJŚCIA"
-.PP
-.RS
-.PD 0
-.TP
-\fB0\fP
-Sukces.
-.TP
-\fB1\fP
-Różne niepowodzenia.
-.TP
-\fB2\fP
-Nie udało się odgałęzić procesu do obserwacji.
-.TP
-\fB3\fP
-Nie udało się zastąpić standardowego wyjścia procesu potomnego stroną
-piszącą potoku.
-.TP
-\fB4\fP
-Nie udało się uruchomić polecenia.
-.TP
-\fB5\fP
-Nie udało się zamknąć potoku piszącego procesu potomnego.
-.TP
-\fB7\fP
-Nie udało się utworzyć potoku IPC.
-.TP
-\fB8\fP
-Nie udało się uzyskać kodu powrotu procesu potomnego przez \fBwaitpid\fP(2) lub
-polecenie zakończyło się błędem.
-.TP
-\fBinne\fP
-Program watch propaguje kod wyjścia polecenia jako kod wyjścia potomka.
-.SH UWAGI
-POSIX option processing is used (i.e., option processing stops at the first
-non\-option argument). This means that flags after \fIcommand\fP don't get
-interpreted by \fBwatch\fP itself.
-.SH BŁĘDY
-Przy zmianie rozmiaru terminala ekran nie zostanie poprawnie odrysowany aż
-do następnego uaktualnienia. Przy tym uaktualnieniu wszystkie podświetlenia
-\fB\-\-differences\fP zostaną utracone.
-
-Znaki niedrukowalne są usuwane z wyjścia programu. Aby je zobaczyć, można
-użyć "cat \-v" jako części potoku polecenia.
-
-Znaki dołączane, które mają być wyświetlane na znaku w ostatniej kolumnie
-ekranu, mogą wyświetlać się o jedną kolumnę za wcześnie albo wcale.
-
-Znaki dołączane nigdy nie liczą się jako różne w trybie
-\fI\-\-differences\fP. Liczy się tylko znak podstawowy.
-
-Puste wiersze bezpośrednio po wierszu kończącym się w ostatniej kolumnie,
-nie są wyświetlane.
-
-Tryb \fI\-\-precise\fP nie ma jeszcze zaawansowanej technologii zakrzywienia
-czasoprzestrzeni w celu skompensowania przypadku wykonywania \fIpolecenia\fP
-dłużej niż \fIokres\fP. \fBwatch\fP może też wejść w stan, w którym szybko
-uruchamia wiele instancji \fIpolecenia\fP, aby dogonić poprzednie działające
-więcej niż \fIokres\fP (np. \fBnetstat\fP trwający wieki przez wyszukiwania DNS).
-.SH PRZYKŁADY
-.PP
-Aby obserwować pocztę, można wykonać
-.IP
-watch \-n 60 from
-.PP
-Aby obserwować zmiany zawartości katalogu, można użyć
-.IP
-watch \-d ls \-l
-.PP
-Jeżeli interesujące są tylko pliki, których właścicielem jest użytkownik
-joe, można użyć
-.IP
-watch \-d 'ls \-l | fgrep joe'
-.PP
-Aby zobaczyć efekty cytowania, można wypróbować
-.IP
-watch echo $$
-.br
-watch echo '$$'
-.br
-watch echo "'"'$$'"'"
-.PP
-Aby zobaczyć efekt precyzyjnej obsługi czasu, można spróbować dodać \fI\-p\fP do
-.IP
-watch \-n 10 sleep 1
-.PP
-Można obserwować, jak administrator instaluje najnowsze jądro, przy użyciu
-.IP
-watch uname \-r
-.PP
-(Uwaga: \fI\-p\fP nie daje gwarancji działania między restartami systemu,
-szczególnie w obliczu \fBntpdate\fP czy innych mechanizmów zmieniających czas w
-trakcie rozruchu)
diff -Nru procps-3.3.12/man-po/pl/man8/sysctl.8 procps-3.3.15/man-po/pl/man8/sysctl.8
--- procps-3.3.12/man-po/pl/man8/sysctl.8 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man8/sysctl.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-.\" Copyright 1999, George Staikos (staikos@0wned.org)
-.\" This file may be used subject to the terms and conditions of the
-.\" GNU General Public License Version 2, or any later version
-.\" at your option, as published by the Free Software Foundation.
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details."
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH SYSCTL 8 "sty 2012" procps\-ng "Administracja systemem"
-.SH NAZWA
-sysctl \- konfiguracja parametrów jądra w czasie działania
-.SH SKŁADNIA
-\fBsysctl\fP [\fIopcje\fP] [\fIzmienna\fP[\fB=\fP\fIwartość\fP]] [...]
-.br
-\fBsysctl \-p\fP [\fIplik\fP lub \fIwyrażenie_regularne\fP] [...]
-.SH OPIS
-\fBsysctl\fP służy do modyfikowania parametrów jądra w czasie
-działania. Dostępne parametry to te, które są w /proc/sys/. Do obsługi
-\fBsysctl\fP pod Linuksem wymagany jest procfs. Program \fBsysctl\fP może być
-używany do odczytu i zapisu danych sysctl.
-.SH PARAMETRY
-.TP
-\fIzmienna\fP
-Nazwa klucza, z którego mają być odczytane dane, na przykład
-kernel.ostype. Akceptowany jest także separator '/' zamiast '.'.
-.TP
-\fIzmienna\fP=\fIwartość\fP
-Aby ustawić klucz, należy użyć formy \fIzmienna\fP=\fIwartość\fP, gdzie \fIzmienna\fP
-to klucz, a \fIwartość\fP wartość, na jaką klucz ma być ustawiony. Jeśli
-wartość zawiera apostrofy lub znaki, które są przetwarzane przez powłokę,
-może być potrzeba ujęcia wartości w cudzysłowy. Wymaga to użycia parametru
-\fB\-w\fP.
-.TP
-\fB\-n\fP, \fB\-\-values\fP
-Ta opcja wyłącza wypisywanie nazwy klucza przy wypisywaniu wartości.
-.TP
-\fB\-e\fP, \fB\-\-ignore\fP
-Ta opcja powoduje ignorowanie błędów przy nieznanych kluczach.
-.TP
-\fB\-N\fP, \fB\-\-names\fP
-Ta opcja powoduje wypisywanie samych nazw. Może być przydatna dla powłok z
-programowalnym dopełnianiem.
-.TP
-\fB\-q\fP, \fB\-\-quiet\fP
-Ta opcja powoduje niewyświetlanie ustawianych wartości na standardowym
-wyjściu.
-.TP
-\fB\-w\fP, \fB\-\-write\fP
-Ta opcja pozwala na zmianę ustawienia sysctl.
-.TP
-\fB\-p\fP[\fIPLIK\fP], \fB\-\-load\fP[=\fIPLIK\fP]
-Wczytanie ustawień sysctl z podanego pliku lub /etc/sysctl.conf, jeśli nie
-podano pliku. Podanie \- jako nazwy pliku oznacza odczyt danych ze
-standardowego wejścia. Użycie tej opcji oznacza, że argumenty \fBsysctl\fP są
-plikami, które będą czytane w kolejności podania. Argument plikowy może być
-też podany jako wyrażenie regularne.
-.TP
-\fB\-a\fP, \fB\-\-all\fP
-Wyświetlenie wszystkie aktualnie dostępnych wartości.
-.TP
-\fB\-\-deprecated\fP
-Dołączenie do listy wartości \fB\-\-all\fP parametrów przestarzałych.
-.TP
-\fB\-b\fP, \fB\-\-binary\fP
-Wypisanie wartości bez nowej linii.
-.TP
-\fB\-\-system\fP
-Wczytanie ustawień ze wszystkich systemowych plików konfiguracyjnych.
-.br
-/run/sysctl.d/*.conf
-.br
-/etc/sysctl.d/*.conf
-.br
-/usr/local/lib/sysctl.d/*.conf
-.br
-/usr/lib/sysctl.d/*.conf
-.br
-/lib/sysctl.d/*.conf
-.br
-/etc/sysctl.conf
-.TP
-\fB\-r\fP, \fB\-\-pattern\fP \fIwzorzec\fP
-Naniesienie wyłącznie ustawień pasujących do \fIwzorca\fP. \fIwzorzec\fP
-wykorzystuje składnię rozszerzonych wyrażeń regularnych.
-.TP
-\fB\-A\fP
-Alias dla \fB\-a\fP
-.TP
-\fB\-d\fP
-Alias dla \fB\-h\fP
-.TP
-\fB\-f\fP
-Alias dla \fB\-p\fP
-.TP
-\fB\-X\fP
-Alias dla \fB\-a\fP
-.TP
-\fB\-o\fP
-Nic nie robi, istnieje dla zgodności z BSD.
-.TP
-\fB\-x\fP
-Nic nie robi, istnieje dla zgodności z BSD.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie tekstu pomocy i zakończenie.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji i zakończenie.
-.SH PRZYKŁADY
-/sbin/sysctl \-a
-.br
-/sbin/sysctl \-n kernel.hostname
-.br
-/sbin/sysctl \-w kernel.domainname="example.com"
-.br
-/sbin/sysctl \-p/etc/sysctl.conf
-.br
-/sbin/sysctl \-a \-\-pattern forward
-.br
-/sbin/sysctl \-a \-\-pattern forward$
-.br
-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
-.br
-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
-.SH "PARAMETRY PRZESTARZAŁE"
-Zmienne \fBbase_reachable_time\fP oraz \fBretrans_time\fP są
-przestarzałe. Polecenie sysctl nie pozwala na zmianę wartości tych
-parametrów. Użytkownicy uporczywie używający przestarzałych interfejsów
-powinni umieścić wartości w systemie plików /proc w inny sposób, na
-przykład:
-.PP
-echo 256 > /proc/sys/net/ipv6/neigh/eth0/base_reachable_time
-.SH PLIKI
-\fI/proc/sys\fP
-.br
-\fI/etc/sysctl.conf\fP
-.SH "ZOBACZ TAKŻE"
-\fBsysctl.conf\fP(5) \fBregex\fP(7)
-.SH AUTOR
-.UR staikos@0wned.org
-George Staikos
-.UE
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl/man8/vmstat.8 procps-3.3.15/man-po/pl/man8/vmstat.8
--- procps-3.3.12/man-po/pl/man8/vmstat.8 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl/man8/vmstat.8 1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-.\" This page Copyright (C) 1994 Henry Ware
-.\" Distributed under the GPL, Copyleft 1994.
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH VMSTAT 8 "wrzesień 2011" procps\-ng "Administracja systemem"
-.SH NAZWA
-vmstat \- statystyki pamięci wirtualnej
-.SH SKŁADNIA
-\fBvmstat\fP [opcje] [\fIopóźnienie\fP [\fIliczba\fP]]
-.SH OPIS
-\fBvmstat\fP raportuje informacje o aktywności procesów, pamięci,
-stronicowania, blokowego we/wy, pułapek, dysków i procesora.
-.PP
-Pierwszy tworzony raport podaje średnie wartości od ostatniego restartu
-systemu. Dodatkowe raporty podają informacje dla okresów próbkowania o
-długości \fIopóźnienia\fP. Raporty dotyczące procesów i pamięci są w obu
-przypadkach natychmiastowe.
-.SH OPCJE
-.TP
-\fIopóźnienie\fP
-\fIOpóźnienie\fP pomiędzy uaktualnieniami w sekundach. Jeśli nie podano
-\fIopóźnienia\fP, wypisywany jest tylko raport z wartościami średnimi od
-rozruchu systemu.
-.TP
-\fIliczba\fP
-Liczba uaktualnień. W przypadku braku \fIliczby\fP, jeśli podano \fIopóźnienie\fP,
-domyślna jest nieskończoność.
-.TP
-\fB\-a\fP, \fB\-\-active\fP
-Wyświetlenie pamięci aktywnej i nieaktywnej, jeśli używane jest jądro 2.5.41
-lub nowsze.
-.TP
-\fB\-f\fP, \fB\-\-forks\fP
-Opcja \fB\-f\fP wyświetla liczbę rozgałęzień procesów od rozruchu
-systemu. Liczba ta obejmuje wywołania systemowe fork, vfork oraz clone; jest
-odpowiednikiem całkowitej liczby utworzonych zadań. Każdy proces jest
-reprezentowany przez jedno lub więcej zadań, w zależności od wykorzystania
-wątków. Ten widok się nie powtarza.
-.TP
-\fB\-m\fP, \fB\-\-slabs\fP
-Wyświetlenie slabinfo.
-.TP
-\fB\-n\fP, \fB\-\-one\-header\fP
-Wyświetlenie nagłówka tylko raz zamiast regularnie.
-.TP
-\fB\-s\fP, \fB\-\-stats\fP
-Wyświetlenie tabeli różnych liczników zdarzeń i statystyk pamięci. Ten widok
-się nie powtarza.
-.TP
-\fB\-d\fP, \fB\-\-disk\fP
-Raport statystyk dysku (wymagane jądro 2.5.70 lub nowsze).
-.TP
-\fB\-D\fP, \fB\-\-disk\-sum\fP
-Raport pewnych statystyk zbiorczych dotyczących aktywności dysku.
-.TP
-\fB\-p\fP, \fB\-\-partition\fP \fIurządzenie\fP
-Szczegółowe statystyki dotyczące partycji (wymagane jądro 2.5.70 lub
-nowsze).
-.TP
-\fB\-S\fP, \fB\-\-unit\fP \fIznak\fP
-Przełączenie wyjścia między jednostkami 1000 (\fIk\fP), 1024 (\fIK\fP),1000000
-(\fIm\fP) lub 1048576 (\fIM\fP) bajtów. Opcja nie zmienia pól operacji wymiany
-(si/so) ani blokowych (bi/bo).
-.TP
-\fB\-t\fP, \fB\-\-timestamp\fP
-Dołączenie znacznika czasu do każdej linii
-.TP
-\fB\-w\fP, \fB\-\-wide\fP
-Tryb szerokiego wyjścia (przydatny dla systemów z dużą ilością pamięci,
-gdzie domyślny tryb wyjścia cierpi przez niechciane łamanie kolumn). Wyjście
-jest szersze niż 80 znaków w linii.
-.TP
-\fB\-V\fP, \fB\-\-version\fP
-Wyświetlenie informacji o wersji i zakończenie.
-.TP
-\fB\-h\fP, \fB\-\-help\fP
-Wyświetlenie opisu i zakończenie.
-.PD
-.SH "OPIS PÓL DLA TRYBU VM"
-.SS Proc.
-.nf
-r: Liczba procesów działających (działających lub czekających na czas pracy).
-b: Liczba procesów w nieprzerywalnym śnie.
-.fi
-.PP
-.SS Pamięć
-.nf
-swap: ilość użytej pamięci wirtualnej.
-wolna: ilość pamięci bezczynnej.
-bufor: ilość pamięci używanej jako bufory.
-cache: ilość pamięci używanej jako podręczna.
-nieakt: ilość pamięci nieaktywnej (opcja \-a).
-akt: ilość pamięci aktywnej (opcja \-a).
-.fi
-.PP
-.SS Swap
-.nf
-si: Ilość pamięci wymiany wczytanej z dysku (/s).
-so: Ilość pamięci wymiany zapisanej na dysk (/s).
-.fi
-.PP
-.SS IO
-.nf
-bi: Bloki odebrane z urządzenia blokowego (bloki/s).
-bo: Bloki wysłane do urządzenia blokowego (bloki/s).
-.fi
-.PP
-.SS System
-.nf
-in: Liczba przerwań na sekundę, włącznie z zegarowym.
-cs: Liczba przełączeń kontekstu na sekundę.
-.fi
-.PP
-.SS CPU
-Procenty całkowitego czasu procesora.
-.nf
-us: Czas spędzony w kodzie poza jądrem (czas użytkownika, w tym nice).
-sy: Czas spędzony w kodzie jądra (czas systemu)
-id: Czas spędzony bezczynnie. Przed Linuksem 2.5.41 obejmował czas IO\-wait.
-wa: Czas spędzony na oczekiwaniu na we/wy. Przed 2.5.41 zawarty w bezczynnym.
-st: Czas skradziony wirtualnej maszynie. Przed Linuksem 2.6.11 nieznany.
-.fi
-.PP
-.SH "OPIS PÓL DLA TRYBU DYSKOWEGO"
-.SS Odczyty
-.nf
-total: wszystkie odczyty zakończone poprawnie
-merged: odczyty zgrupowane (zakończone w jednym we/wy)
-sectors: sektory odczytane poprawnie
-ms: milisekundy spędzone na odczycie
-.fi
-.PP
-.SS Zapisy
-.nf
-total: wszystkie zapisy zakończone poprawnie
-merged: zapisy zgrupowane (zakończone w jednym we/wy)
-sectors: sektory zapisane poprawnie
-ms: milisekundy spędzone na zapisie
-.fi
-.PP
-.SS IO
-.nf
-cur: operacje we/wy w trakcie
-s: sekundy spędzone na operacjach we/wy
-.fi
-.PP
-.SH "OPIS PÓL DLA TRYBU PARTYCJI DYSKU"
-.nf
-reads: całkowita liczba odczytów zleconych dla tej partycji
-read sectors: całkowita liczba sektorów odczytanych z partycji
-writes: całkowita liczba zapisów zleconych dla tej partycji
-requested writes: całkowita liczba żądań zapisu dla partycji
-.fi
-.PP
-.SH "OPIS PÓL DLA TRYBU PŁYT"
-.nf
-cache: nazwa pamięci podręcznej
-num: liczba obecnie aktywnych obiektów
-total: całkowita liczba dostępnych obiektów
-size: rozmiar każdego obiektu
-pages: liczba stron z przynajmniej jednym aktywnym obiektem
-.fi
-.SH UWAGI
-\fBvmstat \fP nie wymaga specjalnych uprawnień.
-.PP
-Niniejsze raporty mają na celu pomoc przy identyfikacji wąskich gardeł w
-systemie. Linuksowy \fBvmstat\fP nie liczy siebie jako działającego procesu.
-.PP
-Wszystkie bloki dla Linuksa mają obecnie 1024 bajty. Stare jądra mogły
-używać bloków 512\-, 2048\- lub 4096\-bajtowych.
-.PP
-Od wersji procps 3.1.9, vmstat pozwala wybrać jednostki (k, K, m,
-M). Domyślna to K (1024 bajty) w trybie domyślnym.
-.PP
-vmstat wykorzystuje slabinfo 1.1
-.SH PLIKI
-.ta
-.nf
-/proc/meminfo
-/proc/stat
-/proc/*/stat
-.fi
-.SH "ZOBACZ TAKŻE"
-\fBfree\fP(1), \fBiostat\fP(1), \fBmpstat\fP(1), \fBps\fP(1), \fBsar\fP(1), \fBtop\fP(1)
-.PP
-.SH BŁĘDY
-Nie raportuje blokowego we/wy per urządzenie ani nie liczy wywołań
-systemowych.
-.SH AUTORZY
-Autorem jest
-.UR al172@yfn.\:ysu.\:edu
-Henry Ware
-.UE .
-.br
-.UR ffrederick@users.\:sourceforge.\:net
-Fabian Fr\('ed\('erick
-.UE
-(dyski, płyty, partycje...)
-.SH "ZGŁASZANIE BŁĘDÓW"
-Zgłoszenia błędów prosimy wysyłać na adres
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.12/man-po/pl.po procps-3.3.15/man-po/pl.po
--- procps-3.3.12/man-po/pl.po 2016-07-10 06:40:26.000000000 +0000
+++ procps-3.3.15/man-po/pl.po 2018-05-19 22:05:40.000000000 +0000
@@ -11,6 +11,7 @@
"Last-Translator: Jakub Bogusz \n"
"Language-Team: Polish \n"
"Language: pl\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -Nru procps-3.3.12/man-po/pt_BR.po procps-3.3.15/man-po/pt_BR.po
--- procps-3.3.12/man-po/pt_BR.po 1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.15/man-po/pt_BR.po 2018-05-19 22:05:40.000000000 +0000
@@ -0,0 +1,3374 @@
+# Brazilian Portuguese translation for procps-ng-man.
+# Copyright (C) 2018 Free Software Foundation, Inc.
+# This file is distributed under the same license as the procps-ng package.
+# Rafael Fontenelle , 2018.
+msgid ""
+msgstr ""
+"Project-Id-Version: procps-ng-man 3.3.10-rc3\n"
+"Report-Msgid-Bugs-To: procps@freelists.org\n"
+"POT-Creation-Date: 2014-09-16 19:45+0300\n"
+"PO-Revision-Date: 2018-02-28 05:10-0200\n"
+"Last-Translator: Rafael Fontenelle \n"
+"Language-Team: Brazilian Portuguese \n"
+"Language: pt_BR\n"
+"X-Bugs: Report translation errors to the Language-Team address.\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"
+"X-Generator: Virtaal 1.0.0-beta1\n"
+
+#. type: TH
+#: free.1:5
+#, no-wrap
+msgid "FREE"
+msgstr "FREE"
+
+#. type: TH
+#: free.1:5
+#, no-wrap
+msgid "July 2014"
+msgstr "Julho de 2014"
+
+#. type: TH
+#: free.1:5 kill.1:8 pgrep.1:5 pmap.1:8 pwdx.1:6 skill.1:9 slabtop.1:5
+#: sysctl.8:9 sysctl.conf.5:9 tload.1:4 uptime.1:3 vmstat.8:3 w.1:3 watch.1:1
+#, no-wrap
+msgid "procps-ng"
+msgstr "procps-ng"
+
+#. type: TH
+#: free.1:5 kill.1:8 pgrep.1:5 pidof.1:18 pmap.1:8 pwdx.1:6 skill.1:9
+#: slabtop.1:5 tload.1:4 uptime.1:3 w.1:3 watch.1:1
+#, no-wrap
+msgid "User Commands"
+msgstr "Comandos de usuário"
+
+#. type: SH
+#: free.1:6 kill.1:9 pgrep.1:6 pidof.1:19 pmap.1:9 pwdx.1:7 skill.1:10
+#: slabtop.1:6 sysctl.8:10 sysctl.conf.5:10 tload.1:5 uptime.1:4 vmstat.8:4
+#: w.1:4 watch.1:2
+#, no-wrap
+msgid "NAME"
+msgstr "NOME"
+
+#. type: Plain text
+#: free.1:8
+msgid "free - Display amount of free and used memory in the system"
+msgstr "free - Exibe quantidade de memória livre e usada no sistema"
+
+#. type: SH
+#: free.1:8 kill.1:11 pgrep.1:8 pidof.1:21 pmap.1:11 pwdx.1:9 skill.1:12
+#: slabtop.1:8 sysctl.8:12 tload.1:7 uptime.1:6 vmstat.8:6 w.1:6 watch.1:4
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SINOPSE"
+
+#. type: Plain text
+#: free.1:11
+msgid "B [I]"
+msgstr "B [I]"
+
+#. type: SH
+#: free.1:11 kill.1:14 pgrep.1:14 pidof.1:32 pmap.1:14 skill.1:22 slabtop.1:11
+#: sysctl.8:18 sysctl.conf.5:12 tload.1:10 uptime.1:9 vmstat.8:10 w.1:9
+#: watch.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIÇÃO"
+
+#. type: Plain text
+#: free.1:17
+msgid "B displays the total amount of free and used physical and swap memory in the system, as well as the buffers and caches used by the kernel. The information is gathered by parsing /proc/meminfo. The displayed columns are:"
+msgstr "B exibe a quantidade total de memória física e de swap livre e usada no sistema, bem como os buffers e caches usados pelo kernel. A informação é coletada através da análise de /proc/meminfo. As colunas exibidas são:"
+
+#. type: TP
+#: free.1:17
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:20
+msgid "Total installed memory (MemTotal and SwapTotal in /proc/meminfo)"
+msgstr "Memória total instalada (MemTotal e SwapTotal em /proc/meminfo)"
+
+#. type: TP
+#: free.1:20
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:23
+msgid "Used memory (calculated as B - B - B - B)"
+msgstr "Memória usada (calculada como B - B - B - B)"
+
+#. type: TP
+#: free.1:23
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:26
+msgid "Unused memory (MemFree and SwapFree in /proc/meminfo)"
+msgstr "Memória não usada (MemFree e SwapFree em /proc/meminfo)"
+
+#. type: TP
+#: free.1:26
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:30
+msgid "Memory used (mostly) by tmpfs (Shmem in /proc/meminfo, available on kernels 2.6.32, displayed as zero if not available)"
+msgstr "Memória usada (em sua maioria) por tmpfs (Shmem em /proc/meminfo, disponível em kernels 2.6.32, exibida como zero se não disponível)"
+
+#. type: TP
+#: free.1:30
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:33
+msgid "Memory used by kernel buffers (Buffers in /proc/meminfo)"
+msgstr "Memória usada por buffers do kernel (Buffers em /proc/meminfo)"
+
+#. type: TP
+#: free.1:33
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:36
+msgid "Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)"
+msgstr "Memória usada por slabs e cache de páginas (Cached e Slab em /proc/meminfo)"
+
+#. type: TP
+#: free.1:36
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:39
+msgid "Sum of B and B"
+msgstr "Soma de B e B"
+
+#. type: TP
+#: free.1:39
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: free.1:48
+msgid "Estimation of how much memory is available for starting new applications, without swapping. Unlike the data provided by the B or B fields, this field takes into account page cache and also that not all reclaimable memory slabs will be reclaimed due to items being in use (MemAvailable in /proc/meminfo, available on kernels 3.14, emulated on kernels 2.6.27+, otherwise the same as B)"
+msgstr "Estimativa da quantidade de memória disponível para iniciar novos aplicativos, sem fazer uso da swap. Ao contrário dos dados fornecidos pelos campos B ou B, este campo leva em consideração o cache da página e também que nem todos os slabs recuperáveis de memória serão recuperados devido a itens em uso (MemAvailable em /proc/meminfo, disponível em kernels 3.14, emulado em kernels 2.6.27+; caso contrário, o mesmo que B)"
+
+#. type: SH
+#: free.1:48 kill.1:30 pgrep.1:39 pidof.1:36 pmap.1:16 pwdx.1:12 skill.1:35
+#: slabtop.1:16 tload.1:15 uptime.1:26 vmstat.8:19 watch.1:17
+#, no-wrap
+msgid "OPTIONS"
+msgstr "OPÇÕES"
+
+#. type: TP
+#: free.1:49
+#, no-wrap
+msgid "B<-b>, B<--bytes>"
+msgstr "B<-b>, B<--bytes>"
+
+#. type: Plain text
+#: free.1:52
+msgid "Display the amount of memory in bytes."
+msgstr "Exibe a quantidade de memória em bytes."
+
+#. type: TP
+#: free.1:52
+#, no-wrap
+msgid "B<-k>, B<--kilo>"
+msgstr "B<-k>, B<--kilo>"
+
+#. type: Plain text
+#: free.1:55
+msgid "Display the amount of memory in kilobytes. This is the default."
+msgstr "Exibe a quantidade de memória em kilobytes. Esse é o padrão."
+
+#. type: TP
+#: free.1:55
+#, no-wrap
+msgid "B<-m>, B<--mega>"
+msgstr "B<-m>, B<--mega>"
+
+#. type: Plain text
+#: free.1:58
+msgid "Display the amount of memory in megabytes."
+msgstr "Exibe a quantidade de memória em megabytes."
+
+#. type: TP
+#: free.1:58
+#, no-wrap
+msgid "B<-g>, B<--giga>"
+msgstr "B<-g>, B<--giga>"
+
+#. type: Plain text
+#: free.1:61
+msgid "Display the amount of memory in gigabytes."
+msgstr "Exibe a quantidade de memória em gigabytes."
+
+#. type: TP
+#: free.1:61
+#, no-wrap
+msgid "B<--tera>"
+msgstr "B<--tera>"
+
+#. type: Plain text
+#: free.1:64
+msgid "Display the amount of memory in terabytes."
+msgstr "Exibe a quantidade de memória em terabytes."
+
+#. type: TP
+#: free.1:64
+#, no-wrap
+msgid "B<-h>, B<--human>"
+msgstr "B<-h>, B<--human>"
+
+#. type: Plain text
+#: free.1:68
+msgid "Show all output fields automatically scaled to shortest three digit unit and display the units of print out. Following units are used."
+msgstr "Mostra todos os campos de saída automaticamente dimensionados para a unidade de três dígitos mais curta e exibe as unidades do resultado. As unidades a seguir são usadas."
+
+#. type: Plain text
+#: free.1:75
+#, no-wrap
+msgid ""
+" B = bytes\n"
+" K = kilos\n"
+" M = megas\n"
+" G = gigas\n"
+" T = teras\n"
+msgstr ""
+" B = bytes\n"
+" K = kilos\n"
+" M = megas\n"
+" G = gigas\n"
+" T = teras\n"
+
+#. type: Plain text
+#: free.1:79
+msgid "If unit is missing, and you have petabyte of RAM or swap, the number is in terabytes and columns might not be aligned with header."
+msgstr "Se a unidade for omitida, e você tiver petabyte de RAM ou swap, o número está em terabytes e as colunas podem não estar alinhadas com o cabeçalho."
+
+#. type: TP
+#: free.1:79 vmstat.8:79
+#, no-wrap
+msgid "B<-w>, B<--wide>"
+msgstr "B<-w>, B<--wide>"
+
+#. type: Plain text
+#: free.1:84
+msgid "Switch to the wide mode. The wide mode produces lines longer than 80 characters. In this mode B and B are reported in two separate columns."
+msgstr "Muda para o modo amplo. O modo amplo produz linhas com mais de 80 caracteres. Neste modo, B e B são relatados em duas colunas separadas."
+
+# A tradução da UI usa "N", portanto usei "núm" como algo aproximado
+#. type: TP
+#: free.1:84
+#, no-wrap
+msgid "B<-c>, B<--count> I"
+msgstr "B<-c>, B<--count> I"
+
+# A tradução da UI usa "N", portanto usei "núm" como algo aproximado
+#. type: Plain text
+#: free.1:91
+msgid "Display the result I times. Requires the B<-s> option."
+msgstr "Exibir o resultado I vezes. Requer a opção B<-s>."
+
+#. type: TP
+#: free.1:91
+#, no-wrap
+msgid "B<-l>, B<--lohi>"
+msgstr "B<-l>, B<--lohi>"
+
+#. type: Plain text
+#: free.1:94
+msgid "Show detailed low and high memory statistics."
+msgstr "Mostre estatísticas detalhadas de memória baixa e alta."
+
+#. type: TP
+#: free.1:94
+#, no-wrap
+msgid "B<-s>, B<--seconds> I"
+msgstr "B<-s>, B<--seconds> I"
+
+#. type: Plain text
+#: free.1:102
+msgid "Continuously display the result delay I apart. You may actually specify any floating point number for I, B(3) is used for microsecond resolution delay times."
+msgstr "Mostra continuamente o resultado com atraso de I. Você pode especificar qualquer número de ponto flutuante para I, B(3) é usado para tempos de atraso com resolução em microssegundos."
+
+#. type: TP
+#: free.1:102
+#, no-wrap
+msgid "B<--si>"
+msgstr "B<--si>"
+
+#. type: Plain text
+#: free.1:105
+msgid "Use power of 1000 not 1024."
+msgstr "Usa potência de 1000, não e de 1024."
+
+#. type: TP
+#: free.1:105
+#, no-wrap
+msgid "B<-t>, B<--total>"
+msgstr "B<-t>, B<--total>"
+
+#. type: Plain text
+#: free.1:108
+msgid "Display a line showing the column totals."
+msgstr "Exibe uma linha mostrando os totais das colunas."
+
+#. type: TP
+#: free.1:108 w.1:48
+#, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+#. type: Plain text
+#: free.1:111
+msgid "Print help."
+msgstr "Exibe a ajuda."
+
+#. type: TP
+#: free.1:111 pgrep.1:157 pmap.1:59 pwdx.1:13 skill.1:61 slabtop.1:35
+#: sysctl.8:122 tload.1:28 uptime.1:36 vmstat.8:84 w.1:54
+#, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>, B<--version>"
+
+#. type: Plain text
+#: free.1:114 skill.1:64 w.1:57
+msgid "Display version information."
+msgstr "Exibe informação da versão."
+
+#. type: SH
+#: free.1:115 slabtop.1:76 sysctl.8:151 sysctl.conf.5:44 tload.1:32
+#: uptime.1:39 vmstat.8:199 w.1:70
+#, no-wrap
+msgid "FILES"
+msgstr "ARQUIVOS"
+
+#. type: TP
+#: free.1:116
+#, no-wrap
+msgid "/proc/meminfo"
+msgstr "/proc/meminfo"
+
+#. type: Plain text
+#: free.1:119
+msgid "memory information"
+msgstr "informações da memória"
+
+#. type: SH
+#: free.1:120 kill.1:72 pgrep.1:231 pidof.1:58 pmap.1:77 pwdx.1:19 skill.1:102
+#: slabtop.1:80 sysctl.8:155 sysctl.conf.5:63 tload.1:35 uptime.1:56
+#: vmstat.8:206 w.1:77
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VEJA TAMBÉM"
+
+#. type: Plain text
+#: free.1:125
+msgid "B(1), B(1), B(1), B(8)."
+msgstr "B(1), B(1), B(1), B(8)."
+
+#. type: SH
+#: free.1:125 slabtop.1:95 tload.1:48 uptime.1:46 vmstat.8:216 w.1:84
+#: watch.1:184
+#, no-wrap
+msgid "AUTHORS"
+msgstr "AUTORES"
+
+#. type: Plain text
+#: free.1:127
+msgid "Written by Brian Edmonds."
+msgstr "Escrito por Brian Edmonds."
+
+#. type: SH
+#: free.1:127 kill.1:90 pgrep.1:248 pmap.1:82 pwdx.1:29 skill.1:118
+#: slabtop.1:101 sysctl.8:162 sysctl.conf.5:69 tload.1:56 uptime.1:61
+#: vmstat.8:226 w.1:94
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "RELATANDO ERROS"
+
+#. type: Plain text
+#: kill.1:8 pgrep.1:5 pidof.1:18 pwdx.1:6 skill.1:9 slabtop.1:5 snice.1:1
+#: sysctl.conf.5:9 tload.1:4 uptime.1:3 vmstat.8:3 w.1:3 watch.1:1
+msgid "Please send bug reports to E<.UR procps@freelists.org> E<.UE>"
+msgstr "Por favor, envie relatórios de erros para E<.UR procps@freelists.org> E<.UE>"
+
+#. type: TH
+#: kill.1:8
+#, no-wrap
+msgid "KILL"
+msgstr "KILL"
+
+#. type: TH
+#: kill.1:8 skill.1:9
+#, no-wrap
+msgid "October 2011"
+msgstr "Outubro de 2011"
+
+#. type: Plain text
+#: kill.1:11
+msgid "kill - send a signal to a process"
+msgstr "kill - envia um sinal para um processo"
+
+#. type: Plain text
+#: kill.1:14
+msgid "B [options] EpidE [...]"
+msgstr "B [opções] EpidE [...]"
+
+#. type: Plain text
+#: kill.1:30
+msgid "The default signal for kill is TERM. Use B<-l> or B<-L> to list available signals. Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0. Alternate signals may be specified in three ways: B<-9>, B<-SIGKILL> or B<-KILL>. Negative PID values may be used to choose whole process groups; see the PGID column in ps command output. A PID of B<-1> is special; it indicates all processes except the kill process itself and init."
+msgstr "O sinal padrão do kill é TERM. Use B<-l> ou B<-L> para listar os sinais disponíveis. Os sinais particularmente úteis incluem HUP, INT, KILL, STOP, CONT e 0. Os sinais alternativos podem ser especificados de três maneiras: B<-9>, B<-SIGKILL> ou B<-KILL>. Valores de PID negativos podem ser usados para escolher todos os grupos de processo; veja a coluna PGID na saída do comando ps. Um PID de B<-1> é especial; indica todos os processos, exceto o próprio processo do kill e o init."
+
+#. type: TP
+#: kill.1:31
+#, no-wrap
+msgid "BpidE [...]>"
+msgstr "BpidE [...]>"
+
+#. type: Plain text
+#: kill.1:34
+msgid "Send signal to every EpidE listed."
+msgstr "Envia sinal para tod EpidE listado."
+
+#. type: TP
+#: kill.1:34
+#, no-wrap
+msgid "B<-EsignalE>"
+msgstr "B<-EsinalE>"
+
+#. type: TQ
+#: kill.1:36
+#, no-wrap
+msgid "B<-s EsignalE>"
+msgstr "B<-s EsinalE>"
+
+#. type: TQ
+#: kill.1:38
+#, no-wrap
+msgid "B<--signal EsignalE>"
+msgstr "B<--signal EsinalE>"
+
+#. type: Plain text
+#: kill.1:46
+msgid "Specify the B to be sent. The signal can be specified by using name or number. The behavior of signals is explained in B(7) manual page."
+msgstr "Especifica o B a ser enviado. O sinal pode ser especificado usando um nome ou número. O comportamento dos sinais é explicado na página de manual B(7)."
+
+#. type: TP
+#: kill.1:46
+#, no-wrap
+msgid "B<-l>, B<--list> [I]"
+msgstr "B<-l>, B<--list> [I]"
+
+#. type: Plain text
+#: kill.1:50
+msgid "List signal names. This option has optional argument, which will convert signal number to signal name, or other way round."
+msgstr "Lista nomes de sinais. Essa opção possui um argumento opcional, que vai converter o número do sinal para um nome de sinal, e vice-versa."
+
+#. type: TP
+#: kill.1:50 skill.1:45
+#, no-wrap
+msgid "B<-L>,B<\\ --table>"
+msgstr "B<-L>,B<\\ --table>"
+
+#. type: Plain text
+#: kill.1:53
+msgid "List signal names in a nice table."
+msgstr "Lista nomes de sinais em uma tabela legal."
+
+#. type: SH
+#: kill.1:55 pgrep.1:208 slabtop.1:85 vmstat.8:184
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTAS"
+
+#. type: Plain text
+#: kill.1:59
+msgid "Your shell (command line interpreter) may have a built-in kill command. You may need to run the command described here as /bin/kill to solve the conflict."
+msgstr "Seu shell (interpretador de linha de comando) pode ter um comando kill embutido. Você pode precisar executar o comando descrito aqui como /bin/kill para resolver o conflito."
+
+#. type: SH
+#: kill.1:59 pgrep.1:169 skill.1:92 sysctl.8:125 watch.1:79
+#, no-wrap
+msgid "EXAMPLES"
+msgstr "EXEMPLOS"
+
+#. type: TP
+#: kill.1:60
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: kill.1:63
+msgid "Kill all processes you can kill."
+msgstr "Termina todos os processos que você pode terminar."
+
+#. type: TP
+#: kill.1:63
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: kill.1:66
+msgid "Translate number 11 into a signal name."
+msgstr "Traduz o número 11 para um nome de sinal."
+
+#. type: TP
+#: kill.1:66
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: kill.1:69
+msgid "List the available signal choices in a nice table."
+msgstr "Lista as escolhas de sinais disponíveis em uma tabela legal."
+
+#. type: TP
+#: kill.1:69
+#, no-wrap
+msgid "B"
+msgstr "B"
+
+#. type: Plain text
+#: kill.1:72
+msgid "Send the default signal, SIGTERM, to all those processes."
+msgstr "Envia um sinal padrão, SIGTERM, para todos esses processos."
+
+#. type: Plain text
+#: kill.1:80
+msgid "B(2), B(1), B(1), B(1), B(1), B(7), B(1)"
+msgstr "B(2), B(1), B(1), B(1), B(1), B(7), B(1)"
+
+#. type: SH
+#: kill.1:80 pgrep.1:239 pmap.1:80 pwdx.1:22 skill.1:110
+#, no-wrap
+msgid "STANDARDS"
+msgstr "PADRÕES"
+
+#. type: Plain text
+#: kill.1:84
+msgid "This command meets appropriate standards. The B<-L> flag is Linux-specific."
+msgstr "Esse comando atende as padrões apropriados. A opção B<-L> é específica do Linux."
+
+#. type: SH
+#: kill.1:84 pgrep.1:244 pidof.1:61 pwdx.1:24 skill.1:112 sysctl.8:158
+#: sysctl.conf.5:65
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTOR"
+
+#. type: Plain text
+#: kill.1:90
+msgid "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> wrote kill in 1999 to replace a bsdutils one that was not standards compliant. The util-linux one might also work correctly."
+msgstr "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> escreveu kill em 1999 para substituir um do bsdutils que não estava em conformidade com os padrões. O do The util-linux também pode funcionar corretamente."
+
+#. type: TH
+#: pgrep.1:5
+#, no-wrap
+msgid "PGREP"
+msgstr "PGREP"
+
+#. type: TH
+#: pgrep.1:5
+#, no-wrap
+msgid "October 2012"
+msgstr "Outubro de 2012"
+
+#. type: Plain text
+#: pgrep.1:8
+msgid "pgrep, pkill - look up or signal processes based on name and other attributes"
+msgstr "pgrep, pkill - procura ou sinaliza processos com base em nomes e outros atributos"
+
+#. type: Plain text
+#: pgrep.1:11
+msgid "B [options] pattern"
+msgstr "B [opções] padrão"
+
+#. type: Plain text
+#: pgrep.1:14
+msgid "B [options] pattern"
+msgstr "B [opções] padrão"
+
+#. type: Plain text
+#: pgrep.1:19
+msgid "B looks through the currently running processes and lists the process IDs which match the selection criteria to stdout. All the criteria have to match. For example,"
+msgstr "B examina os processos atualmente em execução e lista os IDs de processo que combinam os critérios de seleção para stdout (saída padrão). Todos os critérios devem corresponder. Por exemplo,"
+
+#. type: Plain text
+#: pgrep.1:21
+msgid "$ pgrep -u root sshd"
+msgstr "$ pgrep -u root sshd"
+
+#. type: Plain text
+#: pgrep.1:27
+msgid "will only list the processes called B AND owned by B. On the other hand,"
+msgstr "vai listar apenas os processos chamados B E pertencentes ao B. Por outro lado,"
+
+#. type: Plain text
+#: pgrep.1:29
+msgid "$ pgrep -u root,daemon"
+msgstr "$ pgrep -u root,daemon"
+
+#. type: Plain text
+#: pgrep.1:34
+msgid "will list the processes owned by B OR B."
+msgstr "vai listar os processos pertencentes ao B OU B."
+
+#. type: Plain text
+#: pgrep.1:39
+msgid "B will send the specified signal (by default B) to each process instead of listing them on stdout."
+msgstr "B vai enviar um sinal especificado (por padrão, B) para cada processo em vez de listá-los na stdout (saída padrão)."
+
+#. type: TP
+#: pgrep.1:40
+#, no-wrap
+msgid "B<->I"
+msgstr "B<->I"
+
+#. type: TQ
+#: pgrep.1:42
+#, no-wrap
+msgid "B<--signal> I"
+msgstr "B<--signal> I"
+
+#. type: Plain text
+#: pgrep.1:48
+msgid "Defines the signal to send to each matched process. Either the numeric or the symbolic signal name can be used. (B only.)"
+msgstr "Define o sinal para enviar para cada processo correspondente. Tanto nome numérico quanto o simbólico do sinal podem ser usado. (B apenas)"
+
+#. type: TP
+#: pgrep.1:48
+#, no-wrap
+msgid "B<-c>, B<--count>"
+msgstr "B<-c>, B<--count>"
+
+#. type: Plain text
+#: pgrep.1:53
+msgid "Suppress normal output; instead print a count of matching processes. When count does not match anything, e.g. returns zero, the command will return non-zero value."
+msgstr "Suprime a saída normal; em vez disso, imprime uma contagem de processos que correspondem. Quando a contagem não coincide com nada, por exemplo, retorna zero, o comando retornará valor diferente de zero."
+
+#. type: TP
+#: pgrep.1:53
+#, no-wrap
+msgid "B<-d>, B<--delimiter> I"
+msgstr "B<-d>, B<--delimiter> I"
+
+#. type: Plain text
+#: pgrep.1:59
+msgid "Sets the string used to delimit each process ID in the output (by default a newline). (B only.)"
+msgstr "Define a sequência usada para delimitar cada ID de processo na saída (por padrão, uma nova linha). (B apenas.)"
+
+#. type: TP
+#: pgrep.1:59
+#, no-wrap
+msgid "B<-f>, B<--full>"
+msgstr "B<-f>, B<--full>"
+
+#. type: Plain text
+#: pgrep.1:66
+msgid "The I is normally only matched against the process name. When B<-f> is set, the full command line is used."
+msgstr "O I normalmente é analisado pelo nome do processo. Quando B<-f> está configurado, a linha de comando completa é usada."
+
+#. type: TP
+#: pgrep.1:66
+#, no-wrap
+msgid "B<-g>, B<--pgroup> I,..."
+msgstr "B<-g>, B<--pgroup> I,..."
+
+#. type: Plain text
+#: pgrep.1:74
+msgid "Only match processes in the process group IDs listed. Process group 0 is translated into B's or B's own process group."
+msgstr "Corresponde apenas os processos nos IDs de grupo de processo listados. O grupo de processos 0 é traduzido para o grupo de processos do próprio B ou B."
+
+#. type: TP
+#: pgrep.1:74
+#, no-wrap
+msgid "B<-G>, B<--group> I,..."
+msgstr "B<-G>, B<--group> I,..."
+
+#. type: Plain text
+#: pgrep.1:78
+msgid "Only match processes whose real group ID is listed. Either the numerical or symbolical value may be used."
+msgstr "Corresponde apenas os processos cujo ID de grupo real está listado. Ou o valor numérico ou simbólico pode ser usado."
+
+#. type: TP
+#: pgrep.1:78
+#, no-wrap
+msgid "B<-l>, B<--list-name>"
+msgstr "B<-l>, B<--list-name>"
+
+#. type: Plain text
+#: pgrep.1:83
+msgid "List the process name as well as the process ID. (B only.)"
+msgstr "Lista o nome do processo, bem como o ID do processo. (B apenas.)"
+
+#. type: TP
+#: pgrep.1:83
+#, no-wrap
+msgid "B<-a>, B<--list-full>"
+msgstr "B<-a>, B<--list-full>"
+
+#. type: Plain text
+#: pgrep.1:88
+msgid "List the full command line as well as the process ID. (B only.)"
+msgstr "Lista o linha de comando completa, bem como o ID do processo. (B apenas.)"
+
+#. type: TP
+#: pgrep.1:88
+#, no-wrap
+msgid "B<-n>, B<--newest>"
+msgstr "B<-n>, B<--newest>"
+
+#. type: Plain text
+#: pgrep.1:91
+msgid "Select only the newest (most recently started) of the matching processes."
+msgstr "Seleciona apenas o mais novo (iniciado mais recentemente) dos processos correspondentes."
+
+#. type: TP
+#: pgrep.1:91
+#, no-wrap
+msgid "B<-o>, B<--oldest>"
+msgstr "B<-o>, B<--oldest>"
+
+#. type: Plain text
+#: pgrep.1:94
+msgid "Select only the oldest (least recently started) of the matching processes."
+msgstr "Seleciona apenas o mais antigo (iniciado menos recentemente) dos processos correspondentes."
+
+#. type: TP
+#: pgrep.1:94
+#, no-wrap
+msgid "B<-P>, B<--parent> I,..."
+msgstr "B<-P>, B<--parent> I,..."
+
+#. type: Plain text
+#: pgrep.1:97
+msgid "Only match processes whose parent process ID is listed."
+msgstr "Corresponde apenas processos cujo ID de processo pai está listado."
+
+#. type: TP
+#: pgrep.1:97
+#, no-wrap
+msgid "B<-s>, B<--session> I,..."
+msgstr "B<-s>, B<--session> I,..."
+
+#. type: Plain text
+#: pgrep.1:105
+msgid "Only match processes whose process session ID is listed. Session ID 0 is translated into B's or B's own session ID."
+msgstr "Corresponde apenas os processos cujo ID de sessão de processo está listado. ID de Sessão 0 é traduzido para o ID de sessão do próprio B ou B."
+
+#. type: TP
+#: pgrep.1:105
+#, no-wrap
+msgid "B<-t>, B<--terminal> I,..."
+msgstr "B<-t>, B<--terminal> I,..."
+
+#. type: Plain text
+#: pgrep.1:109
+msgid "Only match processes whose controlling terminal is listed. The terminal name should be specified without the \"/dev/\" prefix."
+msgstr "Corresponde apenas os processos cujo terminal controlador está listado. O nome do terminal deve ser especificado sem o prefixo \"/dev/\"."
+
+#. type: TP
+#: pgrep.1:109
+#, no-wrap
+msgid "B<-u>, B<--euid> I,..."
+msgstr "B<-u>, B<--euid> I,..."
+
+#. type: Plain text
+#: pgrep.1:113
+msgid "Only match processes whose effective user ID is listed. Either the numerical or symbolical value may be used."
+msgstr "Corresponde apenas os processos cujo ID de usuário efetivo está listado. Ou o valor numérico ou simbólico pode ser usado."
+
+#. type: TP
+#: pgrep.1:113
+#, no-wrap
+msgid "B<-U>, B<--uid> I,..."
+msgstr "B<-U>, B<--uid> I,..."
+
+#. type: Plain text
+#: pgrep.1:117
+msgid "Only match processes whose real user ID is listed. Either the numerical or symbolical value may be used."
+msgstr "Corresponde apenas os processos cujo ID de usuário real está listado. Ou o valor numérico ou simbólico pode ser usado."
+
+#. type: TP
+#: pgrep.1:117
+#, no-wrap
+msgid "B<-v>, B<--inverse>"
+msgstr "B<-v>, B<--inverse>"
+
+#. type: Plain text
+#: pgrep.1:124
+msgid "Negates the matching. This option is usually used in B's context. In B's context the short option is disabled to avoid accidental usage of the option."
+msgstr "Nega a correspondência. Essa opção geralmente é usada no contexto do B. No contexto do B, a opção curta está desabilitada para evitar uso acidental da opção."
+
+#. type: TP
+#: pgrep.1:124
+#, no-wrap
+msgid "B<-w>, B<--lightweight>"
+msgstr "B<-w>, B<--lightweight>"
+
+#. type: Plain text
+#: pgrep.1:131
+msgid "Shows all thread ids instead of pids in B's context. In B's context this option is disabled."
+msgstr "Mostra todos os IDs de thread em vez dos pids no contexto do B. No contexto do B, essa opção está desabilitada."
+
+#. type: TP
+#: pgrep.1:131
+#, no-wrap
+msgid "B<-x>, B<--exact>"
+msgstr "B<-x>, B<--exact>"
+
+#. type: Plain text
+#: pgrep.1:137
+msgid "Only match processes whose names (or command line if -f is specified) B match the I."
+msgstr "Corresponde apenas a processos cujos nomes (ou linha de comando, se -f for especificado) corresponderem B ao I."
+
+#. type: TP
+#: pgrep.1:137
+#, no-wrap
+msgid "B<-F>, B<--pidfile> I"
+msgstr "B<-F>, B<--pidfile> I"
+
+#. type: Plain text
+#: pgrep.1:145
+msgid "Read I's from file. This option is perhaps more useful for B