Merge tag '0.6.3' into debian

release 0.6.3

1 files changed, 9 insertions, 4 deletions

diff --git a/plugins/rsync b/plugins/rsync
index 1a57660..1ee6831 100755
--- a/plugins/rsync
+++ b/plugins/rsync
@@ -4,8 +4,8 @@
 #
 # ENVIRONMENT VARIABLES:
 #	URL		URL to download known_hosts file from
-#	SIGURL		URL of the GnuPG signature
-#	KEYRING		path to the keyring for use by gpgv
+#	SIGURL		URL of the OpenPGP signature
+#	KEYRING		path to the OpenPGP keyring with certificates
 #
 
 set -e
@@ -15,8 +15,13 @@ rsync -vt --timeout=300 "${URL}" new
 
 if [ "${SIGURL}" ]; then
 	rsync -vt --timeout=300 "${SIGURL}" new.sig
-	gpgv --keyring "${KEYRING}" --status-fd 2 new.sig || exit 1
-	# return 1 because it's not clear what other codes may used
+	if command -v sopv >/dev/null; then
+		sopv verify new.sig "${KEYRING}" <new || exit 1
+	else
+		gpgv --keyring "${KEYRING}" --status-fd 2 new.sig new || exit 1
+	fi
+	# return 1 because it's not clear what other codes may be safe to
+	# use that do not overlap with codes from rsync.
 fi	
 
 # vim:set ft=sh: