- rel 2; force /proc/self/mountinfo usage (newer systemd wants this; makes mtab obsolete)

[packages/util-linux.git] / util-linux-diet.patch

diff --git a/util-linux-diet.patch b/util-linux-diet.patch
index b0085b0de95cd56be510883d7af626d10b143e3e..24404a5f53dd54488bd9985dbbf321b4e1620caa 100644 (file)
--- a/util-linux-diet.patch
+++ b/util-linux-diet.patch
@@ -72,16 +72,16 @@
  
 --- util-linux-2.19/misc-utils/findmnt.c~      2011-01-31 16:43:47.000000000 +0100
 +++ util-linux-2.19/misc-utils/findmnt.c       2011-02-10 20:54:23.100130391 +0100
-@@ -30,6 +30,9 @@
- #include <poll.h>
- #include <sys/statvfs.h>
- #include <sys/types.h>
+@@ -36,6 +36,9 @@
+ # include <libudev.h>
+ #endif
+ #include <libmount.h>
 +#ifdef __dietlibc__
 +#include <sys/stat.h> /* for major and minor macros */
 +#endif
  
- #include <libmount.h>
- 
+ #include "pathnames.h"
+ #include "nls.h"
 --- util-linux-2.19/disk-utils/fsck.c~ 2011-02-07 16:19:29.000000000 +0100
 +++ util-linux-2.19/disk-utils/fsck.c  2011-02-10 21:09:27.024658725 +0100
 @@ -270,7 +270,13 @@
@@ -101,10 +101,10 @@
  
 --- util-linux-2.21/configure.ac~      2012-02-24 12:53:35.000000000 +0200
 +++ util-linux-2.21/configure.ac       2012-03-05 21:03:25.833675080 +0200
-@@ -311,6 +311,7 @@
-       lchown \
+@@ -323,6 +323,7 @@ AC_CHECK_FUNCS([ \
        llseek \
        lseek64 \
+       mempcpy \
 +      mkostemp \
        nanosleep \
        personality \
@@ -144,37 +144,6 @@
        if (n <= 0)
                return 0;
  
---- util-linux-2.22.1/lib/Makemodule.am.orig   2012-09-20 15:16:51.344635140 +0200
-+++ util-linux-2.22.1/lib/Makemodule.am        2012-10-13 16:15:53.662070426 +0200
-@@ -5,7 +5,6 @@
-       lib/at.c \
-       lib/blkdev.c \
-       lib/canonicalize.c \
--      lib/cpuset.c \
-       lib/crc32.c \
-       lib/env.c \
-       lib/fileutils.c \
-@@ -15,7 +14,6 @@
-       lib/mbsalign.c \
-       lib/md5.c \
-       lib/pager.c \
--      lib/path.c \
-       lib/procutils.c \
-       lib/randutils.c \
-       lib/setproctitle.c \
-@@ -25,6 +23,12 @@
-       lib/wholedisk.c \
-       lib/xgetpass.c
- 
-+if HAVE_CPU_SET_T
-+libcommon_la_SOURCES += \
-+      lib/cpuset.c \
-+      lib/path.c
-+endif
-+
- if LINUX
- libcommon_la_SOURCES += \
-       lib/linux_version.c \
 --- util-linux-2.22.1/lib/tt.c.orig    2012-09-20 15:16:51.349635172 +0200
 +++ util-linux-2.22.1/lib/tt.c 2012-10-13 16:58:37.331962836 +0200
 @@ -59,11 +59,13 @@