util-linux-selinux 2.33-2 update

3 files changed, 61 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f44e63be2ac..b3185d644707 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
-	pkgver = 2.32.1
+	pkgver = 2.33
 	pkgrel = 2
 	url = https://www.kernel.org/pub/linux/utils/util-linux/
 	arch = x86_64
@@ -11,8 +11,9 @@ pkgbase = util-linux-selinux
 	makedepends = libcap-ng
 	makedepends = libselinux
 	options = strip
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-2.32.1.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-2.32.1.tar.sign
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.tar.sign
+	source = 0001-agetty-fix-output-of-escaped-characters.patch
 	source = pam-login
 	source = pam-common
 	source = pam-su
@@ -21,8 +22,9 @@ pkgbase = util-linux-selinux
 	source = rfkill-unblock_.service
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
-	sha256sums = 86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
+	sha256sums = f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a
 	sha256sums = SKIP
+	sha256sums = a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4
 	sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92
 	sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20
 	sha256sums = 51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0
@@ -39,11 +41,12 @@ pkgname = util-linux-selinux
 	depends = libcap-ng
 	depends = libutil-linux-selinux
 	optdepends = python: python bindings to libmount
+	optdepends = words: default dictionary for look
 	provides = eject
 	provides = zramctl
 	provides = rfkill
-	provides = util-linux=2.32.1-2
-	provides = selinux-util-linux=2.32.1-2
+	provides = util-linux=2.33-2
+	provides = selinux-util-linux=2.33-2
 	conflicts = eject
 	conflicts = zramctl
 	conflicts = rfkill
@@ -63,6 +66,6 @@ pkgname = libutil-linux-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = libutil-linux=2.32.1-2
+	provides = libutil-linux=2.33-2
 	conflicts = libutil-linux
 
diff --git a/0001-agetty-fix-output-of-escaped-characters.patch b/0001-agetty-fix-output-of-escaped-characters.patch
new file mode 100644
index 000000000000..bba49f58e1d2
--- /dev/null
+++ b/0001-agetty-fix-output-of-escaped-characters.patch
@@ -0,0 +1,23 @@
+From ecf19dcb2d623f9c5847b6d3b3a4b85751323aee Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Wed, 7 Nov 2018 13:54:32 +0100
+Subject: [PATCH 1/1] agetty: fix output of escaped characters
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ term-utils/agetty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 05a269abb..b9f08728e 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie,
+ 		break;
+ 	}
+ 	default:
+-		putchar(c);
++		putc(c, ie->output);
+ 		break;
+ 	}
+ }
diff --git a/PKGBUILD b/PKGBUILD
index 673ba3af4742..ddeb13147735 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -11,8 +10,8 @@
 
 pkgbase=util-linux-selinux
 pkgname=(util-linux-selinux libutil-linux-selinux)
-_pkgmajor=2.32
-pkgver=${_pkgmajor}.1
+_pkgmajor=2.33
+pkgver=${_pkgmajor}
 pkgrel=2
 pkgdesc="SELinux aware miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
@@ -28,13 +27,15 @@ license=('GPL2')
 options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${pkgbase/-selinux}-$pkgver.tar."{xz,sign}
+        '0001-agetty-fix-output-of-escaped-characters.patch'
         pam-{login,common,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2'
+sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
             'SKIP'
+            'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
             '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
@@ -43,22 +44,30 @@ sha256sums=('86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2'
             '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
             'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
+prepare() {
+  cd "${pkgbase/-selinux}-$pkgver"
+
+  # agetty: fix output of escaped characters
+  patch -Np1 < ../0001-agetty-fix-output-of-escaped-characters.patch
+}
+
 build() {
   cd "${pkgbase/-selinux}-$pkgver"
 
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib \
-              --bindir=/usr/bin \
-              --localstatedir=/var \
-              --enable-fs-paths-extra=/usr/bin \
-              --enable-raw \
-              --enable-vipw \
-              --enable-newgrp \
-              --enable-chfn-chsh \
-              --enable-write \
-              --enable-mesg \
-              --with-selinux \
-              --with-python=3
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --bindir=/usr/bin \
+    --localstatedir=/var \
+    --enable-fs-paths-extra=/usr/bin \
+    --enable-raw \
+    --enable-vipw \
+    --enable-newgrp \
+    --enable-chfn-chsh \
+    --enable-write \
+    --enable-mesg \
+    --with-selinux \
+    --with-python=3
 
   make
 }
@@ -71,7 +80,8 @@ package_util-linux-selinux() {
             "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
   depends=('pam-selinux' 'shadow-selinux' 'coreutils-selinux'
            'libsystemd-selinux' 'libcap-ng' 'libutil-linux-selinux')
-  optdepends=('python: python bindings to libmount')
+  optdepends=('python: python bindings to libmount'
+              'words: default dictionary for look')
   backup=(etc/pam.d/chfn
           etc/pam.d/chsh
           etc/pam.d/login