aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-10-26 14:48:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-10-26 14:49:01 +0000
commit2983d59b5ed04b9ee3d3b5ef08d78b28180ca7f6 (patch)
treee063dfe9d9b6148e2ebc1fbfbf35cbf3cb6c7c63
parent94032669d284f150939429526300518b06ced8fe (diff)
downloadalpine_aports-2983d59b5ed04b9ee3d3b5ef08d78b28180ca7f6.tar.bz2
alpine_aports-2983d59b5ed04b9ee3d3b5ef08d78b28180ca7f6.tar.xz
alpine_aports-2983d59b5ed04b9ee3d3b5ef08d78b28180ca7f6.zip
main/mkinitfs: upgrade to 2.4.1
fixes #784
-rw-r--r--main/mkinitfs/0001-mkinitfs-ensure-that-initramfs-image-is-not-world-wr.patch25
-rw-r--r--main/mkinitfs/APKBUILD10
2 files changed, 4 insertions, 31 deletions
diff --git a/main/mkinitfs/0001-mkinitfs-ensure-that-initramfs-image-is-not-world-wr.patch b/main/mkinitfs/0001-mkinitfs-ensure-that-initramfs-image-is-not-world-wr.patch
deleted file mode 100644
index 81602e2a91..0000000000
--- a/main/mkinitfs/0001-mkinitfs-ensure-that-initramfs-image-is-not-world-wr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From ba9ab744c9ede5f9d70d57b1623505d47f9024e4 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 26 Oct 2011 14:10:58 +0000
4Subject: [PATCH] mkinitfs: ensure that initramfs image is not world writable
5
6---
7 mkinitfs.in | 2 ++
8 1 files changed, 2 insertions(+), 0 deletions(-)
9
10diff --git a/mkinitfs.in b/mkinitfs.in
11index f79a204..a7dd090 100755
12--- a/mkinitfs.in
13+++ b/mkinitfs.in
14@@ -143,6 +143,8 @@ initfs_apk_keys() {
15
16 initfs_cpio() {
17 [ -n "$list_sources" ] && return
18+ rm -f $outfile
19+ umask 0022
20 (cd "$tmpdir" && find . | cpio -o -H newc | gzip) > $outfile
21 }
22
23--
241.7.7.1
25
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 31f3270697..957b106163 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,13 +1,12 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=mkinitfs 2pkgname=mkinitfs
3pkgver=2.4.0 3pkgver=2.4.1
4pkgrel=1 4pkgrel=0
5pkgdesc="Tool to generate initramfs images for Alpine" 5pkgdesc="Tool to generate initramfs images for Alpine"
6url=http://git.alpinelinux.org/cgit/mkinitfs 6url=http://git.alpinelinux.org/cgit/mkinitfs
7depends="busybox apk-tools>=2.0" 7depends="busybox apk-tools>=2.0"
8triggers="$pkgname.trigger=/usr/share/kernel/*" 8triggers="$pkgname.trigger=/usr/share/kernel/*"
9source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 9source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
10 0001-mkinitfs-ensure-that-initramfs-image-is-not-world-wr.patch
11 eglibc.patch 10 eglibc.patch
12 " 11 "
13arch="noarch" 12arch="noarch"
@@ -43,6 +42,5 @@ package() {
43 cd "$srcdir"/$pkgname-$pkgver 42 cd "$srcdir"/$pkgname-$pkgver
44 make install DESTDIR="$pkgdir" || return 1 43 make install DESTDIR="$pkgdir" || return 1
45} 44}
46md5sums="3b7ca4f70bdded5fca0c0c70ddac56f6 mkinitfs-2.4.0.tar.bz2 45md5sums="f38010635e83fe277e1e261a4a9ea66e mkinitfs-2.4.1.tar.bz2
473885d1eb3f76bc87120159f007db3cea 0001-mkinitfs-ensure-that-initramfs-image-is-not-world-wr.patch
48e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" 46e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch"