diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-19 16:31:43 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-19 16:41:17 +0200 |
| commit | 86021d77133b1e6954d80baa730b053a202c66e6 (patch) | |
| tree | a2c0c7f76f81df2e91e8204d56f873ff4fab587f /main | |
| parent | 091c5e930dbcb16c8920fc550148d2ab4f5379bf (diff) | |
main/mkinitfs: upgrade to 3.1.0_rc1
Diffstat (limited to 'main')
| -rw-r--r-- | main/mkinitfs/0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch | 27 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 3 insertions, 36 deletions
diff --git a/main/mkinitfs/0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch b/main/mkinitfs/0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch deleted file mode 100644 index cda26ed3c1f..00000000000 --- a/main/mkinitfs/0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 841a76b3a96955c7840edc29f8397078514a55a9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 25 Jan 2017 08:57:24 +0000 -Subject: [PATCH] init: pull in libressl instead of openssl for encrypted - apkovl - -ref #6689 ---- - initramfs-init.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index f4cd274..adcc7be 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -55,7 +55,7 @@ unpack_apkovl() { - fi - - # we need openssl. let apk handle deps -- apk add --quiet --initdb --repositories-file $repofile openssl || return 1 -+ apk add --quiet --initdb --repositories-file $repofile libressl || return 1 - - if ! openssl list-cipher-commands | grep "^$suffix$" > /dev/null; then - errstr="Cipher $suffix is not supported" --- -2.11.0 - diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 8e05bd843fa..ce2bac871cc 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=3.0.9 +pkgver=3.1.0_rc1 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url="http://git.alpinelinux.org/cgit/mkinitfs" makedepends_build="" @@ -12,7 +12,6 @@ depends="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-pull-in-libressl-instead-of-openssl-for-encrypt.patch " arch="all" license="GPL2" @@ -28,9 +27,4 @@ package() { make install DESTDIR="$pkgdir" || return 1 } -md5sums="1267c40a5a75c28242e9f76c90d24df4 mkinitfs-3.0.9.tar.xz -6bc10f3c0fe2b8554e1135e15fcf4040 0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch" -sha256sums="42e7a5d3649eac6e23687d617c79e3ddd653164391dae7034ed828bae5ce120d mkinitfs-3.0.9.tar.xz -8608e02824d7c7dec4d6aa4906a4c6c55fcd8b8d99838d57dd71b768c2acaea2 0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch" -sha512sums="f625f128aa7f570d5d65082f17ad28a1eac4c2fd9070e6d2ab027ff78b1f474122cb639de78b82fae35e6f8139f1b04e8f7ed369875bd8fd723cbb2e93ae50f1 mkinitfs-3.0.9.tar.xz -1feb19ff6bfbe1e3131b6c1d8a7158d523633933706713ddacafda88da431e90cd6f7e1a621c52c396c7e7111e985b28cc7ad6c5e1ece1c7b22389991776c105 0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch" +sha512sums="b1ec1d07bae813d105779112b407e07f4a89b03664ece87e63b1db8060e8f304c0855b64252ade5910b1981d5711612ed96fbce77d33c27909650efbcb7e769a mkinitfs-3.1.0_rc1.tar.xz" |