summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2017-07-06 21:18:13 +0200
committerNicolas Iooss2017-07-06 21:18:13 +0200
commitaa530bb77a799f4107b0d628b97581a98a8c5adc (patch)
tree195394df6b73030e2b9850637c0ba2ab6744fa7a
parent8cf000369cacac564910dc3a18a33a55b77efc66 (diff)
downloadaur-aa530bb77a799f4107b0d628b97581a98a8c5adc.tar.gz
psmisc-selinux 23.1-1 update
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD15
-rw-r--r--psmisc-fuser.patch11
3 files changed, 10 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a0ff8a3a47d2..e32e065e7791 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = psmisc-selinux
pkgdesc = Miscellaneous procfs tools with SELinux support
- pkgver = 22.21
- pkgrel = 3
+ pkgver = 23.1
+ pkgrel = 1
url = http://psmisc.sourceforge.net/index.html
arch = i686
arch = x86_64
@@ -9,14 +9,12 @@ pkgbase = psmisc-selinux
license = GPL
depends = ncurses
depends = libselinux
- provides = psmisc=22.21-3
- provides = selinux-psmisc=22.21-3
+ provides = psmisc=23.1-1
+ provides = selinux-psmisc=23.1-1
conflicts = psmisc
conflicts = selinux-psmisc
- source = http://downloads.sourceforge.net/psmisc/psmisc-22.21.tar.gz
- source = psmisc-fuser.patch
- sha1sums = 09fabbef4539b58b6b8738a73da3d21d5daa1a58
- sha1sums = e739ad5b14ca836db5859f0755d8f2fc8e86de69
+ source = http://downloads.sourceforge.net/psmisc/psmisc-23.1.tar.xz
+ sha256sums = 2e84d474cf75dfbe3ecdacfb797bbfab71a35c7c2639d1b9f6d5f18b2149ba30
pkgname = psmisc-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 918c4028e503..be30780f75c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
# SELinux Contributor: Nicky726 <Nicky726@gmail.com>
pkgname=psmisc-selinux
-pkgver=22.21
-pkgrel=3
+pkgver=23.1
+pkgrel=1
pkgdesc="Miscellaneous procfs tools with SELinux support"
arch=('i686' 'x86_64')
url="http://psmisc.sourceforge.net/index.html"
@@ -16,15 +16,8 @@ depends=('ncurses' 'libselinux')
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
- psmisc-fuser.patch)
-sha1sums=('09fabbef4539b58b6b8738a73da3d21d5daa1a58'
- 'e739ad5b14ca836db5859f0755d8f2fc8e86de69')
-
-prepare() {
- cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
- patch -p1 -i ../psmisc-fuser.patch
-}
+source=(http://downloads.sourceforge.net/psmisc/${pkgname/-selinux}-${pkgver}.tar.xz)
+sha256sums=('2e84d474cf75dfbe3ecdacfb797bbfab71a35c7c2639d1b9f6d5f18b2149ba30')
build() {
cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
diff --git a/psmisc-fuser.patch b/psmisc-fuser.patch
deleted file mode 100644
index b7645f201378..000000000000
--- a/psmisc-fuser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
- }
-