diff --git a/system/base/file/actions.py b/system/base/file/actions.py index 12791965..02f3b9cd 100644 --- a/system/base/file/actions.py +++ b/system/base/file/actions.py @@ -10,6 +10,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import pythonmodules + def setup(): pisitools.flags.add("-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC") @@ -19,9 +20,11 @@ def setup(): pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + def build(): autotools.make() + def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/system/base/file/files/git_fixes.patch b/system/base/file/files/git_fixes.patch deleted file mode 100644 index beec1b05..00000000 --- a/system/base/file/files/git_fixes.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -aur file-5.18/ChangeLog file.git/ChangeLog ---- file-5.18/ChangeLog 2014-03-26 16:27:39.000000000 +0100 -+++ file.git/ChangeLog 2014-04-03 18:50:06.066659023 +0200 -@@ -1,3 +1,7 @@ -+2014-04-01 15:25 Christos Zoulas -+ -+ * PR/341: Jan Kaluza, fix memory leak -+ * PR/342: Jan Kaluza, fix out of bounds read - 2014-03-26 11:25 Christos Zoulas - - * release 5.18 -diff -aur file-5.18/src/apprentice.c file.git/src/apprentice.c ---- file-5.18/src/apprentice.c 2014-03-14 19:48:11.000000000 +0100 -+++ file.git/src/apprentice.c 2014-04-03 18:50:06.086659024 +0200 -@@ -517,14 +517,18 @@ - { - if (map == NULL) - return; -- if (map->p == NULL) -- return; -+ if (map->p != NULL) { - #ifdef QUICK -- if (map->len) -- (void)munmap(map->p, map->len); -- else -+ if (map->len) -+ (void)munmap(map->p, map->len); -+ else - #endif - free(map->p); -+ } else { -+ uint32_t j; -+ for (j = 0; j < MAGIC_SETS; j++) -+ free(map->magic[j]); -+ } - free(map); - } - -@@ -1290,11 +1294,7 @@ - magic_entry_free(mset[j].me, mset[j].count); - - if (errs) { -- for (j = 0; j < MAGIC_SETS; j++) { -- if (map->magic[j]) -- free(map->magic[j]); -- } -- free(map); -+ apprentice_unmap(map); - return NULL; - } - return map; -diff -aur file-5.18/python/magic.py file.git/python/magic.py ---- file-5.18/python/magic.py 2014-04-04 20:34:38.086623965 +0200 -+++ file.git/python/magic.py 2014-04-04 20:35:42.886623752 +0200 -@@ -116,7 +116,10 @@ - is set. A call to errno() will return the numeric error code. - """ - try: # attempt python3 approach first -- bi = bytes(filename, 'utf-8') -+ if isinstance(filename, bytes): -+ bi = filename -+ else: -+ bi = bytes(filename, 'utf-8') - return str(_file(self._magic_t, bi), 'utf-8') - except: - return _file(self._magic_t, filename.encode('utf-8')) diff --git a/system/base/file/pspec.xml b/system/base/file/pspec.xml index 492313c3..f319de6e 100644 --- a/system/base/file/pspec.xml +++ b/system/base/file/pspec.xml @@ -12,17 +12,13 @@ app:console Program to identify a file's format by scanning binary data for patterns Program to identify a file's format by scanning binary data for patterns. - ftp://ftp.astron.com/pub/file/file-5.37.tar.gz - + ftp://ftp.astron.com/pub/file/file-5.38.tar.gz zlib-devel python-setuptools - @@ -42,6 +38,13 @@ + + 2020-01-13 + 5.38 + Version bump + Safa Arıman + safa@ariman.gen.tr + 2019-12-11 5.37 diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index b866c08d..b1672049 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -12,7 +12,7 @@ app:console PISI is the package management system of Pisi Linux PISI is a modern package management system implemented in Python. Some of its main features are: package sources are written in XML and python, implements all functions through a simple-to-use API, integrates low-level and high-level package management features. - https://github.com/PisiLinuxNew/pisi/archive/v2.7.1.tar.gz + https://github.com/PisiLinuxNew/pisi/archive/v2.7.2.tar.gz comar plyvel @@ -71,6 +71,13 @@ + + 2020-01-13 + 2.7.2 + Version bump + Safa Arıman + safa@ariman.gen.tr + 2020-01-10 2.7.1