Commit 80a42e35 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/mkinitfs: upgrade to 3.4.4

parent 6159f17d
From 44a1873443ab15bafd6dfd61a7350bec594c907c Mon Sep 17 00:00:00 2001
From: Roman Shaposhnik <rvs@zededa.com>
Date: Thu, 5 Dec 2019 15:59:32 -0800
Subject: [PATCH] Helping parsing code survive variable settings with (xxx,yyy)
in them
---
initramfs-init.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/initramfs-init.in b/initramfs-init.in
index 496d93b..76f284c 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -346,7 +346,7 @@ for opt; do
for i in $myopts; do
case "$opt" in
- $i=*) eval "KOPT_${i}=${opt#*=}";;
+ $i=*) eval "KOPT_${i}"='${opt#*=}';;
$i) eval "KOPT_${i}=yes";;
no$i) eval "KOPT_${i}=no";;
esac
--
2.24.0
From 5a6f829e2ccd5f34bd299f93d6d0e03ca83e7f72 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Aug 2019 08:01:53 +0000
Subject: [PATCH] features: add af_packet kernel module for dhcp
udhcpc needs af_packet to work.
ref https://gitlab.alpinelinux.org/alpine/aports/issues/10750
---
features.d/dhcp.modules | 1 +
1 file changed, 1 insertion(+)
create mode 100644 features.d/dhcp.modules
diff --git a/features.d/dhcp.modules b/features.d/dhcp.modules
new file mode 100644
index 0000000..f9799e0
--- /dev/null
+++ b/features.d/dhcp.modules
@@ -0,0 +1 @@
+kernel/net/packet/af_packet.ko
--
2.23.0
From 23fe38c883439310ead972e734cba985b7baaf63 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 18 Dec 2019 11:48:14 +0000
Subject: [PATCH] mkinitfs: harden permissions of initramfs
ref https://gitlab.alpinelinux.org/alpine/aports/issues/11044
---
mkinitfs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkinitfs.in b/mkinitfs.in
index 8cd3de3..9bd95f9 100755
--- a/mkinitfs.in
+++ b/mkinitfs.in
@@ -153,7 +153,7 @@ initfs_cpio() {
return
fi
rm -f $outfile
- umask 0022
+ umask 0077
(cd "$tmpdir" && find . | sort | cpio --quiet -o -H newc | $comp) > $outfile
}
--
2.24.1
From 098f197040e0942e8afc2d0ba498860a96be4137 Mon Sep 17 00:00:00 2001
From: Andre F de Miranda <trixpan@users.noreply.github.com>
Date: Sun, 21 Jul 2019 12:10:51 +0000
Subject: [PATCH] nlplug-findfs.c: Explicitly include sys/sysmacros.h due to
musl 1.1.23 changes
---
nlplug-findfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/nlplug-findfs.c b/nlplug-findfs.c
index 9f15de5..1ede4ca 100644
--- a/nlplug-findfs.c
+++ b/nlplug-findfs.c
@@ -29,6 +29,7 @@
#include <sys/mount.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/wait.h>
--
2.22.0
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
pkgver=3.4.3
pkgver=3.4.4
_ver=${pkgver%_git*}
pkgrel=4
pkgrel=0
pkgdesc="Tool to generate initramfs images for Alpine"
url="https://git.alpinelinux.org/cgit/mkinitfs"
arch="all"
......@@ -16,10 +16,6 @@ subpackages="$pkgname-doc"
install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
triggers="$pkgname.trigger=/usr/share/kernel/*"
source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch
0001-features-add-af_packet-kernel-module-for-dhcp.patch
0001-Helping-parsing-code-survive-variable-settings-with-.patch
0001-mkinitfs-harden-permissions-of-initramfs.patch
"
build() {
......@@ -32,8 +28,4 @@ package() {
make install DESTDIR="$pkgdir"
}
sha512sums="d335a6f58ca38a3cc6dcc560baaabd3ea9522ce25de008eb637f0761db7f783c3b03767ba046c3d34550d1d0741bcc54ad09903b41e79fe408264eadbbc0a457 mkinitfs-3.4.3.tar.xz
6b7c16035181ab96a1d0dad9f31df8d74e6d39db775ce540b2b2efaaa4d918a18f331829f4113bff7a38805f648b7d83b7ec15adaaf78b17c9465dc0a19e8b32 0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch
2b29aceee789a79c5395e9a4e896aa0561f812420aa98ab9febdca8e1ea34691d2b819a8f0c09e56d198fda587e569ce026bc6aacdb700ea00a91fc08dcd3a05 0001-features-add-af_packet-kernel-module-for-dhcp.patch
2a443d1c45533c39339c5f30c0a0318205f59f2fadf4ce4b3992439cecb9f6f3c2c5d9dbaa1be89b2d09d4ec8876280963f7ea93b68f3a0f26cec99e1028d847 0001-Helping-parsing-code-survive-variable-settings-with-.patch
848c4e4a30eb878a3733289e00b55665c72b1f810a98e2f04df7a82dfb442ec5be9413719b3f1a1116458571730ffa30e14dc746cfa9dc482c13b49ebac84d2f 0001-mkinitfs-harden-permissions-of-initramfs.patch"
sha512sums="0f26969cb0e6627e7594f09038ada99ea1fa161de918834b95a92d5ba41ebe2ffa93510e2797310f98c963a3140dbde53747064f43ebc31c15bb061a56173ee5 mkinitfs-3.4.4.tar.xz"
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