file: update to 5.31

This commit is contained in:
cvh 2017-07-06 22:59:07 +02:00
parent 74eff6b4ba
commit 3dd7c0f03a
3 changed files with 5 additions and 48 deletions

View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -17,17 +17,17 @@
################################################################################
PKG_NAME="file"
PKG_VERSION="5.29"
PKG_VERSION="70c5f15"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://www.darwinsys.com/file/"
PKG_URL="ftp://ftp.astron.com/pub/file/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="https://github.com/file/file/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="ccache:host"
PKG_DEPENDS_TARGET="toolchain zlib file:host"
PKG_SECTION="tools"
PKG_SHORTDESC="file: File type identification utility"
PKG_LONGDESC="These are the sources to Darwin's file(1) utility and master magic(4) file, now maintained by Christos Zoulas. The file(1) utility is used to determine the types of various files."
PKG_AUTORECONF="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_HOST="--enable-fsect-man5 --enable-static --disable-shared"
PKG_CONFIGURE_OPTS_TARGET="--enable-fsect-man5 --enable-static --disable-shared"

View File

@ -1,17 +0,0 @@
diff --git a/src/apprentice.c b/src/apprentice.c
index 961e83d..b7d500c 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -348,11 +348,9 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
protected void
file_ms_free(struct magic_set *ms)
{
- size_t i;
if (ms == NULL)
return;
- for (i = 0; i < MAGIC_SETS; i++)
- mlist_free(ms->mlist[i]);
+ mlist_free(ms->mlist[0]);
free(ms->o.pbuf);
free(ms->o.buf);
free(ms->c.li);

View File

@ -1,26 +0,0 @@
From e990dc53f658cb67ec7b33c32e0bc24e65801792 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sat, 14 May 2011 15:04:15 +0000
Subject: [PATCH] small archive
---
magic/Magdir/archive | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index e84c8e3..5ad1ce3 100644
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -654,6 +654,9 @@
>>>>78 string -template Template
!:mime application/vnd.oasis.opendocument.image-template
+>26 byte x Zip archive data
+
+
# StarView Metafile
# From Pierre Ducroquet <pinaraf@pinaraf.info>
0 string VCLMTF StarView MetaFile
--
1.7.4.1