upgpkg: nonsystemd/util-linux 2.33-2.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

5 files changed, 57 insertions, 131 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
new file mode 100644
index 000000000..bba49f58e
--- /dev/null
+++ b/nonsystemd/util-linux/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/nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch b/nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch
deleted file mode 100644
index 74078555f..000000000
--- a/nonsystemd/util-linux/0001-fstrim-cleanup-uncludes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 22 Mar 2018 13:17:10 +0100
-Subject: fstrim: cleanup includes
-
-* HAVE_SYS_FS_H is incorrect (should be HAVE_LINUX_FS_H)
-
-* linux/fs.h cannot be included together with sys/mount.h as the both
-  files define MS_* constants. The libmount.h includes sys/mount.h now.
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/fstrim.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
-index ca8cf256d..53ac594c0 100644
---- a/sys-utils/fstrim.c
-+++ b/sys-utils/fstrim.c
-@@ -36,10 +36,6 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- 
--#ifdef HAVE_SYS_FS_H
--# include <linux/fs.h>
--#endif
--
- #include "nls.h"
- #include "strutils.h"
- #include "c.h"
-@@ -49,6 +45,10 @@
- 
- #include <libmount.h>
- 
-+
-+/* We cannot include linux/fs.h due to MS_* constants collision with
-+ * sys/mount.h (and libmount.h)
-+ */
- #ifndef FITRIM
- struct fstrim_range {
- 	uint64_t start;
diff --git a/nonsystemd/util-linux/0002-libmount_include_sys_mount_h_only_if_necessary.patch b/nonsystemd/util-linux/0002-libmount_include_sys_mount_h_only_if_necessary.patch
deleted file mode 100644
index 0c478f622..000000000
--- a/nonsystemd/util-linux/0002-libmount_include_sys_mount_h_only_if_necessary.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 22 Mar 2018 14:05:17 +0100
-Subject: libmount: include sys/mount.h only if necessary
-
-Addresses: https://github.com/systemd/systemd/issues/8507
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/libmount.h.in | 9 ++++++++-
- sys-utils/fstrim.c         | 4 +---
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
-index 8f323fcbf..11fd759fa 100644
---- a/libmount/src/libmount.h.in
-+++ b/libmount/src/libmount.h.in
-@@ -28,7 +28,14 @@ extern "C" {
- #include <stdio.h>
- #include <mntent.h>
- #include <sys/types.h>
--#include <sys/mount.h>
-+
-+/* Make sure libc MS_* definitions are used by default. Note that MS_* flags
-+ * may be already defined by linux/fs.h or another file -- in this case we
-+ * don't want to include sys/mount.h at all to avoid collisions.
-+ */
-+#ifndef MS_RDONLY
-+# include <sys/mount.h>
-+#endif
- 
- #define LIBMOUNT_VERSION   "@LIBMOUNT_VERSION@"
- #define LIBMOUNT_MAJOR_VERSION   @LIBMOUNT_MAJOR_VERSION@
-diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
-index 53ac594c0..ce52063e1 100644
---- a/sys-utils/fstrim.c
-+++ b/sys-utils/fstrim.c
-@@ -35,6 +35,7 @@
- 
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <linux/fs.h>
- 
- #include "nls.h"
- #include "strutils.h"
-@@ -46,9 +47,6 @@
- #include <libmount.h>
- 
- 
--/* We cannot include linux/fs.h due to MS_* constants collision with
-- * sys/mount.h (and libmount.h)
-- */
- #ifndef FITRIM
- struct fstrim_range {
- 	uint64_t start;
diff --git a/nonsystemd/util-linux/PKGBUILD b/nonsystemd/util-linux/PKGBUILD
index e6e2d1bd1..7cc5344ec 100644
--- a/nonsystemd/util-linux/PKGBUILD
+++ b/nonsystemd/util-linux/PKGBUILD
@@ -1,72 +1,71 @@
-# $Id$
+# Maintainer: David P. <megver83@parabola.nu>
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Contributor (Arch): judd <jvinet@zeroflux.org>
-# Maintainer: David P. <megver83@parabola.nu>
 
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
-_pkgmajor=2.32
+_pkgmajor=2.33
 pkgver=${_pkgmajor}
-pkgrel=3
+pkgrel=2
 pkgrel+=.nonsystemd1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 makedepends=('eudev' '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-fstrim-cleanup-uncludes.patch'
-        '0002-libmount_include_sys_mount_h_only_if_necessary.patch'
+        '0001-agetty-fix-output-of-escaped-characters.patch'
         pam-{login,common,su}
         'util-linux.sysusers'
         '60-rfkill.rules')
-sha256sums=('6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734'
+sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
             'SKIP'
-            'b1c0db069f60c086351f7a6fb7ff1add1c41e9ed7c1b65bd67e6604943fc4c75'
-            'c65d8354fc2773035be8ac071541f4709763366d22a8a8f1bc2cb3401dcfdf69'
+            'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
             '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
-            'a3980e33ef3a8d356379b4964c9730fd525d46e5b28cded5d0b50d6dc8a5563c'
+            '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
             '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
 
 prepare() {
   cd "$pkgbase-$pkgver"
 
-  patch -Np1 -i ../0001-fstrim-cleanup-uncludes.patch
-  patch -Np1 -i ../0002-libmount_include_sys_mount_h_only_if_necessary.patch
+  # 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=/run \
-              --enable-fs-paths-extra=/usr/bin \
-              --enable-raw \
-              --enable-vipw \
-              --enable-newgrp \
-              --enable-chfn-chsh \
-              --enable-write \
-              --enable-mesg \
-              --with-python=3 \
-              --with-systemd=no \
-              --with-systemdsystemunitdir=no \
-              --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 \
+    --with-systemd=no \
+    --with-systemdsystemunitdir=no
+
   make
 }
 
 package_util-linux() {
-  conflicts=('util-linux-nosystemd' 'eject' 'zramctl' 'rfkill')
-  provides=("util-linux-nosystemd=$pkgver" 'eject' 'zramctl' 'rfkill')
-  replaces=('util-linux-nosystemd' 'zramctl' 'rfkill')
+  conflicts=('eject' 'zramctl' 'rfkill')
+  provides=('eject' 'zramctl' 'rfkill')
+  replaces=('zramctl' 'rfkill')
   depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libutil-linux')
-  optdepends=('python: python bindings to libmount')
+  optdepends=('python: python bindings to libmount'
+              'words: default dictionary for look')
   groups=('base' 'base-devel')
   backup=(etc/pam.d/chfn
           etc/pam.d/chsh
@@ -97,7 +96,7 @@ package_util-linux() {
   ### runtime libs are shipped as part of libutil-linux
   rm "$pkgdir"/usr/lib/lib*.{a,so}*
 
-  ### install sysusers
+  ### install opensysusers
   install -Dm644 "$srcdir/util-linux.sysusers" \
     "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
 
@@ -107,9 +106,7 @@ package_util-linux() {
 
 package_libutil-linux() {
   pkgdesc="util-linux runtime libraries"
-  provides=("libutil-linux-nosystemd=$pkgver" 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-  replaces=('libutil-linux-nosystemd')
-  conflicts=('libutil-linux-nosystemd')
+  provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
 
   make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
 }
diff --git a/nonsystemd/util-linux/util-linux.sysusers b/nonsystemd/util-linux/util-linux.sysusers
index d7425ae9e..de04d9f05 100644
--- a/nonsystemd/util-linux/util-linux.sysusers
+++ b/nonsystemd/util-linux/util-linux.sysusers
@@ -1 +1,2 @@
 u uuidd 68
+g rfkill - - -