summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD29
-rw-r--r--trid.install4
-rw-r--r--trid.sh2
-rw-r--r--tridupdate.py114
-rw-r--r--update-trid-defs.service3
-rw-r--r--update-trid-defs.sh7
7 files changed, 34 insertions, 154 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a0ce1a2d7cc7..3926d751ac71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,26 @@
-# Generated by mksrcinfo v8
-# Wed Sep 21 16:25:43 UTC 2016
pkgbase = trid
pkgdesc = An utility designed to identify file types from their binary signatures
pkgver = 2.24
- pkgrel = 2
+ pkgrel = 4
url = http://mark0.net/soft-trid-e.html
install = trid.install
- arch = i686
arch = x86_64
license = CUSTOM
- depends = python2
+ depends = python
source = trid.sh
source = update-trid-defs.sh
source = update-trid-defs.service
source = update-trid-defs.timer
- source = triupdate-1.00.zip::http://mark0.net/download/tridupdate.zip
- md5sums = fe447a9fb6da5591ad72bf17e77084ae
- md5sums = 6ef06da62edde6c84c9473f7a62969e6
- md5sums = 3acd810a05f49c9dc586e964aea90146
- md5sums = 2ea012671b50e0761cbc4bbec820952e
- md5sums = 341ca17bfdd30ff6b23db373d82f5dcc
- source_i686 = trid-2.24-i686.zip::http://mark0.net/download/trid_linux.zip
- md5sums_i686 = e250feae78ac8e5a5523d044669bba96
- source_x86_64 = trid-2.24-x86_64.zip::http://mark0.net/download/trid_linux_64.zip
- md5sums_x86_64 = 75078cdd077c71b89cc1956525a09649
+ source = triupdate-1.10.zip::http://mark0.net/download/tridupdate.zip
+ source = trid-2.24-x86_64.zip::http://mark0.net/download/trid_linux_64.zip
+ source = trid-2.24-x86_64.zip.asc::http://mark0.net/download/trid_linux_64.zip.asc
+ validpgpkeys = 7EFFF01538C2BE8937BDAF52FABE6DB9D3807047
+ b2sums = acd89bc33a6f00d2709219fa6f67343680384f320860b7e9e3cc0ead6dddf0ebcc953fbf1a8d2e4d4f2a705b3c0cc20a12ec8bfa6dd849f8235b323cd13575f8
+ b2sums = db8916665fbaef5e02993ccaa3098f0906ae5e16862b853de84336533cd3431f0a15b7fd1de5ec0d5f8e50f4444946db718a8597e0079e3641a1d3468134bdfb
+ b2sums = bde55d3c7ae1f93a9e50f41549a759492cee34212109e4bfd76289f46ade2ceb2ed65ce0290907b1b31b863b23b57e05096afee8882971979d9df1d30685b164
+ b2sums = ad09bd81ba2855ee9a729320ebf0a1528124cc998e6af3f9bfff9524a736d05c77808c7b300f53c9632d5d420bbe9c85cb6e0bee1d32c08df1bedd336e4a98a7
+ b2sums = 41d43bb2587a3d08030d0f4250027d62876338e56c2d4bafd5adeca343ad678feaf844e7a12e8a0409262a849d04d00a1c352359b619ea7621f81bb91c0066f0
+ b2sums = c28e12d6b308a243beeb030dbc09582b703332e9d87d9d6f9ee5f1c7da6e5ce7b57867db00fcfeb30c9ebea8379aac83a16b7ad11c3864dec329e1d0251b05d1
+ b2sums = SKIP
pkgname = trid
-
diff --git a/PKGBUILD b/PKGBUILD
index 8633c14cb539..f6464035c268 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,30 @@
pkgname=trid
pkgver=2.24
-pkgrel=2
+pkgrel=4
pkgdesc="An utility designed to identify file types from their binary signatures"
-arch=('i686' 'x86_64')
+arch=('x86_64')
url="http://mark0.net/soft-trid-e.html"
license=('CUSTOM')
-depends=('python2')
+depends=('python')
install=trid.install
+validpgpkeys=('7EFFF01538C2BE8937BDAF52FABE6DB9D3807047')
+
source=(trid.sh
update-trid-defs.sh
update-trid-defs.service
update-trid-defs.timer
- triupdate-1.00.zip::http://mark0.net/download/tridupdate.zip)
-
-source_i686=(trid-${pkgver}-i686.zip::http://mark0.net/download/trid_linux.zip)
-source_x86_64=(trid-${pkgver}-x86_64.zip::http://mark0.net/download/trid_linux_64.zip)
-md5sums=('fe447a9fb6da5591ad72bf17e77084ae'
- '6ef06da62edde6c84c9473f7a62969e6'
- '3acd810a05f49c9dc586e964aea90146'
- '2ea012671b50e0761cbc4bbec820952e'
- '341ca17bfdd30ff6b23db373d82f5dcc')
-md5sums_i686=('e250feae78ac8e5a5523d044669bba96')
-md5sums_x86_64=('75078cdd077c71b89cc1956525a09649')
+ triupdate-1.10.zip::http://mark0.net/download/tridupdate.zip
+ trid-${pkgver}-x86_64.zip::http://mark0.net/download/trid_linux_64.zip
+ trid-${pkgver}-x86_64.zip.asc::http://mark0.net/download/trid_linux_64.zip.asc)
+b2sums=('acd89bc33a6f00d2709219fa6f67343680384f320860b7e9e3cc0ead6dddf0ebcc953fbf1a8d2e4d4f2a705b3c0cc20a12ec8bfa6dd849f8235b323cd13575f8'
+ 'db8916665fbaef5e02993ccaa3098f0906ae5e16862b853de84336533cd3431f0a15b7fd1de5ec0d5f8e50f4444946db718a8597e0079e3641a1d3468134bdfb'
+ '00787de3be0a3244669485022015bc1376683dceb80d18194aef9be90a8f77ee4faa4c897f1c60ec06b182bb46fd8e7ee1d27ca0f202a619cee01a4f1a1051be'
+ 'ad09bd81ba2855ee9a729320ebf0a1528124cc998e6af3f9bfff9524a736d05c77808c7b300f53c9632d5d420bbe9c85cb6e0bee1d32c08df1bedd336e4a98a7'
+ '41d43bb2587a3d08030d0f4250027d62876338e56c2d4bafd5adeca343ad678feaf844e7a12e8a0409262a849d04d00a1c352359b619ea7621f81bb91c0066f0'
+ 'c28e12d6b308a243beeb030dbc09582b703332e9d87d9d6f9ee5f1c7da6e5ce7b57867db00fcfeb30c9ebea8379aac83a16b7ad11c3864dec329e1d0251b05d1'
+ 'SKIP')
package() {
cd "${srcdir}"
diff --git a/trid.install b/trid.install
index ed653a2b6ba5..df7629f5dedb 100644
--- a/trid.install
+++ b/trid.install
@@ -1,6 +1,8 @@
post_install() {
echo "To enable automatic defenitions database updating"
- echo "run systemctl enable update-trid-defs.timer"
+ echo "run: systemctl enable update-trid-defs.timer"
+ echo "To update the data base manually (recommended)"
+ echo "run: sudo update-trid-defs"
}
post_upgrade() {
diff --git a/trid.sh b/trid.sh
index fedc8f156ad4..92e51e5fb21d 100644
--- a/trid.sh
+++ b/trid.sh
@@ -8,4 +8,4 @@ if [ ! -e /var/lib/trid/triddefs.trd ]; then
exit 200;
fi
-/usr/bin/trid.bin -d:/var/lib/trid/triddefs.trd $*
+LANG=c /usr/bin/trid.bin -d:/var/lib/trid/triddefs.trd $*
diff --git a/tridupdate.py b/tridupdate.py
deleted file mode 100644
index a90bf58dfe0c..000000000000
--- a/tridupdate.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#-------------------------------------------------------------------------------
-# Name: tridupdate.py
-# Purpose: TrID's definitions package updater
-#
-# Author: Marco Pontello
-#
-# Created: 20/05/2012
-# Copyright: (c) Mark 2012
-# Licence: public domain
-#-------------------------------------------------------------------------------
-#!/usr/bin/env python
-
-import os
-import sys
-import hashlib
-import argparse
-import urllib
-import zipfile
-import tempfile
-
-PROGRAM_VER = "1.00"
-
-
-def errexit(mess, errlev=1):
- """Display an error and exit."""
- print "%s: error: %s" % (os.path.split(sys.argv[0])[1], mess)
- sys.exit(errlev)
-
-
-def chunked(file, chunk_size):
- """Helper function to read files in chunks."""
- return iter(lambda: file.read(chunk_size), '')
-
-
-def MD5digest(filename=None, data=None):
- """Return an MD5 digest for a file or a string."""
- h = hashlib.md5()
- if filename:
- f = open(filename, "rb")
- for data in chunked(f, 1024*1024):
- h.update(data)
- f.close()
- elif data:
- h.update(data)
- return h.hexdigest()
-
-
-def trdget(url_defs):
- """Download & unzip a new TrID defs package"""
- f = tempfile.TemporaryFile()
- u = urllib.urlopen(url_defs)
- for data in chunked(u, 1024*8):
- f.write(data)
- print "\r%dKB" % (f.tell() / 1024),
- print "\r",
- z = zipfile.ZipFile(f)
- trd = z.read("triddefs.trd")
- z.close()
- f.close()
- return trd
-
-
-def get_cmdline():
- """Evaluate command line parameters, usage & help."""
- parser = argparse.ArgumentParser(
- description="TrID's definitions updater",
- formatter_class=argparse.ArgumentDefaultsHelpFormatter,
- prefix_chars='-/+',
- version = "TrIDUpdate v%s - (C) 2012 M.Pontello" % PROGRAM_VER)
- parser.add_argument("filename", action="store", nargs='?',
- help = "TRD package filename.", default="triddefs.trd")
- res = parser.parse_args()
- return res
-
-
-def main():
- res = get_cmdline()
- trdfilename = res.filename
-
- url_MD5 = "http://mark0.net/download/triddefs.trd.md5"
- url_defs = "http://mark0.net/download/triddefs.zip"
-
- if os.path.exists(trdfilename):
- curdigest = MD5digest(filename=trdfilename)
- print "MD5: %s" % (curdigest)
- else:
- curdigest = 0
- print "File %s not found" % (trdfilename)
-
- print "Checking last version online..."
- f = urllib.urlopen(url_MD5)
- newdigest = f.read()
- f.close()
- print "MD5: %s" % (newdigest)
-
- if curdigest == newdigest:
- print "Current defs are up-to-date."
- sys.exit(0)
-
- print "Downloading new defs..."
- trdpack = trdget(url_defs)
-
- print "Checking defs integrity..."
- if MD5digest(data=trdpack) == newdigest:
- f = open(trdfilename, "wb")
- f.write(trdpack)
- f.close()
- print "OK."
- else:
- errexit("Digest don't match. Retry!")
-
-
-if __name__ == '__main__':
- main()
diff --git a/update-trid-defs.service b/update-trid-defs.service
index 8fb64b886e84..5f60276430ad 100644
--- a/update-trid-defs.service
+++ b/update-trid-defs.service
@@ -8,5 +8,4 @@ Type=oneshot
ExecStart=/usr/bin/update-trid-defs
[Install]
-WantedBy=multi-user.target
- \ No newline at end of file
+WantedBy=multi-user.target \ No newline at end of file
diff --git a/update-trid-defs.sh b/update-trid-defs.sh
index 66b9c39bba15..75042afac5c0 100644
--- a/update-trid-defs.sh
+++ b/update-trid-defs.sh
@@ -5,9 +5,4 @@ if [ "$(id -u)" != "0" ]; then
exit 1
fi
-_PWD=$(pwd)
-
-cd /var/lib/trid/
-python2 /usr/share/trid/tridupdate.py
-
-cd ${_PWD}
+python /usr/share/trid/tridupdate.py -- /var/lib/trid/triddefs.trd