Commit 75d9f7dd authored by Jochen Sprickerhof's avatar Jochen Sprickerhof

New upstream version 20180301

parent f055a2a6
...@@ -7,7 +7,6 @@ sadmin/logontime WTFPL-2.0+ ...@@ -7,7 +7,6 @@ sadmin/logontime WTFPL-2.0+
sadmin/hxnetload WTFPL-2.0+ sadmin/hxnetload WTFPL-2.0+
sadmin/ofl WTFPL-2.0+ sadmin/ofl WTFPL-2.0+
sadmin/pmap_dirty WTFPL-2.0+ sadmin/pmap_dirty WTFPL-2.0+
sadmin/printcaps WTFPL-2.0+
sadmin/proc_iomem_count WTFPL-2.0+ sadmin/proc_iomem_count WTFPL-2.0+
sadmin/proc_stat_parse WTFPL-2.0+ sadmin/proc_stat_parse WTFPL-2.0+
sadmin/psthreads GPL-2.0+ sadmin/psthreads GPL-2.0+
......
...@@ -272,7 +272,6 @@ install_sh = @install_sh@ ...@@ -272,7 +272,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
......
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for hxtools 20170430. # Generated by GNU Autoconf 2.69 for hxtools 20180301.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
...@@ -577,8 +577,8 @@ MAKEFLAGS= ...@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='hxtools' PACKAGE_NAME='hxtools'
PACKAGE_TARNAME='hxtools' PACKAGE_TARNAME='hxtools'
PACKAGE_VERSION='20170430' PACKAGE_VERSION='20180301'
PACKAGE_STRING='hxtools 20170430' PACKAGE_STRING='hxtools 20180301'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
...@@ -628,9 +628,6 @@ HAVE_XBRZ_FALSE ...@@ -628,9 +628,6 @@ HAVE_XBRZ_FALSE
HAVE_XBRZ_TRUE HAVE_XBRZ_TRUE
CXXCPP CXXCPP
libdl_LIBS libdl_LIBS
HAVE_LIBCAP_FALSE
HAVE_LIBCAP_TRUE
libcap_LIBS
libxcb_LIBS libxcb_LIBS
libxcb_CFLAGS libxcb_CFLAGS
libpci_LIBS libpci_LIBS
...@@ -1308,7 +1305,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1308,7 +1305,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures hxtools 20170430 to adapt to many kinds of systems. \`configure' configures hxtools 20180301 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1374,7 +1371,7 @@ fi ...@@ -1374,7 +1371,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of hxtools 20170430:";; short | recursive ) echo "Configuration of hxtools 20180301:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1494,7 +1491,7 @@ fi ...@@ -1494,7 +1491,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
hxtools configure 20170430 hxtools configure 20180301
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -2078,7 +2075,7 @@ cat >config.log <<_ACEOF ...@@ -2078,7 +2075,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by hxtools $as_me 20170430, which was It was created by hxtools $as_me 20180301, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -2943,7 +2940,7 @@ fi ...@@ -2943,7 +2940,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='hxtools' PACKAGE='hxtools'
VERSION='20170430' VERSION='20180301'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -5460,71 +5457,6 @@ $as_echo "yes" >&6; } ...@@ -5460,71 +5457,6 @@ $as_echo "yes" >&6; }
$as_echo "#define HAVE_LIBXCB 1" >>confdefs.h $as_echo "#define HAVE_LIBXCB 1" >>confdefs.h
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cap_get_pid" >&5
$as_echo_n "checking for library containing cap_get_pid... " >&6; }
if ${ac_cv_search_cap_get_pid+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char cap_get_pid ();
int
main ()
{
return cap_get_pid ();
;
return 0;
}
_ACEOF
for ac_lib in '' cap; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_cap_get_pid=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_cap_get_pid+:} false; then :
break
fi
done
if ${ac_cv_search_cap_get_pid+:} false; then :
else
ac_cv_search_cap_get_pid=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cap_get_pid" >&5
$as_echo "$ac_cv_search_cap_get_pid" >&6; }
ac_res=$ac_cv_search_cap_get_pid
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
libcap_LIBS="$LIBS"; LIBS=""
fi
if test -n "$libcap_LIBS"; then
HAVE_LIBCAP_TRUE=
HAVE_LIBCAP_FALSE='#'
else
HAVE_LIBCAP_TRUE='#'
HAVE_LIBCAP_FALSE=
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
$as_echo_n "checking for library containing dlopen... " >&6; } $as_echo_n "checking for library containing dlopen... " >&6; }
if ${ac_cv_search_dlopen+:} false; then : if ${ac_cv_search_dlopen+:} false; then :
...@@ -5931,10 +5863,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then ...@@ -5931,10 +5863,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${HAVE_LIBCAP_TRUE}" && test -z "${HAVE_LIBCAP_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LIBCAP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_XBRZ_TRUE}" && test -z "${HAVE_XBRZ_FALSE}"; then if test -z "${HAVE_XBRZ_TRUE}" && test -z "${HAVE_XBRZ_FALSE}"; then
as_fn_error $? "conditional \"HAVE_XBRZ\" was never defined. as_fn_error $? "conditional \"HAVE_XBRZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
...@@ -6336,7 +6264,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -6336,7 +6264,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by hxtools $as_me 20170430, which was This file was extended by hxtools $as_me 20180301, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -6402,7 +6330,7 @@ _ACEOF ...@@ -6402,7 +6330,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
hxtools config.status 20170430 hxtools config.status 20180301
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
AC_INIT([hxtools], [20170430]) AC_INIT([hxtools], [20180301])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL AC_PROG_INSTALL
...@@ -24,9 +24,6 @@ PKG_CHECK_MODULES([libHX], [libHX >= 3.17]) ...@@ -24,9 +24,6 @@ PKG_CHECK_MODULES([libHX], [libHX >= 3.17])
PKG_CHECK_MODULES([libmount], [mount >= 2.19], [AC_DEFINE([HAVE_LIBMOUNT], [1])], [true]) PKG_CHECK_MODULES([libmount], [mount >= 2.19], [AC_DEFINE([HAVE_LIBMOUNT], [1])], [true])
PKG_CHECK_MODULES([libpci], [libpci >= 3], [AC_DEFINE([HAVE_LIBPCI], [1])], [true]) PKG_CHECK_MODULES([libpci], [libpci >= 3], [AC_DEFINE([HAVE_LIBPCI], [1])], [true])
PKG_CHECK_MODULES([libxcb], [xcb >= 1], [AC_DEFINE([HAVE_LIBXCB], [1])], [true]) PKG_CHECK_MODULES([libxcb], [xcb >= 1], [AC_DEFINE([HAVE_LIBXCB], [1])], [true])
AC_SEARCH_LIBS([cap_get_pid], [cap], [libcap_LIBS="$LIBS"; LIBS=""])
AC_SUBST([libcap_LIBS])
AM_CONDITIONAL([HAVE_LIBCAP], [test -n "$libcap_LIBS"])
AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""]) AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
AC_SUBST([libdl_LIBS]) AC_SUBST([libdl_LIBS])
AC_CHECK_FUNCS([splice]) AC_CHECK_FUNCS([splice])
......
...@@ -218,7 +218,6 @@ install_sh = @install_sh@ ...@@ -218,7 +218,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
......
...@@ -38,7 +38,6 @@ dist_man_MANS = \ ...@@ -38,7 +38,6 @@ dist_man_MANS = \
qplay.1 \ qplay.1 \
qtar.1 \ qtar.1 \
pcmdiff.1 \ pcmdiff.1 \
printcaps.8 \
psthreads.1 \ psthreads.1 \
recursive_lower.1 \ recursive_lower.1 \
rezip.1 \ rezip.1 \
......
...@@ -222,7 +222,6 @@ install_sh = @install_sh@ ...@@ -222,7 +222,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
...@@ -291,7 +290,6 @@ dist_man_MANS = \ ...@@ -291,7 +290,6 @@ dist_man_MANS = \
qplay.1 \ qplay.1 \
qtar.1 \ qtar.1 \
pcmdiff.1 \ pcmdiff.1 \
printcaps.8 \
psthreads.1 \ psthreads.1 \
recursive_lower.1 \ recursive_lower.1 \
rezip.1 \ rezip.1 \
......
...@@ -97,8 +97,6 @@ substitutions) ...@@ -97,8 +97,6 @@ substitutions)
.PP .PP
\fBpng2wx.pl\fP(1) \(en transform arbitrary files into C++ files for wxWidgets \fBpng2wx.pl\fP(1) \(en transform arbitrary files into C++ files for wxWidgets
.PP .PP
\fBprintcaps\fP(1) \(en print currently active process capabilities
.PP
\fBproc_iomem_count\fP(1) \(en show MMIO region sizes \fBproc_iomem_count\fP(1) \(en show MMIO region sizes
.PP .PP
\fBproc_stat_signal\fP(1) \(en decode /proc/self/stat for signal status \fBproc_stat_signal\fP(1) \(en decode /proc/self/stat for signal status
......
.TH printcaps 8 "2011-12-14" "hxtools" "hxtools"
.SH Name
.PP
printcaps \(em print capabilities of processes in human-readable fashion
.SH Syntax
.PP
\fBprintcaps\fP [\fIpid\fP...]
.SH Description
.PP
\fBprintcaps\fP outputs the capability sets of one or more processes in a
human-readable tabular fashion. PIDs may be specified to get the sets of
specific processes; if none is given, the current process (i.e. printcaps
itself) will be inspected.
...@@ -222,7 +222,6 @@ install_sh = @install_sh@ ...@@ -222,7 +222,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/fd0ssh /fd0ssh
/ofl /ofl
/parkverbot /parkverbot
/printcaps
/proc_iomem_count /proc_iomem_count
/proc_stat_parse /proc_stat_parse
/psthreads /psthreads
......
...@@ -17,9 +17,6 @@ pkglibexec_PROGRAMS = \ ...@@ -17,9 +17,6 @@ pkglibexec_PROGRAMS = \
proc_stat_parse \ proc_stat_parse \
psthreads \ psthreads \
utmp_register utmp_register
if HAVE_LIBCAP
pkglibexec_PROGRAMS += printcaps
endif
dist_pkglibexec_SCRIPTS = \ dist_pkglibexec_SCRIPTS = \
logontime \ logontime \
...@@ -39,7 +36,6 @@ dist_noinst_SCRIPTS = \ ...@@ -39,7 +36,6 @@ dist_noinst_SCRIPTS = \
clock_info_LDADD = -lrt clock_info_LDADD = -lrt
ofl_LDADD = ${libHX_LIBS} ofl_LDADD = ${libHX_LIBS}
printcaps_LDADD = ${libHX_LIBS} ${libcap_LIBS}
proc_iomem_count_LDADD = ${libHX_LIBS} proc_iomem_count_LDADD = ${libHX_LIBS}
proc_stat_parse_LDADD = ${libHX_LIBS} proc_stat_parse_LDADD = ${libHX_LIBS}
psthreads_LDADD = ${libHX_LIBS} psthreads_LDADD = ${libHX_LIBS}
......
...@@ -82,8 +82,7 @@ POST_UNINSTALL = : ...@@ -82,8 +82,7 @@ POST_UNINSTALL = :
bin_PROGRAMS = clock_info$(EXEEXT) ofl$(EXEEXT) bin_PROGRAMS = clock_info$(EXEEXT) ofl$(EXEEXT)
pkglibexec_PROGRAMS = fd0ssh$(EXEEXT) proc_iomem_count$(EXEEXT) \ pkglibexec_PROGRAMS = fd0ssh$(EXEEXT) proc_iomem_count$(EXEEXT) \
proc_stat_parse$(EXEEXT) psthreads$(EXEEXT) \ proc_stat_parse$(EXEEXT) psthreads$(EXEEXT) \
utmp_register$(EXEEXT) $(am__EXEEXT_1) utmp_register$(EXEEXT)
@HAVE_LIBCAP_TRUE@am__append_1 = printcaps
noinst_PROGRAMS = xfs_irecover$(EXEEXT) noinst_PROGRAMS = xfs_irecover$(EXEEXT)
subdir = sadmin subdir = sadmin
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
...@@ -99,7 +98,6 @@ CONFIG_CLEAN_FILES = ...@@ -99,7 +98,6 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)"
@HAVE_LIBCAP_TRUE@am__EXEEXT_1 = printcaps$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
clock_info_SOURCES = clock_info.c clock_info_SOURCES = clock_info.c
clock_info_OBJECTS = clock_info.$(OBJEXT) clock_info_OBJECTS = clock_info.$(OBJEXT)
...@@ -111,9 +109,6 @@ ofl_SOURCES = ofl.c ...@@ -111,9 +109,6 @@ ofl_SOURCES = ofl.c
ofl_OBJECTS = ofl.$(OBJEXT) ofl_OBJECTS = ofl.$(OBJEXT)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
ofl_DEPENDENCIES = $(am__DEPENDENCIES_1) ofl_DEPENDENCIES = $(am__DEPENDENCIES_1)
printcaps_SOURCES = printcaps.c
printcaps_OBJECTS = printcaps.$(OBJEXT)
printcaps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
proc_iomem_count_SOURCES = proc_iomem_count.c proc_iomem_count_SOURCES = proc_iomem_count.c
proc_iomem_count_OBJECTS = proc_iomem_count.$(OBJEXT) proc_iomem_count_OBJECTS = proc_iomem_count.$(OBJEXT)
proc_iomem_count_DEPENDENCIES = $(am__DEPENDENCIES_1) proc_iomem_count_DEPENDENCIES = $(am__DEPENDENCIES_1)
...@@ -186,11 +181,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) ...@@ -186,11 +181,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 = am__v_CCLD_1 =
SOURCES = clock_info.c fd0ssh.c ofl.c printcaps.c proc_iomem_count.c \ SOURCES = clock_info.c fd0ssh.c ofl.c proc_iomem_count.c \
proc_stat_parse.c psthreads.c utmp_register.c xfs_irecover.c
DIST_SOURCES = clock_info.c fd0ssh.c ofl.c proc_iomem_count.c \
proc_stat_parse.c psthreads.c utmp_register.c xfs_irecover.c proc_stat_parse.c psthreads.c utmp_register.c xfs_irecover.c
DIST_SOURCES = clock_info.c fd0ssh.c ofl.c printcaps.c \
proc_iomem_count.c proc_stat_parse.c psthreads.c \
utmp_register.c xfs_irecover.c
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \ n|no|NO) false;; \
...@@ -295,7 +289,6 @@ install_sh = @install_sh@ ...@@ -295,7 +289,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
...@@ -347,7 +340,6 @@ dist_noinst_SCRIPTS = \ ...@@ -347,7 +340,6 @@ dist_noinst_SCRIPTS = \
clock_info_LDADD = -lrt clock_info_LDADD = -lrt
ofl_LDADD = ${libHX_LIBS} ofl_LDADD = ${libHX_LIBS}
printcaps_LDADD = ${libHX_LIBS} ${libcap_LIBS}
proc_iomem_count_LDADD = ${libHX_LIBS} proc_iomem_count_LDADD = ${libHX_LIBS}
proc_stat_parse_LDADD = ${libHX_LIBS} proc_stat_parse_LDADD = ${libHX_LIBS}
psthreads_LDADD = ${libHX_LIBS} psthreads_LDADD = ${libHX_LIBS}
...@@ -487,10 +479,6 @@ ofl$(EXEEXT): $(ofl_OBJECTS) $(ofl_DEPENDENCIES) $(EXTRA_ofl_DEPENDENCIES) ...@@ -487,10 +479,6 @@ ofl$(EXEEXT): $(ofl_OBJECTS) $(ofl_DEPENDENCIES) $(EXTRA_ofl_DEPENDENCIES)
@rm -f ofl$(EXEEXT) @rm -f ofl$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ofl_OBJECTS) $(ofl_LDADD) $(LIBS) $(AM_V_CCLD)$(LINK) $(ofl_OBJECTS) $(ofl_LDADD) $(LIBS)
printcaps$(EXEEXT): $(printcaps_OBJECTS) $(printcaps_DEPENDENCIES) $(EXTRA_printcaps_DEPENDENCIES)
@rm -f printcaps$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(printcaps_OBJECTS) $(printcaps_LDADD) $(LIBS)
proc_iomem_count$(EXEEXT): $(proc_iomem_count_OBJECTS) $(proc_iomem_count_DEPENDENCIES) $(EXTRA_proc_iomem_count_DEPENDENCIES) proc_iomem_count$(EXEEXT): $(proc_iomem_count_OBJECTS) $(proc_iomem_count_DEPENDENCIES) $(EXTRA_proc_iomem_count_DEPENDENCIES)
@rm -f proc_iomem_count$(EXEEXT) @rm -f proc_iomem_count$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(proc_iomem_count_OBJECTS) $(proc_iomem_count_LDADD) $(LIBS) $(AM_V_CCLD)$(LINK) $(proc_iomem_count_OBJECTS) $(proc_iomem_count_LDADD) $(LIBS)
...@@ -590,7 +578,6 @@ distclean-compile: ...@@ -590,7 +578,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clock_info.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clock_info.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd0ssh.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd0ssh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printcaps.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc_iomem_count.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc_iomem_count.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc_stat_parse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc_stat_parse.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psthreads.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psthreads.Po@am__quote@
......
/*
* Print current process capabilities in human-readable fashion
* written by Jan Engelhardt, 2011
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the WTF Public License version 2 or
* (at your option) any later version.
*/
#include <sys/types.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libHX/defs.h>
#include <libHX/init.h>
#include <libHX/string.h>
#undef _POSIX_SOURCE
#include <sys/capability.h>
static const char *const cap_names[] = {
#define E(x) [CAP_##x] = #x
E(CHOWN),
E(DAC_OVERRIDE),
E(DAC_READ_SEARCH),
E(FOWNER),
E(FSETID),
E(KILL),
E(SETGID),
E(SETUID),
E(SETPCAP),
E(LINUX_IMMUTABLE),
E(NET_BIND_SERVICE),
E(NET_BROADCAST),
E(NET_ADMIN),
E(NET_RAW),
E(IPC_LOCK),
E(IPC_OWNER),
E(SYS_MODULE),
E(SYS_RAWIO),
E(SYS_CHROOT),
E(SYS_PTRACE),
E(SYS_PACCT),
E(SYS_ADMIN),
E(SYS_BOOT),
E(SYS_NICE),
E(SYS_RESOURCE),
E(SYS_TIME),
E(SYS_TTY_CONFIG),
E(MKNOD),
E(LEASE),
E(AUDIT_WRITE),
E(AUDIT_CONTROL),
#ifdef CAP_SETFCAP
E(SETFCAP),
#endif
#ifdef CAP_MAC_OVERRIDE
E(MAC_OVERRIDE),
#endif
#ifdef CAP_MAC_ADMIN
E(MAC_ADMIN),
#endif
#ifdef CAP_SYSLOG
E(SYSLOG),
#endif
#ifdef CAP_WAKE_ALARM
E(WAKE_ALARM),
#endif
#ifdef CAP_BLOCK_SUSPEND
E(BLOCK_SUSPEND),
#endif
#undef E
};
static int print_caps(cap_t data)
{
cap_flag_value_t value;
unsigned int i, j;
printf("%-20s %s %s %s %-20s %s %s %s\n", "", "EFF", "PRM", "INH",
"", "EFF", "PRM", "INH");
for (i = 0; i < (ARRAY_SIZE(cap_names) + 1) / 2; ++i) {
j = i + ARRAY_SIZE(cap_names) / 2;
printf("%-20s ", cap_names[i]);
cap_get_flag(data, i, CAP_EFFECTIVE, &value);
printf(" %s ", (value == CAP_SET) ? "X" : ".");
cap_get_flag(data, i, CAP_PERMITTED, &value);
printf(" %s ", (value == CAP_SET) ? "X" : ".");
cap_get_flag(data, i, CAP_INHERITABLE, &value);
printf(" %s ", (value == CAP_SET) ? "X" : ".");
if (j < ARRAY_SIZE(cap_names)) {
printf("%-20s ", cap_names[j]);
cap_get_flag(data, j, CAP_EFFECTIVE, &value);
printf(" %s ", (value == CAP_SET) ? "X" : ".");
cap_get_flag(data, j, CAP_PERMITTED, &value);
printf(" %s ", (value == CAP_SET) ? "X" : ".");
cap_get_flag(data, j, CAP_INHERITABLE, &value);
printf(" %s", (value == CAP_SET) ? "X" : ".");
}
printf("\n");
}
cap_free(data);
return EXIT_SUCCESS;
}
static int r_current(void)
{
cap_t data;
data = cap_get_proc();
print_caps(data);
return EXIT_SUCCESS;
}
static int r_show(unsigned int pid)
{
cap_t data;
data = cap_get_pid(pid);
print_caps(data);
return EXIT_SUCCESS;
}
int main(int argc, const char **argv)
{
int ret;
if ((ret = HX_init()) < 0) {
fprintf(stderr, "%s\n", strerror(-ret));
return EXIT_FAILURE;
}
if (argc == 1)
ret = r_current();
else
while (*++argv != NULL)
ret |= r_show(strtoul(*argv, NULL, 0));
HX_exit();
return ret;
}
...@@ -284,7 +284,6 @@ install_sh = @install_sh@ ...@@ -284,7 +284,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
......
...@@ -32,7 +32,7 @@ sub process_generic ...@@ -32,7 +32,7 @@ sub process_generic
if ($s->{sectype} eq "shell") { if ($s->{sectype} eq "shell") {
# Undo crimes on shell vars # Undo crimes on shell vars
s<\${($IDNAME)}$VSTOP> <\$$1>g; s<\$\{($IDNAME)\}$VSTOP> <\$$1>g;
# Shell variables to RPM macros # Shell variables to RPM macros
#s<\$RPM_SOURCE_DIR> <\%_sourcedir>g; #s<\$RPM_SOURCE_DIR> <\%_sourcedir>g;
...@@ -121,7 +121,7 @@ sub process_generic ...@@ -121,7 +121,7 @@ sub process_generic
foreach my $re (qw(centos debian fedora mandrive meego rhel foreach my $re (qw(centos debian fedora mandrive meego rhel
sles suse ubuntu)) sles suse ubuntu))
{ {
s<\%\{${re}_version\}><0\%{?${re}_version}>g; s<\%\{${re}_version\}><0\%\{?${re}_version}>g;
} }
# Undo crimes on RPM macros # Undo crimes on RPM macros
......
...@@ -232,7 +232,6 @@ install_sh = @install_sh@ ...@@ -232,7 +232,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
......
...@@ -302,7 +302,6 @@ install_sh = @install_sh@ ...@@ -302,7 +302,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@ kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@ libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@ libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@ libdir = @libdir@
libdl_LIBS = @libdl_LIBS@ libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
......
...@@ -34,6 +34,7 @@ sub main ...@@ -34,6 +34,7 @@ sub main
sub moov_one_file sub moov_one_file
{ {
my $input = shift @_; my $input = shift @_;
my($ext) = ($input =~ m{(\.[^\.]+)$});
local(*CIN, *COUT); local(*CIN, *COUT);
my @args = ("ffmpeg", "-i", $input, "-acodec", "copy"); my @args = ("ffmpeg", "-i", $input, "-acodec", "copy");
push(@args, $strip_video ? "-vn" : ("-vcodec", "copy")); push(@args, $strip_video ? "-vn" : ("-vcodec", "copy"));
...@@ -43,7 +44,7 @@ sub moov_one_file ...@@ -43,7 +44,7 @@ sub moov_one_file
} }
} }
my $tmpfile = "~\$~$$.moov.mp4"; my $tmpfile = "~\$~$$.moov$ext";
# must be in same filesystem for rename() to succeed, so don't use /tmp # must be in same filesystem for rename() to succeed, so don't use /tmp
my @targs = ("-moov_size", 4, "-y", $tmpfile); my @targs = ("-moov_size", 4, "-y", $tmpfile);
print STDERR "*** Running ", join(" ", @args, @targs), "\n";