diff options
author | Timothée Ravier | 2014-01-16 21:36:16 +0100 |
---|---|---|
committer | Timothée Ravier | 2014-01-16 21:36:16 +0100 |
commit | 13abb45108e0adc493c685ad42800644f8f33242 (patch) | |
tree | 65548d469fd9343404e5fe800606df42a9f06422 | |
parent | 49e3361b3eb11f955b1973eb5e7bb6490b097342 (diff) | |
download | aur-13abb45108e0adc493c685ad42800644f8f33242.tar.gz |
util-linux-selinux 2.24-2 update
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-lsblk-fix-D-segfault.patch | 45 | ||||
-rw-r--r-- | 0001-pylibmount-correctly-import-from-pylibmount.so.patch | 30 | ||||
-rw-r--r-- | PKGBUILD | 28 |
4 files changed, 102 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = util-linux-selinux - pkgdesc = Miscellaneous system utilities for Linux + pkgdesc = SELinux aware miscellaneous system utilities for Linux pkgver = 2.24 - pkgrel = 1 + pkgrel = 2 url = http://www.kernel.org/pub/linux/utils/util-linux/ install = util-linux.install arch = i686 @@ -32,11 +32,15 @@ pkgbase = util-linux-selinux backup = etc/pam.d/su backup = etc/pam.d/su-l source = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/util-linux-2.24.tar.xz + source = 0001-lsblk-fix-D-segfault.patch + source = 0001-pylibmount-correctly-import-from-pylibmount.so.patch source = uuidd.tmpfiles source = pam-login source = pam-common source = pam-su md5sums = 4fac6443427f575fc5f3531a4ad2ca01 + md5sums = 1899fe3b853a5835c76cca0501b6b518 + md5sums = a18a1e89ffdfa3bc96ae976646a723ec md5sums = a39554bfd65cccfd8254bb46922f4a67 md5sums = 4368b3f98abd8a32662e094c54e7f9b1 md5sums = a31374fef2cba0ca34dfc7078e2969e4 diff --git a/0001-lsblk-fix-D-segfault.patch b/0001-lsblk-fix-D-segfault.patch new file mode 100644 index 000000000000..8e4d7c6d203e --- /dev/null +++ b/0001-lsblk-fix-D-segfault.patch @@ -0,0 +1,45 @@ +From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Mon, 18 Nov 2013 11:27:35 +0100 +Subject: [PATCH] lsblk: fix -D segfault + +References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + misc-utils/lsblk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c +index 9f7f1b6..9b53be3 100644 +--- a/misc-utils/lsblk.c ++++ b/misc-utils/lsblk.c +@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line + if (cxt->discard && p) + tt_line_set_data(ln, col, p); + else +- tt_line_set_data(ln, col, "0"); ++ tt_line_set_data(ln, col, xstrdup("0")); + break; + case COL_DGRAN: + if (lsblk->bytes) +@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line + if (cxt->discard && p) + tt_line_set_data(ln, col, p); + else +- tt_line_set_data(ln, col, "0"); ++ tt_line_set_data(ln, col, xstrdup("0")); + break; + case COL_WSAME: + if (lsblk->bytes) +@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line + "queue/write_same_max_bytes", &x) == 0) + p = size_to_human_string(SIZE_SUFFIX_1LETTER, x); + } +- tt_line_set_data(ln, col, p ? p : "0"); ++ tt_line_set_data(ln, col, p ? p : xstrdup("0")); + break; + }; + } +-- +1.8.4.2 + diff --git a/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/0001-pylibmount-correctly-import-from-pylibmount.so.patch new file mode 100644 index 000000000000..34040b9eb8a8 --- /dev/null +++ b/0001-pylibmount-correctly-import-from-pylibmount.so.patch @@ -0,0 +1,30 @@ +From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 21 Nov 2013 12:25:27 -0500 +Subject: [PATCH] pylibmount: correctly import from pylibmount.so + +Without this, python is unable to find the module: + +$ python -c 'import libmount' +Traceback (most recent call last): + File "<string>", line 1, in <module> + File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module> + from pylibmount import * +ImportError: No module named 'pylibmount' + +Signed-off-by: Dave Reisner <dreisner@archlinux.org> +--- + libmount/python/libmount/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py +index 243c639..09104e2 100644 +--- a/libmount/python/libmount/__init__.py ++++ b/libmount/python/libmount/__init__.py +@@ -1,2 +1,2 @@ +-from pylibmount import * ++from .pylibmount import * + +-- +1.8.4.2 + @@ -7,20 +7,25 @@ pkgname=util-linux-selinux pkgver=2.24 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url='http://www.kernel.org/pub/linux/utils/util-linux/' +pkgrel=2 +pkgdesc="SELinux aware miscellaneous system utilities for Linux" +url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('selinux') depends=('pam-selinux' 'shadow-selinux' 'coreutils' 'glibc' 'libselinux') optdepends=('python: python bindings to libmount') makedepends=('systemd' 'python') # checkdepends=('bc') -conflicts=('util-linux-ng' 'eject' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}") -provides=("util-linux-ng=$pkgver" 'eject' "${pkgname/-selinux}=${pkgver}-${pkrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkrel}") +conflicts=('util-linux-ng' 'eject' + "${pkgname/-selinux}" "selinux-${pkgname/-selinux}") +provides=("util-linux-ng=$pkgver" 'eject' + "${pkgname/-selinux}=${pkgver}-${pkrel}" + "selinux-${pkgname/-selinux}=${pkgver}-${pkrel}") license=('GPL2') options=('strip' 'debug') source=("ftp://ftp.kernel.org/pub/linux/utils/${pkgname/-selinux}/v2.24/${pkgname/-selinux}-$pkgver.tar.xz" + 0001-lsblk-fix-D-segfault.patch + 0001-pylibmount-correctly-import-from-pylibmount.so.patch uuidd.tmpfiles pam-login pam-common @@ -32,11 +37,20 @@ backup=(etc/pam.d/chfn etc/pam.d/su-l) install=util-linux.install md5sums=('4fac6443427f575fc5f3531a4ad2ca01' + '1899fe3b853a5835c76cca0501b6b518' + 'a18a1e89ffdfa3bc96ae976646a723ec' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' 'fa85e5cce5d723275b14365ba71a8aad') +prepare() { + cd "${pkgname/-selinux}-$pkgver" + + patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch + patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch +} + build() { cd "${pkgname/-selinux}-$pkgver" @@ -52,8 +66,8 @@ build() { --enable-write \ --enable-mesg \ --enable-socket-activation \ - --with-python=3 \ - --with-selinux + --with-selinux \ + --with-python=3 # --enable-reset \ # part of ncurses # --enable-last \ # not compat |