[Frugalware-darcs] frugalware-0.6: id3lib-3.8.3-4terminus1-i686

voroskoi voroskoi at frugalware.org
Thu Sep 6 20:04:23 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906175558-dd049-667513401d43f89181d90810e064e41789efa310.gz;

[id3lib-3.8.3-4terminus1-i686
voroskoi <voroskoi at frugalware.org>**20070906175558
 secfix relbump, closes #2372
] {
addfile ./source/multimedia/id3lib/CVE-2007-4460.diff
hunk ./source/multimedia/id3lib/CVE-2007-4460.diff 1
+--- id3lib3.8.3-3.8.3.orig/src/tag_file.cpp
++++ id3lib3.8.3-3.8.3/src/tag_file.cpp
+@@ -242,8 +242,8 @@
+     strcpy(sTempFile, filename.c_str());
+     strcat(sTempFile, sTmpSuffix.c_str());
+ 
+-#if ((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
+-    // This section is for Windows folk && gcc 3.x folk
++#if !defined(HAVE_MKSTEMP)
++    // This section is for Windows folk
+     fstream tmpOut;
+     createFile(sTempFile, tmpOut);
+ 
+@@ -257,7 +257,7 @@
+       tmpOut.write((char *)tmpBuffer, nBytes);
+     }
+ 
+-#else //((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
++#else //!defined(HAVE_MKSTEMP)
+ 
+     // else we gotta make a temp file, copy the tag into it, copy the
+     // rest of the old file after the tag, delete the old file, rename
+@@ -270,7 +270,7 @@
+       //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
+     }
+ 
+-    ofstream tmpOut(fd);
++    ofstream tmpOut(sTempFile);
+     if (!tmpOut)
+     {
+       tmpOut.close();
+@@ -285,14 +285,14 @@
+     uchar tmpBuffer[BUFSIZ];
+     while (file)
+     {
+-      file.read(tmpBuffer, BUFSIZ);
++      file.read((char *)tmpBuffer, BUFSIZ);
+       size_t nBytes = file.gcount();
+-      tmpOut.write(tmpBuffer, nBytes);
++      tmpOut.write((char *)tmpBuffer, nBytes);
+     }
+ 
+     close(fd); //closes the file
+ 
+-#endif ////((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
++#endif ////!defined(HAVE_MKSTEMP)
+ 
+     tmpOut.close();
+     file.close();
+only in patch2:
+unchanged:
hunk ./source/multimedia/id3lib/FrugalBuild 6
-pkgrel=3
+pkgrel=4terminus1
hunk ./source/multimedia/id3lib/FrugalBuild 12
-source=(${source[@]} id3lib-3.8.3-autoconf259.patch id3lib-3.8.3-zlib.patch)
+source=(${source[@]} id3lib-3.8.3-autoconf259.patch id3lib-3.8.3-zlib.patch CVE-2007-4460.diff)
hunk ./source/multimedia/id3lib/FrugalBuild 16
-          '231721feb310f5ef6d820d1c1397e3605b5689cb')
+          '231721feb310f5ef6d820d1c1397e3605b5689cb' \
+          '05f00def566a151b3e47a2bfed67d28df898918a')
}


More information about the Frugalware-darcs mailing list