summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2014-05-04 10:45:06 +0200
committerNicolas Iooss2015-06-27 11:44:55 +0800
commitd2e7cd8366b9574aa07f69b4deb47366e8ecb48e (patch)
tree0102a6e647023324afed7430eb3b4a6d333be7ed
parent34d2012ab7ce9a3cc57055f6311c03add602b98f (diff)
downloadaur-d2e7cd8366b9574aa07f69b4deb47366e8ecb48e.tar.gz
psmisc-selinux 22.21-2 update
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--psmisc-fuser.patch11
3 files changed, 26 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bcf9b1539cc..88f64f035e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
pkgbase = psmisc-selinux
pkgdesc = Miscellaneous procfs tools with SELinux support
pkgver = 22.21
- pkgrel = 1
+ pkgrel = 2
url = http://psmisc.sourceforge.net/index.html
arch = i686
arch = x86_64
groups = selinux
license = GPL
depends = ncurses
- provides = psmisc=22.21-1
- provides = selinux-psmisc=22.21-1
+ provides = psmisc=22.21-2
+ provides = selinux-psmisc=22.21-2
conflicts = psmisc
conflicts = selinux-psmisc
source = http://downloads.sourceforge.net/psmisc/psmisc-22.21.tar.gz
+ source = psmisc-fuser.patch
sha1sums = 09fabbef4539b58b6b8738a73da3d21d5daa1a58
+ sha1sums = e739ad5b14ca836db5859f0755d8f2fc8e86de69
pkgname = psmisc-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 8c20c39fbbe..55d4a0d1175 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=psmisc-selinux
pkgver=22.21
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous procfs tools with SELinux support"
arch=('i686' 'x86_64')
url="http://psmisc.sourceforge.net/index.html"
@@ -16,8 +16,15 @@ depends=('ncurses')
conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
"selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
-source=(http://downloads.sourceforge.net/psmisc/${pkgname/-selinux}-${pkgver}.tar.gz)
-sha1sums=('09fabbef4539b58b6b8738a73da3d21d5daa1a58')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname/-selinux}-${pkgver}.tar.gz
+ psmisc-fuser.patch)
+sha1sums=('09fabbef4539b58b6b8738a73da3d21d5daa1a58'
+ 'e739ad5b14ca836db5859f0755d8f2fc8e86de69')
+
+prepare() {
+ cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
+ patch -p1 -i ../psmisc-fuser.patch
+}
build() {
cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
diff --git a/psmisc-fuser.patch b/psmisc-fuser.patch
new file mode 100644
index 00000000000..b7645f20137
--- /dev/null
+++ b/psmisc-fuser.patch
@@ -0,0 +1,11 @@
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -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);
+ }
+