~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[PATCH] main/openssl: remove conflicting man page with shadow-doc

Bart Ribbers <bribbers@disroot.org>
Details
Message ID
<20190916105515.10099-1-bribbers@disroot.org>
DKIM signature
missing
Download raw message
Patch: +5 -1
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
Reply to thread Export thread (mbox)