resolve merge

file-5.11-magicmgc-home.patch

@@ -1,8 +1,8 @@
 diff --git a/src/magic.c b/src/magic.c
-index 7eb0441..d8c5835 100644
+index 5403951..2b61080 100644
 --- a/src/magic.c
 +++ b/src/magic.c
-@@ -101,16 +101,20 @@ get_default_magic(void)
+@@ -101,16 +101,21 @@ get_default_magic(void)
  	if ((home = getenv("HOME")) == NULL)
  		return MAGIC;
  
@@ -12,9 +12,9 @@ index 7eb0441..d8c5835 100644
 -	if (stat(hmagicpath, &st) == -1)
 -		goto out;
 -	if (S_ISDIR(st.st_mode)) {
--		free(hmagicpath);
--		if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0)
 +	if (stat(hmagicpath, &st) == -1) {
+ 		free(hmagicpath);
+-		if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0)
 +		if (asprintf(&hmagicpath, "%s/.magic", home) < 0)
  			return MAGIC;
 -		if (access(hmagicpath, R_OK) == -1)

file.spec

@@ -159,6 +159,12 @@ cd python
 - remove file-static subpackage
 - move python-magic .py files to python_sitearch
 
+* Mon Mar 11 2013 Jan Kaluza <jkaluza@redhat.com> - 5.11-9
+- fix #919466 - fix memory leak in get_default_magic
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Dec 04 2012 Jan Kaluza <jkaluza@redhat.com> - 5.11-7
 - removed duplicated patterns for backups generated by "dump" tool
 - recognize volume_key escrow packets