From 914b3f5a36c84adda720f557548b89a6051b9b60 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 6 May 2010 00:16:00 +0000
Subject: [PATCH] lvm2: update to 2.02.64 (closes: #7291)

SVN-Revision: 21385
---
 utils/lvm2/Makefile                        |  4 +-
 utils/lvm2/patches/100-readline-link.patch | 95 +++++++++-------------
 2 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 33b153363..77a4726eb 100644
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
-PKG_VERSION:=2.02.63
+PKG_VERSION:=2.02.64
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/ \
 		http://netbsd.mirrors.tds.net/pub/sourceware.org/lvm2/
-PKG_MD5SUM:=74bb3beeefe68d539ab712e92fddfb39
+PKG_MD5SUM:=59fc0f7f6703a8c7f12df6b7d2e509fb
 # 2.02.43 = fc34655706a2aa116b92328b24fad619
 # 2.02.44 = 4ed7b99903a6fc5165b7b0b8def42486
 # 2.02.53 = f9ae3579bf15467b7f1d7aea8b9ed9b3
diff --git a/utils/lvm2/patches/100-readline-link.patch b/utils/lvm2/patches/100-readline-link.patch
index f5aa6b1f9..39783e8ca 100644
--- a/utils/lvm2/patches/100-readline-link.patch
+++ b/utils/lvm2/patches/100-readline-link.patch
@@ -1,58 +1,37 @@
-*** LVM2.2.02.63/make.tmpl.in	2010-04-17 17:18:45.407964881 -0700
---- LVM2.2.02.63/make.tmpl.in	2010-04-17 17:21:38.467947847 -0700
-***************
-*** 113,123 ****
-  endif
-  
-  LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
-- CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
-  
-  ifeq ("@DMEVENTD@", "yes")
-    LDFLAGS += -L$(top_builddir)/daemons/dmeventd
--   CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
-  endif
-  
-  ifeq ("@DM_COMPAT@", "yes")
---- 113,121 ----
-***************
-*** 288,298 ****
-  $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
-  ifeq ("@LIB_SUFFIX@","so")
-  	$(CC) -shared -Wl,-soname,$(notdir $@) \
-! 		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-  endif
-  ifeq ("@LIB_SUFFIX@","dylib")
-  	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-! 		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-  endif
-  
-  $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
---- 286,296 ----
-  $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
-  ifeq ("@LIB_SUFFIX@","so")
-  	$(CC) -shared -Wl,-soname,$(notdir $@) \
-! 		$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
-  endif
-  ifeq ("@LIB_SUFFIX@","dylib")
-  	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-! 		$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
-  endif
-  
-  $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
-***************
-*** 310,316 ****
-  
-  %.so: %.a
-  	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-! 	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
-  	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
-  
-  $(LIB_STATIC): $(OBJECTS)
---- 308,314 ----
-  
-  %.so: %.a
-  	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-! 	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \
-  	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
-  
-  $(LIB_STATIC): $(OBJECTS)
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -116,11 +116,9 @@ ifeq ("@INTL@", "yes")
+ endif
+ 
+ LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
+-CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
+ 
+ ifeq ("@DMEVENTD@", "yes")
+   LDFLAGS += -L$(top_builddir)/daemons/dmeventd
+-  CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
+ endif
+ 
+ ifeq ("@DM_COMPAT@", "yes")
+@@ -291,11 +289,11 @@ TARGETS += $(LIB_SHARED).$(LIB_VERSION)
+ $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
+ ifeq ("@LIB_SUFFIX@","so")
+ 	$(CC) -shared -Wl,-soname,$(notdir $@) \
+-		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++		$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ endif
+ ifeq ("@LIB_SUFFIX@","dylib")
+ 	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
+-		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++		$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ endif
+ 
+ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
+@@ -313,7 +311,7 @@ endif
+ 
+ %.so: %.a
+ 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
+-	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
++	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \
+ 	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
+ 
+ $(LIB_STATIC): $(OBJECTS)
-- 
2.30.2