summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-11-09 10:01:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-11-09 10:01:47 +0000
commit1960f43857568a0610c1d0054cc64283a7d1e764 (patch)
tree3a7b9876b594ca5e2c53c319f171ac3d78e38c4c /media-sound
parentversion bump wrt #292484 (diff)
downloadhistorical-1960f43857568a0610c1d0054cc64283a7d1e764.tar.gz
historical-1960f43857568a0610c1d0054cc64283a7d1e764.tar.bz2
historical-1960f43857568a0610c1d0054cc64283a7d1e764.zip
Unused patch.
Package-Manager: portage-2.2_rc48/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/amarok/Manifest1
-rw-r--r--media-sound/amarok/files/amarok-1.4.10-audibletag.patch85
2 files changed, 0 insertions, 86 deletions
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 00675442b890..9088bd870ab5 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,4 +1,3 @@
-AUX amarok-1.4.10-audibletag.patch 2412 RMD160 9c37b2861c17a3ff9c5a447338cbbc735fcfd634 SHA1 25ebc67a0f6254c1fae9a96b967f700a5ea81746 SHA256 724f2411cc9a6d4cc972fe6b3d40bdf1d4075347eca3460bdaf0b35980f838a3
AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
AUX amarok-1.4.10-gcc44.patch 4085 RMD160 bda16ee1d016cd158654b3f80faa413eaa7a6543 SHA1 f5c7eeea6ff80d6e634465517face69f3f344516 SHA256 b94338af91e5a108c39b100162f38bfe53d6c94fb9ed4c175f09de68df1c1989
AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
diff --git a/media-sound/amarok/files/amarok-1.4.10-audibletag.patch b/media-sound/amarok/files/amarok-1.4.10-audibletag.patch
deleted file mode 100644
index ee94739f12ab..000000000000
--- a/media-sound/amarok/files/amarok-1.4.10-audibletag.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp 2008-08-14 00:21:51.000000000 +0300
-+++ amarok-1.4.10/amarok/src/metadata/audible/audibletag.cpp 2009-03-04 19:55:15.000000000 +0200
-@@ -71,7 +71,8 @@
- {
- char buf[1023];
- fseek(fp, OFF_PRODUCT_ID, SEEK_SET);
-- fread(buf, strlen("product_id"), 1, fp);
-+ if (fread(buf, strlen("product_id"), 1, fp) != 1)
-+ return;
- if(memcmp(buf, "product_id", strlen("product_id")))
- {
- buf[20]='\0';
-@@ -130,24 +131,65 @@
-
- bool Audible::Tag::readTag( FILE *fp, char **name, char **value)
- {
-+ // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags
-+ const uint32_t maxtaglen = 100000;
-+
- uint32_t nlen;
-- fread(&nlen, sizeof(nlen), 1, fp);
-+ if (fread(&nlen, sizeof(nlen), 1, fp) != 1)
-+ return false;
- nlen = ntohl(nlen);
- //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen);
-- *name = new char[nlen+1];
-- (*name)[nlen] = '\0';
-+ if (nlen > maxtaglen)
-+ return false;
-
- uint32_t vlen;
-- fread(&vlen, sizeof(vlen), 1, fp);
-+ if (fread(&vlen, sizeof(vlen), 1, fp) != 1)
-+ return false;
- vlen = ntohl(vlen);
- //fprintf(stderr, "tag len=%x\n", (unsigned)vlen);
-+ if (vlen > maxtaglen)
-+ return false;
-+
-+ *name = new char[nlen+1];
-+ if (!*name)
-+ return false;
-+
- *value = new char[vlen+1];
-+ if (!*value)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ return false;
-+ }
-+
-+ (*name)[nlen] = '\0';
- (*value)[vlen] = '\0';
-
-- fread(*name, nlen, 1, fp);
-- fread(*value, vlen, 1, fp);
-+ if (fread(*name, nlen, 1, fp) != 1)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ delete[] *value;
-+ *value = 0;
-+ return false;
-+ }
-+ if (fread(*value, vlen, 1, fp) != 1)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ delete[] *value;
-+ *value = 0;
-+ return false;
-+ }
- char lasttag;
-- fread(&lasttag, 1, 1, fp);
-+ if (fread(&lasttag, 1, 1, fp) != 1)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ delete[] *value;
-+ *value = 0;
-+ return false;
-+ }
- //fprintf(stderr, "%s: \"%s\"\n", *name, *value);
-
- m_tagsEndOffset += 2 * 4 + nlen + vlen + 1;