Commit b41bb19f authored by Slugger@Github's avatar Slugger@Github
Browse files

Merge branch 'package/piawgmgr' of gitlab.alpinelinux.org:ddb_db/aports into package/piawgmgr

parents 2a4e6851 0b0d94ab
......@@ -3,7 +3,7 @@
pkgname=php7-pecl-igbinary
_extname=igbinary
pkgver=3.1.6
pkgver=3.2.0
pkgrel=0
pkgdesc="Igbinary is a drop in replacement for the standard php serializer"
url="https://pecl.php.net/package/igbinary"
......@@ -14,7 +14,7 @@ replaces="php7-igbinary" # for backward compatibility
depends="php7-common"
makedepends="php7-dev php7-pecl-apcu"
checkdepends="php7-json php7-session" # sessions needs work https://github.com/igbinary/igbinary/issues/116
source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
builddir="$srcdir/$_extname-$pkgver"
build() {
......@@ -29,6 +29,7 @@ check() {
local modules="/usr/lib/php7/modules"
# Tests require extra extensions which are not bundled
make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
TESTS=--show-diff \
PHP_TEST_SHARED_EXTENSIONS="
-d extension=$modules/apcu.so \
-d extension=$modules/json.so \
......@@ -43,4 +44,4 @@ package() {
echo "extension=$_extname.so" > $_confdir/10_$_extname.ini
}
sha512sums="c93e581dd20ae5c17d5a2d28ccac3b9e7e2779a8b9b519c604f5c51242f5bd8deb6c4d1373ee5e37694108ff4088fe3a548125e5044d571489917c193b5aa5b6 php7-pecl-igbinary-3.1.6.tgz"
sha512sums="5da15a4ca9e16338b56781036995cf14c2d1f09942680e71ee708dcab270740463eb185d82a063c461fffd3ed0977b8bde6984db4def83cf16be172d38022042 php-pecl-igbinary-3.2.0.tgz"
......@@ -3,7 +3,7 @@
pkgname=php8-pecl-igbinary
_extname=igbinary
pkgver=3.1.6
pkgver=3.2.0
pkgrel=0
pkgdesc="PHP 8 extension Igbinary is a drop in replacement for the standard php serializer - PECL"
url="https://pecl.php.net/package/igbinary"
......@@ -12,7 +12,7 @@ license="BSD-3-Clause"
depends="php8-common"
makedepends="php8-dev php8-pecl-apcu"
checkdepends="php8-session" # sessions needs work https://github.com/igbinary/igbinary/issues/116
source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
builddir="$srcdir/$_extname-$pkgver"
build() {
......@@ -39,4 +39,4 @@ package() {
echo "extension=$_extname.so" > $_confdir/10_$_extname.ini
}
sha512sums="c93e581dd20ae5c17d5a2d28ccac3b9e7e2779a8b9b519c604f5c51242f5bd8deb6c4d1373ee5e37694108ff4088fe3a548125e5044d571489917c193b5aa5b6 php8-pecl-igbinary-3.1.6.tgz"
sha512sums="5da15a4ca9e16338b56781036995cf14c2d1f09942680e71ee708dcab270740463eb185d82a063c461fffd3ed0977b8bde6984db4def83cf16be172d38022042 php-pecl-igbinary-3.2.0.tgz"
From 64676437e9aa46f3cf614e06e4f03e31fc461c94 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Wed, 23 Dec 2020 21:29:05 +0100
Subject: [PATCH] Fix double-free in charset sdb
---
libr/core/core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libr/core/core.c b/libr/core/core.c
index 81c991ffc..f72e581d7 100644
--- a/libr/core/core.c
+++ b/libr/core/core.c
@@ -2714,6 +2714,9 @@ R_API bool r_core_init(RCore *core) {
core->lastcmd = NULL;
core->cmdlog = NULL;
core->print->charset->db = sdb_ns (core->sdb, "charset", 1);
+ core->print->charset->db->refs++; // increase reference counter to avoid double-free
+ // ideally sdb_ns_set should be used here, but it doesnt seems to work well. must fix
+ // sdb_ns_set (DB, "charset", core->print->charset->db);
core->stkcmd = NULL;
core->cmdqueue = NULL;
core->cmdrepeat = true;
......@@ -5,7 +5,7 @@
# Maintainer: Valery Kartel <valery.kartel@gmail.com>
pkgname=radare2
pkgver=5.0.0
pkgrel=0
pkgrel=1
pkgdesc="An opensource, crossplatform reverse engineering framework"
url="http://www.radare.org"
arch="all"
......@@ -14,6 +14,7 @@ options="!check" # upstream does not provide any working testsuite
makedepends="$depends_dev libzip-dev openssl-dev capstone-dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-libs"
source="$pkgname-$pkgver.tar.gz::https://github.com/radare/radare2/archive/$pkgver.tar.gz
0001-Fix-double-free-in-charset-sdb.patch
string-header-build-fix.patch"
# secfixes:
......@@ -47,4 +48,5 @@ package() {
}
sha512sums="059bc341bc34c5f39ef7493af9e2d3b7e52667a2d16f12ef19c9c6ba83c911fd02e07cd527599caea503d5e81a5fedbd8ff343db4d41257e0f48ace9dd52f3ba radare2-5.0.0.tar.gz
5b0afdfb71b1c75dbdaf0b69320564469883fb3c74218a592bf08c147f9b786ac7d1bbee19f54fb9b739778ce9930c0bae2e6ea8d03a1fa22d2f3827f95d3e88 0001-Fix-double-free-in-charset-sdb.patch
5e60a1112a10cdd6a31374ba9b564d6522a37086380cf74b7232e32fb700ae1b2f68edbc0726ebedcc31d4789bc4f89525f117f25dac3609c60a75d471e49c85 string-header-build-fix.patch"
......@@ -3,7 +3,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=youtube-dl
pkgver=2020.12.22
pkgver=2020.12.26
pkgrel=0
pkgdesc="Command-line program to download videos from YouTube"
url="https://youtube-dl.org/"
......@@ -46,4 +46,4 @@ zshcomp() {
"$subpkgdir"/usr/share/zsh/site-functions/_$pkgname
}
sha512sums="2acd7256d3479387db25cc85882da77996cb8fe09a6c6400a9580c1c10317ab72ee18b0e1c2429f533992c41e172f2bbd8c9570daed01578aa971b1ba9d3fbc2 youtube-dl-2020.12.22.tar.gz"
sha512sums="6a577aa435639af7c5e60183d7548d5f0a74cdea3cb87edaa81dc20ce5ca788ba99f731cbaacffdae74cc10d530e6b8d5b0cfccaf4cb9c2f4cc4f9c540b2d175 youtube-dl-2020.12.26.tar.gz"
# Contributor: Frank Oltmanns <alpine@oltmanns.dev>
# Maintainer: Frank Oltmanns <alpine@oltmanns.dev>
pkgname=anki
pkgver=2.1.15
pkgrel=0
pkgdesc="flashcard program using spaced repetition"
url="https://apps.ankiweb.net/"
arch="noarch !ppc64le !s390x" # py3-qtwebengine unavailable for !archs
license="AGPL-3.0-or-later"
options="!check" # no test suite provided
makedepends="bash xdg-utils perl"
depends="py3-decorator py3-qt5 py3-qtwebengine py3-beautifulsoup4 py3-requests
py3-send2trash py3-pyaudio py3-markdown py3-jsonschema py3-distro"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/2.1.15.tar.gz"
build() {
"$builddir"/tools/build_ui.sh
}
package() {
make DESTDIR="$pkgdir" install
}
sha512sums="5bad99d9bfa10782f1d5b69437f45ea8b44d7a65ac1defe1169379f6ce29727c05af896934169c5222b37a4c1b6f3e05b6d10a3a152cc32cfec432fdf2e19b79 anki-2.1.15.tar.gz"
......@@ -4,7 +4,7 @@ _flavor=edge
pkgname=linux-${_flavor}
# NOTE: this kernel is intended for testing
# please resist urge to upgrade it blindly
pkgver=5.10.2
pkgver=5.10.3
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
......@@ -220,11 +220,11 @@ _dev() {
}
sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
bc68175046235bdb74783e82b8f6d6a6e37e7a93d972989703ffb8bce450d70f4883b317033122482d22ba2ebeddd1742f32ba8051ad4c8b8259a8be7322a3e9 patch-5.10.2.xz
02c48f0e481978e0f36ea0b56e62b4137f0800415425cce52cad2675b97400e66b3d71f3e4551b3c3a6c5db22883ee29eaa33332444bb72bd1495d598d3a9998 config-edge.aarch64
4c21909d41aa1ef2712e403b50432e0a945e86c7aa7ce182504b9ecf725f70d815cd3e12f1f3668e34921f8b790019999f58c62701bd3df275149d13c06cb63a config-edge.armhf
2d7b890b6ef27dc59703e68f66ca40145550943f1fad694e68619252415adb8a1d7fa4c4b3599942956af85842d2b18527236f04a278b5e16724bc55acb833ec config-edge.armv7
7c286b4e41110cc554f232d9c6bd2215b3e811c0b269f18536e5619b7333ed15274c5106173b3e15655ba201475fcf1b74120adccca0dbd19d19597ec8c811cb config-edge.x86_64
05fcbc34d5d607337d8b2ae9f34c99c4dd158a8ab7163ece56cd0c81b46b67591dd21371916bed1ede8f41118d1ff558e74c7f5bccc46fd4f1eac0caf1aae4b4 config-edge-virt.aarch64
6ad74e793a0f56fe393302535e4ed470f53a80f636e7b62a24d0c3366cf16161f0dbe750f34aea1797dd70a28323769f928daa38a19286eaa62fa3dffd6c6138 config-edge-virt.armv7
128ff0a24724938bd16557aec1dbf6a2b5a1df5a63cf435479812bee89748541162e503dce5ea54e10d4fc30719ff0c86b334bafe4a991f2a57c5f8413a9bef9 config-edge-virt.x86_64"
7c999ff311944ec30fa46bf31afa0d2a9d743b4ce9b8b17e97cc675c9fff76f3b0f02e75ae971624e0bf5cffadec5324f0496b53be9f431c0ec65b2bdeb34bda patch-5.10.3.xz
d61b9723b6e12026ebf8a3bc8d2ee0fbbf48852a0673be3091ca08c9e239e3eb6ac389fe2ca7cb7677a1e12e5e335c9656968c127b6ac41b9d50a633208b8bb8 config-edge.aarch64
0351a25221e76b83a020299f3c5540f822dfc287b15d5488a5e1c032551be22923aab0dce16ecf6820db645bbc339305ea0e91f2edfc8c8d9b269b28f5e5c140 config-edge.armhf
3321f1ae7fdcf881b6e2ece44cbe9824fdb346ef63f5bb001698e5522cc209f32790867cfcefff5939541166349a105f278b58c9f077f83b82ea3e27db0fa5da config-edge.armv7
fc4b1a10b22b0f29995371265b64a0bf326f7206ecb6ff6bc85b4c08e793a22b8a9307808671d71dc3eee5010377383433bc5ca875bf1032a8df0481103b7995 config-edge.x86_64
584d467bb610420de73d565f2c52541f779c5313e4fd8e9c4d807d313dd761617435d0e0ec99d11aab570023f6aa10f4180189b276d93bf01d7e61b88b121fc6 config-edge-virt.aarch64
6e13ecc6ea0d56b827189668351e801eea0abca2dc5a1d7805eeb1cc384a0a80576d8d011b63c8a5c1a56faa81bea4813f7a4aa437499196129e6918c5ada6b8 config-edge-virt.armv7
e3e18b01d5fae63c41133ac0bcb595430583e59c64cc079cd7a0f0ac7f92842640f6b9a869c7d3bd9854603f8085ee035cb17cef1d456ce328c29e1eb4048fc7 config-edge-virt.x86_64"
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.2 Kernel Configuration
# Linux/arm64 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.2 Kernel Configuration
# Linux/arm 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.10.2 Kernel Configuration
# Linux/x86_64 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.2 Kernel Configuration
# Linux/arm64 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.2 Kernel Configuration
# Linux/arm 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.2 Kernel Configuration
# Linux/arm 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.10.2 Kernel Configuration
# Linux/x86_64 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
......@@ -4,7 +4,7 @@ _flavor=elm
pkgname=linux-${_flavor}
# NOTE: this kernel is intended for testing
# please resist urge to upgrade it blindly
pkgver=5.10.2
pkgver=5.10.3
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
......@@ -175,7 +175,7 @@ package() {
rm cmdline bootloader.bin
rm $pkgdir/boot/vmlinuz-elm
cd $pkgdir/boot
ln -s vmlinux-5.10.2-elm vmlinux.kpart
ln -s vmlinux.kpart-$pkgver-$pkgrel-$_flavor vmlinux.kpart
}
_dev() {
......@@ -231,6 +231,6 @@ _dev() {
}
sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
bc68175046235bdb74783e82b8f6d6a6e37e7a93d972989703ffb8bce450d70f4883b317033122482d22ba2ebeddd1742f32ba8051ad4c8b8259a8be7322a3e9 patch-5.10.2.xz
5eb083495f76751df0ecc17825a65779794811af1407e372ea925b4e589ecef6ebd59455ad877be6ffe750314a9ae6f1f0289a10a25c8ef59d48032ccbd22c82 config-elm.aarch64
7c999ff311944ec30fa46bf31afa0d2a9d743b4ce9b8b17e97cc675c9fff76f3b0f02e75ae971624e0bf5cffadec5324f0496b53be9f431c0ec65b2bdeb34bda patch-5.10.3.xz
2d82cc35cb747c9aac89c07e798faa77481b022164d6bd21e2eb99811358adb3e5a6eed2b50a128f3e6092f9f5e5a4a57e99566d4647723a285cb826c1f3e724 config-elm.aarch64
2b999f151dac0dcfe9021ff67059753641b647dcfa08aace1449c8df5ecbbd363616d525c301dfccb533499b7f0bc1138746b5bf24c78624e2497836e8c0f127 kernel.its.elm"
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.2 Kernel Configuration
# Linux/arm64 5.10.3 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
......
# Contributor: Clayton Craft <clayton@craftyguy.net>
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=tootle
pkgver=1.0_alpha2
_pkgver=${pkgver/_/-}
pkgrel=0
pkgdesc="Simple Mastodon client for Linux"
url="https://github.com/bleakgrey/tootle"
arch="all !s390x" # no libhandy
license="GPL-3.0-or-later"
makedepends="
glib-dev
gtk+3.0-dev
json-glib-dev
libgee-dev
libhandy1-dev
libsoup-dev
meson
vala
"
subpackages="$pkgname-lang"
source="https://github.com/bleakgrey/tootle/archive/$_pkgver.tar.gz"
options="!check" # no tests
builddir="$srcdir/$pkgname-$_pkgver"
build() {
abuild-meson . output
meson compile ${JOBS:+-j ${JOBS}} -C output
}
package() {
DESTDIR="$pkgdir" meson install -C output
}
sha512sums="cb51fce1b439a0703be5e0c755aaebd4ad81b87252f19784cbec80ce3c43e94bfc72c5e205e9a016706a8edd4dfffc9ce0ecfddae4fc45f0edec85f5fca9dfcf 1.0-alpha2.tar.gz"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment