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

[Christian Hesse]

    Date: Wednesday, November 7, 2018 @ 13:10:57
  Author: eworm
Revision: 338029

upgpkg: util-linux 2.33-2

agetty: fix output of escaped characters (FS#60731)

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

----------------------------------------------------+
 0001-agetty-fix-output-of-escaped-characters.patch |   23 ++++++++++++
 PKGBUILD                                           |   36 ++++++++++++-------
 2 files changed, 46 insertions(+), 13 deletions(-)

Added: 0001-agetty-fix-output-of-escaped-characters.patch
===================================================================
--- 0001-agetty-fix-output-of-escaped-characters.patch	                        (rev 0)
+++ 0001-agetty-fix-output-of-escaped-characters.patch	2018-11-07 13:10:57 UTC (rev 338029)
@@ -0,0 +1,23 @@
+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	2018-11-07 01:36:15 UTC (rev 338028)
+++ PKGBUILD	2018-11-07 13:10:57 UTC (rev 338029)
@@ -6,7 +6,7 @@
 pkgname=(util-linux libutil-linux)
 _pkgmajor=2.33
 pkgver=${_pkgmajor}
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('x86_64')
@@ -15,6 +15,7 @@
 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,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
@@ -22,6 +23,7 @@
         'rfkill-block_.service')
 sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
             'SKIP'
+            'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
             '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
@@ -30,21 +32,29 @@
             '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"
 
-  ./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-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-python=3
 
   make
 }