merge previous security upload

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 6e85b735361749197405a4484a3b85a25dd35fa1..166508c8ef46820dc810fb44adc8d6d8193c0dc4 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -86,6 +86,8 @@ add_keys_with_verify_against_master_keyring() {
 # the archive-keyring keys needs to be signed with the master key
 # (otherwise it does not make sense from a security POV)
 net_update() {
+    # Disabled for now as code is insecure (LP: #1013639 (and 857472, 1013128))
+    exit 1
 
     if [ -z "$ARCHIVE_KEYRING_URI" ]; then
        echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set"