X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2-diet.patch;h=abd2313d9af1dd87f780055562c7961bbcc90ce3;hp=3859bbfd8a5e3c32ca2121e4b4f1791c90194c8f;hb=eeebf03100069a2d93ac4199fb7e7be29e5d31b0;hpb=86014e0c66e041b3c60c6bc98a4219b51df2849f

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index 3859bbf..abd2313 100644
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -1,7 +1,7 @@
-diff -urp LVM2.2.02.177.orig/lib/commands/toolcontext.c LVM2.2.02.177/lib/commands/toolcontext.c
---- LVM2.2.02.177.orig/lib/commands/toolcontext.c	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/lib/commands/toolcontext.c	2018-01-26 15:13:17.915538732 +0000
-@@ -1840,10 +1840,10 @@ struct cmd_context *create_toolcontext(u
+diff -urp LVM2.2.02.179.orig/lib/commands/toolcontext.c LVM2.2.02.179/lib/commands/toolcontext.c
+--- LVM2.2.02.179.orig/lib/commands/toolcontext.c	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/lib/commands/toolcontext.c	2018-06-26 11:40:23.355840745 +0000
+@@ -1827,10 +1827,10 @@ struct cmd_context *create_toolcontext(u
  #ifdef M_MMAP_MAX
  	mallopt(M_MMAP_MAX, 0);
  #endif
@@ -14,10 +14,10 @@ diff -urp LVM2.2.02.177.orig/lib/commands/toolcontext.c LVM2.2.02.177/lib/comman
  #ifdef INTL_PACKAGE
  	bindtextdomain(INTL_PACKAGE, LOCALEDIR);
  #endif
-diff -urp LVM2.2.02.177.orig/lib/config/config.c LVM2.2.02.177/lib/config/config.c
---- LVM2.2.02.177.orig/lib/config/config.c	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/lib/config/config.c	2018-01-26 15:13:17.917538732 +0000
-@@ -43,6 +43,10 @@ static const char *_config_source_names[
+diff -urp LVM2.2.02.179.orig/lib/config/config.c LVM2.2.02.179/lib/config/config.c
+--- LVM2.2.02.179.orig/lib/config/config.c	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/lib/config/config.c	2018-06-26 11:40:23.356840745 +0000
+@@ -44,6 +44,10 @@ static const char *_config_source_names[
  	[CONFIG_FILE_SPECIAL] = "special purpose"
  };
  
@@ -28,9 +28,9 @@ diff -urp LVM2.2.02.177.orig/lib/config/config.c LVM2.2.02.177/lib/config/config
  struct config_file {
  	off_t st_size;
  	char *filename;
-diff -urp LVM2.2.02.177.orig/lib/metadata/pv.c LVM2.2.02.177/lib/metadata/pv.c
---- LVM2.2.02.177.orig/lib/metadata/pv.c	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/lib/metadata/pv.c	2018-01-26 15:13:17.919538732 +0000
+diff -urp LVM2.2.02.179.orig/lib/metadata/pv.c LVM2.2.02.179/lib/metadata/pv.c
+--- LVM2.2.02.179.orig/lib/metadata/pv.c	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/lib/metadata/pv.c	2018-06-26 11:40:23.356840745 +0000
 @@ -17,6 +17,12 @@
  #include "metadata.h"
  #include "lvmcache.h"
@@ -44,10 +44,10 @@ diff -urp LVM2.2.02.177.orig/lib/metadata/pv.c LVM2.2.02.177/lib/metadata/pv.c
  /*
   * FIXME: Check for valid handle before dereferencing field or log error?
   */
-diff -urp LVM2.2.02.177.orig/lib/misc/lib.h LVM2.2.02.177/lib/misc/lib.h
---- LVM2.2.02.177.orig/lib/misc/lib.h	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/lib/misc/lib.h	2018-01-26 15:13:17.917538732 +0000
-@@ -94,4 +94,20 @@
+diff -urp LVM2.2.02.179.orig/lib/misc/lib.h LVM2.2.02.179/lib/misc/lib.h
+--- LVM2.2.02.179.orig/lib/misc/lib.h	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/lib/misc/lib.h	2018-06-26 11:40:23.356840745 +0000
+@@ -93,4 +93,20 @@
  
  #include <unistd.h>
  
@@ -68,9 +68,9 @@ diff -urp LVM2.2.02.177.orig/lib/misc/lib.h LVM2.2.02.177/lib/misc/lib.h
 +#endif
 +
  #endif
-diff -urp LVM2.2.02.177.orig/lib/report/report.c LVM2.2.02.177/lib/report/report.c
---- LVM2.2.02.177.orig/lib/report/report.c	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/lib/report/report.c	2018-01-26 15:13:17.918538732 +0000
+diff -urp LVM2.2.02.179.orig/lib/report/report.c LVM2.2.02.179/lib/report/report.c
+--- LVM2.2.02.179.orig/lib/report/report.c	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/lib/report/report.c	2018-06-26 11:40:23.357840745 +0000
 @@ -29,6 +29,11 @@
  #include <float.h> /* DBL_MAX */
  #include <time.h>
@@ -83,9 +83,9 @@ diff -urp LVM2.2.02.177.orig/lib/report/report.c LVM2.2.02.177/lib/report/report
  struct lvm_report_object {
  	struct volume_group *vg;
  	struct lv_with_info_and_seg_status *lvdm;
-diff -urp LVM2.2.02.177.orig/libdm/libdevmapper.h LVM2.2.02.177/libdm/libdevmapper.h
---- LVM2.2.02.177.orig/libdm/libdevmapper.h	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/libdm/libdevmapper.h	2018-01-26 15:13:17.916538732 +0000
+diff -urp LVM2.2.02.179.orig/libdm/libdevmapper.h LVM2.2.02.179/libdm/libdevmapper.h
+--- LVM2.2.02.179.orig/libdm/libdevmapper.h	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/libdm/libdevmapper.h	2018-06-26 11:40:23.357840745 +0000
 @@ -251,6 +251,10 @@ int dm_task_set_add_node(struct dm_task
  /*
   * Control read_ahead.
@@ -97,9 +97,9 @@ diff -urp LVM2.2.02.177.orig/libdm/libdevmapper.h LVM2.2.02.177/libdm/libdevmapp
  #define DM_READ_AHEAD_AUTO UINT32_MAX	/* Use kernel default readahead */
  #define DM_READ_AHEAD_NONE 0		/* Disable readahead */
  
-diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/tools/dmsetup.c
---- LVM2.2.02.177.orig/tools/dmsetup.c	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/tools/dmsetup.c	2018-01-26 15:13:17.919538732 +0000
+diff -urp LVM2.2.02.179.orig/tools/dmsetup.c LVM2.2.02.179/tools/dmsetup.c
+--- LVM2.2.02.179.orig/tools/dmsetup.c	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/tools/dmsetup.c	2018-06-26 11:40:23.358840745 +0000
 @@ -37,6 +37,23 @@
  #  include <libudev.h>
  #endif
@@ -124,47 +124,48 @@ diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/tools/dmsetup.c
  /* FIXME Unused so far */
  #undef HAVE_SYS_STATVFS_H
  
-diff -urp LVM2.2.02.177.orig/tools/Makefile.in LVM2.2.02.177/tools/Makefile.in
---- LVM2.2.02.177.orig/tools/Makefile.in	2018-01-26 15:12:22.000000000 +0000
-+++ LVM2.2.02.177/tools/Makefile.in	2018-01-26 15:17:46.765522708 +0000
-@@ -126,12 +126,13 @@ device-mapper: $(TARGETS_DM)
- CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
+diff -urp LVM2.2.02.179.orig/tools/Makefile.in LVM2.2.02.179/tools/Makefile.in
+--- LVM2.2.02.179.orig/tools/Makefile.in	2018-06-26 11:33:19.629866001 +0000
++++ LVM2.2.02.179/tools/Makefile.in	2018-06-26 11:44:55.383824531 +0000
+@@ -127,13 +127,14 @@ CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXT
  
  dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
-+	$(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm \
+ 	@echo "    [CC] $@"
+-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
++	$(Q) $(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm \
 +	      $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
  	      -o $@ dmsetup.o -ldevmapper $(LIBS)
  
  dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
+ 	@echo "    [CC] $@"
+-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
 -	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
-+	$(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
++	$(Q) $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
 +	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
  
  all: device-mapper
  
-@@ -140,7 +141,7 @@ CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
- INCLUDES += -I$(top_builddir)/tools
+@@ -143,7 +144,7 @@ INCLUDES += -I$(top_builddir)/tools
  
  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
--	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
-+	$(CC) $(CFLAGS) -L$(interfacebuilddir) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
+ 	@echo "    [CC] $@"
+-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
++	$(Q) $(CC) $(CFLAGS) -L$(interfacebuilddir) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
  		$(LVMLIBS) $(READLINE_LIBS) $(LIBS)
  
  DEFS_man-generator.o += -DMAN_PAGE_GENERATOR
-@@ -157,7 +158,7 @@ endif
- 
+@@ -163,7 +164,7 @@ endif
  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+ 	@echo "    [CC] $@"
+ 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
 -	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
 +	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS)
  
  liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
- 	cat $(top_builddir)/lib/liblvm-internal.a > $@
-diff -urp LVM2.2.02.177.orig/tools/tools.h LVM2.2.02.177/tools/tools.h
---- LVM2.2.02.177.orig/tools/tools.h	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/tools/tools.h	2018-01-26 15:13:17.917538732 +0000
+ 	@echo "    [AR] $@"
+diff -urp LVM2.2.02.179.orig/tools/tools.h LVM2.2.02.179/tools/tools.h
+--- LVM2.2.02.179.orig/tools/tools.h	2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/tools/tools.h	2018-06-26 11:40:23.359840745 +0000
 @@ -47,6 +47,21 @@
  #include <ctype.h>
  #include <sys/types.h>