diff --git a/desktop/font/fontconfig/pspec.xml b/desktop/font/fontconfig/pspec.xml index b50c750d08..2808319101 100644 --- a/desktop/font/fontconfig/pspec.xml +++ b/desktop/font/fontconfig/pspec.xml @@ -97,6 +97,13 @@ + + 2020-01-05 + 2.13.1 + Rebuild + Pisi Linux Community + admin@pisilinux.org + 2019-11-09 2.13.1 diff --git a/hardware/misc/dkms/actions.py b/hardware/misc/dkms/actions.py index 23d77c9eb5..079026d10c 100644 --- a/hardware/misc/dkms/actions.py +++ b/hardware/misc/dkms/actions.py @@ -4,14 +4,13 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt -from pisi.actionsapi import autotools from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def build(): - autotools.make() 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") diff --git a/hardware/misc/dkms/comar/pakhandler.py b/hardware/misc/dkms/comar/pakhandler.py new file mode 100644 index 0000000000..e2d4a059ca --- /dev/null +++ b/hardware/misc/dkms/comar/pakhandler.py @@ -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 diff --git a/hardware/misc/dkms/pspec.xml b/hardware/misc/dkms/pspec.xml index 2f41528700..9c69da4ce1 100644 --- a/hardware/misc/dkms/pspec.xml +++ b/hardware/misc/dkms/pspec.xml @@ -3,34 +3,45 @@ dkms http://linux.dell.com/dkms - Ertan Güven - ertan@pisilinux.org + Marcin Bojara + marcin.bojara@gmail.com GPLv2 hardware.misc kernel Dynamic Kernel Module Support DKMS is a dynamic kernel module support framework. - - kernel-headers - - https://github.com/dell/dkms/archive/v2.6.1.tar.gz + https://github.com/dell/dkms/archive/v2.8.1.tar.gz dkms - kernel-headers + gcc + bash + kmod + make + coreutils /etc - /usr/lib /usr/sbin /usr/share/doc /usr/share/man /var/lib + /usr/share/bash-completion + + System.PackageHandler + + + 2020-01-06 + 2.8.1 + Version bump. Add pakhandler.py + Marcin Bojara + marcin.bojara@gmail.com + 2018-09-01 2.6.1 diff --git a/multimedia/graphics/jasper/pspec.xml b/multimedia/graphics/jasper/pspec.xml index 7d82a13d0f..bc3aa263c0 100644 --- a/multimedia/graphics/jasper/pspec.xml +++ b/multimedia/graphics/jasper/pspec.xml @@ -83,6 +83,13 @@ + + 2020-01-05 + 2.0.14 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2019-02-06 2.0.14 diff --git a/multimedia/graphics/libgexiv2/actions.py b/multimedia/graphics/libgexiv2/actions.py index a85e8edc44..49c7766f42 100644 --- a/multimedia/graphics/libgexiv2/actions.py +++ b/multimedia/graphics/libgexiv2/actions.py @@ -5,16 +5,17 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - shelltools.system("meson build --prefix=/usr -Dgtk_doc=true") + mesontools.configure() def build(): - shelltools.system("ninja -C build") + mesontools.build() def install(): - shelltools.system("DESTDIR=%s ninja -C build install" % get.installDIR()) + mesontools.install() pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README") diff --git a/multimedia/graphics/libgexiv2/pspec.xml b/multimedia/graphics/libgexiv2/pspec.xml index ab1c6fe40a..5382255428 100644 --- a/multimedia/graphics/libgexiv2/pspec.xml +++ b/multimedia/graphics/libgexiv2/pspec.xml @@ -12,9 +12,7 @@ library GObject-based wrapper around the Exiv2 library GObject-based wrapper around the Exiv2 library - - https://download.gnome.org/sources/gexiv2/0.11/gexiv2-0.11.0.tar.xz - + https://download.gnome.org/sources/gexiv2/0.12/gexiv2-0.12.0.tar.xz meson gtk-doc @@ -25,6 +23,8 @@ gobject-introspection-devel exiv2-devel vala-devel + vala-devel + python3-pygobject3-devel @@ -58,6 +58,13 @@ + + 2020-01-05 + 0.12.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-06-18 0.11.0 diff --git a/multimedia/graphics/libjpeg-turbo/pspec.xml b/multimedia/graphics/libjpeg-turbo/pspec.xml index 663a436077..d3a925ed1f 100644 --- a/multimedia/graphics/libjpeg-turbo/pspec.xml +++ b/multimedia/graphics/libjpeg-turbo/pspec.xml @@ -67,6 +67,13 @@ + + 2020-01-05 + 2.0.2 + Rebuild. + Idris Kalp + idriskalp@gmail.com + 2019-06-19 2.0.2 diff --git a/multimedia/misc/exiv2/actions.py b/multimedia/misc/exiv2/actions.py index 829362796b..061f932f4a 100644 --- a/multimedia/misc/exiv2/actions.py +++ b/multimedia/misc/exiv2/actions.py @@ -1,23 +1,27 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. # 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 get def setup(): - autotools.configure("--disable-static \ - --disable-dependency-tracking \ - --enable-video \ - --disable-rpath") + cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DEXIV2_ENABLE_VIDEO=yes \ + -DEXIV2_ENABLE_WEBREADY=yes \ + -DEXIV2_ENABLE_CURL=yes \ + -DEXIV2_ENABLE_NLS=ON \ + -DEXIV2_BUILD_SAMPLES=no") def build(): - autotools.make() + cmaketools.make() 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") diff --git a/multimedia/misc/exiv2/files/CVE-2019-17402.patch b/multimedia/misc/exiv2/files/CVE-2019-17402.patch new file mode 100644 index 0000000000..45451442d5 --- /dev/null +++ b/multimedia/misc/exiv2/files/CVE-2019-17402.patch @@ -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 diff --git a/multimedia/misc/exiv2/pspec.xml b/multimedia/misc/exiv2/pspec.xml index 84c9943013..d1f7bb4bf8 100644 --- a/multimedia/misc/exiv2/pspec.xml +++ b/multimedia/misc/exiv2/pspec.xml @@ -13,13 +13,15 @@ app:console Another library for parsing, editing, and saving EXIF data 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. - http://www.exiv2.org/builds/exiv2-0.26-trunk.tar.gz + http://www.exiv2.org/builds/exiv2-0.27.2-Source.tar.gz + cmake + curl-devel zlib-devel expat-devel - exiv2-0.18-deps.patch + CVE-2019-17402.patch @@ -41,6 +43,7 @@ exiv2-libs zlib + curl expat libgcc @@ -57,11 +60,19 @@ /usr/include + /usr/lib/cmake /usr/lib/pkgconfig + + 2020-01-05 + 0.27.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-08-07 0.26 diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index 2c77bf96eb..9e8c046a8a 100755 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -36,13 +36,13 @@ def setup(): 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.export("CC", "clang") - shelltools.export("CXX", "clang++") + #shelltools.export("CC", "clang") + #shelltools.export("CXX", "clang++") if get.buildTYPE() == "emul32": - shelltools.export("CC", "clang -m32") - shelltools.export("CXX", "clang++ -m32") + #shelltools.export("CC", "clang -m32") + #shelltools.export("CXX", "clang++ -m32") shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") shelltools.makedirs("build") diff --git a/programming/language/python3/python3-pygobject3/pspec.xml b/programming/language/python3/python3-pygobject3/pspec.xml index 3d3494a4fa..dc0b7b93e7 100755 --- a/programming/language/python3/python3-pygobject3/pspec.xml +++ b/programming/language/python3/python3-pygobject3/pspec.xml @@ -57,6 +57,13 @@ + + 2020-01-05 + 3.32.2 + Rebuild + Pisi Linux Community + admin@pisilinux.org + 2019-09-14 3.32.2 diff --git a/programming/language/vala/pspec.xml b/programming/language/vala/pspec.xml index 03b0407c81..e5bb136ab3 100644 --- a/programming/language/vala/pspec.xml +++ b/programming/language/vala/pspec.xml @@ -12,7 +12,7 @@ BSD A modern programming language for GNOME 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. - mirrors://gnome/vala/0.40/vala-0.40.3.tar.xz + mirrors://gnome/vala/0.40/vala-0.40.18.tar.xz glib2-devel gobject-introspection-devel @@ -71,6 +71,13 @@ + + 2020-01-05 + 0.40.18 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-07-30 0.40.3 diff --git a/programming/misc/icu4c/actions.py b/programming/misc/icu4c/actions.py index a175cda3b8..a442b383a8 100644 --- a/programming/misc/icu4c/actions.py +++ b/programming/misc/icu4c/actions.py @@ -16,12 +16,15 @@ def setup(): options = "--with-data-packaging=library \ --disable-samples \ --disable-silent-rules" + if get.buildTYPE() == "_emul32": + shelltools.export("CC", "%s -m32" % get.CC()) + shelltools.export("CXX", "%s -m32" % get.CXX()) + options += " --libdir=/usr/lib32 \ --bindir=/_emul32/bin \ --sbindir=/_emul32/sbin" - shelltools.export("CC", "%s -m32" % get.CC()) - shelltools.export("CXX", "%s -m32" % get.CXX()) + autotools.configure(options) pisitools.dosed("config/mh-linux", "-nodefaultlibs -nostdlib") @@ -38,7 +41,7 @@ def install(): pisitools.removeDir("/_emul32") 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/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") return diff --git a/programming/misc/icu4c/pspec.xml b/programming/misc/icu4c/pspec.xml index a15383f10f..7a99734311 100644 --- a/programming/misc/icu4c/pspec.xml +++ b/programming/misc/icu4c/pspec.xml @@ -14,7 +14,7 @@ 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. - http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz + http://download.icu-project.org/files/icu4c/64.2/icu4c-64_2-src.tgz libgcc @@ -72,6 +72,13 @@ + + 2020-01-06 + 64.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-04-06 60.2 diff --git a/x11/library/libICE/pspec.xml b/x11/library/libICE/pspec.xml index afd265eee7..41b7f41da5 100644 --- a/x11/library/libICE/pspec.xml +++ b/x11/library/libICE/pspec.xml @@ -65,6 +65,13 @@ + + 2020-01-05 + 1.0.10 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-20 1.0.10 diff --git a/x11/library/libSM/pspec.xml b/x11/library/libSM/pspec.xml index c1e36bced1..64149693d0 100644 --- a/x11/library/libSM/pspec.xml +++ b/x11/library/libSM/pspec.xml @@ -73,6 +73,13 @@ libomxil-bellagio:rebuild + + 2020-01-05 + 1.2.3 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-20 1.2.3 diff --git a/x11/library/libXext/pspec.xml b/x11/library/libXext/pspec.xml index 948365e603..ed90636ee5 100644 --- a/x11/library/libXext/pspec.xml +++ b/x11/library/libXext/pspec.xml @@ -67,6 +67,13 @@ + + 2020-01-05 + 1.3.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-20 1.3.4 diff --git a/x11/library/libXrender/pspec.xml b/x11/library/libXrender/pspec.xml index 5ffc9ccf8f..8bb413207c 100644 --- a/x11/library/libXrender/pspec.xml +++ b/x11/library/libXrender/pspec.xml @@ -66,6 +66,13 @@ + + 2020-01-05 + 0.9.10 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-20 0.9.10 diff --git a/x11/library/libXt/pspec.xml b/x11/library/libXt/pspec.xml index 79542909df..d36580ecd0 100644 --- a/x11/library/libXt/pspec.xml +++ b/x11/library/libXt/pspec.xml @@ -78,6 +78,13 @@ + + 2020-01-05 + 1.2.0 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-20 1.2.0 diff --git a/x11/library/libpciaccess/pspec.xml b/x11/library/libpciaccess/pspec.xml index 35f381ee75..4529b3e31c 100644 --- a/x11/library/libpciaccess/pspec.xml +++ b/x11/library/libpciaccess/pspec.xml @@ -12,7 +12,7 @@ library X.Org PCI access library libpciaccess is the Xorg library for portable PCI access routines across multiple operating systems. - mirrors://xorg/individual/lib/libpciaccess-0.15.tar.bz2 + mirrors://xorg/individual/lib/libpciaccess-0.16.tar.bz2 util-macros @@ -57,6 +57,13 @@ + + 2020-01-06 + 0.16 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + 2019-10-25 0.15 diff --git a/x11/library/pixman/pspec.xml b/x11/library/pixman/pspec.xml index a73d2e98f3..4d2ef568f0 100644 --- a/x11/library/pixman/pspec.xml +++ b/x11/library/pixman/pspec.xml @@ -1,4 +1,3 @@ - @@ -13,7 +12,10 @@ library Pixel manipulation library Pixman contains lowlevel pixel manipulation routines. - mirrors://xorg/individual/lib/pixman-0.36.0.tar.bz2 + mirrors://xorg/individual/lib/pixman-0.38.4.tar.bz2 + + libpng-devel + @@ -42,9 +44,9 @@ emul32 32-bit shared libraries for pixman emul32 - + + libpng-32bit + pixman @@ -54,6 +56,13 @@ + + 2020-01-06 + 0.38.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-01-09 0.36.0 diff --git a/x11/library/xcb-util/pspec.xml b/x11/library/xcb-util/pspec.xml index e3fa54378e..6d231482c1 100644 --- a/x11/library/xcb-util/pspec.xml +++ b/x11/library/xcb-util/pspec.xml @@ -64,6 +64,13 @@ + + 2020-01-05 + 0.4.0 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + 2019-02-20 0.4.0