[arch-commits] Commit in util-linux/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, January 9, 2019 @ 12:07:31
  Author: eworm
Revision: 343186

upgpkg: util-linux 2.33.1-1

new upstream release

Modified:
  util-linux/trunk/PKGBUILD
Deleted:
  util-linux/trunk/0001-agetty-fix-output-of-escaped-characters.patch

----------------------------------------------------+
 0001-agetty-fix-output-of-escaped-characters.patch |   23 -------------------
 PKGBUILD                                           |   15 ++----------
 2 files changed, 3 insertions(+), 35 deletions(-)

Deleted: 0001-agetty-fix-output-of-escaped-characters.patch
===================================================================
--- 0001-agetty-fix-output-of-escaped-characters.patch	2019-01-09 07:57:40 UTC (rev 343185)
+++ 0001-agetty-fix-output-of-escaped-characters.patch	2019-01-09 12:07:31 UTC (rev 343186)
@@ -1,23 +0,0 @@
-From ecf19dcb2d623f9c5847b6d3b3a4b85751323aee Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at 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;
- 	}
- }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 07:57:40 UTC (rev 343185)
+++ PKGBUILD	2019-01-09 12:07:31 UTC (rev 343186)
@@ -5,8 +5,8 @@
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
 _pkgmajor=2.33
-pkgver=${_pkgmajor}
-pkgrel=3
+pkgver=${_pkgmajor}.1
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('x86_64')
@@ -15,15 +15,13 @@
 options=('strip' 'debug')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$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'
@@ -33,13 +31,6 @@
             '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
             'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  # agetty: fix output of escaped characters
-  patch -Np1 < ../0001-agetty-fix-output-of-escaped-characters.patch
-}
-
 build() {
   cd "$pkgbase-$pkgver"