lvm2: Updated (2.02.100 -> 2.02.104) and rediffed musl patch accordingly

base/lvm2/lvm2.desc

@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../lvm2/lvm2.desc
-[COPY] Copyright (C) 2006 - 2013 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY]
@@ -33,7 +33,7 @@
 
 [L] GPL
 [S] Stable
-[V] 2.02.100
+[V] 2.02.104
 [P] X -?-3-----9 184.000
 
-[D] 223325396 LVM2.2.02.100.tgz ftp://sources.redhat.com/pub/lvm2/
+[D] 4041316239 LVM2.2.02.104.tgz ftp://sources.redhat.com/pub/lvm2/

base/musl/pkg/lvm2/lvm2-musl-0001-read-only-assignment.patch

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../musl/pkg/lvm2/lvm2-musl-0001-read-only-assignment.patch
-# Copyright (C) 2012 - 2013 The OpenSDE Project
+# Copyright (C) 2012 - 2014 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -14,9 +14,27 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- a/tools/lvmcmdline.c	2012-11-24 19:32:51.319288478 +0100
-+++ b/tools/lvmcmdline.c	2012-11-24 19:34:46.381960596 +0100
-@@ -1194,9 +1194,12 @@
+lib/commands/toolcontext.c
+-------------------------------------------------------------------------------
+commands/toolcontext.c: In function 'create_toolcontext':
+commands/toolcontext.c:1427:4: error: assignment of read-only variable 'stdin'
+commands/toolcontext.c:1439:4: error: assignment of read-only variable 'stdout'
+commands/toolcontext.c: In function 'destroy_toolcontext':
+commands/toolcontext.c:1757:5: error: assignment of read-only variable 'stdin'
+commands/toolcontext.c:1767:5: error: assignment of read-only variable 'stdout'
+-------------------------------------------------------------------------------
+
+tools/lvmcmdline.c
+-------------------------------------------------------------------------------
+lvmcmdline.c: In function '_check_standard_fds':
+lvmcmdline.c:1255:6: error: assignment of read-only variable 'stdin'
+lvmcmdline.c:1265:6: error: assignment of read-only variable 'stdout'
+lvmcmdline.c:1273:6: error: assignment of read-only variable 'stderr'
+-------------------------------------------------------------------------------
+
+--- a/tools/lvmcmdline.c	2013-11-13 15:12:23.000000000 +0100
++++ b/tools/lvmcmdline.c	2014-01-11 13:08:11.746838326 +0100
+@@ -1250,9 +1250,12 @@
  static int _check_standard_fds(void)
  {
  	int err = is_valid_fd(STDERR_FILENO);
@@ -30,7 +48,7 @@
  		if (err)
  			perror("stdin stream open");
  		else
-@@ -1206,7 +1209,7 @@
+@@ -1262,7 +1265,7 @@
  	}
  
  	if (!is_valid_fd(STDOUT_FILENO) &&
@@ -39,7 +57,7 @@
  		if (err)
  			perror("stdout stream open");
  		/* else no stdout */
-@@ -1214,7 +1217,7 @@
+@@ -1270,7 +1273,7 @@
  	}
  
  	if (!is_valid_fd(STDERR_FILENO) &&
@@ -48,21 +66,21 @@
  		printf("stderr stream open: %s\n",
  		       strerror(errno));
  		return 0;
---- a/lib/commands/toolcontext.c	2012-11-24 19:16:13.532208503 +0100
-+++ b/lib/commands/toolcontext.c	2012-11-24 19:45:44.053159552 +0100
-@@ -1315,6 +1315,8 @@
+--- a/lib/commands/toolcontext.c	2014-01-11 13:08:11.746838326 +0100
++++ b/lib/commands/toolcontext.c	2014-01-11 18:43:42.136857198 +0100
+@@ -1373,6 +1373,8 @@
  {
  	struct cmd_context *cmd;
  	FILE *new_stream;
 +	FILE *stdin_stream = stdin;
 +	FILE *stdout_stream = stdout;
+ 	int flags;
  
  #ifdef M_MMAP_MAX
- 	mallopt(M_MMAP_MAX, 0);
-@@ -1359,20 +1361,20 @@
- 		}
- 
- 		if (is_valid_fd(STDIN_FILENO)) {
+@@ -1422,10 +1424,10 @@
+ 		if (is_valid_fd(STDIN_FILENO) &&
+ 		    ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
+ 		    (flags & O_ACCMODE) != O_WRONLY) {
 -			if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream))
 +			if (!_reopen_stream(stdin_stream, STDIN_FILENO, "r", "stdin", &new_stream))
  				goto_out;
@@ -73,9 +91,10 @@
  				log_sys_error("setvbuf", "");
  				goto out;
  			}
- 		}
- 
- 		if (is_valid_fd(STDOUT_FILENO)) {
+@@ -1434,10 +1436,10 @@
+ 		if (is_valid_fd(STDOUT_FILENO) &&
+ 		    ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
+ 		    (flags & O_ACCMODE) != O_RDONLY) {
 -			if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream))
 +			if (!_reopen_stream(stdout_stream, STDOUT_FILENO, "w", "stdout", &new_stream))
  				goto_out;
@@ -86,19 +105,19 @@
  				     _IOLBF, linebuffer_size)) {
  				log_sys_error("setvbuf", "");
  				goto out;
-@@ -1629,6 +1631,8 @@
+@@ -1717,6 +1719,8 @@
  {
  	struct dm_config_tree *cft_cmdline;
  	FILE *new_stream;
 +	FILE *stdin_stream = stdin;
 +	FILE *stdout_stream = stdout;
+ 	int flags;
  
- 	if (cmd->dump_filter)
- 		persistent_filter_dump(cmd->filter, 1);
-@@ -1655,17 +1659,17 @@
- 	if (cmd->linebuffer) {
- 		/* Reset stream buffering to defaults */
- 		if (is_valid_fd(STDIN_FILENO)) {
+ 	if (cmd->dump_filter && cmd->filter && cmd->filter->dump &&
+@@ -1753,9 +1757,9 @@
+ 		if (is_valid_fd(STDIN_FILENO) &&
+ 		    ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
+ 		    (flags & O_ACCMODE) != O_WRONLY) {
 -			if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) {
 -				stdin = new_stream;
 -				setlinebuf(stdin);
@@ -108,8 +127,10 @@
  			} else
  				cmd->linebuffer = NULL;	/* Leave buffer in place (deliberate leak) */
  		}
- 
- 		if (is_valid_fd(STDOUT_FILENO)) {
+@@ -1763,9 +1767,9 @@
+ 		if (is_valid_fd(STDOUT_FILENO) &&
+ 		    ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
+ 		    (flags & O_ACCMODE) != O_RDONLY) {
 -			if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) {
 -				stdout = new_stream;
 -				setlinebuf(stdout);