Date: Thu, 1 Aug 2013 19:03:41 +0000 (UTC) From: Remko Lodder <remko@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324119 - head/ports-mgmt/portaudit/files Message-ID: <201308011903.r71J3f7d005981@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: remko (src,doc committer) Date: Thu Aug 1 19:03:40 2013 New Revision: 324119 URL: http://svnweb.freebsd.org/changeset/ports/324119 Log: Add support for an alternative openssl location, for example when installed via the Ports Collection. PR: 166561 Submitted by: Eugene Grosbein <eugen@grosbein.pp.ru> Modified: head/ports-mgmt/portaudit/files/portaudit-cmd.sh head/ports-mgmt/portaudit/files/portaudit.conf Modified: head/ports-mgmt/portaudit/files/portaudit-cmd.sh ============================================================================== --- head/ports-mgmt/portaudit/files/portaudit-cmd.sh Thu Aug 1 18:47:43 2013 (r324118) +++ head/ports-mgmt/portaudit/files/portaudit-cmd.sh Thu Aug 1 19:03:40 2013 (r324119) @@ -52,6 +52,7 @@ portaudit_confs() : ${portaudit_pubkey:="%%PREFIX%%/etc/portaudit.pubkey"} : ${portaudit_fixed=""} + : ${portaudit_openssl:="/usr/bin/openssl"} } extract_auditfile_raw() @@ -78,10 +79,10 @@ checksignature_auditfile() local TMPFILE=`mktemp -t portaudit` extract_auditfile_raw | egrep "^#SIGNATURE: " | sed "s/^#SIGNATURE: //g" \ - | openssl enc -d -a >$TMPFILE + | $portaudit_openssl enc -d -a >$TMPFILE signatureresult=`extract_auditfile_raw | egrep -v "^#SIGNATURE: " \ | egrep -v "^#CHECKSUM: " \ - | openssl dgst -sha256 -verify ${portaudit_pubkey} -signature $TMPFILE` + | $portaudit_openssl dgst -sha256 -verify ${portaudit_pubkey} -signature $TMPFILE` if [ -n "$TMPFILE" ]; then rm "$TMPFILE" fi Modified: head/ports-mgmt/portaudit/files/portaudit.conf ============================================================================== --- head/ports-mgmt/portaudit/files/portaudit.conf Thu Aug 1 18:47:43 2013 (r324118) +++ head/ports-mgmt/portaudit/files/portaudit.conf Thu Aug 1 19:03:40 2013 (r324119) @@ -17,3 +17,6 @@ # this vulnerability has been fixed in your FreeBSD version #portaudit_fixed="d2102505-f03d-11d8-81b0-000347a4fa7d" + +# Alternative location for openssl +#portaudit_openssl="/usr/bin/openssl"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308011903.r71J3f7d005981>