aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Polański <michal@polanski.me>2020-04-24 19:09:05 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-04-24 23:36:56 +0000
commitddfa4390468f6be33f962cd635a54e9f278d4657 (patch)
tree3be4a9a825f55f5139981e30b7313a471fb6eb47
parenta168abd336347ee8377d611ea0c51f456e488fc2 (diff)
testing/libslirp: upgrade to 4.3.0
-rw-r--r--testing/libslirp/APKBUILD17
-rw-r--r--testing/libslirp/version.patch11
2 files changed, 25 insertions, 3 deletions
diff --git a/testing/libslirp/APKBUILD b/testing/libslirp/APKBUILD
index f09abc41409..9967fc55e3c 100644
--- a/testing/libslirp/APKBUILD
+++ b/testing/libslirp/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=libslirp
-pkgver=4.2.0
+pkgver=4.3.0
pkgrel=0
pkgdesc="A general purpose TCP-IP emulator"
url="https://gitlab.freedesktop.org/slirp/libslirp"
@@ -10,9 +10,19 @@ license="BSD-3-Clause"
makedepends="meson glib-dev"
subpackages="$pkgname-dev"
options="!check" # no test suite
-source="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$pkgver/libslirp-v$pkgver.tar.gz"
+source="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$pkgver/libslirp-v$pkgver.tar.gz
+ version.patch"
builddir="$srcdir/$pkgname-v$pkgver"
+# secfixes:
+# 4.3.0-r0:
+# - CVE-2020-1983
+
+prepare() {
+ default_prepare
+ sed -i "s/%SLIRP_VERSION%/$pkgver/g" meson.build
+}
+
build() {
meson \
--buildtype=plain \
@@ -26,4 +36,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="514744ac8325857915b9946a76f4a55d48c8361b6167cd69c533086928ae06f059d923c5f057e92a0915921bb363b69d34a939a0bcc28233515125a5d1858d25 libslirp-v4.2.0.tar.gz"
+sha512sums="24c5a6c60e0a08674353db1050a6a6b6cd7633e7cb691a3380b7acc6f0bb65d8aa52a076623d4615f63c7b5e96e600b99b56d2f14772fafe132afb1f0102a993 libslirp-v4.3.0.tar.gz
+adb828ebbaeecbba313c028b34deb96ad592f53fb2f777d58286bf8397285be8714ae4cdbaad086168cc0ac7c729a2fc34e6e57f82c7d657c29884e3f3fa59aa version.patch"
diff --git a/testing/libslirp/version.patch b/testing/libslirp/version.patch
new file mode 100644
index 00000000000..683aef439a1
--- /dev/null
+++ b/testing/libslirp/version.patch
@@ -0,0 +1,11 @@
+diff --git a/meson.build b/meson.build
+index 2e48fd8..5c1f87f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,5 +1,5 @@
+ project('libslirp', 'c',
+- version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check : true).stdout().strip(),
++ version : '%SLIRP_VERSION%',
+ license : 'BSD-3-Clause',
+ default_options : ['warning_level=1', 'c_std=gnu99'],
+ meson_version : '>= 0.49',