pisi and file updated to newer version

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())
 

system/base/file/files/git_fixes.patch

@@ -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 <christos@zoulas.com>
-+
-+	* PR/341: Jan Kaluza, fix memory leak
-+	* PR/342: Jan Kaluza, fix out of bounds read
- 2014-03-26  11:25  Christos Zoulas <christos@zoulas.com>
- 
- 	* 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'))

system/base/file/pspec.xml

@@ -12,17 +12,13 @@
         <IsA>app:console</IsA>
         <Summary>Program to identify a file's format by scanning binary data for patterns</Summary>
         <Description>Program to identify a file's format by scanning binary data for patterns.</Description>
-        <Archive sha1sum="891176efa3006eff222bd364cd96135aad171941" type="targz">ftp://ftp.astron.com/pub/file/file-5.37.tar.gz</Archive>
+        <Archive sha1sum="57cad9341c3f74f8681c2ef931786c420105f35e" type="targz">ftp://ftp.astron.com/pub/file/file-5.38.tar.gz</Archive>
-        <!-- An update to this package can easily break pisi, pay attention! -->
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
             <!-- remove python dependencies while bootstrap -->
             <!--Dependency>python-devel</Dependency-->
             <Dependency>python-setuptools</Dependency>
         </BuildDependencies>
-        <!--<Patches>
-            <Patch level="1">git_fixes.patch</Patch>
-        </Patches>-->
     </Source>
 
     <Package>
@@ -42,6 +38,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2020-01-13</Date>
+            <Version>5.38</Version>
+            <Comment>Version bump</Comment>
+            <Name>Safa Arıman</Name>
+            <Email>safa@ariman.gen.tr</Email>
+        </Update>
 		<Update release="7">
             <Date>2019-12-11</Date>
             <Version>5.37</Version>

system/base/pisi/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>PISI is the package management system of Pisi Linux</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="3f357cf20c4a981c4c976faf0a92b0e4f2b7d4fa" type="targz">https://github.com/PisiLinuxNew/pisi/archive/v2.7.1.tar.gz</Archive>
+        <Archive sha1sum="6e014304e8f87c9426808dfbeda6f7ddf44c4a39" type="targz">https://github.com/PisiLinuxNew/pisi/archive/v2.7.2.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>comar</Dependency>
             <Dependency>plyvel</Dependency>
@@ -71,6 +71,13 @@
     </Package>
 
     <History>
+        <Update release="16">
+            <Date>2020-01-13</Date>
+            <Version>2.7.2</Version>
+            <Comment>Version bump</Comment>
+            <Name>Safa Arıman</Name>
+            <Email>safa@ariman.gen.tr</Email>
+        </Update>
         <Update release="15">
             <Date>2020-01-10</Date>
             <Version>2.7.1</Version>