CVS commit: pkgsrc/security/keychain/files

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Nov  8 15:55:48 UTC 2025

Modified Files:
        pkgsrc/security/keychain/files: README.pkgsrc startkeychain.sh

Log Message:
security/keychain: startkeychain: use quiet mode by default


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/keychain/files/README.pkgsrc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/keychain/files/startkeychain.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/keychain/files/README.pkgsrc
diff -u pkgsrc/security/keychain/files/README.pkgsrc:1.1 pkgsrc/security/keychain/files/README.pkgsrc:1.2
--- pkgsrc/security/keychain/files/README.pkgsrc:1.1    Sat Nov  8 12:36:14 2025
+++ pkgsrc/security/keychain/files/README.pkgsrc        Sat Nov  8 15:55:48 2025
@@ -14,12 +14,13 @@ variables:    
 KCHOPTS
        This variable takes options for keychain like "--nocolor" or
        "--noask".  Please see the keychain manpage for a full list. By
-       default, startkeychain will pass `--eval --gpg2' to the keychain
-       command line. The script also accepts a number of arguments:
-    
-       * -q  makes keychain only print messages in case of warning, error
-             or required interactivity.
+       default, startkeychain will pass `--quiet' to the keychain command
+       line, making keychain only print messages in case of warning, error
+       or required interactivity. When used interactively, startkeychain 
+       also accepts a number of arguments: 
+
        * -c  wipes all existing cached keys/passphrases first.
+       * -e  ensures that only the specified keys are loaded.
        * -f  allow keychain to use a forwarded ssh-agent connection.
        * -h  print usage.
 

Index: pkgsrc/security/keychain/files/startkeychain.sh
diff -u pkgsrc/security/keychain/files/startkeychain.sh:1.2 pkgsrc/security/keychain/files/startkeychain.sh:1.3
--- pkgsrc/security/keychain/files/startkeychain.sh:1.2 Sat Nov  8 13:32:44 2025
+++ pkgsrc/security/keychain/files/startkeychain.sh     Sat Nov  8 15:55:48 2025
@@ -12,13 +12,13 @@
 [ -n "$GPGKEYS" ] || GPGKEYS=""
 
 # Allow to pass a number of keychain options as first argument.
-# By deafult, use gpg2 and ensure that only the specified keys are loaded.
+# Silence output by default, to allow this to be sourced in login scripts.
 
-[ -n "$KCHOPTS" ] || KCHOPTS="--eval --gpg2"
+[ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
 case $1 in
-    -f) KCHOPTS="$KCHOPTS --ssh-allow-forwarded" ;;
     -c) KCHOPTS="$KCHOPTS --clear" ;;
-    -q) KCHOPTS="$KCHOPTS --quiet" ;;
+    -e) KCHOPTS="$KCHOPTS --eval" ;;
+    -f) KCHOPTS="$KCHOPTS --ssh-allow-forwarded" ;;
     -h) echo "usage: keychain [-fcq]"
        exit 0 ;;
     -*|--*)