util-linux-selinux 2.33.1-1 update

3 files changed, 11 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73f3b05db123..5dbc9ae6c8b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
-	pkgver = 2.33
-	pkgrel = 3
+	pkgver = 2.33.1
+	pkgrel = 1
 	url = https://www.kernel.org/pub/linux/utils/util-linux/
 	arch = x86_64
 	groups = selinux
@@ -11,9 +11,8 @@ pkgbase = util-linux-selinux
 	makedepends = libcap-ng
 	makedepends = libselinux
 	options = strip
-	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 = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.sign
 	source = pam-login
 	source = pam-common
 	source = pam-runuser
@@ -23,9 +22,8 @@ pkgbase = util-linux-selinux
 	source = rfkill-unblock_.service
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
-	sha256sums = f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a
+	sha256sums = c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21
 	sha256sums = SKIP
-	sha256sums = a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4
 	sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92
 	sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20
 	sha256sums = 95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935
@@ -45,8 +43,8 @@ pkgname = util-linux-selinux
 	optdepends = python: python bindings to libmount
 	optdepends = words: default dictionary for look
 	provides = rfkill
-	provides = util-linux=2.33-3
-	provides = selinux-util-linux=2.33-3
+	provides = util-linux=2.33.1-1
+	provides = selinux-util-linux=2.33.1-1
 	conflicts = rfkill
 	conflicts = util-linux
 	conflicts = selinux-util-linux
@@ -66,6 +64,6 @@ pkgname = libutil-linux-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = libutil-linux=2.33-3
+	provides = libutil-linux=2.33.1-1
 	conflicts = libutil-linux
 
diff --git a/0001-agetty-fix-output-of-escaped-characters.patch b/0001-agetty-fix-output-of-escaped-characters.patch
deleted file mode 100644
index bba49f58e1d2..000000000000
--- a/0001-agetty-fix-output-of-escaped-characters.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 4994372a9805..90f35d5988a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
 pkgbase=util-linux-selinux
 pkgname=(util-linux-selinux libutil-linux-selinux)
 _pkgmajor=2.33
-pkgver=${_pkgmajor}
-pkgrel=3
+pkgver=${_pkgmajor}.1
+pkgrel=1
 pkgdesc="SELinux aware miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('x86_64')
@@ -27,15 +27,13 @@ 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,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
+sha256sums=('c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21'
             'SKIP'
-            'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
             '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935'
@@ -45,13 +43,6 @@ sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
             '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"