Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2012-02-28 14:15:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-11 15:38:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2012-02-28 14:15:07.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Feb 27 17:43:46 UTC 2012 - [email protected] + +- Update to version 22.16 + * Use strncpy for COMM_LEN and make it 18 characters to cover + brackets in name. + * don't change COMM_LEN, it breaks matching long commands + Debian #661145 + * Enable some harden AM_CFLAGS by default, use configure option + --disable-harden-flags to not use it. + * Use ENOENT not EBADE for FreeBSD Debian #631566 + * Fix prstat typos + * Stop zombies by using waitpid Ubuntu #876387 by Peter Holik, SF#3429674 + * Fixed minor older/younger typo in killall.1 thanks to Maikel Linke + * Correct defines for timeout in configure.ac + +------------------------------------------------------------------- Old: ---- psmisc-22.14-22.15.patch psmisc-22.14.dif psmisc-22.14.tar.gz psmisc-22.15-timeout.patch New: ---- psmisc-22.16-timeout.patch psmisc-22.16.dif psmisc-22.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.aJbHbY/_old 2012-02-28 14:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.aJbHbY/_new 2012-02-28 14:15:08.000000000 +0100 @@ -27,17 +27,16 @@ License: GPL-2.0+ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq -Version: 22.14 -Release: 0 +Version: 22.16 +Release: 1 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://sourceforge.net/projects/psmisc/files/psmisc/%{name}-%{version}.tar.gz -Patch0: %name-22.14.dif +Patch0: %name-22.16.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.12-pstree.patch Patch3: pstree-segfault.patch -Patch42: %name-22.14-22.15.patch -Patch43: %name-22.15-timeout.patch +Patch42: %name-22.16-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %sparc hppa @@ -52,12 +51,11 @@ %prep %setup -q -%patch42 -p1 -%patch43 -p1 -b .to +%patch42 -p0 -b .to %patch1 -p0 -b .tigetstr %patch2 -p0 -b .pstree +%patch3 -p0 -b .comm %patch0 -p0 -b .0 -%patch3 -p1 %build autoreconf -fi ++++++ psmisc-22.15-timeout.patch -> psmisc-22.16-timeout.patch ++++++ --- /work/SRC/openSUSE:Factory/psmisc/psmisc-22.15-timeout.patch 2011-10-11 18:22:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc-22.16-timeout.patch 2012-02-28 14:15:06.000000000 +0100 @@ -1,26 +1,5 @@ -diff --git a/configure.ac b/configure.ac -index 6177975..d54f0ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,12 +26,12 @@ AC_SUBST([SELINUX_LIB]) - - dnl Call fork before all stat calls to stop hanging on NFS mounts - AC_SUBST([WITH_TIMEOUT_STAT]) --AC_ARG_ENABLE([TIMEOUT_STAT], -+AC_ARG_ENABLE([timeout_stat], - [AS_HELP_STRING([--enable-timeout-stat], [Use a timeout on stat calls])], - [enable_timeout_stat=$enableval], - [enable_timeout_stat="no"]) - if test "$enable_timeout_stat" = "yes"; then -- AC_DEFINE([WITH_timeout_stat], [1], [Use timeout on stat calls]) -+ AC_DEFINE([WITH_TIMEOUT_STAT], [1], [Use timeout on stat calls]) - fi - - dnl ipv4 only option -diff --git a/src/Makefile.am b/src/Makefile.am -index 4398631..bbe9170 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am +--- src/Makefile.am ++++ src/Makefile.am 2012-02-27 00:00:00.000000000 +0000 @@ -23,7 +23,7 @@ if WANT_PEEKFD_MIPS AM_CFLAGS += -DMIPS endif @@ -30,10 +9,19 @@ fuser_LDADD = @LIBINTL@ -diff --git a/src/fuser.c b/src/fuser.c -index 476fdf1..374a17d 100644 ---- a/src/fuser.c -+++ b/src/fuser.c +--- src/Makefile.in ++++ src/Makefile.in 2012-02-27 17:19:33.626434528 +0000 +@@ -68,7 +68,7 @@ CONFIG_CLEAN_VPATH_FILES = + @WANT_PEEKFD_MIPS_TRUE@am__EXEEXT_5 = peekfd$(EXEEXT) + am__installdirs = "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) +-am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT) ++am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT) timeout.$(OBJEXT) + fuser_OBJECTS = $(am_fuser_OBJECTS) + fuser_DEPENDENCIES = + am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT) +--- src/fuser.c ++++ src/fuser.c 2012-02-27 17:09:23.901933700 +0000 @@ -111,9 +111,8 @@ static dev_t device(const char *path); #endif static char *expandpath(const char *path); @@ -45,7 +33,7 @@ #else #define timeout(func,path,buf,dummy) (func)((path),(buf)) #endif /* WITH_TIMEOUT_STAT */ -@@ -1779,70 +1778,6 @@ scan_swaps(struct names *names_head, struct inode_list *ino_head, +@@ -1779,72 +1778,6 @@ scan_swaps(struct names *names_head, str fclose(fp); } @@ -53,6 +41,8 @@ - * Execute stat(2) system call with timeout to avoid deadlock - * on network based file systems. - */ +-#ifdef HAVE_TIMEOUT_STAT +- -static sigjmp_buf jenv; - -static void @@ -62,7 +52,6 @@ - siglongjmp(jenv, 1); -} - --#ifdef HAVE_TIMEOUT_STAT -static int -timeout(stat_t func, const char *path, struct stat *buf, unsigned int seconds) -{ @@ -105,6 +94,7 @@ - (void) alarm(0); - (void) signal(SIGALRM, SIG_DFL); - close(pipes[0]); +- waitpid(pid, NULL, 0); - break; - } - return ret; @@ -116,11 +106,9 @@ #ifdef _LISTS_H /* * Use /proc/self/mountinfo of modern linux system to determine -diff --git a/src/timeout.c b/src/timeout.c -index e69de29..bef93b3 100644 ---- a/src/timeout.c -+++ b/src/timeout.c -@@ -0,0 +1,265 @@ +--- src/timeout.c ++++ src/timeout.c 2012-02-27 00:00:00.000000000 +0000 +@@ -0,0 +1,267 @@ +/* + * timout.c Advanced timeout handling for file system calls + * to avoid deadlocks on remote file shares. @@ -294,6 +282,7 @@ + if (handle->function(handle->path, &handle->argument) < 0) + handle->errcode = errno; + write(STDOUT_FILENO, &handle->errcode, sizeof(handle->errcode)+sizeof(handle->argument)); ++ memset(handle, 0, sizeof(handle_t)); + } + } + sigprocmask(SIG_SETMASK, &oldset, NULL); @@ -329,6 +318,7 @@ + if (active <= 0) /* Oops, last one failed therefore clear status and restart */ + start(); + ++ memset(handle, 0, sizeof(handle_t)); + handle->len = strlen(path) + 1; + if (handle->len >= PATH_MAX) { + errno = ENAMETOOLONG; @@ -386,10 +376,8 @@ +/* + * End of timeout.c + */ -diff --git a/src/timeout.h b/src/timeout.h -index e69de29..546c13b 100644 ---- a/src/timeout.h -+++ b/src/timeout.h +--- src/timeout.h ++++ src/timeout.h 2012-02-27 00:00:00.000000000 +0000 @@ -0,0 +1,36 @@ +/* + * timout.h Advanced timeout handling for file system calls ++++++ psmisc-22.14.dif -> psmisc-22.16.dif ++++++ ++++++ psmisc-22.14.tar.gz -> psmisc-22.16.tar.gz ++++++ ++++ 21598 lines of diff (skipped) ++++++ pstree-segfault.patch ++++++ --- /var/tmp/diff_new_pack.aJbHbY/_old 2012-02-28 14:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.aJbHbY/_new 2012-02-28 14:15:09.000000000 +0100 @@ -1,19 +1,11 @@ -From: Tetsuo Handa <[email protected]> - -See bnc#718915#c1 - ---- - src/pstree.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- psmisc-22.14.orig/src/pstree.c -+++ psmisc-22.14/src/pstree.c -@@ -70,7 +70,7 @@ extern const char *__progname; - #define VT_HD "w" - - typedef struct _proc { -- char comm[COMM_LEN + 1]; -+ char comm[COMM_LEN + 2 + 1]; /* add another 2 for thread brackets */ - char **argv; /* only used : argv[0] is 1st arg; undef if argc < 1 */ - int argc; /* with -a : number of arguments, -1 if swapped */ - pid_t pid; +--- src/pstree.c ++++ src/pstree.c 2012-02-27 17:15:05.418433600 +0000 +@@ -376,7 +376,7 @@ add_proc(const char *comm, pid_t pid, pi + #endif /*WITH_SELINUX */ + else { + strncpy(this->comm, comm, COMM_LEN+2); +- this->comm[COMM_LEN+1]; ++ this->comm[COMM_LEN+1]='\0'; + this->uid = uid; + } + if (args) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
