From ec485dac3f0f8ed55de7acd4156ae70abaa1a4799261186d21181541104f74a3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 4 Aug 2012 07:15:05 +0000 Subject: [PATCH] Accepting request 129784 from devel:libraries:c_c++ - Update to new upstream release 20120802 * sysinfo: do count tmpfs files as memory used - Split some tools into separate package so that they are installable independently (benefit to e.g. pam_mount) OBS-URL: https://build.opensuse.org/request/show/129784 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hxtools?expand=0&rev=15 --- hxtools-20120514.tar.xz | 3 - hxtools-20120514.tar.xz.asc | 17 ----- hxtools-20120802.tar.xz | 3 + hxtools-20120802.tar.xz.asc | 17 +++++ hxtools.changes | 8 +++ hxtools.spec | 121 +++++++++++++++++++++++++++++++----- 6 files changed, 135 insertions(+), 34 deletions(-) delete mode 100644 hxtools-20120514.tar.xz delete mode 100644 hxtools-20120514.tar.xz.asc create mode 100644 hxtools-20120802.tar.xz create mode 100644 hxtools-20120802.tar.xz.asc diff --git a/hxtools-20120514.tar.xz b/hxtools-20120514.tar.xz deleted file mode 100644 index 142e99a..0000000 --- a/hxtools-20120514.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d04cf63a6f4eb42071ebf4af735cc20d6cf48c582e90a14a462e1d0f3e0926c -size 276788 diff --git a/hxtools-20120514.tar.xz.asc b/hxtools-20120514.tar.xz.asc deleted file mode 100644 index 8736720..0000000 --- a/hxtools-20120514.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQIcBAABAgAGBQJPsMDMAAoJEN//LNsZ/DON7k8QAKVNQQvZ6Vt2MPItH+J4tMyz -dOMzQZa8ChSzLYhVMkXWkt/CYQEnuthQxk85vewkg7utCTwARCnqaU6P8LhWs3NQ -cFa7+qhDfsFnXU94DYupou4uLAAWnlLFE6G6vyXC7+Fuo3Eprcc/5Yfxzs4Ncqzu -Itu75NR1rZeU3zXAEn3liw+pASg/40b6I4WYgqQ65Rjf+RsiNeiudnrM8tEAN6dq -98qfifwrSzlMHtmNUCAAE0qXwle/5PkDBYQyS2sqM1G0YTf92cBB351QdM9T1GDG -BJMcbCGYaCWhiio9JMatIsqOjcqsscWRFYrGlm3Hop0KN2FNOyj0hN5W9+Th7JkN -xVic5hAJ0rRbOzfOjl9BgmT7gy7q5b9F351DygNUXNmC49wYXzMinAmw9RwKlfIN -foGdMNnB/kTINHVDk/9w46uuIbq+9wA6H0sKqpcyMC3zL40PLOmlDYuRYzavGixw -E9Egib3Z4t5DOto66XwZGD4HmNbyP8MRH+zlwFSN1T+GamLSogSFQfw6qJIMJadQ -im35ByAPUhORnPhaFpXokkwsvj3tpvd7J9ZGCAGW+H7AKa032fP87JCHlRMNoMS1 -LCULxP7VVdZjMpsKCIedRTjb5Lp70dAMWVXjMfL4UO85cz6rGmJJUjfLFLOdmwvI -wdKfozqtRf1fXaHcbcEk -=9xFi ------END PGP SIGNATURE----- diff --git a/hxtools-20120802.tar.xz b/hxtools-20120802.tar.xz new file mode 100644 index 0000000..f438448 --- /dev/null +++ b/hxtools-20120802.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:697aa25879095b388705d8579fb87e5a0852cdc6759ded29b5978bde493424b6 +size 277928 diff --git a/hxtools-20120802.tar.xz.asc b/hxtools-20120802.tar.xz.asc new file mode 100644 index 0000000..9d74848 --- /dev/null +++ b/hxtools-20120802.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAABAgAGBQJQGcLtAAoJEN//LNsZ/DONYQkQAJPgEqiRZlnDcRYldOLMq0GU +gdQgeQi8INpjX/2ftJbYU19Z89aVk9IFyKHAMwQTcJW38HlaeR0wDSg5a0L4d5jL +7y4rZV+EtL2/IjNDUGdJ+nzSDVitPqI3uXXpexke22wc925SEQ2t2+K+Knxoy073 +HCQxD131uZAdcZhVG9Zry79cVE5y6oGCEYVd3a8Kwfsu+JghvxIxbOryMBzpgWqf +i66BLWWUIkfW4ceAqHwOMqFJYHZcVm3OGYXVD+hGWrK2cM0EzHi/CBdvtJRNr9ea +LrCseceDDn2Ga11Ws27IWNtUax+Uj2iO2v8YCRRAurUyUzgDex0NAmLU83xhIKhW +a8WHf9iaHy27HEXRM036cQ9aWIw1g3QRKpk4iuHU4ppa8L3uzb3y5uHiGocTcAO/ +tOA/E4u4rOxcUH8A9pXux+xZJ0fCb0jX2hgGQJXg/W3bwfP66X+AqoRRJK8sJRoA +wZRnBSEignyBU59J4GrThg4bFEZRNdLuDPCLpJutI8p/u07SEZNgh0L8JHW5YPsw +CYiJ2hX80A9X/bpYn+wj1XH0C3y5O1nOaERhT+5qzu3s635U8a0MOcRZN+i/Kg0y +TT7QvBL2dT7y9sLhUFmOMIKCfVan9MPTyPH1T5U3rCbBylcx7DPp2NX9fnOHfpfM +GJfPbNvlzDHIWWg90zj4 +=ha0V +-----END PGP SIGNATURE----- diff --git a/hxtools.changes b/hxtools.changes index eed74f5..8f239cf 100644 --- a/hxtools.changes +++ b/hxtools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 1 22:15:34 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 20120802 +* sysinfo: do count tmpfs files as memory used +- Split some tools into separate package so that they are + installable independently (benefit to e.g. pam_mount) + ------------------------------------------------------------------- Mon May 14 08:32:41 UTC 2012 - jengelh@inai.de diff --git a/hxtools.spec b/hxtools.spec index 3d7fcc9..39edc09 100644 --- a/hxtools.spec +++ b/hxtools.spec @@ -17,11 +17,11 @@ Name: hxtools -Version: 20120514 +Version: 20120802 Release: 0 Url: http://inai.de/projects/hxtools/ Summary: Collection of day-to-day tools (binaries) -License: GPL-2.0+ +License: GPL-2.0+ ; WTFPL-2.0+ Group: System/Base Source: %name-%version.tar.xz @@ -55,8 +55,12 @@ Recommends: %name-man = %version %else Requires: %name-man = %version %endif +Requires: fd0ssh +Requires: ofl +Requires: sysinfo = %version %define build_profile 1 +%define hldir %_libexecdir/%name %description A collection of various tools. Some of the important ones: @@ -107,10 +111,8 @@ Architecture-independent programs from hxtools. * git-track(1) — set up branch for tracking a remote * man2html(1) — convert nroff manpages to HTML * pesubst(1) — perl-regexp stream substitution (replaces sed for sub‐ stitutions) -* pmap_dirty(1) — display amount of RAM a process uses hard * recursive_lower(1) — recursively lowercase all filenames * spec-beautifier(1) — program to clean up RPM .spec files -* sysinfo(1) — print IRC-style system information banner * vcsaview(8) — display a screen dump in VCSA format * wktimer(1) — work timer @@ -154,6 +156,36 @@ Bash environment settings from hxtools. Particularly, this provides the SUSE 6.x ls color scheme, and an uncluttered PS1 that shows only important parts of a path. +%package -n sysinfo +Summary: System diagnosis tools from hxtools +Group: System/Base + +%description -n sysinfo +This subpackage contains programs from the hxtools suite that +give info about available system components. + +* clock_info(1) – show available system clocks for clock_gettime(2) +* pmap_dirty(1) — display amount of RAM a process uses hard +* sysinfo(1) — print IRC-style system information banner + +%package -n fd0ssh +Summary: Helper program for using a pipe for SSH authentication +Group: System/Base + +%description -n fd0ssh +fd0ssh a helper program used by non-interactive programs, for example +pam_mount, that want to pipe a password to ssh. + +%package -n ofl +Summary: Open File Lister from hxtools +Group: System/Base + +%description -n ofl +ofl lists processes (and can send signals to them) that have +directories or files in specific locations in use. It differs from +lsof/fuser in that it can scan recursively and won't bluntly look at +an entire mount. + %prep %if 0%{?__xz:1} %setup -q @@ -181,12 +213,6 @@ install -dm0755 "$b/%_sysconfdir/openldap/schema"; ln -s "%_datadir/hxtools/rfc2307bis-utf8.schema" \ "$b/%_sysconfdir/openldap/schema/"; -cd "$b"; -find ./%_bindir ./%_libexecdir ! -type d -exec grep -l ELF {} + | \ - perl -pe 's{^\./+}{/}' >"$o/binary.lst"; -find ./%_bindir ./%_libexecdir ! -type d -exec grep -L ELF {} + | \ - perl -pe 's{^\./+}{/}' >"$o/scripts.lst"; - %if 0%{?build_profile} mkdir -p "$b/%_sysconfdir/bashrc.d"; ln -s "%_datadir/%name/hxtools_bashrc.bash" "$b/%_sysconfdir/bashrc.d/"; @@ -198,17 +224,63 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*; %fdupes %buildroot -%files -f binary.lst +%files %defattr(-,root,root) -%dir %_libexecdir/%name +%_bindir/declone +%_bindir/newns +%_bindir/omixer +%_bindir/oplay +%_bindir/orec +%_bindir/tailhex +%_bindir/xcp +%dir %hldir +%hldir/bsvplay +%hldir/cctypeinfo +%hldir/pcmdiff +%hldir/printcaps +%hldir/proc_iomem_count +%hldir/proc_stat_parse +%hldir/psthreads +%hldir/qplay +%hldir/utmp_register +%hldir/vfontas -%files scripts -f scripts.lst +%files scripts %defattr(-,root,root) -%dir %_libexecdir/%name +%_bindir/checkbrack +%_bindir/cwdiff +%_bindir/fduphl +%_bindir/fxterm +%_bindir/git-* +%_bindir/googtts +%_bindir/gpsh +%_bindir/man2html +%_bindir/pesubst +%_bindir/qtar +%_bindir/spec-beautifier +%_bindir/ssa2srt +%_bindir/su1 +%_bindir/wktimer +%dir %hldir +%hldir/diff2php +%hldir/doxygen-kerneldoc-filter +%hldir/extract_* +%hldir/*2* +%hldir/git-* +%hldir/logontime +%hldir/mailsplit +%hldir/png2wx* +%hldir/recursive_lower +%hldir/shared.pm +%hldir/sourcefuncsize +%hldir/stxdb +%hldir/vcsaview %files man %defattr(-,root,root) %doc %_mandir/man*/* +%exclude %_mandir/man*/fd0ssh.1* +%exclude %_mandir/man*/ofl.1* %files data %defattr(-,root,root) @@ -230,4 +302,25 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*; %config %_sysconfdir/profile.d/* %endif +%files -n fd0ssh +%defattr(-,root,root) +%dir %hldir +%hldir/fd0ssh +%_mandir/man1/fd0ssh.1* + +%files -n ofl +%defattr(-,root,root) +%_bindir/ofl +%_mandir/man1/ofl.1* + +%files -n sysinfo +%defattr(-,root,root) +%_bindir/clock_info +%_bindir/pmap_dirty +%_bindir/sysinfo +%dir %hldir +%hldir/netload +%hldir/paddrspacesize +%hldir/proc_stat_signal_decode + %changelog