summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-06-07 01:21:27 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2018-06-07 01:21:27 (GMT)
commit20863d6664c4ea59f7f51b3044b97db6af9d2241 (patch)
tree1454f729731ae9de24440f5f4801db94cc356675 /package
parent02c582b7561f832ba7000a8127e4971ea21f6085 (diff)
lvm: update to 2.02.177
Diffstat (limited to 'package')
-rw-r--r--package/lvm/Makefile8
-rw-r--r--package/lvm/patches/patch-Makefile_in6
-rw-r--r--package/lvm/patches/patch-configure_in14
-rw-r--r--package/lvm/patches/patch-lib_mm_memlock_c8
-rw-r--r--package/lvm/patches/patch-make_tmpl_in8
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in16
-rw-r--r--package/lvm/patches/patch-tools_lvmcmdline_c10
7 files changed, 34 insertions, 36 deletions
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index b052267..ac782d9 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,16 +4,16 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.168
-PKG_RELEASE:= 2
-PKG_HASH:= 23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d
+PKG_VERSION:= 2.02.177
+PKG_RELEASE:= 1
+PKG_HASH:= 4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2
PKG_DESCR:= logical volume management
PKG_SECTION:= sys/fs
PKG_DEPENDS:= libdevmapper libncurses
PKG_BUILDDEP:= ncurses util-linux
PKG_NEEDS:= threads
PKG_URL:= http://sourceware.org/lvm2/
-PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/releases/
+PKG_SITES:= http://ftp.gwdg.de/pub/linux/sources.redhat.com/lvm2/
PKG_LIBNAME:= libdevmapper
PKG_OPTS:= dev
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index 81729e7..305822e 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
---- LVM2.2.02.168.orig/Makefile.in 2016-12-01 00:17:28.000000000 +0100
-+++ LVM2.2.02.168/Makefile.in 2017-03-27 20:43:17.000000000 +0200
+--- LVM2.2.02.177.orig/Makefile.in 2017-12-18 21:44:34.000000000 +0100
++++ LVM2.2.02.177/Makefile.in 2018-06-07 03:09:57.000000000 +0200
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -9,7 +9,7 @@
ifeq ("@UDEV_RULES@", "yes")
SUBDIRS += udev
-@@ -67,7 +67,7 @@ liblvm.device-mapper: include.device-map
+@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-map
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
scripts.device-mapper: include.device-mapper
diff --git a/package/lvm/patches/patch-configure_in b/package/lvm/patches/patch-configure_in
index 6e1148c..a1b99ea 100644
--- a/package/lvm/patches/patch-configure_in
+++ b/package/lvm/patches/patch-configure_in
@@ -1,15 +1,15 @@
---- LVM2.2.02.168.orig/configure.in 2016-12-01 00:17:28.000000000 +0100
-+++ LVM2.2.02.168/configure.in 2017-03-26 19:18:57.000000000 +0200
-@@ -28,7 +28,7 @@ AC_CANONICAL_TARGET([])
+--- LVM2.2.02.177.orig/configure.in 2017-12-18 21:44:34.000000000 +0100
++++ LVM2.2.02.177/configure.in 2018-06-07 03:09:58.000000000 +0200
+@@ -29,7 +29,7 @@ AC_CANONICAL_TARGET([])
AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
case "$host_os" in
- linux*)
+ *)
CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ # equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic"
- # FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -48,21 +48,6 @@ case "$host_os" in
+@@ -50,21 +50,6 @@ case "$host_os" in
FSADM=yes
BLKDEACTIVATE=yes
;;
@@ -31,8 +31,8 @@
esac
################################################################################
-@@ -106,10 +91,8 @@ AC_CHECK_HEADERS([assert.h ctype.h diren
- AC_CHECK_HEADERS(termios.h sys/statvfs.h sys/timerfd.h linux/magic.h linux/fiemap.h)
+@@ -111,10 +96,8 @@ AC_CHECK_HEADERS([assert.h ctype.h diren
+ AC_CHECK_HEADERS(termios.h sys/statvfs.h sys/timerfd.h sys/vfs.h linux/magic.h linux/fiemap.h)
case "$host_os" in
- linux*)
diff --git a/package/lvm/patches/patch-lib_mm_memlock_c b/package/lvm/patches/patch-lib_mm_memlock_c
index bfbc891..af53ad1 100644
--- a/package/lvm/patches/patch-lib_mm_memlock_c
+++ b/package/lvm/patches/patch-lib_mm_memlock_c
@@ -1,5 +1,5 @@
---- LVM2.2.02.168.orig/lib/mm/memlock.c 2016-12-01 00:17:29.000000000 +0100
-+++ LVM2.2.02.168/lib/mm/memlock.c 2017-03-26 19:05:36.000000000 +0200
+--- LVM2.2.02.177.orig/lib/mm/memlock.c 2017-12-18 21:44:35.000000000 +0100
++++ LVM2.2.02.177/lib/mm/memlock.c 2018-06-07 03:09:58.000000000 +0200
@@ -25,7 +25,6 @@
#include <sys/mman.h>
#include <sys/time.h>
@@ -8,7 +8,7 @@
#ifdef HAVE_VALGRIND
#include <valgrind.h>
-@@ -151,10 +150,8 @@ static void _touch_memory(void *mem, siz
+@@ -152,10 +151,8 @@ static void _touch_memory(void *mem, siz
static void _allocate_memory(void)
{
#ifndef VALGRIND_POOL
@@ -20,7 +20,7 @@
/* Check if we could preallocate requested stack */
if ((getrlimit (RLIMIT_STACK, &limit) == 0) &&
-@@ -163,50 +160,13 @@ static void _allocate_memory(void)
+@@ -164,50 +161,13 @@ static void _allocate_memory(void)
_touch_memory(stack_mem, _size_stack);
/* FIXME else warn user setting got ignored */
diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in
index 71ed5df..7ddf320 100644
--- a/package/lvm/patches/patch-make_tmpl_in
+++ b/package/lvm/patches/patch-make_tmpl_in
@@ -1,6 +1,6 @@
---- LVM2.2.02.168.orig/make.tmpl.in 2016-12-01 00:17:30.000000000 +0100
-+++ LVM2.2.02.168/make.tmpl.in 2017-03-27 20:32:53.000000000 +0200
-@@ -437,7 +437,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI
+--- LVM2.2.02.177.orig/make.tmpl.in 2017-12-18 21:44:35.000000000 +0100
++++ LVM2.2.02.177/make.tmpl.in 2018-06-07 03:09:58.000000000 +0200
+@@ -468,7 +468,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI
CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated
install_lib_shared: $(LIB_SHARED)
@@ -10,7 +10,7 @@
$(INSTALL_DIR) $(usrlibdir)
$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
-@@ -445,11 +446,13 @@ install_lib_shared: $(LIB_SHARED)
+@@ -476,11 +477,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)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 9e420a8..9fc5979 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,6 +1,6 @@
---- LVM2.2.02.168.orig/tools/Makefile.in 2016-12-01 00:17:32.000000000 +0100
-+++ LVM2.2.02.168/tools/Makefile.in 2017-03-28 03:03:30.000000000 +0200
-@@ -182,18 +182,22 @@ endif
+--- LVM2.2.02.177.orig/tools/Makefile.in 2017-12-18 21:44:35.000000000 +0100
++++ LVM2.2.02.177/tools/Makefile.in 2018-06-07 03:15:42.000000000 +0200
+@@ -217,18 +217,21 @@ endif
install_dmsetup_dynamic install_dmsetup_static
install_cmdlib_include: $(srcdir)/lvm2cmd.h
@@ -10,15 +10,13 @@
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)
++ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
$(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_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
install_tools_dynamic: lvm .commands
- $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
@@ -27,7 +25,7 @@
@echo Creating symbolic links for individual commands in $(sbindir)
@for v in `cat .commands`; do \
echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
-@@ -201,14 +205,17 @@ install_tools_dynamic: lvm .commands
+@@ -236,14 +239,17 @@ install_tools_dynamic: lvm .commands
done;
install_tools_static: lvm.static
@@ -45,6 +43,6 @@
- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
+ $(INSTALL_DIR) $(staticdir)
+ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
- $(LN_S) -f $(<F) $(sbindir)/dmstats
+ $(LN_S) -f $(<F) $(staticdir)/dmstats
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
diff --git a/package/lvm/patches/patch-tools_lvmcmdline_c b/package/lvm/patches/patch-tools_lvmcmdline_c
index 715abd9..8c5cb5c 100644
--- a/package/lvm/patches/patch-tools_lvmcmdline_c
+++ b/package/lvm/patches/patch-tools_lvmcmdline_c
@@ -1,6 +1,6 @@
---- LVM2.2.02.168.orig/tools/lvmcmdline.c 2016-12-01 00:17:32.000000000 +0100
-+++ LVM2.2.02.168/tools/lvmcmdline.c 2017-03-26 19:05:36.000000000 +0200
-@@ -1816,9 +1816,12 @@ int lvm_split(char *str, int *argc, char
+--- LVM2.2.02.177.orig/tools/lvmcmdline.c 2017-12-18 21:44:35.000000000 +0100
++++ LVM2.2.02.177/tools/lvmcmdline.c 2018-06-07 03:09:58.000000000 +0200
+@@ -3093,9 +3093,12 @@ int lvm_split(char *str, int *argc, char
static int _check_standard_fds(void)
{
int err = is_valid_fd(STDERR_FILENO);
@@ -14,7 +14,7 @@
if (err)
perror("stdin stream open");
else
-@@ -1828,7 +1831,7 @@ static int _check_standard_fds(void)
+@@ -3105,7 +3108,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@@ -23,7 +23,7 @@
if (err)
perror("stdout stream open");
/* else no stdout */
-@@ -1836,7 +1839,7 @@ static int _check_standard_fds(void)
+@@ -3113,7 +3116,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&