summaryrefslogtreecommitdiff
path: root/libre/libutil-linux-static
diff options
context:
space:
mode:
Diffstat (limited to 'libre/libutil-linux-static')
-rw-r--r--libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch41
-rw-r--r--libre/libutil-linux-static/0002-libmount_include_sys_mount_h_only_if_necessary.patch54
-rw-r--r--libre/libutil-linux-static/60-rfkill.rules1
-rw-r--r--libre/libutil-linux-static/PKGBUILD65
-rw-r--r--libre/libutil-linux-static/pam-common6
-rw-r--r--libre/libutil-linux-static/pam-login7
-rw-r--r--libre/libutil-linux-static/pam-runuser4
-rw-r--r--libre/libutil-linux-static/pam-su9
-rw-r--r--libre/libutil-linux-static/rfkill-block_.service10
-rw-r--r--libre/libutil-linux-static/rfkill-unblock_.service10
-rw-r--r--libre/libutil-linux-static/util-linux.sysusers2
11 files changed, 0 insertions, 209 deletions
diff --git a/libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch b/libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch
deleted file mode 100644
index 74078555f..000000000
--- a/libre/libutil-linux-static/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/libre/libutil-linux-static/0002-libmount_include_sys_mount_h_only_if_necessary.patch b/libre/libutil-linux-static/0002-libmount_include_sys_mount_h_only_if_necessary.patch
deleted file mode 100644
index 0c478f622..000000000
--- a/libre/libutil-linux-static/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/libre/libutil-linux-static/60-rfkill.rules b/libre/libutil-linux-static/60-rfkill.rules
deleted file mode 100644
index bc98a3bef..000000000
--- a/libre/libutil-linux-static/60-rfkill.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
diff --git a/libre/libutil-linux-static/PKGBUILD b/libre/libutil-linux-static/PKGBUILD
deleted file mode 100644
index 14bf874a3..000000000
--- a/libre/libutil-linux-static/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-_pkgbase=util-linux
-pkgname=libutil-linux-static
-_pkgmajor=2.33
-pkgver=${_pkgmajor}.1
-pkgrel=2
-pkgrel+=.static1
-pkgdesc="Miscellaneous system utilities for Linux"
-url="https://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-makedepends=('systemd' '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}
- pam-{login,common,runuser,su}
- 'util-linux.sysusers'
- '60-rfkill.rules'
- 'rfkill-unblock_.service'
- 'rfkill-block_.service')
-sha256sums=('c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21'
- 'SKIP'
- '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
- 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
- '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935'
- '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
- '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
- '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
- '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
- 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
-
-build() {
- cd "$_pkgbase-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --bindir=/usr/bin \
- --localstatedir=/var \
- --enable-fs-paths-default=/usr/bin:/usr/local/bin \
- --enable-raw \
- --enable-vipw \
- --enable-newgrp \
- --enable-chfn-chsh \
- --enable-write \
- --enable-mesg \
- --disable-shared --enable-static \
- --with-python=3
-
- make
-}
-
-package() {
- pkgdesc="util-linux runtime libraries"
- pkgdesc+=" (static libraries)"
- provides=()
- depends=("libutil-linux=$pkgver")
- options=('staticlibs')
-
- make -C "$_pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
-}
diff --git a/libre/libutil-linux-static/pam-common b/libre/libutil-linux-static/pam-common
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/libre/libutil-linux-static/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/libre/libutil-linux-static/pam-login b/libre/libutil-linux-static/pam-login
deleted file mode 100644
index 1960d9497..000000000
--- a/libre/libutil-linux-static/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/libre/libutil-linux-static/pam-runuser b/libre/libutil-linux-static/pam-runuser
deleted file mode 100644
index d5b1ea353..000000000
--- a/libre/libutil-linux-static/pam-runuser
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-
-auth sufficient pam_rootok.so
-session include system-login
diff --git a/libre/libutil-linux-static/pam-su b/libre/libutil-linux-static/pam-su
deleted file mode 100644
index cf15f40f1..000000000
--- a/libre/libutil-linux-static/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/libre/libutil-linux-static/rfkill-block_.service b/libre/libutil-linux-static/rfkill-block_.service
deleted file mode 100644
index ede74d12d..000000000
--- a/libre/libutil-linux-static/rfkill-block_.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=RFKill-Block %I
-After=rfkill-unblock@all.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/rfkill block %I
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/libutil-linux-static/rfkill-unblock_.service b/libre/libutil-linux-static/rfkill-unblock_.service
deleted file mode 100644
index 94ebf35af..000000000
--- a/libre/libutil-linux-static/rfkill-unblock_.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=RFKill-Unblock %I
-After=rfkill-block@all.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/rfkill unblock %I
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/libutil-linux-static/util-linux.sysusers b/libre/libutil-linux-static/util-linux.sysusers
deleted file mode 100644
index de04d9f05..000000000
--- a/libre/libutil-linux-static/util-linux.sysusers
+++ /dev/null
@@ -1,2 +0,0 @@
-u uuidd 68
-g rfkill - - -