diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-08-06 21:35:30 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2013-08-06 21:35:30 +0000 |
commit | 321b35abc890e10f5d883903c468a96026b07ae5 (patch) | |
tree | a7b20fd081a272c7eda869fc18b8f09bca22bb17 /sys-apps/less | |
parent | Fix build with ffmpeg 2, bug #476494 (diff) | |
download | gentoo-2-321b35abc890e10f5d883903c468a96026b07ae5.tar.gz gentoo-2-321b35abc890e10f5d883903c468a96026b07ae5.tar.bz2 gentoo-2-321b35abc890e10f5d883903c468a96026b07ae5.zip |
Handle csr/crt files with openssl.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps/less')
-rw-r--r-- | sys-apps/less/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/less/files/lesspipe.sh | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog index 4289427c9aeb..f5d10651ad08 100644 --- a/sys-apps/less/ChangeLog +++ b/sys-apps/less/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/less # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.176 2013/07/09 00:40:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.177 2013/08/06 21:35:30 vapier Exp $ + + 06 Aug 2013; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh: + Handle csr/crt files with openssl. *less-460 (09 Jul 2013) diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh index e5c8e65da92e..c21052b72370 100644 --- a/sys-apps/less/files/lesspipe.sh +++ b/sys-apps/less/files/lesspipe.sh @@ -183,7 +183,8 @@ lesspipe() { ### Encryption stuff ### *.crl) openssl crl -hash -text -noout -in "$1" ;; - *.pem) openssl x509 -hash -text -noout -in "$1" ;; + *.csr) openssl req -text -noout -in "$1" ;; + *.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;; # May not be such a good idea :) # ### Device nodes ### @@ -235,7 +236,7 @@ if [[ -z $1 ]] ; then elif [[ $1 == "-V" || $1 == "--version" ]] ; then Id="cvsid" cat <<-EOF - $Id: lesspipe.sh,v 1.52 2013/04/29 18:37:49 vapier Exp $ + $Id: lesspipe.sh,v 1.53 2013/08/06 21:35:30 vapier Exp $ Copyright 2001-2013 Gentoo Foundation Mike Frysinger <vapier@gentoo.org> (with plenty of ideas stolen from other projects/distros) |