commit a8dc513154749837d3a291984cd9f90ac529e5f1 Author: OBS User unknown Date: Mon Dec 18 23:17:33 2006 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fecc750 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/psmisc-21.5.diff b/psmisc-21.5.diff new file mode 100644 index 0000000..4031225 --- /dev/null +++ b/psmisc-21.5.diff @@ -0,0 +1,123 @@ +Index: psmisc-21.5/src/pstree.c +================================================================================ +--- psmisc-21.7/po/Makefile.in.in ++++ psmisc-21.7/po/Makefile.in.in +@@ -29,7 +29,6 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ +--- psmisc-21.7/src/pstree.c ++++ psmisc-21.7/src/pstree.c +@@ -63,6 +63,7 @@ + #define UTF_HD "\342\224\254" /* U+252C, Horizontal and down */ + + #define VT_BEG "\033(0\017" /* use graphic chars */ ++#define VT_BEG_LEN 4 + #define VT_END "\033(B" /* back to normal char set */ + #define VT_V "x" /* see UTF definitions above */ + #define VT_VR "t" +@@ -113,13 +114,21 @@ + UTF_VR UTF_H, + + UTF_V " ", +- UTF_UR UTF_H, UTF_H UTF_H UTF_H, UTF_H UTF_HD UTF_H}, sym_vt100 = ++ UTF_UR UTF_H, UTF_H UTF_H UTF_H, UTF_H UTF_HD UTF_H} ++ ++, sym_vt100 = ++/* ++ * For the vt100 line drawing fix: Do not append VT_END here ++ * because we may need to end the line drawing prematurely and ++ * we have to turn off line drawing mode by sending VT_END ++ * then anyway. That's why VT_END is sent by out_sym(). ++ */ + { + " ", +- VT_BEG VT_VR VT_H VT_END, +- VT_BEG VT_V VT_END " ", +- VT_BEG VT_UR VT_H VT_END, +- VT_BEG VT_H VT_H VT_H VT_END, VT_BEG VT_H VT_HD VT_H VT_END} ++ VT_BEG VT_VR VT_H, ++ VT_BEG VT_V " ", ++ VT_BEG VT_UR VT_H, ++ VT_BEG VT_H VT_H VT_H, VT_BEG VT_H VT_HD VT_H} + + , *sym = &sym_ascii; + +@@ -144,9 +153,13 @@ + putchar (c); + if (cur_x == output_width + 1 && trunc && ((c & 0xc0) != 0x80)) + { +- if (last_char || (c & 0x80)) ++ if (last_char || (c & 0x80)) { ++/* ++ * pstree: UTF-8: never draw >1 '+' at end of line(no change for ASCII): ++ */ ++ cur_x++; + putchar ('+'); +- else ++ } else + { + last_char = c; + cur_x--; +@@ -163,6 +176,26 @@ + out_char (*str++); + } + ++/* ++ * Only affects vt100 line drawing mode: Do not count the strlen of ++ * VT_BEG to prevent doing end-of-line way too early: ++ */ ++static void ++out_sym (const char *str) ++{ ++ int seq = 0; ++ if (sym == &sym_vt100 && *str == '\033') { ++ seq = 1; ++ if (cur_x <= output_width || !trunc) ++ cur_x -= VT_BEG_LEN; ++ } ++ out_string(str); ++ if (seq) { ++ str = VT_END; ++ while (*str) ++ putchar (*str++); ++ } ++} + + static int + out_int (int x) /* non-negative integers only */ +@@ -379,7 +412,11 @@ + { + for (i = width[lvl] + 1; i; i--) + out_char (' '); +- out_string (lvl == level - 1 ? last ? sym->last_2 : sym->branch_2 : ++ /* ++ * Replace all three symbol-drawing calls with calls to out_sym() ++ * to handle VT100 line drawing sequences if VT100 mode is active: ++ */ ++ out_sym (lvl == level - 1 ? last ? sym->last_2 : sym->branch_2 : + more[lvl + 1] ? sym->vert_2 : sym->empty_2); + } + if (rep < 2) +@@ -489,7 +526,7 @@ + width[level] = comm_len + cur_x - offset + add; + if (cur_x >= output_width && trunc) + { +- out_string (sym->first_3); ++ out_sym (sym->first_3); + out_string ("+"); + out_newline (); + } +@@ -516,7 +553,7 @@ + } + if (first) + { +- out_string (next ? sym->first_3 : sym->single_3); ++ out_sym (next ? sym->first_3 : sym->single_3); + first = 0; + } + dump_tree (walk->child, level + 1, count + 1, diff --git a/psmisc-22.3.tar.bz2 b/psmisc-22.3.tar.bz2 new file mode 100644 index 0000000..1e7971b --- /dev/null +++ b/psmisc-22.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61efeeb78f3e39fc6c7bb91be6638c61d3033d4e43e078e951fb9c6db9657904 +size 214357 diff --git a/psmisc.changes b/psmisc.changes new file mode 100644 index 0000000..a81cec5 --- /dev/null +++ b/psmisc.changes @@ -0,0 +1,103 @@ +------------------------------------------------------------------- +Fri Sep 15 11:37:34 CEST 2006 - werner@suse.de + +- Update to psmisc version 22.3 which includes the previous fixes + +------------------------------------------------------------------- +Wed Feb 8 11:51:52 CET 2006 - max@suse.de + +- Fix exit code of fuser in silent mode [#148563]. + +------------------------------------------------------------------- +Fri Jan 27 13:50:20 CET 2006 - mmj@suse.de + +- Fix finding AF_UNIX sockets [#142342] +- Fix minor nits with net_* + +------------------------------------------------------------------- +Wed Jan 25 21:30:51 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 12 11:30:14 CET 2006 - mmj@suse.de + +- Update to psmisc-22.1 including: + * Updated PO files + * fuser signals eg -INT work better + * removed space out of fuser man page for -signal + * fuser -s flag works + * fix grep lines in Makefile for i386 arches + +------------------------------------------------------------------- +Fri Dec 16 13:33:48 CET 2005 - mmj@suse.de + +- update to psmisc-21.9 including: + * Fixed install-exec-hook so only symlink pstree.x11 if file does + not exist already. + * buffer overflow in killall scanf removed + * Fixed segfault in pstree -a + * fuser can not use IPv6, for things like uClibc + * configure has --disable-ipv6 for above + * fuser finds unix sockets + * fixed print_matches to only print unmatched objects if -a is + specified and to output the header for -v + * fixed argument parsing to handle groups like -av again + +------------------------------------------------------------------- +Fri Dec 9 09:59:36 CET 2005 - ro@suse.de + +- disable selinux + +------------------------------------------------------------------- +Tue Nov 8 09:26:15 CET 2005 - mmj@suse.de + +- add patch to fix print_matches and commandline arguments parsing + +------------------------------------------------------------------- +Sun Nov 6 17:54:33 CET 2005 - mmj@suse.de + +- fuser returns 1 if no match found like before [#132180] + +------------------------------------------------------------------- +Tue Nov 1 10:19:32 CET 2005 - mmj@suse.de + +- Update to psmisc-21.7 + +------------------------------------------------------------------- +Mon Aug 8 11:18:07 CEST 2005 - meissner@suse.de + +- fixed buffer overflow in -k failure case with pids >= 10000 + +------------------------------------------------------------------- +Mon Aug 16 11:39:28 CEST 2004 - garloff@suse.de + +- Update to psmisc-21.5: + * bugs fixed: UTF-8 line truncation (SF#757164), ss_family + (SF#845292), docu (fuser, ...) + * POSIX compat: -m option, ignore -f, fuser output, case + insensitive options for -I. + * Cleanups: dev_t and ino_t usage, automake update + * pstree -A(SCII) flag +- Rediff patches. + +------------------------------------------------------------------- +Tue Jul 20 09:55:28 CEST 2004 - schwab@suse.de + +- Use autoreconf. + +------------------------------------------------------------------- +Sun Apr 4 20:05:18 CEST 2004 - kukuk@suse.de + +- Add split alias [Bug #38279] + +------------------------------------------------------------------- +Sun Feb 15 01:55:14 CET 2004 - stepan@suse.de + +- update to v21.4 + +------------------------------------------------------------------- +Sat Feb 14 16:47:09 CET 2004 - kukuk@suse.de + +- Split from ps package + diff --git a/psmisc.spec b/psmisc.spec new file mode 100644 index 0000000..0ff63e3 --- /dev/null +++ b/psmisc.spec @@ -0,0 +1,128 @@ +# +# spec file for package psmisc (Version 22.3) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: psmisc +URL: http://switch.dl.sourceforge.net/sourceforge/psmisc/ +License: GPL +Group: System/Monitoring +PreReq: %fillup_prereq %insserv_prereq +Autoreqprov: on +Version: 22.3 +Release: 1 +Provides: ps:/usr/bin/killall +Summary: Utilities for managing processes on your system +Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/psmisc-%{version}.tar.bz2 +Patch0: %name-21.5.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +The psmisc package contains utilities for managing processes on your +system: pstree, killall and fuser. The pstree command displays a tree +structure of all of the running processes on your system. The killall +command sends a specified signal (SIGTERM if nothing is specified) to +processes identified by name. The fuser command identifies the PIDs of +processes that are using specified files or filesystems. + + + +Authors: +-------- + Werner Almesberger + +%prep +%setup -q +%patch0 -p1 + +%build +autoreconf -fi +CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${RPM_OPT_FLAGS} -pipe" +CC=gcc +export CFLAGS CC +sh ./configure --prefix=%{_prefix} --mandir=%{_mandir} +make CFLAGS="$CFLAGS -DLOCALEDIR=\\\"/usr/share/locale\\\"" "CC=$CC" + +%install +make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT/bin/ +mv $RPM_BUILD_ROOT/usr/bin/fuser $RPM_BUILD_ROOT/bin/ +%find_lang psmisc + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f psmisc.lang +%defattr (-,root,root,755) +/bin/fuser +%{_bindir}/oldfuser +%{_bindir}/killall +%{_bindir}/pstree +%{_bindir}/pstree.x11 +%{_mandir}/man1/fuser.1* +%{_mandir}/man1/killall.1* +%{_mandir}/man1/pstree.1* + +%changelog -n psmisc +* Fri Sep 15 2006 - werner@suse.de +- Update to psmisc version 22.3 which includes the previous fixes +* Wed Feb 08 2006 - max@suse.de +- Fix exit code of fuser in silent mode [#148563]. +* Fri Jan 27 2006 - mmj@suse.de +- Fix finding AF_UNIX sockets [#142342] +- Fix minor nits with net_* +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Thu Jan 12 2006 - mmj@suse.de +- Update to psmisc-22.1 including: + * Updated PO files + * fuser signals eg -INT work better + * removed space out of fuser man page for -signal + * fuser -s flag works + * fix grep lines in Makefile for i386 arches +* Fri Dec 16 2005 - mmj@suse.de +- update to psmisc-21.9 including: + * Fixed install-exec-hook so only symlink pstree.x11 if file does + not exist already. + * buffer overflow in killall scanf removed + * Fixed segfault in pstree -a + * fuser can not use IPv6, for things like uClibc + * configure has --disable-ipv6 for above + * fuser finds unix sockets + * fixed print_matches to only print unmatched objects if -a is + specified and to output the header for -v + * fixed argument parsing to handle groups like -av again +* Fri Dec 09 2005 - ro@suse.de +- disable selinux +* Tue Nov 08 2005 - mmj@suse.de +- add patch to fix print_matches and commandline arguments parsing +* Sun Nov 06 2005 - mmj@suse.de +- fuser returns 1 if no match found like before [#132180] +* Tue Nov 01 2005 - mmj@suse.de +- Update to psmisc-21.7 +* Mon Aug 08 2005 - meissner@suse.de +- fixed buffer overflow in -k failure case with pids >= 10000 +* Mon Aug 16 2004 - garloff@suse.de +- Update to psmisc-21.5: + * bugs fixed: UTF-8 line truncation (SF#757164), ss_family + (SF#845292), docu (fuser, ...) + * POSIX compat: -m option, ignore -f, fuser output, case + insensitive options for -I. + * Cleanups: dev_t and ino_t usage, automake update + * pstree -A(SCII) flag +- Rediff patches. +* Tue Jul 20 2004 - schwab@suse.de +- Use autoreconf. +* Sun Apr 04 2004 - kukuk@suse.de +- Add split alias [Bug #38279] +* Sun Feb 15 2004 - stepan@suse.de +- update to v21.4 +* Sat Feb 14 2004 - kukuk@suse.de +- Split from ps package diff --git a/ready b/ready new file mode 100644 index 0000000..e69de29