Date: Sunday, March 31, 2019 @ 12:26:37 Author: dreisner Revision: 446681
Drop unused patches, update upstream URL Modified: lib32-util-linux/trunk/PKGBUILD Deleted: lib32-util-linux/trunk/0001-fstrim-cleanup-uncludes.patch lib32-util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch -----------------------------------------------------------+ 0001-fstrim-cleanup-uncludes.patch | 41 --------- 0002-libmount_include_sys_mount_h_only_if_necessary.patch | 54 ------------ PKGBUILD | 2 3 files changed, 1 insertion(+), 96 deletions(-) Deleted: 0001-fstrim-cleanup-uncludes.patch =================================================================== --- 0001-fstrim-cleanup-uncludes.patch 2019-03-31 12:14:43 UTC (rev 446680) +++ 0001-fstrim-cleanup-uncludes.patch 2019-03-31 12:26:37 UTC (rev 446681) @@ -1,41 +0,0 @@ -From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -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 <[email protected]> ---- - 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; Deleted: 0002-libmount_include_sys_mount_h_only_if_necessary.patch =================================================================== --- 0002-libmount_include_sys_mount_h_only_if_necessary.patch 2019-03-31 12:14:43 UTC (rev 446680) +++ 0002-libmount_include_sys_mount_h_only_if_necessary.patch 2019-03-31 12:26:37 UTC (rev 446681) @@ -1,54 +0,0 @@ -From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -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 <[email protected]> ---- - 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; Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-31 12:14:43 UTC (rev 446680) +++ PKGBUILD 2019-03-31 12:26:37 UTC (rev 446681) @@ -7,7 +7,7 @@ pkgver=${_pkgmajor}.1 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux (32-bit)" -url='http://www.kernel.org/pub/linux/utils/util-linux/' +url='https://github.com/karelzak/util-linux' arch=('x86_64') depends=('lib32-glibc' "$_pkgbasename") provides=('libuuid.so' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so')
