1 --- LVM2.2.02.45/lib/commands/toolcontext.c 2009-02-22 22:14:38.000000000 +0100
2 +++ LVM2.2.02.45-diet/lib/commands/toolcontext.c 2009-03-18 12:18:23.000000000 +0100
3 @@ -1006,10 +1006,10 @@
5 mallopt(M_MMAP_MAX, 0);
9 if (!setlocale(LC_ALL, ""))
10 log_very_verbose("setlocale failed");
14 bindtextdomain(INTL_PACKAGE, LOCALEDIR);
16 --- LVM2.2.02.45/lib/locking/file_locking.c 2008-11-12 10:30:52.000000000 +0100
17 +++ LVM2.2.02.45-diet/lib/locking/file_locking.c 2009-03-18 12:18:52.000000000 +0100
23 +typedef void (*sig_t) (int);
29 --- LVM2.2.02.45/libdm/libdevmapper.h 2008-11-04 16:07:45.000000000 +0100
30 +++ LVM2.2.02.45-diet/libdm/libdevmapper.h 2009-03-18 12:17:27.000000000 +0100
36 +# define UINT32_MAX (4294967295U)
39 #define DM_READ_AHEAD_AUTO UINT32_MAX /* Use kernel default readahead */
40 #define DM_READ_AHEAD_NONE 0 /* Disable readahead */
42 --- LVM2.2.02.45/lib/config/config.c 2008-11-03 23:14:27.000000000 +0100
43 +++ LVM2.2.02.45-diet/lib/config/config.c 2009-03-18 12:22:31.000000000 +0100
49 +typedef char* caddr_t __attribute_dontuse__;
55 --- LVM2.2.02.45/lib/misc/lib.h 2008-11-03 19:59:58.000000000 +0100
56 +++ LVM2.2.02.45-diet/lib/misc/lib.h 2009-03-18 12:24:30.000000000 +0100
62 +# include <strings.h>
64 +# if __WORDSIZE == 64
65 +# define INT64_C(c) c ## L
67 +# define INT64_C(c) c ## LL
69 +# define UINT32_C(c) c ## U
70 +# if __WORDSIZE == 64
71 +# define UINT64_C(c) c ## UL
73 +# define UINT64_C(c) c ## ULL
78 --- LVM2.2.02.45/tools/tools.h 2008-11-04 15:57:06.000000000 +0100
79 +++ LVM2.2.02.45-diet/tools/tools.h 2009-03-18 12:24:58.000000000 +0100
82 #include <sys/types.h>
86 +# if __WORDSIZE == 64
87 +# define INT64_C(c) c ## L
89 +# define INT64_C(c) c ## LL
91 +# define UINT32_C(c) c ## U
92 +# if __WORDSIZE == 64
93 +# define UINT64_C(c) c ## UL
95 +# define UINT64_C(c) c ## ULL
102 --- LVM2.2.02.45/lib/report/report.c 2009-02-09 10:45:49.000000000 +0100
103 +++ LVM2.2.02.45-diet/lib/report/report.c 2009-03-18 12:45:23.000000000 +0100
105 #include "str_list.h"
106 #include "lvmcache.h"
109 +#define __UINT64_C(c) c ## ULL
110 +# define UINT64_MAX (__UINT64_C(18446744073709551615))
113 struct lvm_report_object {
114 struct volume_group *vg;
115 struct logical_volume *lv;
116 --- LVM2.2.02.45/tools/dmsetup.c 2008-10-30 18:52:06.000000000 +0100
117 +++ LVM2.2.02.45-diet/tools/dmsetup.c 2009-03-18 12:47:46.000000000 +0100
120 #include <sys/stat.h>
123 +# include <limits.h>
124 +# if __WORDSIZE == 64
125 +# define INT64_C(c) c ## L
127 +# define INT64_C(c) c ## LL
129 +# define UINT32_C(c) c ## U
130 +# if __WORDSIZE == 64
131 +# define UINT64_C(c) c ## UL
133 +# define UINT64_C(c) c ## ULL
135 +#define canonicalize_file_name(x) realpath(x, NULL)
137 +#include <strings.h>
139 /* FIXME Unused so far */
140 #undef HAVE_SYS_STATVFS_H
142 --- LVM2.2.02.105/tools/Makefile.in.orig 2014-01-26 18:33:51.531497416 +0100
143 +++ LVM2.2.02.105/tools/Makefile.in 2014-01-26 19:14:42.264728615 +0100
144 @@ -127,19 +127,19 @@
145 CFLAGS_dmsetup.o += $(EXTRA_EXEC_CFLAGS)
147 dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
148 - $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
149 + $(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm $(EXTRA_EXEC_LDFLAGS) $(LDFLAGS) \
150 -o $@ dmsetup.o -ldevmapper $(LIBS)
152 dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
153 - $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
154 - -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
155 + $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
156 + -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS)
160 CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
162 lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
163 - $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
164 + $(CC) $(CFLAGS) -L$(interfacebuilddir) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
165 $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
167 ifeq ("@BUILD_LVMETAD@", "yes")
170 lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
171 $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
172 - $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
173 + $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS)
175 liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
176 cat $(top_builddir)/lib/liblvm-internal.a > $@
177 --- LVM2.2.02.75/lib/metadata/pv.c.orig 2010-09-30 22:47:18.000000000 +0200
178 +++ LVM2.2.02.75/lib/metadata/pv.c 2010-11-06 12:05:40.672884033 +0100
180 #include "metadata.h"
181 #include "lvmcache.h"
185 +# define UINT64_MAX __UINT64_MAX__
190 * FIXME: Check for valid handle before dereferencing field or log error?