diff --git a/package/base/file/file.desc b/package/base/file/file.desc index e0fd76fa2..87c05ab30 100644 --- a/package/base/file/file.desc +++ b/package/base/file/file.desc @@ -36,8 +36,8 @@ [L] BSD [S] Stable -[V] 4.17 +[V] 4.21 [P] X -?-3-5---9 103.300 -[D] 3668382963 file-4.17.tar.gz ftp://ftp.astron.com/pub/file/ +[D] 0 file-4.21.tar.gz ftp://ftp.astron.com/pub/file/ diff --git a/package/base/file/init-mem.patch b/package/base/file/init-mem.patch deleted file mode 100644 index de0d5c1b3..000000000 --- a/package/base/file/init-mem.patch +++ /dev/null @@ -1,25 +0,0 @@ - -Taken from file-4.17-2.fc5.src.rpm (file-4.17-init-mem.patch). - ---- file-4.17/src/apprentice.c -+++ file-4.17/src/apprentice.c -@@ -380,8 +380,8 @@ apprentice_file(struct magic_set *ms, st - return -1; - } - -- maxmagic = MAXMAGIS; -- if ((marray = malloc(maxmagic * sizeof(*marray))) == NULL) { -+ maxmagic = MAXMAGIS; -+ if ((marray = calloc(maxmagic, sizeof(*marray))) == NULL) { - (void)fclose(f); - file_oomem(ms); - return -1; -@@ -509,7 +509,7 @@ parse(struct magic_set *ms, struct magic - char *t; - private const char *fops = FILE_OPS; - uint32_t val; -- uint32_t cont_level, cont_count; -+ uint32_t cont_level; - - cont_level = 0; -