summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nonsystemd/util-linux/0001-agetty-fix-output-of-escaped-characters.patch23
-rw-r--r--nonsystemd/util-linux/PKGBUILD17
2 files changed, 4 insertions, 36 deletions
diff --git a/nonsystemd/util-linux/0001-agetty-fix-output-of-escaped-characters.patch b/nonsystemd/util-linux/0001-agetty-fix-output-of-escaped-characters.patch
deleted file mode 100644
index bba49f58e..000000000
--- a/nonsystemd/util-linux/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/nonsystemd/util-linux/PKGBUILD b/nonsystemd/util-linux/PKGBUILD
index 7cc5344ec..f6052a257 100644
--- a/nonsystemd/util-linux/PKGBUILD
+++ b/nonsystemd/util-linux/PKGBUILD
@@ -6,37 +6,28 @@
pkgbase=util-linux
pkgname=(util-linux libutil-linux)
_pkgmajor=2.33
-pkgver=${_pkgmajor}
+pkgver=${_pkgmajor}.1
pkgrel=2
pkgrel+=.nonsystemd1
pkgdesc="Miscellaneous system utilities for Linux"
url="https://www.kernel.org/pub/linux/utils/util-linux/"
arch=('x86_64' 'i686' 'armv7h')
-makedepends=('eudev' 'python' 'libcap-ng')
+makedepends=('udev' 'python' 'libcap-ng')
license=('GPL2')
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')
-sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
+sha256sums=('c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21'
'SKIP'
- 'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
'993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
'51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
'10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
'7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
-prepare() {
- cd "$pkgbase-$pkgver"
-
- # agetty: fix output of escaped characters
- patch -Np1 < ../0001-agetty-fix-output-of-escaped-characters.patch
-}
-
build() {
cd "$pkgbase-$pkgver"
@@ -63,7 +54,7 @@ package_util-linux() {
conflicts=('eject' 'zramctl' 'rfkill')
provides=('eject' 'zramctl' 'rfkill')
replaces=('zramctl' 'rfkill')
- depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libutil-linux')
+ depends=('pam' 'shadow' 'coreutils' 'libudev' 'libcap-ng' 'libutil-linux')
optdepends=('python: python bindings to libmount'
'words: default dictionary for look')
groups=('base' 'base-devel')