Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2012-12-21 15:02:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psmisc (Old) and /work/SRC/openSUSE:Factory/.psmisc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psmisc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/psmisc/psmisc.changes 2012-03-19 10:12:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2012-12-21 15:02:18.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Dec 18 17:16:02 UTC 2012 - [email protected] + +- Update to version 22.20 + upstream patch + * Make usage of linked lists of devices found in + /proc/self/mountinfo optional + * Make timeout() in timeout.c work with shared mmap to + reduce the load due write/read the stat buffers + * Add list_sort() to lists.h to be able to sort lists + * pstree sorts properly on names Debian #682014 + * fuser -m regresion fixed SF #3559232, thanks to hanpt + * pstree finds orphaned processes SF#3537508 + * fuser finds unix sockets again SF #3502649 + * pstree finds pid 0 stops looping Debian #687829 + * killall with no args exits again SF #3536526 + * Added AC_CANONICAL_TARGET for target_os Debian #673485 + * sed doesn't have [0-9]+ replace with [0-9][0-9]* + * assert in killall triggered for small lifetimes Debian #628617 + * killall MAX_NAMES off by one Debian #677428 + * Removed remaining parts of pidof + * fuser uses correct timeout_stat define Debian #661723 + * fuser is not compiled on hurd-i386 Debian #673485 + * No TEXTRELS in src/lists built as PIE on x86 + * Fake pstree root for kernels with hidepid turned on + * More fixes for Cygwin SF Patch #3511920 + * pstree can show PGIDs SF Patch #3471056 +- This should fix the bug reported by Madhu + +------------------------------------------------------------------- Old: ---- psmisc-22.16-timeout.patch psmisc-22.16.dif psmisc-22.16.tar.gz pstree-segfault.patch New: ---- psmisc-22.20-pstree.patch psmisc-22.20-upstream.patch psmisc-22.20.dif psmisc-22.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.hWftdN/_old 2012-12-21 15:02:20.000000000 +0100 +++ /var/tmp/diff_new_pack.hWftdN/_new 2012-12-21 15:02:20.000000000 +0100 @@ -24,18 +24,21 @@ BuildRequires: ncurses-devel Url: http://sourceforge.net/projects/psmisc/ PreReq: %fillup_prereq %insserv_prereq -Version: 22.16 +Version: 22.20 Release: 0 Provides: ps:/usr/bin/killall +%if %suse_version > 1020 +Recommends: %{name}-lang = 6.18.00 +%endif Summary: Utilities for managing processes on your system License: GPL-2.0+ Group: System/Monitoring Source: http://sourceforge.net/projects/psmisc/files/psmisc/%{name}-%{version}.tar.gz -Patch0: %name-22.16.dif +Patch0: %name-22.20.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree.patch -Patch42: pstree-segfault.patch -Patch43: %name-22.16-timeout.patch +Patch3: %name-22.20-pstree.patch +Patch42: %{name}-%{version}-upstream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %sparc hppa @@ -48,12 +51,20 @@ processes identified by name. The fuser command identifies the PIDs of processes that are using specified files or filesystems. +%package lang +Summary: Languages for package %{name} +Group: System/Localization +Requires: %{name} = %{version} + +%description lang +Provides translations to the package %{name} + %prep %setup -q -%patch42 -p1 -b .to -%patch43 -p1 -b .comm +%patch42 -p0 -b .up %patch1 -p0 -b .tigetstr %patch2 -p0 -b .pstree +%patch3 -p0 -b .se %patch0 -p0 -b .0 %build @@ -67,7 +78,8 @@ --disable-rpath \ --with-gnu-ld \ --enable-selinux \ - --enable-timeout-stat + --enable-mountinfo-list \ + --enable-timeout-stat=static make %{?_smp_mflags} CFLAGS="$CFLAGS" "CC=$CC" %install @@ -82,7 +94,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -f psmisc.lang +%files %defattr (-,root,root,755) /bin/fuser %{_bindir}/killall @@ -100,4 +112,6 @@ %{_mandir}/man1/prtstat.1* %{_mandir}/man1/pstree.1* +%files lang -f psmisc.lang + %changelog ++++++ psmisc-22.20-pstree.patch ++++++ --- src/pstree.c +++ src/pstree.c 2012-12-18 17:06:03.369452415 +0000 @@ -141,7 +141,11 @@ static char last_char = 0; static int dumped = 0; /* used by dump_by_user */ static int charlen = 0; /* length of character */ +#ifdef WITH_SELINUX +static void fix_orphans(security_context_t scontext); +#else static void fix_orphans(void); +#endif /* * Allocates additional buffer space for width and more as needed. * The first call will allocate the first buffer. @@ -810,7 +814,11 @@ static void read_proc(void) } } (void) closedir(dir); +#ifdef WITH_SELINUX + fix_orphans(scontext); +#else fix_orphans(); +#endif if (print_args) free(buffer); if (empty) { @@ -819,7 +827,11 @@ static void read_proc(void) } } +#ifdef WITH_SELINUX +static void fix_orphans(security_context_t scontext) +#else static void fix_orphans(void) +#endif { /* When using kernel 3.3 with hidepid feature enabled on /proc * then we need fake root pid and gather all the orphan processes ++++++ psmisc-22.20-upstream.patch ++++++ ++++ 861 lines (skipped) ++++++ psmisc-22.16.dif -> psmisc-22.20.dif ++++++ --- /work/SRC/openSUSE:Factory/psmisc/psmisc-22.16.dif 2012-02-28 14:15:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc-22.20.dif 2012-12-21 15:02:18.000000000 +0100 @@ -1,6 +1,6 @@ --- configure.ac -+++ configure.ac 2010-10-15 09:00:32.915927054 +0000 -@@ -72,7 +72,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc ++++ configure.ac 2010-10-15 09:00:33.000000000 +0000 +@@ -121,7 +121,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc struct user_regs_struct.rdi, struct user_regs_struct.rsi, struct user_regs_struct.rdx], [],[], @@ -10,37 +10,35 @@ AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>]) --- src/fuser.c -+++ src/fuser.c 2011-02-08 16:08:59.823926228 +0000 -@@ -888,7 +888,8 @@ int main(int argc, char *argv[]) - char option_buf[3]; - struct option *optr; ++++ src/fuser.c 2012-12-18 16:52:23.749452207 +0000 +@@ -878,6 +878,7 @@ int main(int argc, char *argv[]) + struct option *optr; char *nsptr; -- int skip_argv; -+ int skip_argv; + int skip_argv; + int seen_file; struct option options[] = { {"all", 0, NULL, 'a'}, -@@ -927,6 +928,7 @@ int main(int argc, char *argv[]) - netdev = find_net_dev(); +@@ -918,6 +919,7 @@ int main(int argc, char *argv[]) fill_unix_cache(&unixsockets); + #endif -+ seen_file = 0; - for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) { - current_argv = argv[argc_cnt]; - if (current_argv[0] == '-') { /* its an option */ -@@ -1056,6 +1058,7 @@ int main(int argc, char *argv[]) ++ seen_file = 0; + for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) { + current_argv = argv[argc_cnt]; + if (current_argv[0] == '-') { /* its an option */ +@@ -1070,6 +1072,7 @@ int main(int argc, char *argv[]) } } this_name->matched_procs = NULL; + seen_file = 1; - if (opts & (OPT_MOUNTS|OPT_ISMOUNTPOINT) + if (opts & (OPT_MOUNTS | OPT_ISMOUNTPOINT) && this_name->name_space != NAMESPACE_FILE) usage(_ -@@ -1103,7 +1106,7 @@ int main(int argc, char *argv[]) +@@ -1126,7 +1129,7 @@ int main(int argc, char *argv[]) names_tail->next = this_name; names_tail = this_name; - } /* for across the argvs */ + } /* for across the argvs */ - if (names_head == NULL) + if (names_head == NULL && !seen_file) usage(_("No process specification given")); ++++++ psmisc-22.16.tar.gz -> psmisc-22.20.tar.gz ++++++ ++++ 31010 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
