8 files changed, 0 insertions, 233 deletions
diff --git a/pcr/util-linux-nosystemd/0001-fstrim-cleanup-uncludes.patch b/pcr/util-linux-nosystemd/0001-fstrim-cleanup-uncludes.patch
deleted file mode 100644
index 74078555f..000000000
--- a/pcr/util-linux-nosystemd/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/pcr/util-linux-nosystemd/0002-libmount_include_sys_mount_h_only_if_necessary.patch b/pcr/util-linux-nosystemd/0002-libmount_include_sys_mount_h_only_if_necessary.patch
deleted file mode 100644
index 0c478f622..000000000
--- a/pcr/util-linux-nosystemd/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/pcr/util-linux-nosystemd/60-rfkill.rules b/pcr/util-linux-nosystemd/60-rfkill.rules
deleted file mode 100644
index bc98a3bef..000000000
--- a/pcr/util-linux-nosystemd/60-rfkill.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
diff --git a/pcr/util-linux-nosystemd/PKGBUILD b/pcr/util-linux-nosystemd/PKGBUILD
deleted file mode 100644
index 117d1634a..000000000
--- a/pcr/util-linux-nosystemd/PKGBUILD
+++ /dev/null
@@ -1,114 +0,0 @@
-# $Id$
-# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
-# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
-# Contributor (Arch): judd <jvinet@zeroflux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Maintainer: David P. <megver83@parabola.nu>
-
-pkgbase=util-linux-nosystemd
-pkgname=(util-linux-nosystemd libutil-linux-nosystemd)
-_pkgmajor=2.32
-pkgver=${_pkgmajor}
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux"
-url="https://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64' '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%-nosystemd}-$pkgver.tar."{xz,sign}
-        '0001-fstrim-cleanup-uncludes.patch'
-        '0002-libmount_include_sys_mount_h_only_if_necessary.patch'
-        pam-{login,common,su}
-        'util-linux.sysusers'
-        '60-rfkill.rules')
-sha256sums=('6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734'
-            'SKIP'
-            'b1c0db069f60c086351f7a6fb7ff1add1c41e9ed7c1b65bd67e6604943fc4c75'
-            'c65d8354fc2773035be8ac071541f4709763366d22a8a8f1bc2cb3401dcfdf69'
-            '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
-            'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
-            '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
-            'a3980e33ef3a8d356379b4964c9730fd525d46e5b28cded5d0b50d6dc8a5563c'
-            '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
-
-prepare() {
-  cd "${pkgbase%-nosystemd}-$pkgver"
-
-  patch -Np1 -i ../0001-fstrim-cleanup-uncludes.patch
-  patch -Np1 -i ../0002-libmount_include_sys_mount_h_only_if_necessary.patch
-}
-
-build() {
-  cd "${pkgbase%-nosystemd}-$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
-  make
-}
-
-package_util-linux-nosystemd() {
-  conflicts=('util-linux' 'eject' 'zramctl' 'rfkill')
-  provides=("util-linux=$pkgver" 'eject' 'zramctl' 'rfkill')
-  replaces=('zramctl' 'rfkill')
-  depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libutil-linux-nosystemd')
-  optdepends=('python: python bindings to libmount')
-  #groups=('base' 'base-devel')
-  backup=(etc/pam.d/chfn
-          etc/pam.d/chsh
-          etc/pam.d/login
-          etc/pam.d/su
-          etc/pam.d/su-l)
-
-  cd "${pkgbase%-nosystemd}-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # setuid chfn and chsh
-  chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
-
-  # install PAM files for login-utils
-  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
-  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
-  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
-
-  # adjust for usrmove
-  # TODO(dreisner): fix configure.ac upstream so that this isn't needed
-  cd "$pkgdir"
-  mv {,usr/}sbin/* usr/bin
-  rmdir sbin usr/sbin
-
-  ### runtime libs are shipped as part of libutil-linux
-  rm "$pkgdir"/usr/lib/lib*.{a,so}*
-
-  ### install sysusers
-  install -Dm644 "$srcdir/util-linux.sysusers" \
-    "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
-
-  install -Dm644 "$srcdir/60-rfkill.rules" \
-    "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
-}
-
-package_libutil-linux-nosystemd() {
-  pkgdesc="util-linux runtime libraries"
-  provides=("libutil-linux=$pkgver" 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-  conflicts=('libutil-linux')
-
-  make -C "${pkgbase%-nosystemd}-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
-}
diff --git a/pcr/util-linux-nosystemd/pam-common b/pcr/util-linux-nosystemd/pam-common
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/pcr/util-linux-nosystemd/pam-common
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/pcr/util-linux-nosystemd/pam-login b/pcr/util-linux-nosystemd/pam-login
deleted file mode 100644
index 1960d9497..000000000
--- a/pcr/util-linux-nosystemd/pam-login
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_securetty.so
-auth       requisite    pam_nologin.so
-auth       include      system-local-login
-account    include      system-local-login
-session    include      system-local-login
diff --git a/pcr/util-linux-nosystemd/pam-su b/pcr/util-linux-nosystemd/pam-su
deleted file mode 100644
index cf15f40f1..000000000
--- a/pcr/util-linux-nosystemd/pam-su
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth		sufficient	pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth		required	pam_wheel.so use_uid
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/pcr/util-linux-nosystemd/util-linux.sysusers b/pcr/util-linux-nosystemd/util-linux.sysusers
deleted file mode 100644
index d7425ae9e..000000000
--- a/pcr/util-linux-nosystemd/util-linux.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u uuidd 68