diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-25 08:59:07 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-25 08:59:47 +0000 |
| commit | a13f26f5c5892f3ec379ebb4f478bd0e2101c711 (patch) | |
| tree | 335f6a1670c8c32311365a2c94c0c1e991bc7bf2 /main/mkinitfs | |
| parent | f5a990a458291632ac7f90ba9a42621effcc9bb2 (diff) | |
| download | aports-a13f26f5c5892f3ec379ebb4f478bd0e2101c711.tar.bz2 aports-a13f26f5c5892f3ec379ebb4f478bd0e2101c711.tar.xz | |
main/mkinitfs: fix decrypt of apkovl
ref #6689
Diffstat (limited to 'main/mkinitfs')
| -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, 35 insertions, 4 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 new file mode 100644 index 0000000000..cda26ed3c1 --- /dev/null +++ b/main/mkinitfs/0001-init-pull-in-libressl-instead-of-openssl-for-encrypt.patch @@ -0,0 +1,27 @@ +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 137eae2efc..8e05bd843f 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.0.9 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="http://git.alpinelinux.org/cgit/mkinitfs" makedepends_build="" @@ -12,6 +12,7 @@ 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" @@ -27,6 +28,9 @@ package() { make install DESTDIR="$pkgdir" || return 1 } -md5sums="1267c40a5a75c28242e9f76c90d24df4 mkinitfs-3.0.9.tar.xz" -sha256sums="42e7a5d3649eac6e23687d617c79e3ddd653164391dae7034ed828bae5ce120d mkinitfs-3.0.9.tar.xz" -sha512sums="f625f128aa7f570d5d65082f17ad28a1eac4c2fd9070e6d2ab027ff78b1f474122cb639de78b82fae35e6f8139f1b04e8f7ed369875bd8fd723cbb2e93ae50f1 mkinitfs-3.0.9.tar.xz" +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" |