From 6f4ea22674f1349bf75039e7217a69fb2acfc866 Mon Sep 17 00:00:00 2001
From: P J P <pjp@fedoraproject.org>
Date: Nov 19 2014 06:01:09 +0000
Subject: Fixed CVE-2014-1934, patch from Travis Shirk.


---

diff --git a/0001-Fix-sym-link-attack.patch b/0001-Fix-sym-link-attack.patch
new file mode 100644
index 0000000..e98a1ea
--- /dev/null
+++ b/0001-Fix-sym-link-attack.patch
@@ -0,0 +1,45 @@
+--- a/src/eyed3/id3/tag.py
++++ a/src/eyed3/id3/tag.py
+@@ -946,8 +946,8 @@ class Tag(core.Tag):
+                       "padding" % (len(tag_data), len(padding)))
+             if rewrite_required:
+                 # Open tmp file
+-                tmp_name = tempfile.mktemp()
+-                with open(tmp_name, "wb") as tmp_file:
++                with tempfile.NamedTemporaryFile("wb", delete=False) \
++                        as tmp_file:
+                     tmp_file.write(tag_data + padding)
+ 
+                     # Copy audio data in chunks
+@@ -961,9 +961,11 @@ class Tag(core.Tag):
+                         tag_file.seek(seek_point)
+                         chunkCopy(tag_file, tmp_file)
+ 
++                    tmp_file.flush()
++
+                 # Move tmp to orig.
+-                shutil.copyfile(tmp_name, self.file_info.name)
+-                os.unlink(tmp_name)
++                shutil.copyfile(tmp_file.name, self.file_info.name)
++                os.unlink(tmp_file.name)
+ 
+             else:
+                 with open(self.file_info.name, "r+b") as tag_file:
+@@ -1118,13 +1120,13 @@ class Tag(core.Tag):
+                     tag_file.seek(tag.file_info.tag_size)
+ 
+                     # Open tmp file
+-                    tmp_name = tempfile.mktemp()
+-                    with open(tmp_name, "wb") as tmp_file:
++                    with tempfile.NamedTemporaryFile("wb", delete=False) \
++                            as tmp_file:
+                         chunkCopy(tag_file, tmp_file)
+ 
+                     # Move tmp to orig
+-                    shutil.copyfile(tmp_name, filename)
+-                    os.unlink(tmp_name)
++                    shutil.copyfile(tmp_file.name, filename)
++                    os.unlink(tmp_file.name)
+ 
+                     retval |= True
+ 
diff --git a/python-eyed3.spec b/python-eyed3.spec
index 72c72a3..3246490 100644
--- a/python-eyed3.spec
+++ b/python-eyed3.spec
@@ -1,6 +1,6 @@
 Name:           python-eyed3
 Version:        0.7.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python audio data toolkit (ID3 and MP3)
 License:        GPLv2+
 URL:            http://eyed3.nicfit.net/
@@ -11,6 +11,8 @@ BuildRequires:  python-nose
 BuildRequires:  python-setuptools
 Requires:       python-magic
 
+Patch1: 0001-Fix-sym-link-attack.patch
+
 %description
 A Python module and program for processing ID3 tags. Information about
 mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
@@ -18,7 +20,7 @@ provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
 
 %prep
 %setup -qn eyeD3-%{version}
-
+%patch1 -p1
 %build
 %{__python2} setup.py build
 
@@ -35,6 +37,9 @@ provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
 %{python2_sitelib}/eyeD3-%{version}-py%{python2_version}.egg-info/
 
 %changelog
+* Wed Nov 19 2014 Mr Niranjan <mrniranjan@fedoraproject.org> - 0.7.4-4
+- Fixed CVE-2014-1934, patch from Travis Shirk.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild