summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/s6-linux-init/APKBUILD2
-rw-r--r--system/skalibs/APKBUILD8
-rw-r--r--system/skalibs/env_dump-unterminated-strings.patch26
-rw-r--r--user/claws-mail/APKBUILD2
-rw-r--r--user/gnutls/APKBUILD2
-rw-r--r--user/libverto/APKBUILD2
-rw-r--r--user/live-media/APKBUILD4
-rw-r--r--user/mate-control-center/APKBUILD2
-rw-r--r--user/mosh/APKBUILD2
-rw-r--r--user/nfs-utils/APKBUILD2
-rw-r--r--user/nsd/APKBUILD2
-rw-r--r--user/postgresql/APKBUILD8
-rw-r--r--user/qemu/APKBUILD2
-rw-r--r--user/unbound/APKBUILD2
-rw-r--r--user/vlc/APKBUILD2
-rw-r--r--user/xrandr/APKBUILD10
16 files changed, 53 insertions, 25 deletions
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 9217a7d03..a52c329d5 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
pkgver=1.0.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="A s6-based init system"
url="https://skarnet.org/software/$pkgname/"
arch="all"
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index a55906f6d..cbf64462e 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -2,14 +2,15 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
pkgver=2.8.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
arch="all"
options="!check" # No test suite.
license="ISC"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
+ env_dump-unterminated-strings.patch"
build() {
cd "$builddir"
@@ -59,4 +60,5 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86 skalibs-2.8.1.0.tar.gz"
+sha512sums="d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86 skalibs-2.8.1.0.tar.gz
+286a8e0537399fc52c550c1aeac7dd0748c07d34d51b65cb36ab9e3db5a44ff51ba988c212c6bafa74b107ce80698bcab37a99df6276fe7ce60550de0ffc0567 env_dump-unterminated-strings.patch"
diff --git a/system/skalibs/env_dump-unterminated-strings.patch b/system/skalibs/env_dump-unterminated-strings.patch
new file mode 100644
index 000000000..a20a78125
--- /dev/null
+++ b/system/skalibs/env_dump-unterminated-strings.patch
@@ -0,0 +1,26 @@
+From d69644de85148f56efeed4259a783881e2a1bddc Mon Sep 17 00:00:00 2001
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Wed, 31 Jul 2019 23:47:35 +0000
+Subject: [PATCH] bugfix: env_dump() unterminated strings
+
+---
+ src/libstddjb/env_dump.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libstddjb/env_dump.c b/src/libstddjb/env_dump.c
+index fc79bc3..10f5913 100644
+--- a/src/libstddjb/env_dump.c
++++ b/src/libstddjb/env_dump.c
+@@ -32,7 +32,8 @@ int env_dump (char const *dir, mode_t mode, char const *const *envp)
+ size_t len = str_chr(*envp, '=') ;
+ size_t vallen = strlen(*envp + len + 1) ;
+ char fn[len + 1] ;
+- memcpy(fn, *envp, len + 1) ;
++ memcpy(fn, *envp, len) ;
++ fn[len] = 0 ;
+ len = openwritenclose_at(fd, fn, *envp + len + 1, vallen) ;
+ if (len < vallen) goto cerr ;
+ }
+--
+2.22.0
+
diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD
index 1a46d92d1..1194f3c0e 100644
--- a/user/claws-mail/APKBUILD
+++ b/user/claws-mail/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=claws-mail
pkgver=3.17.4
-pkgrel=0
+pkgrel=1
pkgdesc="User-friendly, lightweight, and fast email client"
url="https://www.claws-mail.org/"
arch="all"
diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD
index 8578e002b..2ca589cae 100644
--- a/user/gnutls/APKBUILD
+++ b/user/gnutls/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer:
pkgname=gnutls
pkgver=3.6.9
-pkgrel=0
+pkgrel=1
pkgdesc="A TLS protocol implementation"
url="http://www.gnutls.org/"
arch="all"
diff --git a/user/libverto/APKBUILD b/user/libverto/APKBUILD
index f0de5eeec..9038302e7 100644
--- a/user/libverto/APKBUILD
+++ b/user/libverto/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=libverto
pkgver=0.3.1
-pkgrel=0
+pkgrel=1
pkgdesc="Main loop abstraction library"
url="https://github.com/npmccallum/libverto"
arch="all"
diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD
index 856b852ba..341ff1c0b 100644
--- a/user/live-media/APKBUILD
+++ b/user/live-media/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer:
pkgname=live-media
-pkgver=2019.07.27
+pkgver=2019.08.12
pkgrel=0
pkgdesc="Libraries for multimedia streaming"
url="http://live555.com/liveMedia"
@@ -50,4 +50,4 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="909dff48bcd5c0b4b3a04b9f44030d720125fcbfa7c289bb035b85cd1e9defb8490453bb80ce2a453ceda1d0ccd790f56f551720c1ed99d1feae8d3871f9f7e6 live.2019.07.27.tar.gz"
+sha512sums="0e8db673888db3aabcaf0335ea3be1afe7861436d833ddfc130cae17be88ce941c08f362f9543c7a31654a507b0d5503a7d0c6082e97f970b9c1299742785b69 live.2019.08.12.tar.gz"
diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD
index 93d563e05..349d73377 100644
--- a/user/mate-control-center/APKBUILD
+++ b/user/mate-control-center/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=mate-control-center
pkgver=1.22.1
-pkgrel=0
+pkgrel=1
pkgdesc="Configuration utilities for the MATE desktop environment"
url="https://mate-desktop.org"
arch="all"
diff --git a/user/mosh/APKBUILD b/user/mosh/APKBUILD
index afa107c80..c3136055d 100644
--- a/user/mosh/APKBUILD
+++ b/user/mosh/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=mosh
pkgver=1.3.2
-pkgrel=0
+pkgrel=1
pkgdesc="Mobile shell surviving disconnects with local echo and line editing"
url="https://mosh.org"
arch="all"
diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index ca02a8688..8b1039750 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nfs-utils
pkgver=2.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="NFS file sharing client and server"
url="http://nfs.sourceforge.net/"
arch="all"
diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD
index 93c9de3d6..ddd805a09 100644
--- a/user/nsd/APKBUILD
+++ b/user/nsd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=nsd
pkgver=4.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="An authoritative only name server"
url="https://www.nlnetlabs.nl/projects/nsd/about/"
arch="all"
diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD
index 87a397f3d..fef7c4ef2 100644
--- a/user/postgresql/APKBUILD
+++ b/user/postgresql/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=postgresql
-pkgver=10.9
-pkgrel=1
+pkgver=10.10
+pkgrel=0
pkgdesc="Featureful object-relational database system (RDBMS)"
url="https://www.postgresql.org/"
arch="all"
@@ -57,6 +57,8 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
# - CVE-2019-10130
# 10.9-r0:
# - CVE-2019-10164
+# 10.10-r0:
+# - CVE-2019-10208
prepare() {
default_prepare
@@ -254,7 +256,7 @@ _submv() {
done
}
-sha512sums="4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e postgresql-10.9.tar.bz2
+sha512sums="60cafe4b27a194949aff482dcce4fa096a9916f37205868437a32afb8964df71934b619a0b891fe85eb7c7f9b11775cffbbedca589e78feb6c4184eb224b48bc postgresql-10.10.tar.bz2
1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch
5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854 perl-rpath.patch
8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index d2b372b0c..94a69c6ce 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qemu
pkgver=3.0.0
-pkgrel=3
+pkgrel=4
pkgdesc="Machine emulator and virtualisation software"
url="https://www.qemu.org/"
arch="all"
diff --git a/user/unbound/APKBUILD b/user/unbound/APKBUILD
index b68881e4f..af66bbfab 100644
--- a/user/unbound/APKBUILD
+++ b/user/unbound/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=unbound
pkgver=1.9.2
-pkgrel=0
+pkgrel=1
pkgdesc="A validating, recursive and caching DNS resolver"
url="https://nlnetlabs.nl/projects/unbound/about/"
arch="all"
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD
index 1cd7f5981..a12d1a34d 100644
--- a/user/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=vlc
pkgver=3.0.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
diff --git a/user/xrandr/APKBUILD b/user/xrandr/APKBUILD
index 44137b5bd..e9e37a32c 100644
--- a/user/xrandr/APKBUILD
+++ b/user/xrandr/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=xrandr
-pkgver=1.5.0
-pkgrel=1
+pkgver=1.5.1
+pkgrel=0
pkgdesc="Command line interface to X RandR extension"
url="https://www.X.Org/"
arch="all"
@@ -12,10 +12,9 @@ license="MIT"
subpackages="$pkgname-doc"
depends=""
makedepends="libxrandr-dev util-macros"
-source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
+source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,9 +24,8 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/bin/xkeystone
}
-sha512sums="11d8fb1b98fbe215555d5bb875d82f80a7fd6a61c93ebf175c226f4f747570e8d18980add54a4b88d20dc637155074b2a558b34f035d66a465f324281d65f9e4 xrandr-1.5.0.tar.bz2"
+sha512sums="3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922 xrandr-1.5.1.tar.xz"