[arch-commits] Commit in util-linux/repos (11 files)
Christian Hesse
eworm at archlinux.org
Tue Apr 10 13:45:41 UTC 2018
Date: Tuesday, April 10, 2018 @ 13:45:40
Author: eworm
Revision: 321468
archrelease: copy trunk to testing-x86_64
Added:
util-linux/repos/testing-x86_64/
util-linux/repos/testing-x86_64/0001-fstrim-cleanup-uncludes.patch
(from rev 321467, util-linux/trunk/0001-fstrim-cleanup-uncludes.patch)
util-linux/repos/testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
(from rev 321467, util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch)
util-linux/repos/testing-x86_64/60-rfkill.rules
(from rev 321467, util-linux/trunk/60-rfkill.rules)
util-linux/repos/testing-x86_64/PKGBUILD
(from rev 321467, util-linux/trunk/PKGBUILD)
util-linux/repos/testing-x86_64/pam-common
(from rev 321467, util-linux/trunk/pam-common)
util-linux/repos/testing-x86_64/pam-login
(from rev 321467, util-linux/trunk/pam-login)
util-linux/repos/testing-x86_64/pam-su
(from rev 321467, util-linux/trunk/pam-su)
util-linux/repos/testing-x86_64/rfkill-block_.service
(from rev 321467, util-linux/trunk/rfkill-block_.service)
util-linux/repos/testing-x86_64/rfkill-unblock_.service
(from rev 321467, util-linux/trunk/rfkill-unblock_.service)
util-linux/repos/testing-x86_64/util-linux.sysusers
(from rev 321467, util-linux/trunk/util-linux.sysusers)
-----------------------------------------------------------+
0001-fstrim-cleanup-uncludes.patch | 41 ++++
0002-libmount_include_sys_mount_h_only_if_necessary.patch | 54 +++++
60-rfkill.rules | 1
PKGBUILD | 121 ++++++++++++
pam-common | 6
pam-login | 7
pam-su | 9
rfkill-block_.service | 10
rfkill-unblock_.service | 10
util-linux.sysusers | 2
10 files changed, 261 insertions(+)
Copied: util-linux/repos/testing-x86_64/0001-fstrim-cleanup-uncludes.patch (from rev 321467, util-linux/trunk/0001-fstrim-cleanup-uncludes.patch)
===================================================================
--- testing-x86_64/0001-fstrim-cleanup-uncludes.patch (rev 0)
+++ testing-x86_64/0001-fstrim-cleanup-uncludes.patch 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,41 @@
+From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at 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 at 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;
Copied: util-linux/repos/testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch (from rev 321467, util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch)
===================================================================
--- testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch (rev 0)
+++ testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,54 @@
+From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at 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 at 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;
Copied: util-linux/repos/testing-x86_64/60-rfkill.rules (from rev 321467, util-linux/trunk/60-rfkill.rules)
===================================================================
--- testing-x86_64/60-rfkill.rules (rev 0)
+++ testing-x86_64/60-rfkill.rules 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 321467, util-linux/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,121 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.32
+pkgver=${_pkgmajor}
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="https://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('x86_64')
+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}
+ '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'
+ 'rfkill-unblock_.service'
+ 'rfkill-block_.service')
+sha256sums=('6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734'
+ 'SKIP'
+ 'b1c0db069f60c086351f7a6fb7ff1add1c41e9ed7c1b65bd67e6604943fc4c75'
+ 'c65d8354fc2773035be8ac071541f4709763366d22a8a8f1bc2cb3401dcfdf69'
+ '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
+ 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
+ '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
+ '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
+ '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
+ '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
+ 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
+
+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
+}
+
+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
+
+ make
+}
+
+package_util-linux() {
+ conflicts=('eject' 'zramctl' 'rfkill')
+ provides=('eject' 'zramctl' 'rfkill')
+ replaces=('zramctl' 'rfkill')
+ depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libcap-ng' 'libutil-linux')
+ 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-$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"
+
+ # TODO(dreisner): offer this upstream?
+ sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket"
+
+ # 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 systemd-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"
+
+ install -Dm644 "$srcdir/rfkill-unblock_.service" \
+ "$pkgdir/usr/lib/systemd/system/rfkill-unblock at .service"
+ install -Dm644 "$srcdir/rfkill-block_.service" \
+ "$pkgdir/usr/lib/systemd/system/rfkill-block at .service"
+}
+
+package_libutil-linux() {
+ pkgdesc="util-linux runtime libraries"
+ provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+
+ make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
+}
Copied: util-linux/repos/testing-x86_64/pam-common (from rev 321467, util-linux/trunk/pam-common)
===================================================================
--- testing-x86_64/pam-common (rev 0)
+++ testing-x86_64/pam-common 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,6 @@
+#%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
Copied: util-linux/repos/testing-x86_64/pam-login (from rev 321467, util-linux/trunk/pam-login)
===================================================================
--- testing-x86_64/pam-login (rev 0)
+++ testing-x86_64/pam-login 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,7 @@
+#%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
Copied: util-linux/repos/testing-x86_64/pam-su (from rev 321467, util-linux/trunk/pam-su)
===================================================================
--- testing-x86_64/pam-su (rev 0)
+++ testing-x86_64/pam-su 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,9 @@
+#%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
Copied: util-linux/repos/testing-x86_64/rfkill-block_.service (from rev 321467, util-linux/trunk/rfkill-block_.service)
===================================================================
--- testing-x86_64/rfkill-block_.service (rev 0)
+++ testing-x86_64/rfkill-block_.service 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock at all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill block %I
+
+[Install]
+WantedBy=multi-user.target
Copied: util-linux/repos/testing-x86_64/rfkill-unblock_.service (from rev 321467, util-linux/trunk/rfkill-unblock_.service)
===================================================================
--- testing-x86_64/rfkill-unblock_.service (rev 0)
+++ testing-x86_64/rfkill-unblock_.service 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block at all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill unblock %I
+
+[Install]
+WantedBy=multi-user.target
Copied: util-linux/repos/testing-x86_64/util-linux.sysusers (from rev 321467, util-linux/trunk/util-linux.sysusers)
===================================================================
--- testing-x86_64/util-linux.sysusers (rev 0)
+++ testing-x86_64/util-linux.sysusers 2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,2 @@
+u uuidd 68
+g rfkill - - -
More information about the arch-commits
mailing list