Quellcode durchsuchen

lvm2: update to version 2.02.138

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Daniel Golle vor 9 Jahren
Ursprung
Commit
9377520afd

+ 2
- 2
utils/lvm2/Makefile Datei anzeigen

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

+ 3
- 3
utils/lvm2/patches/002-const-stdio.patch Datei anzeigen

@@ -1,6 +1,6 @@
1 1
 --- a/lib/commands/toolcontext.c
2 2
 +++ b/lib/commands/toolcontext.c
3
-@@ -1740,8 +1740,10 @@ struct cmd_context *create_toolcontext(u
3
+@@ -1741,8 +1741,10 @@ struct cmd_context *create_toolcontext(u
4 4
  				       unsigned set_filters)
5 5
  {
6 6
  	struct cmd_context *cmd;
@@ -11,7 +11,7 @@
11 11
  
12 12
  #ifdef M_MMAP_MAX
13 13
  	mallopt(M_MMAP_MAX, 0);
14
-@@ -1777,7 +1779,7 @@ struct cmd_context *create_toolcontext(u
14
+@@ -1778,7 +1780,7 @@ struct cmd_context *create_toolcontext(u
15 15
  	/* FIXME Make this configurable? */
16 16
  	reset_lvm_errno(1);
17 17
  
@@ -20,7 +20,7 @@
20 20
  	/* Set in/out stream buffering before glibc */
21 21
  	if (set_buffering) {
22 22
  		/* Allocate 2 buffers */
23
-@@ -2160,7 +2162,7 @@ void destroy_toolcontext(struct cmd_cont
23
+@@ -2161,7 +2163,7 @@ void destroy_toolcontext(struct cmd_cont
24 24
  	if (cmd->libmem)
25 25
  		dm_pool_destroy(cmd->libmem);
26 26
  

+ 3
- 3
utils/lvm2/patches/003-no-mallinfo.patch Datei anzeigen

@@ -1,6 +1,6 @@
1 1
 --- a/lib/mm/memlock.c
2 2
 +++ b/lib/mm/memlock.c
3
-@@ -161,12 +161,15 @@ static void _allocate_memory(void)
3
+@@ -169,12 +169,15 @@ static void _allocate_memory(void)
4 4
           *  memory on free(), this is good enough for our purposes.
5 5
           */
6 6
  	while (missing > 0) {
@@ -16,7 +16,7 @@
16 16
  		inf = mallinfo();
17 17
  
18 18
  		if (hblks < inf.hblks) {
19
-@@ -176,9 +179,12 @@ static void _allocate_memory(void)
19
+@@ -184,9 +187,12 @@ static void _allocate_memory(void)
20 20
  			free(areas[area]);
21 21
  			_size_malloc_tmp /= 2;
22 22
  		} else {
@@ -29,7 +29,7 @@
29 29
  
30 30
  		if (area == max_areas && missing > 0) {
31 31
  			/* Too bad. Warn the user and proceed, as things are
32
-@@ -467,8 +473,13 @@ static void _lock_mem(struct cmd_context
32
+@@ -475,8 +481,13 @@ static void _lock_mem(struct cmd_context
33 33
  	 * will not block memory locked thread
34 34
  	 * Note: assuming _memlock_count_daemon is updated before _memlock_count
35 35
  	 */