diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-16 12:26:05 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-16 12:32:15 +0000 |
| commit | 551139ef080cad0538ff12a7d8442510d2d27b34 (patch) | |
| tree | 60e334c94962d5719f20c0237d2e5dd1c99e129a /main/alpine-conf | |
| parent | d5f113bcd3161150e5c79ee9fb501012a5d4c7db (diff) | |
| download | aports-551139ef080cad0538ff12a7d8442510d2d27b34.tar.bz2 aports-551139ef080cad0538ff12a7d8442510d2d27b34.tar.xz | |
main/alpine-conf: backport lbu fix for listing ciphers
upstream bug: https://gitlab.alpinelinux.org/alpine/alpine-conf/issues/10451
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch | 27 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 31 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch b/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch new file mode 100644 index 0000000000..7369c46d49 --- /dev/null +++ b/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch @@ -0,0 +1,27 @@ +From ad9996810186cbed04ec0c185bd3c998622a0a4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net> +Date: Thu, 16 Jan 2020 11:09:28 +0100 +Subject: [PATCH] lbu: fix wrong cipher match in check_openssl for 'lbu commit + -e' + +fixes #10451 +--- + lbu.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lbu.in b/lbu.in +index f439cf2..fb4fbe5 100644 +--- a/lbu.in ++++ b/lbu.in +@@ -126,7 +126,7 @@ check_openssl() { + [ -z "$ENCRYPTION" ] && return 0 + OPENSSL=$(which openssl 2>/dev/null) || die "openssl was not found" + +- $OPENSSL enc -ciphers | grep "^$ENCRYPTION$" > /dev/null \ ++ $OPENSSL list -1 -cipher-commands | grep "^$ENCRYPTION$" > /dev/null \ + || die "Cipher $ENCRYPTION is not supported" + } + +-- +2.25.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 6ec1dd5ffd..d59daa726b 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.8.3 -pkgrel=4 +pkgrel=5 pkgdesc="Alpine configuration management scripts" url="https://git.alpinelinux.org/alpine-conf/about" arch="all" @@ -12,6 +12,7 @@ source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar. 0001-setup-disk-let-user-set-ROOT_SIZE.patch 0001-setup-apkrepos-use-cdn-as-default-answer.patch 0001-update-kernel-fix-dtbs-dir.patch + 0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -32,4 +33,5 @@ sha512sums="73bd999b552d266c994cc1535570b86ddd7a7379f3b9e244c4985722f5754b11323a b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb 0001-libalpine-use-correct-exit-code-in-trap.patch bf59558e5477929a0692c9ba182b71f7913533b50abd53303be6c47897348c53ec587c27a20442c180564c552f84d90d3c7d700b5f6e2cb4bb0a6ac1a7dafd1d 0001-setup-disk-let-user-set-ROOT_SIZE.patch a11e69e18da2c86cb5a419b2fc9db144b7fef4676fb4cd7c33bfe6dbf638adb872f7dd43b5c86fba916e94bdcd2d3c352931c579ea3e3333736c1fc3e5cd22fa 0001-setup-apkrepos-use-cdn-as-default-answer.patch -e6d7ef82f2c875866dba6c8d18c6b8d9909c0a56081252ff1a1b0bfba2a493a3550377e20fa2975e5b6aa4e52f2607730b7ed158dd419751fad2368d9fa0ece5 0001-update-kernel-fix-dtbs-dir.patch" +e6d7ef82f2c875866dba6c8d18c6b8d9909c0a56081252ff1a1b0bfba2a493a3550377e20fa2975e5b6aa4e52f2607730b7ed158dd419751fad2368d9fa0ece5 0001-update-kernel-fix-dtbs-dir.patch +d2f961761f237240bb046d9a56c07927d2011b5b62c9d84542d45ac144a09aa08e186efe759d66929a2796e416442db8a339e4bdf9e88643c2bf15f4125fe280 0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch" |