...
 
Commits (9)
......@@ -7,7 +7,6 @@ sadmin/logontime WTFPL-2.0+
sadmin/hxnetload WTFPL-2.0+
sadmin/ofl WTFPL-2.0+
sadmin/pmap_dirty WTFPL-2.0+
sadmin/printcaps WTFPL-2.0+
sadmin/proc_iomem_count WTFPL-2.0+
sadmin/proc_stat_parse WTFPL-2.0+
sadmin/psthreads GPL-2.0+
......
......@@ -272,7 +272,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......
#! /bin/sh
# 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.
......@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='hxtools'
PACKAGE_TARNAME='hxtools'
PACKAGE_VERSION='20170430'
PACKAGE_STRING='hxtools 20170430'
PACKAGE_VERSION='20180301'
PACKAGE_STRING='hxtools 20180301'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -628,9 +628,6 @@ HAVE_XBRZ_FALSE
HAVE_XBRZ_TRUE
CXXCPP
libdl_LIBS
HAVE_LIBCAP_FALSE
HAVE_LIBCAP_TRUE
libcap_LIBS
libxcb_LIBS
libxcb_CFLAGS
libpci_LIBS
......@@ -1308,7 +1305,7 @@ if test "$ac_init_help" = "long"; then
# 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 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]...
......@@ -1374,7 +1371,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of hxtools 20170430:";;
short | recursive ) echo "Configuration of hxtools 20180301:";;
esac
cat <<\_ACEOF
......@@ -1494,7 +1491,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
hxtools configure 20170430
hxtools configure 20180301
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2078,7 +2075,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
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
$ $0 $@
......@@ -2943,7 +2940,7 @@ fi
# Define the identity of the package.
PACKAGE='hxtools'
VERSION='20170430'
VERSION='20180301'
cat >>confdefs.h <<_ACEOF
......@@ -5460,71 +5457,6 @@ $as_echo "yes" >&6; }
$as_echo "#define HAVE_LIBXCB 1" >>confdefs.h
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_n "checking for library containing dlopen... " >&6; }
if ${ac_cv_search_dlopen+:} 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.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
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
as_fn_error $? "conditional \"HAVE_XBRZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
......@@ -6336,7 +6264,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
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
CONFIG_FILES = $CONFIG_FILES
......@@ -6402,7 +6330,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
hxtools config.status 20170430
hxtools config.status 20180301
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_INIT([hxtools], [20170430])
AC_INIT([hxtools], [20180301])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL
......@@ -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([libpci], [libpci >= 3], [AC_DEFINE([HAVE_LIBPCI], [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_SUBST([libdl_LIBS])
AC_CHECK_FUNCS([splice])
......
......@@ -218,7 +218,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......
hxtools (20180301-1) unstable; urgency=medium
* Remove unneeded with autotools_dev (fix lintian warning)
* Update Vcs URLs to salsa.d.o
* Move cleanup to d/clean
* Update signing key and decompress before checking signature
* New upstream version 20180301
* Rebase patch
* Enable R³
* Bum standards and debhelper versions (no changes)
* Remove autotools-dev dependency
* Add patch to fix typos
-- Jochen Sprickerhof <jspricke@debian.org> Sat, 31 Mar 2018 11:28:29 +0200
hxtools (20170430-1) unstable; urgency=medium
* New upstream version 20170430
......
......@@ -2,8 +2,9 @@ Source: hxtools
Section: utils
Priority: optional
Maintainer: Jochen Sprickerhof <jspricke@debian.org>
Build-Depends: debhelper (>= 10), autotools-dev, pkg-config, libhx-dev
Standards-Version: 4.0.0
Build-Depends: debhelper (>= 11), pkg-config, libhx-dev
Standards-Version: 4.1.3
Rules-Requires-Root: no
Homepage: http://inai.de/projects/hxtools/
Vcs-Git: https://salsa.debian.org/debian/hxtools.git
Vcs-Browser: https://salsa.debian.org/debian/hxtools
......
......@@ -5,11 +5,11 @@ Subject: Drop some tools
---
Makefile.am | 2 +-
doc/Makefile.am | 18 +-----------------
sadmin/Makefile.am | 6 +++---
sadmin/Makefile.am | 4 ++--
sdevel/Makefile.am | 12 ++----------
smm/Makefile.am | 9 ++-------
suser/Makefile.am | 12 ++----------
6 files changed, 11 insertions(+), 48 deletions(-)
6 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6acdd77..d2bd616 100644
......@@ -25,7 +25,7 @@ index 6acdd77..d2bd616 100644
tmpdir := $(shell mktemp -dtu)
packer = xz
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a8c2b5b..21b71ed 100644
index 7615ad8..b0b08e9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,28 +9,16 @@ dist_man_MANS = \
......@@ -57,7 +57,7 @@ index a8c2b5b..21b71ed 100644
ofl.1 \
pegrep.1 \
peicon.1 \
@@ -47,11 +35,7 @@ dist_man_MANS = \
@@ -46,11 +34,7 @@ dist_man_MANS = \
spec-beautifier.1 \
ssa2srt.1 \
stxdb.1 \
......@@ -71,10 +71,10 @@ index a8c2b5b..21b71ed 100644
- xfs_irecover.8
+ wktimer.1
diff --git a/sadmin/Makefile.am b/sadmin/Makefile.am
index b2834ae..f8c3ee7 100644
index 7905782..c8ddcaf 100644
--- a/sadmin/Makefile.am
+++ b/sadmin/Makefile.am
@@ -11,17 +11,17 @@ dist_bin_SCRIPTS = \
@@ -11,14 +11,14 @@ dist_bin_SCRIPTS = \
pmap_dirty \
su1
......@@ -85,10 +85,6 @@ index b2834ae..f8c3ee7 100644
proc_stat_parse \
psthreads \
utmp_register
if HAVE_LIBCAP
-pkglibexec_PROGRAMS += printcaps
+bin_PROGRAMS += printcaps
endif
-dist_pkglibexec_SCRIPTS = \
+dist_bin_SCRIPTS += \
......
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 31 Mar 2018 11:27:38 +0200
Subject: Fix typos
---
doc/bin2c.1 | 2 +-
doc/pcmdiff.1 | 2 +-
doc/vfontas.1 | 2 +-
sadmin/fd0ssh.c | 2 +-
smm/qplay.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/bin2c.1 b/doc/bin2c.1
index 2cef2f8..c99428f 100644
--- a/doc/bin2c.1
+++ b/doc/bin2c.1
@@ -1,4 +1,4 @@
-.TH bin2c "2013-09-29" "hxtools" "hxtools"
+.TH bin2c 1 "2013-09-29" "hxtools" "hxtools"
.SH Name
.PP
bin2c \(em embed data files into C as variables
diff --git a/doc/pcmdiff.1 b/doc/pcmdiff.1
index e53a0ac..1042cff 100644
--- a/doc/pcmdiff.1
+++ b/doc/pcmdiff.1
@@ -8,7 +8,7 @@ pcmdiff \(em proof-of-concept raw PCM deltifier
.SH Description
.PP
pcmdiff will compute the arithmetic difference between the raw PCM files
-\fIfile1\fP and \fIfile2\fP and write it to stdout. This allows to make the
+\fIfile1\fP and \fIfile2\fP and write it to stdout. This allows one to make the
degradation that inherently comes with lossy audio formats, audible.
.SH Examples
.PP
diff --git a/doc/vfontas.1 b/doc/vfontas.1
index ca476ac..bac79b1 100644
--- a/doc/vfontas.1
+++ b/doc/vfontas.1
@@ -24,7 +24,7 @@ Convert a raw 8x16 FNT file from stdin to a 9x16 PSF2 suitable for fbdev, while
extending the 8th column to the 9th column like the PC VGA BIOS mode 01h does.
.TP
\fB\-W\fP
-Convert a raw 8x16 FNT file from stdin to a 16x16 PSF2, mimicing 40x25 text
+Convert a raw 8x16 FNT file from stdin to a 16x16 PSF2, mimicking 40x25 text
mode on a 80x25 display.
.TP
\fB\-c\fP, \fB\-\-create\fP
diff --git a/sadmin/fd0ssh.c b/sadmin/fd0ssh.c
index 83f56dc..cab803b 100644
--- a/sadmin/fd0ssh.c
+++ b/sadmin/fd0ssh.c
@@ -114,7 +114,7 @@ static int zerossh_setup(int argc, const char **argv)
/*
* Making the writer a subprocess makes for a very compact memory
- * usage, allows to use no special signal setup, and even both
+ * usage, allows one to use no special signal setup, and even both
* interactive and non-interactive work as expected, that is, if
* mount.fuse detaches, so does the pipe writer with it.
*/
diff --git a/smm/qplay.c b/smm/qplay.c
index 965dfec..937b536 100644
--- a/smm/qplay.c
+++ b/smm/qplay.c
@@ -301,7 +301,7 @@ static void parse_str(const char *ptr)
ptr += parse_arg_x(ptr);
break;
default:
- fprintf(stderr, "** Unkown command ignored: %c\n", *ptr);
+ fprintf(stderr, "** Unknown command ignored: %c\n", *ptr);
break;
}
}
0001-Drop-some-tools.patch
0002-Fix-typos.patch
......@@ -23,63 +23,74 @@ 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
cCAy
=ePMx
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
j8TiTqBylSuM7O+Ps0s3cCAy
=lMsl
-----END PGP PUBLIC KEY BLOCK-----
version=4
opts="pgpsigurlmangle=s%.xz$%.asc%" http://jftp.inai.de/hxtools/ \
opts="pgpsigurlmangle=s%.xz$%.asc%,decompress" http://jftp.inai.de/hxtools/ \
hxtools-([\d\.]+)\.tar\.xz debian
......@@ -38,7 +38,6 @@ dist_man_MANS = \
qplay.1 \
qtar.1 \
pcmdiff.1 \
printcaps.8 \
psthreads.1 \
recursive_lower.1 \
rezip.1 \
......
......@@ -222,7 +222,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......@@ -291,7 +290,6 @@ dist_man_MANS = \
qplay.1 \
qtar.1 \
pcmdiff.1 \
printcaps.8 \
psthreads.1 \
recursive_lower.1 \
rezip.1 \
......
......@@ -97,8 +97,6 @@ substitutions)
.PP
\fBpng2wx.pl\fP(1) \(en transform arbitrary files into C++ files for wxWidgets
.PP
\fBprintcaps\fP(1) \(en print currently active process capabilities
.PP
\fBproc_iomem_count\fP(1) \(en show MMIO region sizes
.PP
\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@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......
......@@ -2,7 +2,6 @@
/fd0ssh
/ofl
/parkverbot
/printcaps
/proc_iomem_count
/proc_stat_parse
/psthreads
......
......@@ -17,9 +17,6 @@ pkglibexec_PROGRAMS = \
proc_stat_parse \
psthreads \
utmp_register
if HAVE_LIBCAP
pkglibexec_PROGRAMS += printcaps
endif
dist_pkglibexec_SCRIPTS = \
logontime \
......@@ -39,7 +36,6 @@ dist_noinst_SCRIPTS = \
clock_info_LDADD = -lrt
ofl_LDADD = ${libHX_LIBS}
printcaps_LDADD = ${libHX_LIBS} ${libcap_LIBS}
proc_iomem_count_LDADD = ${libHX_LIBS}
proc_stat_parse_LDADD = ${libHX_LIBS}
psthreads_LDADD = ${libHX_LIBS}
......
......@@ -82,8 +82,7 @@ POST_UNINSTALL = :
bin_PROGRAMS = clock_info$(EXEEXT) ofl$(EXEEXT)
pkglibexec_PROGRAMS = fd0ssh$(EXEEXT) proc_iomem_count$(EXEEXT) \
proc_stat_parse$(EXEEXT) psthreads$(EXEEXT) \
utmp_register$(EXEEXT) $(am__EXEEXT_1)
@HAVE_LIBCAP_TRUE@am__append_1 = printcaps
utmp_register$(EXEEXT)
noinst_PROGRAMS = xfs_irecover$(EXEEXT)
subdir = sadmin
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
......@@ -99,7 +98,6 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)"
@HAVE_LIBCAP_TRUE@am__EXEEXT_1 = printcaps$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
clock_info_SOURCES = clock_info.c
clock_info_OBJECTS = clock_info.$(OBJEXT)
......@@ -111,9 +109,6 @@ ofl_SOURCES = ofl.c
ofl_OBJECTS = ofl.$(OBJEXT)
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_OBJECTS = proc_iomem_count.$(OBJEXT)
proc_iomem_count_DEPENDENCIES = $(am__DEPENDENCIES_1)
......@@ -186,11 +181,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
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
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 = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -295,7 +289,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......@@ -347,7 +340,6 @@ dist_noinst_SCRIPTS = \
clock_info_LDADD = -lrt
ofl_LDADD = ${libHX_LIBS}
printcaps_LDADD = ${libHX_LIBS} ${libcap_LIBS}
proc_iomem_count_LDADD = ${libHX_LIBS}
proc_stat_parse_LDADD = ${libHX_LIBS}
psthreads_LDADD = ${libHX_LIBS}
......@@ -487,10 +479,6 @@ ofl$(EXEEXT): $(ofl_OBJECTS) $(ofl_DEPENDENCIES) $(EXTRA_ofl_DEPENDENCIES)
@rm -f ofl$(EXEEXT)
$(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)
@rm -f proc_iomem_count$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(proc_iomem_count_OBJECTS) $(proc_iomem_count_LDADD) $(LIBS)
......@@ -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)/fd0ssh.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_stat_parse.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@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......
......@@ -32,7 +32,7 @@ sub process_generic
if ($s->{sectype} eq "shell") {
# Undo crimes on shell vars
s<\${($IDNAME)}$VSTOP> <\$$1>g;
s<\$\{($IDNAME)\}$VSTOP> <\$$1>g;
# Shell variables to RPM macros
#s<\$RPM_SOURCE_DIR> <\%_sourcedir>g;
......@@ -121,7 +121,7 @@ sub process_generic
foreach my $re (qw(centos debian fedora mandrive meego rhel
sles suse ubuntu))
{
s<\%\{${re}_version\}><0\%{?${re}_version}>g;
s<\%\{${re}_version\}><0\%\{?${re}_version}>g;
}
# Undo crimes on RPM macros
......
......@@ -232,7 +232,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......
......@@ -302,7 +302,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......
......@@ -34,6 +34,7 @@ sub main
sub moov_one_file
{
my $input = shift @_;
my($ext) = ($input =~ m{(\.[^\.]+)$});
local(*CIN, *COUT);
my @args = ("ffmpeg", "-i", $input, "-acodec", "copy");
push(@args, $strip_video ? "-vn" : ("-vcodec", "copy"));
......@@ -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
my @targs = ("-moov_size", 4, "-y", $tmpfile);
print STDERR "*** Running ", join(" ", @args, @targs), "\n";
......
......@@ -272,7 +272,6 @@ install_sh = @install_sh@
kbddatadir = @kbddatadir@
libHX_CFLAGS = @libHX_CFLAGS@
libHX_LIBS = @libHX_LIBS@
libcap_LIBS = @libcap_LIBS@
libdir = @libdir@
libdl_LIBS = @libdl_LIBS@
libexecdir = @libexecdir@
......