Browse Source

lvm2: update to version 2.02.130

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle 9 years ago
parent
commit
ab413cbcf5
2 changed files with 8 additions and 8 deletions
  1. 2
    2
      utils/lvm2/Makefile
  2. 6
    6
      utils/lvm2/patches/002-const-stdio.patch

+ 2
- 2
utils/lvm2/Makefile View File

9
 include $(TOPDIR)/rules.mk
9
 include $(TOPDIR)/rules.mk
10
 
10
 
11
 PKG_NAME:=LVM2
11
 PKG_NAME:=LVM2
12
-PKG_VERSION:=2.02.129
12
+PKG_VERSION:=2.02.130
13
 PKG_RELEASE:=1
13
 PKG_RELEASE:=1
14
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
14
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
15
 
15
 
16
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
16
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
17
 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2
17
 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2
18
-PKG_MD5SUM:=7ddcbf6eee4970068a0ca598fc775a75
18
+PKG_MD5SUM:=e7ae07e413120713549cc6dd2a558c75
19
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
19
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
20
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
20
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
21
 
21
 

+ 6
- 6
utils/lvm2/patches/002-const-stdio.patch View File

1
 --- a/lib/commands/toolcontext.c
1
 --- a/lib/commands/toolcontext.c
2
 +++ b/lib/commands/toolcontext.c
2
 +++ b/lib/commands/toolcontext.c
3
-@@ -1686,8 +1686,10 @@ struct cmd_context *create_toolcontext(u
4
- 				       unsigned threaded)
3
+@@ -1728,8 +1728,10 @@ struct cmd_context *create_toolcontext(u
4
+ 				       unsigned set_filters)
5
  {
5
  {
6
  	struct cmd_context *cmd;
6
  	struct cmd_context *cmd;
7
 +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
7
 +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
11
  
11
  
12
  #ifdef M_MMAP_MAX
12
  #ifdef M_MMAP_MAX
13
  	mallopt(M_MMAP_MAX, 0);
13
  	mallopt(M_MMAP_MAX, 0);
14
-@@ -1723,7 +1725,7 @@ struct cmd_context *create_toolcontext(u
14
+@@ -1765,7 +1767,7 @@ struct cmd_context *create_toolcontext(u
15
  	/* FIXME Make this configurable? */
15
  	/* FIXME Make this configurable? */
16
  	reset_lvm_errno(1);
16
  	reset_lvm_errno(1);
17
  
17
  
20
  	/* Set in/out stream buffering before glibc */
20
  	/* Set in/out stream buffering before glibc */
21
  	if (set_buffering) {
21
  	if (set_buffering) {
22
  		/* Allocate 2 buffers */
22
  		/* Allocate 2 buffers */
23
-@@ -2096,7 +2098,7 @@ void destroy_toolcontext(struct cmd_cont
23
+@@ -2148,7 +2150,7 @@ void destroy_toolcontext(struct cmd_cont
24
  	if (cmd->libmem)
24
  	if (cmd->libmem)
25
  		dm_pool_destroy(cmd->libmem);
25
  		dm_pool_destroy(cmd->libmem);
26
  
26
  
31
  		if (is_valid_fd(STDIN_FILENO) &&
31
  		if (is_valid_fd(STDIN_FILENO) &&
32
 --- a/tools/lvmcmdline.c
32
 --- a/tools/lvmcmdline.c
33
 +++ b/tools/lvmcmdline.c
33
 +++ b/tools/lvmcmdline.c
34
-@@ -1722,6 +1722,7 @@ int lvm_split(char *str, int *argc, char
34
+@@ -1735,6 +1735,7 @@ int lvm_split(char *str, int *argc, char
35
  /* Make sure we have always valid filedescriptors 0,1,2 */
35
  /* Make sure we have always valid filedescriptors 0,1,2 */
36
  static int _check_standard_fds(void)
36
  static int _check_standard_fds(void)
37
  {
37
  {
39
  	int err = is_valid_fd(STDERR_FILENO);
39
  	int err = is_valid_fd(STDERR_FILENO);
40
  
40
  
41
  	if (!is_valid_fd(STDIN_FILENO) &&
41
  	if (!is_valid_fd(STDIN_FILENO) &&
42
-@@ -1748,6 +1749,12 @@ static int _check_standard_fds(void)
42
+@@ -1761,6 +1762,12 @@ static int _check_standard_fds(void)
43
  		       strerror(errno));
43
  		       strerror(errno));
44
  		return 0;
44
  		return 0;
45
  	}
45
  	}