From bf6d5b428e247dd28fb593cc3677da4e5eee0a54 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 12 Sep 2007 17:05:19 -0300
Subject: * Add support to apt-key to export keys to stdout. Thanks to "Dwayne 
  C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)

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

(limited to 'cmdline')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 90ecae2cf..3bd1a92d9 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -39,6 +39,8 @@ usage() {
     echo
     echo "  apt-key add <file>          - add the key contained in <file> ('-' for stdin)"
     echo "  apt-key del <keyid>         - remove the key <keyid>"
+    echo "  apt-key export <keyid>      - output the key <keyid>"
+    echo "  apt-key exportall           - output all trusted keys"
     echo "  apt-key update              - update keys using the keyring package"
     echo "  apt-key list                - list keys"
     echo
@@ -75,6 +77,12 @@ case "$command" in
     finger*)
         $GPG --batch --fingerprint
         ;;
+    export)
+        $GPG --armor --export "$1"
+        ;;
+    exportall)
+        $GPG --armor --export
+        ;;
     adv*)
         echo "Executing: $GPG $*"
         $GPG $*
-- 
cgit v1.2.3


From 70e6f24e3b39f7cc72cecab181b10c1f79474182 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 2 Oct 2007 09:39:05 -0300
Subject:   - cmdline/apt-extracttemplates.cc: likewise;

---
 cmdline/apt-extracttemplates.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 6d580cc28..de22386b9 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
 	char fn[512];
 	static int i;
-        char *tempdir = NULL;
+	const char *tempdir = NULL;
 
         tempdir = getenv("TMPDIR");
         if (tempdir == NULL)
-- 
cgit v1.2.3


From 5edb74a357b6b167bc7d9848b302942b9865307b Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@debian.org>
Date: Sat, 6 Oct 2007 18:24:27 -0300
Subject: * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage  
 statement of apt-get (closes: #445468).

---
 cmdline/apt-get.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmdline')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index e214691f8..8bf279456 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2644,6 +2644,7 @@ bool ShowHelp(CommandLine &CmdL)
       "   upgrade - Perform an upgrade\n"
       "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
       "   remove - Remove packages\n"
+	  "   autoremove - Remove all automatic unused packages\n"
       "   purge - Remove and purge packages\n"
       "   source - Download source archives\n"
       "   build-dep - Configure build-dependencies for source packages\n"
-- 
cgit v1.2.3


From 3272872427693b9e4f0fabca48ed27ea7ace02ea Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@debian.org>
Date: Sat, 6 Oct 2007 18:38:51 -0300
Subject: Fix indentation

---
 cmdline/apt-get.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 8bf279456..079b1473f 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2644,7 +2644,7 @@ bool ShowHelp(CommandLine &CmdL)
       "   upgrade - Perform an upgrade\n"
       "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
       "   remove - Remove packages\n"
-	  "   autoremove - Remove all automatic unused packages\n"
+      "   autoremove - Remove all automatic unused packages\n"
       "   purge - Remove and purge packages\n"
       "   source - Download source archives\n"
       "   build-dep - Configure build-dependencies for source packages\n"
-- 
cgit v1.2.3


From 24401c09f0a826ec0074f46dfe70efe3aaf79f25 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@debian.org>
Date: Sat, 6 Oct 2007 18:54:11 -0300
Subject: * cmdline/apt-get.cc: really applies Julien Danjou <acid@debian.org> 
  patch to add 'purge' command line argument (closes: #133421).

---
 cmdline/apt-get.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmdline')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 079b1473f..efb618cb0 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2755,6 +2755,7 @@ int main(int argc,const char *argv[])
                                    {"upgrade",&DoUpgrade},
                                    {"install",&DoInstall},
                                    {"remove",&DoInstall},
+                                   {"purge",&DoInstall},
 				   {"autoremove",&DoInstall},
 				   {"purge",&DoInstall},
                                    {"dist-upgrade",&DoDistUpgrade},
-- 
cgit v1.2.3