X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2-diet.patch;h=abd2313d9af1dd87f780055562c7961bbcc90ce3;hp=bd90a36e308fe30b5e4dd0c894f76c30b178f8cf;hb=1785ea5471da12614d5ab191ba40d63db784cd73;hpb=99ada230dd55f3e0aa06824f3b95335424c57557

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index bd90a36..abd2313 100644
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -1,6 +1,7 @@
---- LVM2.2.02.45/lib/commands/toolcontext.c	2009-02-22 22:14:38.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/commands/toolcontext.c	2009-03-18 12:18:23.000000000 +0100
-@@ -1006,10 +1006,10 @@
+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
@@ -13,75 +14,45 @@
  #ifdef INTL_PACKAGE
  	bindtextdomain(INTL_PACKAGE, LOCALEDIR);
  #endif
---- LVM2.2.02.45/lib/locking/file_locking.c	2008-11-12 10:30:52.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/locking/file_locking.c	2009-03-18 12:18:52.000000000 +0100
-@@ -30,6 +30,10 @@
- #include <fcntl.h>
- #include <signal.h>
- 
-+#ifdef __dietlibc__
-+typedef void (*sig_t) (int);
-+#endif
-+
- struct lock_list {
- 	struct dm_list list;
- 	int lf;
---- LVM2.2.02.45/libdm/libdevmapper.h	2008-11-04 16:07:45.000000000 +0100
-+++ LVM2.2.02.45-diet/libdm/libdevmapper.h	2009-03-18 12:17:27.000000000 +0100
-@@ -160,6 +160,10 @@
- /*
-  * Control read_ahead.
-  */
-+#ifdef __dietlibc__
-+# define UINT32_MAX             (4294967295U)
-+#endif
-+
- #define DM_READ_AHEAD_AUTO UINT32_MAX	/* Use kernel default readahead */
- #define DM_READ_AHEAD_NONE 0		/* Disable readahead */
- 
---- LVM2.2.02.45/lib/config/config.c	2008-11-03 23:14:27.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/config/config.c	2009-03-18 12:22:31.000000000 +0100
-@@ -28,6 +28,10 @@
- #include <ctype.h>
- #include <assert.h>
+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"
+ };
  
 +#ifdef __dietlibc__
 +typedef char* caddr_t __attribute_dontuse__;
 +#endif
 +
  struct config_file {
- 	time_t timestamp;
  	off_t st_size;
---- LVM2.2.02.45/lib/misc/lib.h	2008-11-03 19:59:58.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/misc/lib.h	2009-03-18 12:24:30.000000000 +0100
-@@ -45,4 +45,20 @@
- #include <unistd.h>
- #include <sys/stat.h>
+ 	char *filename;
+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"
  
 +#ifdef __dietlibc__
-+# include <strings.h>
-+# include <limits.h>
-+# if __WORDSIZE == 64
-+#  define INT64_C(c)    c ## L
-+# else
-+#  define INT64_C(c)    c ## LL
-+# endif
-+# define UINT32_C(c)    c ## U
-+# if __WORDSIZE == 64
-+#  define UINT64_C(c)   c ## UL
-+# else
-+#  define UINT64_C(c)   c ## ULL
++# ifndef UINT64_MAX
++#  define UINT64_MAX             __UINT64_MAX__
 +# endif
 +#endif
 +
- #endif
---- LVM2.2.02.45/tools/tools.h	2008-11-04 15:57:06.000000000 +0100
-+++ LVM2.2.02.45-diet/tools/tools.h	2009-03-18 12:24:58.000000000 +0100
-@@ -55,6 +55,21 @@
- #include <stdarg.h>
- #include <sys/types.h>
+ /*
+  * FIXME: Check for valid handle before dereferencing field or log error?
+  */
+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>
  
 +#ifdef __dietlibc__
++# include <strings.h>
 +# include <limits.h>
 +# if __WORDSIZE == 64
 +#  define INT64_C(c)    c ## L
@@ -96,14 +67,13 @@
 +# endif
 +#endif
 +
- #define CMD_LEN 256
- #define MAX_ARGS 64
- 
---- LVM2.2.02.45/lib/report/report.c	2009-02-09 10:45:49.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/report/report.c	2009-03-18 12:45:23.000000000 +0100
-@@ -24,6 +24,11 @@
- #include "str_list.h"
- #include "lvmcache.h"
+ #endif
+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>
  
 +#ifdef __dietlibc__
 +#define __UINT64_C(c) c ## ULL
@@ -112,12 +82,27 @@
 +
  struct lvm_report_object {
  	struct volume_group *vg;
- 	struct logical_volume *lv;
---- LVM2.2.02.45/tools/dmsetup.c	2008-10-30 18:52:06.000000000 +0100
-+++ LVM2.2.02.45-diet/tools/dmsetup.c	2009-03-18 12:47:46.000000000 +0100
-@@ -40,6 +40,23 @@
- #include <fcntl.h>
- #include <sys/stat.h>
+ 	struct lv_with_info_and_seg_status *lvdm;
+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.
+  */
++#ifdef __dietlibc__
++# define UINT32_MAX             (4294967295U)
++#endif
++
+ #define DM_READ_AHEAD_AUTO UINT32_MAX	/* Use kernel default readahead */
+ #define DM_READ_AHEAD_NONE 0		/* Disable readahead */
+ 
+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
  
 +#ifdef __dietlibc__
 +# include <limits.h>
@@ -138,55 +123,68 @@
 +
  /* FIXME Unused so far */
  #undef HAVE_SYS_STATVFS_H
-
---- LVM2.2.02.65/tools/Makefile.in~	2010-05-18 13:18:54.344217166 +0200
-+++ LVM2.2.02.65/tools/Makefile.in	2010-05-18 13:21:19.303172002 +0200
-@@ -122,18 +122,18 @@
- device-mapper: $(TARGETS_DM)
+ 
+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) -L$(top_builddir)/libdm \
-+	$(CC) $(CFLAGS) -L$(interfacedir) -L$(top_builddir)/libdm $(LDFLAGS) \
+ 	@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) \
--	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
-+	$(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
-+	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
+ 	@echo "    [CC] $@"
+-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
+-	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
++	$(Q) $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
++	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
  
  all: device-mapper
  
- lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
--	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
-+	$(CC) $(CFLAGS) -L$(interfacedir) $(LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
- 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
+@@ -143,7 +144,7 @@ INCLUDES += -I$(top_builddir)/tools
  
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
-
---- LVM2.2.02.65/tools/Makefile.in~	2010-05-18 13:39:46.797633173 +0200
-+++ LVM2.2.02.65/tools/Makefile.in	2010-05-18 13:46:01.629690313 +0200
-@@ -137,7 +137,7 @@
+ lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
+ 	@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
+@@ -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) $(DIETLIBC_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 > $@
---- LVM2.2.02.75/lib/metadata/pv.c.orig	2010-09-30 22:47:18.000000000 +0200
-+++ LVM2.2.02.75/lib/metadata/pv.c	2010-11-06 12:05:40.672884033 +0100
-@@ -17,6 +17,12 @@
- #include "metadata.h"
- #include "lvmcache.h"
+ 	@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>
  
 +#ifdef __dietlibc__
-+# ifndef UINT64_MAX
-+#  define UINT64_MAX             __UINT64_MAX__
++# include <limits.h>
++# if __WORDSIZE == 64
++#  define INT64_C(c)    c ## L
++# else
++#  define INT64_C(c)    c ## LL
++# endif
++# define UINT32_C(c)    c ## U
++# if __WORDSIZE == 64
++#  define UINT64_C(c)   c ## UL
++# else
++#  define UINT64_C(c)   c ## ULL
 +# endif
 +#endif
 +
- /*
-  * FIXME: Check for valid handle before dereferencing field or log error?
-  */
+ #define CMD_LEN 256
+ #define MAX_ARGS 64
+