summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/parted/APKBUILD4
-rw-r--r--user/dracut/APKBUILD4
-rw-r--r--user/grub/APKBUILD4
-rw-r--r--user/grub/update-grub1
-rw-r--r--user/libjpeg-turbo/APKBUILD4
5 files changed, 11 insertions, 6 deletions
diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD
index da56a73f9..63356d7b6 100644
--- a/system/parted/APKBUILD
+++ b/system/parted/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=parted
pkgver=3.2
-pkgrel=1
+pkgrel=2
pkgdesc="Utility to create, destroy, resize, check and copy partitions"
url="https://www.gnu.org/software/parted/parted.html"
arch="all"
@@ -32,7 +32,7 @@ build() {
--host=$CHOST \
--prefix=/usr \
--disable-debug \
- --disable-static \
+ --enable-static \
--enable-shared \
--enable-device-mapper \
--without-readline
diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index a4b386c68..fd0988844 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dracut
pkgver=048
-pkgrel=3
+pkgrel=4
pkgdesc="Event-driven initramfs infrastructure"
url="https://dracut.wiki.kernel.org/"
arch="all"
options="!check" # Test suite is for kernel developers only, requires ext3 rootfs
license="GPL-2.0+"
-depends="libarchive-tools musl-utils xz"
+depends="bash libarchive-tools musl-utils xz"
makedepends="fts-dev kmod-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
$pkgname-crypt::noarch $pkgname-lvm::noarch"
diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD
index 69c53c313..06e574c8d 100644
--- a/user/grub/APKBUILD
+++ b/user/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=grub
pkgver=2.04
-pkgrel=0
+pkgrel=1
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -175,5 +175,5 @@ f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857
6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch
4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg
1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub
-0907a810e9ba5be92d10dae38403d1e50fb9b324799df36d2241ff59f545dace37a65f2b1c8f07367220da4fd341d8f21dd9a4fab8da6c87ae52d7ffbca3dbd7 update-grub
+8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub
78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode"
diff --git a/user/grub/update-grub b/user/grub/update-grub
index d22930bd7..07b57a9c0 100644
--- a/user/grub/update-grub
+++ b/user/grub/update-grub
@@ -10,6 +10,7 @@ if [ "$ADELIE_MANUAL_CONFIG" = 1 ]; then
exit 0
fi
+mkdir -p /boot/grub
if [ -e /boot/grub/grub.cfg ]; then
cp -p /boot/grub/grub.cfg /boot/grub/grub.cfg.update-grub-old
fi
diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD
index f64e03452..b7b048811 100644
--- a/user/libjpeg-turbo/APKBUILD
+++ b/user/libjpeg-turbo/APKBUILD
@@ -16,6 +16,10 @@ case "$CTARGET_ARCH" in
pmmx | x86 | x86_64) makedepends="$makedepends nasm" ;;
esac
+# secfixes:
+# 2.0.3-r0:
+# - CVE-2019-2201
+
build() {
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"