Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
@@ -97,6 +97,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="9">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>2.13.1</Version>
|
||||||
|
<Comment>Rebuild</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="8">
|
<Update release="8">
|
||||||
<Date>2019-11-09</Date>
|
<Date>2019-11-09</Date>
|
||||||
<Version>2.13.1</Version>
|
<Version>2.13.1</Version>
|
||||||
|
|||||||
@@ -4,14 +4,13 @@
|
|||||||
# Licensed under the GNU General Public License, version 3.
|
# Licensed under the GNU General Public License, version 3.
|
||||||
# See the file http://www.gnu.org/copyleft/gpl.txt
|
# See the file http://www.gnu.org/copyleft/gpl.txt
|
||||||
|
|
||||||
from pisi.actionsapi import autotools
|
|
||||||
from pisi.actionsapi import pisitools
|
from pisi.actionsapi import pisitools
|
||||||
from pisi.actionsapi import get
|
|
||||||
|
|
||||||
def build():
|
|
||||||
autotools.make()
|
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
pisitools.dosbin("dkms")
|
||||||
|
pisitools.doman("dkms.8")
|
||||||
|
pisitools.insinto("/usr/share/bash-completion/completions", "dkms.bash-completion", "dkms")
|
||||||
|
pisitools.insinto("/etc/dkms", "dkms_framework.conf", "framework.conf")
|
||||||
|
pisitools.insinto("/var/lib/dkms", "dkms_dbversion")
|
||||||
|
|
||||||
pisitools.dodoc("AUTHORS", "COPYING", "README*", "TODO")
|
pisitools.dodoc("AUTHORS", "COPYING", "README*", "TODO")
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import os
|
||||||
|
import piksemel
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
def generate_initrd(kver):
|
||||||
|
subprocess.call(["/usr/bin/mkinitcpio","-k","%s"% kver ,"-g","/boot/initramfs-%s-fallback.img"% kver,"-S","autodetect"])
|
||||||
|
subprocess.call(["/usr/bin/mkinitcpio","-k","%s"% kver ,"-c","/etc/mkinitcpio.conf","-g","/boot/initramfs-%s.img"% kver])
|
||||||
|
|
||||||
|
def get_kver():
|
||||||
|
with open("/etc/kernel/kernel") as f:
|
||||||
|
return f.readline().strip()
|
||||||
|
|
||||||
|
def run_dkms(name, version, kver, arch):
|
||||||
|
os.system("dkms build -m %s -v %s -k %s -a %s" % (name, version, kver, arch))
|
||||||
|
os.system("dkms install -m %s -v %s -k %s -a %s" % (name, version, kver, arch))
|
||||||
|
|
||||||
|
def buildModules(metapath, filepath):
|
||||||
|
if piksemel.parse(metapath).getTag("Package").getTagData("Name") == "kernel-module-headers":
|
||||||
|
kver = get_kver()
|
||||||
|
arch = piksemel.parse(metapath).getTag("Package").getTagData("Architecture").replace("_", "-")
|
||||||
|
# rebuild if /usr/src/*/dkms.conf exists
|
||||||
|
for d in os.walk("/usr/src").next()[1]:
|
||||||
|
if os.path.isfile("/usr/src/%s/dkms.conf" % d):
|
||||||
|
name, version = d.split("-")
|
||||||
|
run_dkms(name, version, kver, arch)
|
||||||
|
generate_initrd(kver)
|
||||||
|
return
|
||||||
|
|
||||||
|
parse = piksemel.parse(filepath)
|
||||||
|
for fp in parse.tags("File"):
|
||||||
|
path = fp.getTagData("Path")
|
||||||
|
# build if package has /usr/src/*/dkms.conf
|
||||||
|
if path.endswith("/dkms.conf") and path.startswith("usr/src/"):
|
||||||
|
name = path.split("/")[-2].split("-")[0]
|
||||||
|
version = path.split("/")[-2].split("-")[1]
|
||||||
|
kver = get_kver()
|
||||||
|
arch = piksemel.parse(metapath).getTag("Package").getTagData("Architecture").replace("_", "-")
|
||||||
|
run_dkms(name, version, kver, arch)
|
||||||
|
generate_initrd(kver)
|
||||||
|
return
|
||||||
|
|
||||||
|
def setupPackage(metapath, filepath):
|
||||||
|
buildModules(metapath, filepath)
|
||||||
|
|
||||||
|
def cleanupPackage(metapath, filepath):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def postCleanupPackage(metapath, filepath):
|
||||||
|
pass
|
||||||
@@ -3,34 +3,45 @@
|
|||||||
<Name>dkms</Name>
|
<Name>dkms</Name>
|
||||||
<Homepage>http://linux.dell.com/dkms</Homepage>
|
<Homepage>http://linux.dell.com/dkms</Homepage>
|
||||||
<Packager>
|
<Packager>
|
||||||
<Name>Ertan Güven</Name>
|
<Name>Marcin Bojara</Name>
|
||||||
<Email>ertan@pisilinux.org</Email>
|
<Email>marcin.bojara@gmail.com</Email>
|
||||||
</Packager>
|
</Packager>
|
||||||
<License>GPLv2</License>
|
<License>GPLv2</License>
|
||||||
<PartOf>hardware.misc</PartOf>
|
<PartOf>hardware.misc</PartOf>
|
||||||
<IsA>kernel</IsA>
|
<IsA>kernel</IsA>
|
||||||
<Summary>Dynamic Kernel Module Support</Summary>
|
<Summary>Dynamic Kernel Module Support</Summary>
|
||||||
<Description>DKMS is a dynamic kernel module support framework.</Description>
|
<Description>DKMS is a dynamic kernel module support framework.</Description>
|
||||||
<BuildDependencies>
|
<Archive sha1sum="d4c4e2d160d6119f8757d6a4a4c364f0f770cc43" type="targz">https://github.com/dell/dkms/archive/v2.8.1.tar.gz</Archive>
|
||||||
<Dependency>kernel-headers</Dependency>
|
|
||||||
</BuildDependencies>
|
|
||||||
<Archive sha1sum="9cdfecc29116d578e693cf3273ea9695d9471cf2" type="targz">https://github.com/dell/dkms/archive/v2.6.1.tar.gz</Archive>
|
|
||||||
</Source>
|
</Source>
|
||||||
<Package>
|
<Package>
|
||||||
<Name>dkms</Name>
|
<Name>dkms</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>kernel-headers</Dependency>
|
<Dependency>gcc</Dependency>
|
||||||
|
<Dependency>bash</Dependency>
|
||||||
|
<Dependency>kmod</Dependency>
|
||||||
|
<Dependency>make</Dependency>
|
||||||
|
<Dependency>coreutils</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="config">/etc</Path>
|
<Path fileType="config">/etc</Path>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
|
||||||
<Path fileType="executable">/usr/sbin</Path>
|
<Path fileType="executable">/usr/sbin</Path>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
<Path fileType="man">/usr/share/man</Path>
|
<Path fileType="man">/usr/share/man</Path>
|
||||||
<Path fileType="data">/var/lib</Path>
|
<Path fileType="data">/var/lib</Path>
|
||||||
|
<Path fileType="data">/usr/share/bash-completion</Path>
|
||||||
</Files>
|
</Files>
|
||||||
|
<Provides>
|
||||||
|
<COMAR script="pakhandler.py">System.PackageHandler</COMAR>
|
||||||
|
</Provides>
|
||||||
</Package>
|
</Package>
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="6">
|
||||||
|
<Date>2020-01-06</Date>
|
||||||
|
<Version>2.8.1</Version>
|
||||||
|
<Comment>Version bump. Add pakhandler.py</Comment>
|
||||||
|
<Name>Marcin Bojara</Name>
|
||||||
|
<Email>marcin.bojara@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="5">
|
<Update release="5">
|
||||||
<Date>2018-09-01</Date>
|
<Date>2018-09-01</Date>
|
||||||
<Version>2.6.1</Version>
|
<Version>2.6.1</Version>
|
||||||
|
|||||||
@@ -83,6 +83,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="8">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>2.0.14</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="7">
|
<Update release="7">
|
||||||
<Date>2019-02-06</Date>
|
<Date>2019-02-06</Date>
|
||||||
<Version>2.0.14</Version>
|
<Version>2.0.14</Version>
|
||||||
|
|||||||
@@ -5,16 +5,17 @@
|
|||||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||||
|
|
||||||
from pisi.actionsapi import shelltools
|
from pisi.actionsapi import shelltools
|
||||||
|
from pisi.actionsapi import mesontools
|
||||||
from pisi.actionsapi import pisitools
|
from pisi.actionsapi import pisitools
|
||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
shelltools.system("meson build --prefix=/usr -Dgtk_doc=true")
|
mesontools.configure()
|
||||||
|
|
||||||
def build():
|
def build():
|
||||||
shelltools.system("ninja -C build")
|
mesontools.build()
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
shelltools.system("DESTDIR=%s ninja -C build install" % get.installDIR())
|
mesontools.install()
|
||||||
|
|
||||||
pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README")
|
pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README")
|
||||||
|
|||||||
@@ -12,9 +12,7 @@
|
|||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>GObject-based wrapper around the Exiv2 library</Summary>
|
<Summary>GObject-based wrapper around the Exiv2 library</Summary>
|
||||||
<Description>GObject-based wrapper around the Exiv2 library</Description>
|
<Description>GObject-based wrapper around the Exiv2 library</Description>
|
||||||
<Archive sha1sum="52a948a9813d2231bbd63ba955c7b5656f2b6635" type="tarxz">
|
<Archive sha1sum="2d8894d307363726b345d0535d5fe5b7153a7ea9" type="tarxz">https://download.gnome.org/sources/gexiv2/0.12/gexiv2-0.12.0.tar.xz</Archive>
|
||||||
https://download.gnome.org/sources/gexiv2/0.11/gexiv2-0.11.0.tar.xz
|
|
||||||
</Archive>
|
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>meson</Dependency>
|
<Dependency>meson</Dependency>
|
||||||
<Dependency>gtk-doc</Dependency>
|
<Dependency>gtk-doc</Dependency>
|
||||||
@@ -25,6 +23,8 @@
|
|||||||
<Dependency>gobject-introspection-devel</Dependency>
|
<Dependency>gobject-introspection-devel</Dependency>
|
||||||
<Dependency>exiv2-devel</Dependency>
|
<Dependency>exiv2-devel</Dependency>
|
||||||
<Dependency>vala-devel</Dependency>
|
<Dependency>vala-devel</Dependency>
|
||||||
|
<Dependency>vala-devel</Dependency>
|
||||||
|
<Dependency>python3-pygobject3-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -58,6 +58,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="4">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>0.12.0</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="3">
|
<Update release="3">
|
||||||
<Date>2019-06-18</Date>
|
<Date>2019-06-18</Date>
|
||||||
<Version>0.11.0</Version>
|
<Version>0.11.0</Version>
|
||||||
|
|||||||
@@ -67,6 +67,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="9">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>2.0.2</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Idris Kalp</Name>
|
||||||
|
<Email>idriskalp@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="8">
|
<Update release="8">
|
||||||
<Date>2019-06-19</Date>
|
<Date>2019-06-19</Date>
|
||||||
<Version>2.0.2</Version>
|
<Version>2.0.2</Version>
|
||||||
|
|||||||
@@ -1,23 +1,27 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Licensed under the GNU General Public License, version 3.
|
# Licensed under the GNU General Public License, version 3.
|
||||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||||
|
|
||||||
from pisi.actionsapi import autotools
|
from pisi.actionsapi import cmaketools
|
||||||
from pisi.actionsapi import pisitools
|
from pisi.actionsapi import pisitools
|
||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
autotools.configure("--disable-static \
|
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
--disable-dependency-tracking \
|
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||||
--enable-video \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
--disable-rpath")
|
-DEXIV2_ENABLE_VIDEO=yes \
|
||||||
|
-DEXIV2_ENABLE_WEBREADY=yes \
|
||||||
|
-DEXIV2_ENABLE_CURL=yes \
|
||||||
|
-DEXIV2_ENABLE_NLS=ON \
|
||||||
|
-DEXIV2_BUILD_SAMPLES=no")
|
||||||
|
|
||||||
def build():
|
def build():
|
||||||
autotools.make()
|
cmaketools.make()
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||||
|
|
||||||
pisitools.dodoc("COPYING", "README", "doc/ChangeLog")
|
pisitools.dodoc("COPYING*", "README*", "doc/ChangeLog")
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
|
||||||
|
index 29311fd..c0d9553 100644
|
||||||
|
--- a/src/crwimage_int.cpp
|
||||||
|
+++ b/src/crwimage_int.cpp
|
||||||
|
@@ -268,6 +268,9 @@ namespace Exiv2 {
|
||||||
|
#ifdef EXIV2_DEBUG_MESSAGES
|
||||||
|
std::cout << "Reading directory 0x" << std::hex << tag() << "\n";
|
||||||
|
#endif
|
||||||
|
+ if (this->offset() + this->size() > size)
|
||||||
|
+ throw Error(kerOffsetOutOfRange);
|
||||||
|
+
|
||||||
|
readDirectory(pData + offset(), this->size(), byteOrder);
|
||||||
|
#ifdef EXIV2_DEBUG_MESSAGES
|
||||||
|
std::cout << "<---- 0x" << std::hex << tag() << "\n";
|
||||||
|
diff --git a/test/data/POC-file_issue_1019 b/test/data/POC-file_issue_1019
|
||||||
|
new file mode 100755
|
||||||
|
index 0000000..e69de29
|
||||||
|
diff --git a/tests/bugfixes/github/test_issue_1019.py b/tests/bugfixes/github/test_issue_1019.py
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..c2682f9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/bugfixes/github/test_issue_1019.py
|
||||||
|
@@ -0,0 +1,14 @@
|
||||||
|
+from system_tests import CaseMeta, path
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+class OverreadInCiffDirectoryReadDirectory(metaclass=CaseMeta):
|
||||||
|
+
|
||||||
|
+ filename = path("$data_path/POC-file_issue_1019")
|
||||||
|
+ commands = ["$exiv2 -pv $filename"]
|
||||||
|
+ stdout = [""]
|
||||||
|
+ stderr = [
|
||||||
|
+ """$exiv2_exception_message $filename:
|
||||||
|
+$kerOffsetOutOfRange
|
||||||
|
+"""
|
||||||
|
+ ]
|
||||||
|
+ retval = [1]
|
||||||
|
diff --git a/tests/suite.conf b/tests/suite.conf
|
||||||
|
index 5b31930..dab7427 100644
|
||||||
|
--- a/tests/suite.conf
|
||||||
|
+++ b/tests/suite.conf
|
||||||
|
@@ -19,6 +19,7 @@ largeiptc_test: ${ENV:exiv2_path}/largeiptc-test${ENV:binary_extension}
|
||||||
|
easyaccess_test: ${ENV:exiv2_path}/easyaccess-test${ENV:binary_extension}
|
||||||
|
|
||||||
|
[variables]
|
||||||
|
+kerOffsetOutOfRange: Offset out of range
|
||||||
|
kerFailedToReadImageData: Failed to read image data
|
||||||
|
kerCorruptedMetadata: corrupted image metadata
|
||||||
|
kerInvalidMalloc: invalid memory allocation request
|
||||||
@@ -13,13 +13,15 @@
|
|||||||
<IsA>app:console</IsA>
|
<IsA>app:console</IsA>
|
||||||
<Summary>Another library for parsing, editing, and saving EXIF data</Summary>
|
<Summary>Another library for parsing, editing, and saving EXIF data</Summary>
|
||||||
<Description>exiv2 is a C++ library and a command line utility to access image metadata. Exiv2 is available as free software and with a commercial license, and is used in a growing number of projects.</Description>
|
<Description>exiv2 is a C++ library and a command line utility to access image metadata. Exiv2 is available as free software and with a commercial license, and is used in a growing number of projects.</Description>
|
||||||
<Archive sha1sum="e68404958ebfbee39354f5aaaa895ac6abf127a2" type="targz">http://www.exiv2.org/builds/exiv2-0.26-trunk.tar.gz</Archive>
|
<Archive sha1sum="1a72065c95e721b1c21df4f2ee64d8338c6acf94" type="targz">http://www.exiv2.org/builds/exiv2-0.27.2-Source.tar.gz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
|
<Dependency>cmake</Dependency>
|
||||||
|
<Dependency>curl-devel</Dependency>
|
||||||
<Dependency>zlib-devel</Dependency>
|
<Dependency>zlib-devel</Dependency>
|
||||||
<Dependency>expat-devel</Dependency>
|
<Dependency>expat-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">exiv2-0.18-deps.patch</Patch>
|
<Patch level="1">CVE-2019-17402.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -41,6 +43,7 @@
|
|||||||
<Name>exiv2-libs</Name>
|
<Name>exiv2-libs</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>zlib</Dependency>
|
<Dependency>zlib</Dependency>
|
||||||
|
<Dependency>curl</Dependency>
|
||||||
<Dependency>expat</Dependency>
|
<Dependency>expat</Dependency>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
@@ -57,11 +60,19 @@
|
|||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="header">/usr/include</Path>
|
<Path fileType="header">/usr/include</Path>
|
||||||
|
<Path fileType="data">/usr/lib/cmake</Path>
|
||||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||||
</Files>
|
</Files>
|
||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="6">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>0.27.2</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="5">
|
<Update release="5">
|
||||||
<Date>2018-08-07</Date>
|
<Date>2018-08-07</Date>
|
||||||
<Version>0.26</Version>
|
<Version>0.26</Version>
|
||||||
|
|||||||
@@ -36,13 +36,13 @@ def setup():
|
|||||||
shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION())
|
shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION())
|
||||||
shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt")
|
shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt")
|
||||||
|
|
||||||
shelltools.export("CC", "clang")
|
#shelltools.export("CC", "clang")
|
||||||
shelltools.export("CXX", "clang++")
|
#shelltools.export("CXX", "clang++")
|
||||||
|
|
||||||
|
|
||||||
if get.buildTYPE() == "emul32":
|
if get.buildTYPE() == "emul32":
|
||||||
shelltools.export("CC", "clang -m32")
|
#shelltools.export("CC", "clang -m32")
|
||||||
shelltools.export("CXX", "clang++ -m32")
|
#shelltools.export("CXX", "clang++ -m32")
|
||||||
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
|
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
|
||||||
|
|
||||||
shelltools.makedirs("build")
|
shelltools.makedirs("build")
|
||||||
|
|||||||
@@ -57,6 +57,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="10">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>3.32.2</Version>
|
||||||
|
<Comment>Rebuild</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="9">
|
<Update release="9">
|
||||||
<Date>2019-09-14</Date>
|
<Date>2019-09-14</Date>
|
||||||
<Version>3.32.2</Version>
|
<Version>3.32.2</Version>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<License>BSD</License>
|
<License>BSD</License>
|
||||||
<Summary>A modern programming language for GNOME</Summary>
|
<Summary>A modern programming language for GNOME</Summary>
|
||||||
<Description>Vala is a new programming language that aims to bring modern programming language features to GNOME developers without imposing any additional runtime requirements and without using a different ABI compared to applications and libraries written in C.</Description>
|
<Description>Vala is a new programming language that aims to bring modern programming language features to GNOME developers without imposing any additional runtime requirements and without using a different ABI compared to applications and libraries written in C.</Description>
|
||||||
<Archive sha1sum="a972a4294d2c76e820db4cda56d716290d8c61ec" type="tarxz">mirrors://gnome/vala/0.40/vala-0.40.3.tar.xz</Archive>
|
<Archive sha1sum="2199cf64eab96cb5fc6bd5c5658dfd0b720e4c30" type="tarxz">mirrors://gnome/vala/0.40/vala-0.40.18.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>glib2-devel</Dependency>
|
<Dependency>glib2-devel</Dependency>
|
||||||
<Dependency>gobject-introspection-devel</Dependency>
|
<Dependency>gobject-introspection-devel</Dependency>
|
||||||
@@ -71,6 +71,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>0.40.18</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2018-07-30</Date>
|
<Date>2018-07-30</Date>
|
||||||
<Version>0.40.3</Version>
|
<Version>0.40.3</Version>
|
||||||
|
|||||||
@@ -16,12 +16,15 @@ def setup():
|
|||||||
options = "--with-data-packaging=library \
|
options = "--with-data-packaging=library \
|
||||||
--disable-samples \
|
--disable-samples \
|
||||||
--disable-silent-rules"
|
--disable-silent-rules"
|
||||||
|
|
||||||
if get.buildTYPE() == "_emul32":
|
if get.buildTYPE() == "_emul32":
|
||||||
|
shelltools.export("CC", "%s -m32" % get.CC())
|
||||||
|
shelltools.export("CXX", "%s -m32" % get.CXX())
|
||||||
|
|
||||||
options += " --libdir=/usr/lib32 \
|
options += " --libdir=/usr/lib32 \
|
||||||
--bindir=/_emul32/bin \
|
--bindir=/_emul32/bin \
|
||||||
--sbindir=/_emul32/sbin"
|
--sbindir=/_emul32/sbin"
|
||||||
shelltools.export("CC", "%s -m32" % get.CC())
|
|
||||||
shelltools.export("CXX", "%s -m32" % get.CXX())
|
|
||||||
autotools.configure(options)
|
autotools.configure(options)
|
||||||
pisitools.dosed("config/mh-linux", "-nodefaultlibs -nostdlib")
|
pisitools.dosed("config/mh-linux", "-nodefaultlibs -nostdlib")
|
||||||
|
|
||||||
@@ -38,7 +41,7 @@ def install():
|
|||||||
pisitools.removeDir("/_emul32")
|
pisitools.removeDir("/_emul32")
|
||||||
for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()):
|
for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()):
|
||||||
pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), "_emul32", "usr")
|
pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), "_emul32", "usr")
|
||||||
pisitools.dosed("%s/usr/lib32/icu/60.2/Makefile.inc" % get.installDIR(), "_emul32", "usr")
|
pisitools.dosed("%s/usr/lib32/icu/64.2/Makefile.inc" % get.installDIR(), "_emul32", "usr")
|
||||||
pisitools.dosed("%s/usr/bin/icu-config-32" % get.installDIR(), "_emul32", "usr")
|
pisitools.dosed("%s/usr/bin/icu-config-32" % get.installDIR(), "_emul32", "usr")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<Description>ICU is a mature, widely used set of C/C++ and Java libraries for Unicode support, software internationalization and globalization (i18n/g11n). This package contains the C/C++ libraries.</Description>
|
<Description>ICU is a mature, widely used set of C/C++ and Java libraries for Unicode support, software internationalization and globalization (i18n/g11n). This package contains the C/C++ libraries.</Description>
|
||||||
<!-- CAUTION! This package has a great potential to break API/ABI in minor version bumps, check for a file like:
|
<!-- CAUTION! This package has a great potential to break API/ABI in minor version bumps, check for a file like:
|
||||||
http://source.icu-project.org/repos/icu/icu/tags/release-55-1/APIChangeReport.html -->
|
http://source.icu-project.org/repos/icu/icu/tags/release-55-1/APIChangeReport.html -->
|
||||||
<Archive sha1sum="7a099523fcb708b427e94f9b3c372fec3ebd1563" type="targz">http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz</Archive>
|
<Archive sha1sum="3127155ecf2b75ab4835f501b7478e39c07bb852" type="targz">http://download.icu-project.org/files/icu4c/64.2/icu4c-64_2-src.tgz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
@@ -72,6 +72,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="9">
|
||||||
|
<Date>2020-01-06</Date>
|
||||||
|
<Version>64.2</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="8">
|
<Update release="8">
|
||||||
<Date>2019-04-06</Date>
|
<Date>2019-04-06</Date>
|
||||||
<Version>60.2</Version>
|
<Version>60.2</Version>
|
||||||
|
|||||||
@@ -65,6 +65,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>1.0.10</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2019-10-20</Date>
|
<Date>2019-10-20</Date>
|
||||||
<Version>1.0.10</Version>
|
<Version>1.0.10</Version>
|
||||||
|
|||||||
@@ -73,6 +73,13 @@ libomxil-bellagio:rebuild
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="8">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>1.2.3</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="7">
|
<Update release="7">
|
||||||
<Date>2019-10-20</Date>
|
<Date>2019-10-20</Date>
|
||||||
<Version>1.2.3</Version>
|
<Version>1.2.3</Version>
|
||||||
|
|||||||
@@ -67,6 +67,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>1.3.4</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2019-10-20</Date>
|
<Date>2019-10-20</Date>
|
||||||
<Version>1.3.4</Version>
|
<Version>1.3.4</Version>
|
||||||
|
|||||||
@@ -66,6 +66,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="8">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>0.9.10</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="7">
|
<Update release="7">
|
||||||
<Date>2019-10-20</Date>
|
<Date>2019-10-20</Date>
|
||||||
<Version>0.9.10</Version>
|
<Version>0.9.10</Version>
|
||||||
|
|||||||
@@ -78,6 +78,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>1.2.0</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2019-10-20</Date>
|
<Date>2019-10-20</Date>
|
||||||
<Version>1.2.0</Version>
|
<Version>1.2.0</Version>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>X.Org PCI access library</Summary>
|
<Summary>X.Org PCI access library</Summary>
|
||||||
<Description>libpciaccess is the Xorg library for portable PCI access routines across multiple operating systems.</Description>
|
<Description>libpciaccess is the Xorg library for portable PCI access routines across multiple operating systems.</Description>
|
||||||
<Archive sha1sum="e89fe53622533650203271945759e5e397cdbe10" type="tarbz2">mirrors://xorg/individual/lib/libpciaccess-0.15.tar.bz2</Archive>
|
<Archive sha1sum="ffaa13f2df5f822da1089b55223b217c142ef919" type="tarbz2">mirrors://xorg/individual/lib/libpciaccess-0.16.tar.bz2</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>util-macros</Dependency>
|
<Dependency>util-macros</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
@@ -57,6 +57,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="8">
|
||||||
|
<Date>2020-01-06</Date>
|
||||||
|
<Version>0.16</Version>
|
||||||
|
<Comment>Version bump</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="7">
|
<Update release="7">
|
||||||
<Date>2019-10-25</Date>
|
<Date>2019-10-25</Date>
|
||||||
<Version>0.15</Version>
|
<Version>0.15</Version>
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
<PISI>
|
<PISI>
|
||||||
@@ -13,7 +12,10 @@
|
|||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>Pixel manipulation library</Summary>
|
<Summary>Pixel manipulation library</Summary>
|
||||||
<Description>Pixman contains lowlevel pixel manipulation routines.</Description>
|
<Description>Pixman contains lowlevel pixel manipulation routines.</Description>
|
||||||
<Archive sha1sum="10d85590beee287a508a148297808a66d1ce11cd" type="tarbz2">mirrors://xorg/individual/lib/pixman-0.36.0.tar.bz2</Archive>
|
<Archive sha1sum="87e1abc91ac4e5dfcc275f744f1d0ec3277ee7cd" type="tarbz2">mirrors://xorg/individual/lib/pixman-0.38.4.tar.bz2</Archive>
|
||||||
|
<BuildDependencies>
|
||||||
|
<Dependency>libpng-devel</Dependency>
|
||||||
|
</BuildDependencies>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
@@ -42,9 +44,9 @@
|
|||||||
<PartOf>emul32</PartOf>
|
<PartOf>emul32</PartOf>
|
||||||
<Summary>32-bit shared libraries for pixman</Summary>
|
<Summary>32-bit shared libraries for pixman</Summary>
|
||||||
<BuildType>emul32</BuildType>
|
<BuildType>emul32</BuildType>
|
||||||
<!--<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>glibc-32bit</Dependency>
|
<Dependency>libpng-32bit</Dependency>
|
||||||
</BuildDependencies>-->
|
</BuildDependencies>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency release="current">pixman</Dependency>
|
<Dependency release="current">pixman</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
@@ -54,6 +56,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="6">
|
||||||
|
<Date>2020-01-06</Date>
|
||||||
|
<Version>0.38.4</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="5">
|
<Update release="5">
|
||||||
<Date>2019-01-09</Date>
|
<Date>2019-01-09</Date>
|
||||||
<Version>0.36.0</Version>
|
<Version>0.36.0</Version>
|
||||||
|
|||||||
@@ -64,6 +64,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="7">
|
||||||
|
<Date>2020-01-05</Date>
|
||||||
|
<Version>0.4.0</Version>
|
||||||
|
<Comment>Rebuild</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2019-02-20</Date>
|
<Date>2019-02-20</Date>
|
||||||
<Version>0.4.0</Version>
|
<Version>0.4.0</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user