Hello community, here is the log from the commit of package hxtools for openSUSE:Factory checked in at 2018-03-09 10:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hxtools (Old) and /work/SRC/openSUSE:Factory/.hxtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hxtools" Fri Mar 9 10:44:22 2018 rev:34 rq:584114 version:20180301 Changes: -------- --- /work/SRC/openSUSE:Factory/hxtools/hxtools.changes 2017-05-03 15:58:46.190845107 +0200 +++ /work/SRC/openSUSE:Factory/.hxtools.new/hxtools.changes 2018-03-09 10:44:24.667399928 +0100 @@ -1,0 +2,7 @@ +Thu Mar 1 14:17:25 UTC 2018 - [email protected] + +- Update to new upstream release 20180301 + * aumeta: handle containers other than mp4 + * spec-beautifier: escape { in regexes for Perl 5.26 fitness + +------------------------------------------------------------------- Old: ---- hxtools-20170430.tar.asc hxtools-20170430.tar.xz New: ---- hxtools-20180301.tar.asc hxtools-20180301.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hxtools.spec ++++++ --- /var/tmp/diff_new_pack.iTlz1t/_old 2018-03-09 10:44:25.611365929 +0100 +++ /var/tmp/diff_new_pack.iTlz1t/_new 2018-03-09 10:44:25.611365929 +0100 @@ -17,7 +17,7 @@ Name: hxtools -Version: 20170430 +Version: 20180301 Release: 0 Summary: Collection of day-to-day tools (binaries) License: GPL-2.0+ and WTFPL @@ -27,8 +27,6 @@ Source: http://jftp.inai.de/hxtools/%name-%version.tar.xz Source2: http://jftp.inai.de/hxtools/%name-%version.tar.asc Source3: %name.keyring -# This package has a "Upstream First" policy for patches. -# See https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines BuildRequires: bdftopcf BuildRequires: fdupes BuildRequires: gcc-c++ @@ -164,27 +162,25 @@ %build %configure -make %{?_smp_mflags}; +make %{?_smp_mflags} %install -o="$PWD"; -b="%buildroot"; -make install DESTDIR="$b"; - +%make_install +b="%buildroot" mv "$b/%_bindir/rot13" "$b/%_libexecdir/%name/" -install -dm0755 "$b/%_datadir/mc/syntax"; -install -pm0644 cooledit/*.syntax "$b/%_datadir/mc/syntax/"; -install -dm0755 "$b/%_sysconfdir/openldap/schema"; +install -dm0755 "$b/%_datadir/mc/syntax" +install -pm0644 cooledit/*.syntax "$b/%_datadir/mc/syntax/" +install -dm0755 "$b/%_sysconfdir/openldap/schema" ln -s "%_datadir/hxtools/rfc2307bis-utf8.schema" \ - "$b/%_sysconfdir/openldap/schema/"; + "$b/%_sysconfdir/openldap/schema/" %if 0%{?build_profile} -mkdir -p "$b/%_sysconfdir/bashrc.d"; -ln -s "%_datadir/%name/hxtools_bashrc.bash" "$b/%_sysconfdir/bashrc.d/"; -mkdir -p "$b/%_sysconfdir/profile.d"; -ln -s "%_datadir/%name/hxtools_profile.bash" "$b/%_sysconfdir/profile.d/z_hxtools_profile.sh"; +mkdir -p "$b/%_sysconfdir/bashrc.d" +ln -s "%_datadir/%name/hxtools_bashrc.bash" "$b/%_sysconfdir/bashrc.d/" +mkdir -p "$b/%_sysconfdir/profile.d" +ln -s "%_datadir/%name/hxtools_profile.bash" "$b/%_sysconfdir/profile.d/z_hxtools_profile.sh" %else -rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*; +rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx* %endif %fdupes %buildroot/%_prefix @@ -205,7 +201,6 @@ %hldir/clt2pbm %hldir/pcmdiff %hldir/peicon -%hldir/printcaps %hldir/proc_iomem_count %hldir/proc_stat_parse %hldir/psthreads ++++++ hxtools-20170430.tar.xz -> hxtools-20180301.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/LICENSES.txt new/hxtools-20180301/LICENSES.txt --- old/hxtools-20170430/LICENSES.txt 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/LICENSES.txt 2018-03-01 15:24:49.000000000 +0100 @@ -7,7 +7,6 @@ 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+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/Makefile.in new/hxtools-20180301/Makefile.in --- old/hxtools-20170430/Makefile.in 2017-04-30 12:19:53.087933625 +0200 +++ new/hxtools-20180301/Makefile.in 2018-03-01 15:25:01.327891911 +0100 @@ -272,7 +272,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/configure new/hxtools-20180301/configure --- old/hxtools-20170430/configure 2017-04-30 12:19:52.487934081 +0200 +++ new/hxtools-20180301/configure 2018-03-01 15:25:00.739891774 +0100 @@ -1,6 +1,6 @@ #! /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 @@ # 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_TRUE CXXCPP libdl_LIBS -HAVE_LIBCAP_FALSE -HAVE_LIBCAP_TRUE -libcap_LIBS libxcb_LIBS libxcb_CFLAGS libpci_LIBS @@ -1308,7 +1305,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 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 @@ 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 @@ 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 @@ 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 @@ # Define the identity of the package. PACKAGE='hxtools' - VERSION='20170430' + VERSION='20180301' cat >>confdefs.h <<_ACEOF @@ -5460,71 +5457,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 @@ 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 @@ # 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 @@ 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\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/configure.ac new/hxtools-20180301/configure.ac --- old/hxtools-20170430/configure.ac 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/configure.ac 2018-03-01 15:24:49.000000000 +0100 @@ -1,4 +1,4 @@ -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([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]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/data/Makefile.in new/hxtools-20180301/data/Makefile.in --- old/hxtools-20170430/data/Makefile.in 2017-04-30 12:19:53.103933613 +0200 +++ new/hxtools-20180301/data/Makefile.in 2018-03-01 15:25:01.343891915 +0100 @@ -218,7 +218,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/doc/Makefile.am new/hxtools-20180301/doc/Makefile.am --- old/hxtools-20170430/doc/Makefile.am 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/doc/Makefile.am 2018-03-01 15:24:49.000000000 +0100 @@ -38,7 +38,6 @@ qplay.1 \ qtar.1 \ pcmdiff.1 \ - printcaps.8 \ psthreads.1 \ recursive_lower.1 \ rezip.1 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/doc/Makefile.in new/hxtools-20180301/doc/Makefile.in --- old/hxtools-20170430/doc/Makefile.in 2017-04-30 12:19:53.123933598 +0200 +++ new/hxtools-20180301/doc/Makefile.in 2018-03-01 15:25:01.363891919 +0100 @@ -222,7 +222,6 @@ 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 @@ qplay.1 \ qtar.1 \ pcmdiff.1 \ - printcaps.8 \ psthreads.1 \ recursive_lower.1 \ rezip.1 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/doc/hxtools.7 new/hxtools-20180301/doc/hxtools.7 --- old/hxtools-20170430/doc/hxtools.7 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/doc/hxtools.7 2018-03-01 15:24:49.000000000 +0100 @@ -97,8 +97,6 @@ .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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/doc/printcaps.8 new/hxtools-20180301/doc/printcaps.8 --- old/hxtools-20170430/doc/printcaps.8 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/doc/printcaps.8 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -.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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/kbd/Makefile.in new/hxtools-20180301/kbd/Makefile.in --- old/hxtools-20170430/kbd/Makefile.in 2017-04-30 12:19:53.147933579 +0200 +++ new/hxtools-20180301/kbd/Makefile.in 2018-03-01 15:25:01.383891925 +0100 @@ -222,7 +222,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/sadmin/.gitignore new/hxtools-20180301/sadmin/.gitignore --- old/hxtools-20170430/sadmin/.gitignore 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/sadmin/.gitignore 2018-03-01 15:24:49.000000000 +0100 @@ -2,7 +2,6 @@ /fd0ssh /ofl /parkverbot -/printcaps /proc_iomem_count /proc_stat_parse /psthreads diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/sadmin/Makefile.am new/hxtools-20180301/sadmin/Makefile.am --- old/hxtools-20170430/sadmin/Makefile.am 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/sadmin/Makefile.am 2018-03-01 15:24:49.000000000 +0100 @@ -17,9 +17,6 @@ proc_stat_parse \ psthreads \ utmp_register -if HAVE_LIBCAP -pkglibexec_PROGRAMS += printcaps -endif dist_pkglibexec_SCRIPTS = \ logontime \ @@ -39,7 +36,6 @@ 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} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/sadmin/Makefile.in new/hxtools-20180301/sadmin/Makefile.in --- old/hxtools-20170430/sadmin/Makefile.in 2017-04-30 12:19:53.187933549 +0200 +++ new/hxtools-20180301/sadmin/Makefile.in 2018-03-01 15:25:01.419891933 +0100 @@ -82,8 +82,7 @@ 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_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_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_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 @@ 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 @@ 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 @@ @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 @@ @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@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/sadmin/printcaps.c new/hxtools-20180301/sadmin/printcaps.c --- old/hxtools-20170430/sadmin/printcaps.c 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/sadmin/printcaps.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -/* - * 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; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/sdevel/Makefile.in new/hxtools-20180301/sdevel/Makefile.in --- old/hxtools-20170430/sdevel/Makefile.in 2017-04-30 12:19:53.219933524 +0200 +++ new/hxtools-20180301/sdevel/Makefile.in 2018-03-01 15:25:01.447891939 +0100 @@ -284,7 +284,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/sdevel/spec-beautifier new/hxtools-20180301/sdevel/spec-beautifier --- old/hxtools-20170430/sdevel/spec-beautifier 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/sdevel/spec-beautifier 2018-03-01 15:24:49.000000000 +0100 @@ -32,7 +32,7 @@ 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 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/smath/Makefile.in new/hxtools-20180301/smath/Makefile.in --- old/hxtools-20170430/smath/Makefile.in 2017-04-30 12:19:53.243933507 +0200 +++ new/hxtools-20180301/smath/Makefile.in 2018-03-01 15:25:01.471891946 +0100 @@ -232,7 +232,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/smm/Makefile.in new/hxtools-20180301/smm/Makefile.in --- old/hxtools-20170430/smm/Makefile.in 2017-04-30 12:19:53.283933476 +0200 +++ new/hxtools-20180301/smm/Makefile.in 2018-03-01 15:25:01.507891954 +0100 @@ -302,7 +302,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/smm/aumeta new/hxtools-20180301/smm/aumeta --- old/hxtools-20170430/smm/aumeta 2017-04-30 12:17:42.000000000 +0200 +++ new/hxtools-20180301/smm/aumeta 2018-03-01 15:24:49.000000000 +0100 @@ -34,6 +34,7 @@ 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 @@ } } - 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"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20170430/suser/Makefile.in new/hxtools-20180301/suser/Makefile.in --- old/hxtools-20170430/suser/Makefile.in 2017-04-30 12:19:53.311933455 +0200 +++ new/hxtools-20180301/suser/Makefile.in 2018-03-01 15:25:01.535891961 +0100 @@ -272,7 +272,6 @@ kbddatadir = @kbddatadir@ libHX_CFLAGS = @libHX_CFLAGS@ libHX_LIBS = @libHX_LIBS@ -libcap_LIBS = @libcap_LIBS@ libdir = @libdir@ libdl_LIBS = @libdl_LIBS@ libexecdir = @libexecdir@
