update to latest upstream

7 files changed, 11 insertions, 190 deletions

diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 60927ab60..401855955 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lvm
-PKG_VERSION:=		2.02.80
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		816f4cee75674e3a21fd40f1961279f2
+PKG_VERSION:=		2.02.106
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		77f84279fb649b3dc4edad1c6d1a1b0e
 PKG_DESCR:=		logical volume management
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		libdevmapper libncurses
@@ -36,6 +36,7 @@ $(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEAS
 
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
+			--disable-testing \
 			--with-lvm1=none
 
 lvm-install:
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
deleted file mode 100644
index 22b0626e5..000000000
--- a/package/lvm/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- LVM2.2.02.79.orig/Makefile.in	2010-11-22 22:39:47.000000000 +0100
-+++ LVM2.2.02.79/Makefile.in	2011-01-07 20:54:18.000000000 +0100
-@@ -16,7 +16,7 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- top_builddir = @top_builddir@
- 
--SUBDIRS = doc include man scripts
-+SUBDIRS = include man scripts
- 
- ifeq ("@UDEV_RULES@", "yes")
-   SUBDIRS += udev
-@@ -33,7 +33,7 @@ ifeq ("@APPLIB@", "yes")
- endif
- 
- ifeq ($(MAKECMDGOALS),distclean)
--  SUBDIRS = doc include man scripts \
-+  SUBDIRS = include man scripts \
-     lib tools daemons libdm \
-     udev po liblvm test/api test
- endif
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
deleted file mode 100644
index 0f5ca59fc..000000000
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
---- LVM2.2.02.72.orig/doc/Makefile.in	Thu May 20 13:45:57 2010
-+++ LVM2.2.02.72/doc/Makefile.in	Fri Jul 30 09:23:26 2010
-@@ -22,8 +22,9 @@ include $(top_builddir)/make.tmpl
- 
- install_lvm2: $(CONFSRC)
- 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
--		echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \
--		$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \
-+		echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \
-+		$(INSTALL_DIR) $(confdir); \
-+		$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \
- 	fi
- 
- install: install_lvm2
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
deleted file mode 100644
index 49f49a17a..000000000
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ /dev/null
@@ -1,50 +0,0 @@
---- LVM2.2.02.79.orig/libdm/Makefile.in	2010-08-03 15:00:46.000000000 +0200
-+++ LVM2.2.02.79/libdm/Makefile.in	2010-12-26 22:15:11.000000000 +0100
-@@ -34,10 +34,7 @@ SOURCES =\
- 
- INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
- 
--ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
--endif
--
- LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
- LIB_VERSION = $(LIB_VERSION_DM)
- TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
-@@ -65,10 +62,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.
- 	install_pkgconfig
- 
- INSTALL_TYPE = install_dynamic
--
--ifeq ("@STATIC_LINK@", "yes")
--  INSTALL_TYPE += install_static
--endif
-+INSTALL_TYPE += install_static
- 
- ifeq ("@PKGCONFIG@", "yes")
-   INSTALL_TYPE += install_pkgconfig
-@@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include
- install_device-mapper: install
- 
- install_include: $(srcdir)/libdevmapper.h
--	$(INSTALL_DATA) -D $< $(includedir)/$(<F)
-+	$(INSTALL_DIR) $(includedir)
-+	$(INSTALL_DATA) $< $(includedir)/$(<F)
- 
- install_dynamic: install_@interface@
- 
-@@ -88,10 +83,12 @@ install_static: install_@interface@_stat
- install_ioctl: install_lib_shared
- 
- install_pkgconfig: libdevmapper.pc
--	$(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc
-+	$(INSTALL_DIR) $(pkgconfigdir)
-+	$(INSTALL_DATA) $< $(pkgconfigdir)/devmapper.pc
- 
- install_ioctl_static: $(LIB_STATIC)
--	$(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
-+	$(INSTALL_DIR) $(usrlibdir)
-+	$(INSTALL_DATA) $< $(usrlibdir)/$(<F)
- 
- CLEAN_TARGETS += ioctl/libdevmapper.a
- DISTCLEAN_TARGETS += libdevmapper.pc .exported_symbols_generated
diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in
index f5286dfa4..e25835467 100644
--- a/package/lvm/patches/patch-make_tmpl_in
+++ b/package/lvm/patches/patch-make_tmpl_in
@@ -1,37 +1,11 @@
---- LVM2.2.02.80.orig/make.tmpl.in	2011-01-10 14:00:53.000000000 +0100
-+++ LVM2.2.02.80/make.tmpl.in	2011-01-11 11:39:53.000000000 +0100
-@@ -33,7 +33,7 @@ LIBS = @LIBS@
- # Extra libraries always linked with static binaries
- STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS)
+--- LVM2.2.02.106.orig/make.tmpl.in	2014-04-10 17:38:46.000000000 +0200
++++ LVM2.2.02.106/make.tmpl.in	2014-05-23 08:48:28.000000000 +0200
+@@ -46,7 +46,7 @@ LIBS = @LIBS@
+ STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
  DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
 -CFLAGS += @CFLAGS@
-+CFLAGS = @CFLAGS@
++CFLAGS ?= @CFLAGS@
  CLDFLAGS += @CLDFLAGS@
+ ELDFLAGS += @ELDFLAGS@
  LDDEPS += @LDDEPS@
- LDFLAGS += @LDFLAGS@
-@@ -322,7 +322,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI
- 	$(LN_S) -f $(<F) $@
- 
- install_lib_shared: $(LIB_SHARED)
--	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
-+	$(INSTALL_DIR) $(libdir)
-+	$(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
- 	$(INSTALL_DIR) $(usrlibdir)
- 	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
- 
-@@ -330,11 +331,13 @@ install_lib_shared: $(LIB_SHARED)
- #        and for compatibility links in libdir are created
- #        when the code is fixed links could be removed.
- install_dm_plugin: $(LIB_SHARED)
--	$(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
-+	$(INSTALL_DIR) $(libdir)
-+	$(INSTALL_PROGRAM) $< $(libdir)/device-mapper/$(<F)
- 	$(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
- 
- install_lvm2_plugin: $(LIB_SHARED)
--	$(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
-+	$(INSTALL_DIR) $(libdir)
-+	$(INSTALL_PROGRAM) $< $(libdir)/lvm2/$(<F)
- 	$(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
- 	$(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
- endif
diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in
deleted file mode 100644
index ae8e644cc..000000000
--- a/package/lvm/patches/patch-scripts_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
---- LVM2.2.02.79.orig/scripts/Makefile.in	2010-11-05 17:18:38.000000000 +0100
-+++ LVM2.2.02.79/scripts/Makefile.in	2010-12-26 22:15:11.000000000 +0100
-@@ -30,7 +30,8 @@ endif
- vpath %.sh $(srcdir)
- 
- %_install: %.sh
--	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F))
-+	$(INSTALL_DIR) $(sbindir)
-+	$(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F))
- 
- %_install: %.ocf
- 	$(INSTALL_DIR) $(ocf_scriptdir)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
deleted file mode 100644
index c7d18c051..000000000
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ /dev/null
@@ -1,58 +0,0 @@
---- LVM2.2.02.79.orig/tools/Makefile.in	2010-10-15 11:41:21.000000000 +0200
-+++ LVM2.2.02.79/tools/Makefile.in	2010-12-26 22:15:11.000000000 +0100
-@@ -158,7 +158,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION):
- 
- .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
- 	$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
--		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
-+		egrep -v '^ *(#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
- 
- ifneq ("$(CFLOW_CMD)", "")
- CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
-@@ -171,18 +171,22 @@ endif
- 	install_dmsetup_dynamic install_dmsetup_static
- 
- install_cmdlib_include: $(srcdir)/lvm2cmd.h
--	$(INSTALL_DATA) -D $< $(includedir)/$(<F)
-+	$(INSTALL_DIR) $(includedir)
-+	$(INSTALL_DATA) $< $(includedir)/$(<F)
- 
- install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
--	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
-+	$(INSTALL_DIR) $(libdir)
-+	$(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
- 	$(INSTALL_DIR) $(usrlibdir)
- 	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
- 
- install_cmdlib_static: liblvm2cmd-static.a
--	$(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
-+	$(INSTALL_DIR) $(usrlibdir)
-+	$(INSTALL_DATA) $< $(usrlibdir)/liblvm2cmd.a
- 
- install_tools_dynamic: lvm .commands
--	$(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
-+	$(INSTALL_DIR) $(sbindir)
-+	$(INSTALL_PROGRAM) lvm $(sbindir)/lvm
- 	@echo Creating symbolic links for individual commands in $(sbindir)
- 	@for v in `cat .commands`; do \
- 		echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
-@@ -190,13 +194,16 @@ install_tools_dynamic: lvm .commands
- 	done;
- 
- install_tools_static: lvm.static
--	$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
-+	$(INSTALL_DIR) $(staticdir)
-+	$(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
- 
- install_dmsetup_dynamic: dmsetup
--	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
-+	$(INSTALL_DIR) $(sbindir)
-+	$(INSTALL_PROGRAM) $< $(sbindir)/$(<F)
- 
- install_dmsetup_static: dmsetup.static
--	$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
-+	$(INSTALL_DIR) $(staticdir)
-+	$(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
- 
- install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
-