cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600

diff --git a/cmdline/apt-key b/cmdline/apt-key
index c184e3e755b44f96ffd40a43abc7102756d6bb4f..309c51b13aa6bbed3b5eb8d6c3c603e95aec84e7 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -32,6 +32,16 @@ requires_root() {
        fi
 }
 
        fi
 }
 

+# gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead.
+init_keyring() {
+    for path; do
+        if ! [ -e "$path" ]; then
+            touch -- "$path"
+            chmod 0644 -- "$path"
+        fi
+    done
+}
+

 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1
     MASTER=$2
 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1
     MASTER=$2


@@ -198,33 +208,42 @@ fi
 case "$command" in
     add)
         requires_root
 case "$command" in
     add)
         requires_root

+        init_keyring "$TRUSTEDFILE"

         $GPG --quiet --batch --import "$1"
         echo "OK"
         ;;
     del|rm|remove)
         requires_root
         $GPG --quiet --batch --import "$1"
         echo "OK"
         ;;
     del|rm|remove)
         requires_root

+        init_keyring "$TRUSTEDFILE"

         $GPG --quiet --batch --delete-key --yes "$1"
         echo "OK"
         ;;
     update)
         $GPG --quiet --batch --delete-key --yes "$1"
         echo "OK"
         ;;
     update)

+        init_keyring "$TRUSTEDFILE"

        update
        ;;
     net-update)
        update
        ;;
     net-update)

+        init_keyring "$TRUSTEDFILE"

        net_update
        ;;
     list)
        net_update
        ;;
     list)

+        init_keyring "$TRUSTEDFILE"

         $GPG --batch --list-keys
         ;;
     finger*)
         $GPG --batch --list-keys
         ;;
     finger*)

+        init_keyring "$TRUSTEDFILE"

         $GPG --batch --fingerprint
         ;;
     export)
         $GPG --batch --fingerprint
         ;;
     export)

+        init_keyring "$TRUSTEDFILE"

         $GPG --armor --export "$1"
         ;;
     exportall)
         $GPG --armor --export "$1"
         ;;
     exportall)

+        init_keyring "$TRUSTEDFILE"

         $GPG --armor --export
         ;;
     adv*)
         $GPG --armor --export
         ;;
     adv*)

+        init_keyring "$TRUSTEDFILE"

         echo "Executing: $GPG $*"
         $GPG $*
         ;;
         echo "Executing: $GPG $*"
         $GPG $*
         ;;

diff --git a/debian/changelog b/debian/changelog
index f5be97bd37a21baad1dde4a1f0664e6350892d67..89da46ed1149443c2c2761a6421d15702a3e0eab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low
   * buildlib/apti18n.h.in:
     - fix build failure when building without NLS (closes: #671587)
 
   * buildlib/apti18n.h.in:
     - fix build failure when building without NLS (closes: #671587)
 

+  [ Johan Kiviniemi ]
+  * cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600.
+

  -- Christian Perrier <bubulle@debian.org>  Thu, 16 May 2013 22:28:22 +0200
 
 apt (0.9.8.1) unstable; urgency=low
  -- Christian Perrier <bubulle@debian.org>  Thu, 16 May 2013 22:28:22 +0200
 
 apt (0.9.8.1) unstable; urgency=low