aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-01-06 14:39:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-01-06 14:45:55 +0000
commit0ed15a08937ba71c1ef866ab73741940b36f8abd (patch)
tree90ccc4adac719f5734209bde4b304b896eb16f2c
parenteb8930ed66e4ff4996d3da428f4c7b73fbf8c1fa (diff)
downloadaports-0ed15a08937ba71c1ef866ab73741940b36f8abd.tar.gz
aports-0ed15a08937ba71c1ef866ab73741940b36f8abd.tar.bz2
aports-0ed15a08937ba71c1ef866ab73741940b36f8abd.tar.xz
main/mkinitfs: upgrade to 3.0.2
fixes #4975
-rw-r--r--main/mkinitfs/0001-init-fix-grep-to-refer-to-the-securetty-file.patch26
-rw-r--r--main/mkinitfs/APKBUILD14
2 files changed, 5 insertions, 35 deletions
diff --git a/main/mkinitfs/0001-init-fix-grep-to-refer-to-the-securetty-file.patch b/main/mkinitfs/0001-init-fix-grep-to-refer-to-the-securetty-file.patch
deleted file mode 100644
index 927b27c653..0000000000
--- a/main/mkinitfs/0001-init-fix-grep-to-refer-to-the-securetty-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4ab4340f14a1882c486f41c34ed6e016d090b506 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Tue, 22 Dec 2015 14:03:37 +0200
-Subject: [PATCH] init: fix grep to refer to the securetty file
-
-otherwise it hangs waiting input from stdin
----
- initramfs-init.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index e9155e0..ca115e9 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -142,7 +142,7 @@ setup_inittab_console(){
- echo "$tty::respawn:/sbin/getty $line $speed $tty $term" \
- >> $sysroot/etc/inittab
- fi
-- if [ -e "$sysroot"/etc/securetty ] && ! grep -q -w "$tty"; then
-+ if [ -e "$sysroot"/etc/securetty ] && ! grep -q -w "$tty" "$sysroot"/etc/securetty; then
- echo "$tty" >> "$sysroot"/etc/securetty
- fi
- done
---
-2.6.4
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index a21dd2a8cf..16251b6d8e 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
-pkgver=3.0.1
+pkgver=3.0.2
_ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=0
pkgdesc="Tool to generate initramfs images for Alpine"
url="http://git.alpinelinux.org/cgit/mkinitfs"
makedepends="kmod-dev util-linux-dev cryptsetup-dev linux-headers"
@@ -10,7 +10,6 @@ depends="acct busybox apk-tools>=2.0 lddtree>=1.25"
install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
triggers="$pkgname.trigger=/usr/share/kernel/*"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
- 0001-init-fix-grep-to-refer-to-the-securetty-file.patch
"
arch="all"
license="GPL2"
@@ -36,9 +35,6 @@ package() {
cd "$_builddir"
make install DESTDIR="$pkgdir" || return 1
}
-md5sums="4df6d56c154d9752c475055037de1fc0 mkinitfs-3.0.1.tar.xz
-9008a4762c17bf5adb45c6a73a1af043 0001-init-fix-grep-to-refer-to-the-securetty-file.patch"
-sha256sums="06c828525fdc25dde4d3b558f3351a97de1df396020d5d30ee520ed2894b7bea mkinitfs-3.0.1.tar.xz
-1ed024fd8a7f9481380a6d1a7be0358f56365a0cc1d73161526f3e19261c516f 0001-init-fix-grep-to-refer-to-the-securetty-file.patch"
-sha512sums="4b3566b63b74eecca9d09c7c0cdc4d0217a272a6b1ef08c1e798b1f14f8de0de791d4ba0f03901affb5c08d52b2907eae9fc2706e51860850ff932261d0e7662 mkinitfs-3.0.1.tar.xz
-359f745689ef0514b6849cc4d7a14c97efc736066fbbbf58eebfb95182c39292e6e695b465672edc1db5abf9aeee1880d8a651b420a9a2f354203b2d368e7ab3 0001-init-fix-grep-to-refer-to-the-securetty-file.patch"
+md5sums="01208d98615d03a0afb74eec9d9ece4e mkinitfs-3.0.2.tar.xz"
+sha256sums="e87456ab79230a4666281f37b2e7e0678ed70f7dd19fd2916e7b4fe4f426b0c2 mkinitfs-3.0.2.tar.xz"
+sha512sums="8a6cb0e768b09c1cde0b5ec18302df222da4cadb3860920c69553b81e84900b0ebcad1830c993aef79d71889dfe00bc0292563336eebaff8b3f9a3ee85a6770f mkinitfs-3.0.2.tar.xz"