From 7cb48e888df3f4a7156d39515e6573aed66acd39 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 26 Jun 2012 13:48:35 +0200
Subject: merge previous security upload

---
 cmdline/apt-key | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cmdline')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 6e85b7353..166508c8e 100755
--- 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"
-- 
cgit v1.2.3