From 7f97a154647ef3a8f6287757adf1ff45dcc8395a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 13 Nov 2015 10:55:09 +0000 Subject: [PATCH] psmisc: updated to 22.21 and updated mandir --- psmisc/.footprint | 15 ++++++++------- psmisc/.md5sum | 1 + psmisc/Pkgfile | 9 ++++++--- psmisc/fuseropts.patch | 12 ++++++++++++ 4 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 psmisc/fuseropts.patch diff --git a/psmisc/.footprint b/psmisc/.footprint index 5a29ea9..92b5fcf 100644 --- a/psmisc/.footprint +++ b/psmisc/.footprint @@ -5,10 +5,11 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/peekfd -rwxr-xr-x root/root usr/bin/prtstat -rwxr-xr-x root/root usr/bin/pstree -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/fuser.1.gz --rw-r--r-- root/root usr/man/man1/killall.1.gz --rw-r--r-- root/root usr/man/man1/peekfd.1.gz --rw-r--r-- root/root usr/man/man1/prtstat.1.gz --rw-r--r-- root/root usr/man/man1/pstree.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/fuser.1.gz +-rw-r--r-- root/root usr/share/man/man1/killall.1.gz +-rw-r--r-- root/root usr/share/man/man1/peekfd.1.gz +-rw-r--r-- root/root usr/share/man/man1/prtstat.1.gz +-rw-r--r-- root/root usr/share/man/man1/pstree.1.gz diff --git a/psmisc/.md5sum b/psmisc/.md5sum index 416bd43..581840d 100644 --- a/psmisc/.md5sum +++ b/psmisc/.md5sum @@ -1 +1,2 @@ +6d0386913eb0a88e43aa9bc868cb0eb5 fuseropts.patch 935c0fd6eb208288262b385fa656f1bf psmisc-22.21.tar.gz diff --git a/psmisc/Pkgfile b/psmisc/Pkgfile index e9500a5..ac0117e 100644 --- a/psmisc/Pkgfile +++ b/psmisc/Pkgfile @@ -6,8 +6,9 @@ name=psmisc version=22.21 -release=1 -source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz) +release=3 +source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz \ + fuseropts.patch) build() { cd $name-$version @@ -17,11 +18,13 @@ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes EOF + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740275 + patch -p1 -i $SRC/fuseropts.patch + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ --disable-nls \ - --mandir=/usr/man \ --cache-file=config.cache make diff --git a/psmisc/fuseropts.patch b/psmisc/fuseropts.patch new file mode 100644 index 0000000..3bac333 --- /dev/null +++ b/psmisc/fuseropts.patch @@ -0,0 +1,12 @@ +diff -ur a/src/fuser.c b/src/fuser.c +--- a/src/fuser.c 2014-01-31 08:07:32.000000000 -0500 ++++ b/src/fuser.c 2014-02-27 12:34:44.352910007 -0500 +@@ -1174,7 +1174,7 @@ + usage(_("No process specification given")); + + /* Check if -M flag was used and if so check mounts */ +- if (opts * OPT_ISMOUNTPOINT) { ++ if (opts & OPT_ISMOUNTPOINT) { + check_mountpoints(&mounts, &names_head, &names_tail); + } + -- 2.26.2