Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 6BC19781AEB for ; Mon, 16 Sep 2019 10:55:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4446422A96 for ; Mon, 16 Sep 2019 12:55:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L81QN00ct2Qs; Mon, 16 Sep 2019 12:55:19 +0200 (CEST) From: Bart Ribbers DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1568631319; bh=BePWqmnBOnZDUXjlEC6HsgOix1UoqwgURwP8Q9YhUeU=; h=From:To:Cc:Subject:Date; b=Gk2G3+HOpEH74JxmPrFRj1grmTi8lkFO3wQ4ESd2r2NkftZSmFToXMAW9KQiAvpIG 4XAwAqHulS40cSo68XPZUEa+L5ZE31zQj4edGqYmjXkAbn+1sgfJbb2Zv8VQ8jBLGU Ig9Tgh//zg3dFxua9K3O4bGMZG2kGrhtdDlKDCPa8NLDwdIgsjgge+TImZ/WyPvevF ww/3S9y65ZpWyPHpoiyNzaROrDOdnhZ7nMjynkXj6MZ4hOyLQ5hii6+IjuQZ8fUO2T Cqp4wxp4PMl2hi/1v51YmAcVB5e4c0lApSfGzk3MHWJb0EoNT8mZHJ8IbrZVHN77Zi lKC1ft9tUw2yg== To: alpine-aports@lists.alpinelinux.org Cc: Bart Ribbers Subject: [PATCH] main/openssl: remove conflicting man page with shadow-doc Date: Mon, 16 Sep 2019 12:55:15 +0200 Message-Id: <20190916105515.10099-1-bribbers@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit passwd.1 is already described in openssl-passwd.1 and it causes conflicts with passwd.1 from shadow-doc Fixes https://gitlab.alpinelinux.org/alpine/aports/issues/10724 --- main/openssl/APKBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index a5360e1fe3..2f9fdc83ee 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -2,7 +2,7 @@ pkgname=openssl pkgver=1.1.1d _abiver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="Toolkit for Transport Layer Security (TLS)" url="https://www.openssl.org" arch="all" @@ -78,6 +78,10 @@ package() { make DESTDIR="$pkgdir" install # remove the script c_rehash rm "$pkgdir"/usr/bin/c_rehash + + # remove conflicting man page with shadow-doc + # https://gitlab.alpinelinux.org/alpine/aports/issues/10724 + rm "$pkgdir"/usr/share/man/man1/passwd.1 } dev() { -- 2.23.0