Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xMerge branch 'master' of github.com:pisilinux/core

Browse Source
This commit is contained in:
Rmys
2020-01-15 00:12:09 +03:00
parent 1a33dae6ef 64195d8a9f
commit 0c8a4a5c84
13 changed files with 56 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/file/actions.py
+3
View File
@@ -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
-66
View File
@@ -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
+8 -5
View File
@@ -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>
<!-- An update to this package can easily break pisi, pay attention! -->
<Archive sha1sum="57cad9341c3f74f8681c2ef931786c420105f35e" type="targz">ftp://ftp.astron.com/pub/file/file-5.38.tar.gz</Archive>
<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/leveldb/pspec.xml
+1 -1
View File
@@ -42,7 +42,7 @@
</Package>
<History>
<Update release="5">
<Update release="5">
<Date>2019-12-27</Date>
<Version>1.18</Version>
<Comment>Rebuild</Comment>
system/base/libunwind/pspec.xml
+1 -1
View File
@@ -61,7 +61,7 @@
</Package>
<History>
<Update release="6">
<Update release="6">
<Date>2019-12-27</Date>
<Version>1.3.1</Version>
<Comment>Version bump</Comment>
system/base/nspr/actions.py
+2
View File
@@ -9,6 +9,8 @@ from pisi.actionsapi import get
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
NoStrip = ["/usr/lib"]
def setup():
# -fno-strict-aliasing workarounds some aliasing violations, see: https://bugzilla.redhat.com/show_bug.cgi?id=487844 -->
shelltools.system('nspr/configure \
system/base/pisi/files/kernel_build_fix.patch
-14
View File
@@ -1,14 +0,0 @@
diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py
index df3de3b..2560b47 100644
--- a/pisi/actionsapi/kerneltools.py
+++ b/pisi/actionsapi/kerneltools.py
@@ -253,6 +253,9 @@ def installLibcHeaders(excludes=None):
# Create directories
shelltools.makedirs(headers_tmp)
shelltools.makedirs(headers_dir)
+
+ # Clean up the source directory
+ autotools.make('mrproper')
# install the headers
autotools.rawInstall(make_cmd, "headers_install")
system/base/pisi/pspec.xml
+15 -4
View File
@@ -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="227a4a01f7686892c0ad44bce5c95cc2e634cc50" 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>
@@ -22,9 +22,6 @@
<Dependency>intltool</Dependency>
<Dependency versionFrom="1.18">leveldb-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>kernel_build_fix.patch</Patch>
</Patches>
</Source>
<Package>
@@ -74,6 +71,20 @@
</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>
<Comment>Rebuild</Comment>
<Name>Safa Arıman</Name>
<Email>safa@ariman.gen.tr</Email>
</Update>
<Update release="14">
<Date>2020-01-10</Date>
<Version>2.7.1</Version>
system/base/plyvel/pspec.xml
+1 -1
View File
@@ -31,7 +31,7 @@
</Files>
</Package>
<History>
<Update release="6">
<Update release="6">
<Date>2019-12-27</Date>
<Version>0.9</Version>
<Comment>Rebuild</Comment>
system/base/xz/pspec.xml
+1 -1
View File
@@ -69,7 +69,7 @@
</Package>
<History>
<Update release="6">
<Update release="6">
<Date>2019-12-11</Date>
<Version>5.2.4</Version>
<Comment>Version bump</Comment>
system/base/zlib/pspec.xml
+1 -1
View File
@@ -93,7 +93,7 @@
<Update release="7">
<Date>2019-12-11</Date>
<Version>1.2.11</Version>
<Comment>Rebuild</Comment>
<Comment>Rebuild.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>