#
#
# patch "commands.cc"
#  from [f1e78f7e76f517a0011691ac5cad18b6d76a62ac]
#    to [d8eb728253d2abcd8c9ca02c7433acb9a1458780]
# 
# patch "sha1.cc"
#  from [60cca14abc15c37e5c93959e0bc189cecda2e705]
#    to [19586d394326fcd517f08de8e8f4362da1895aa0]
#
============================================================
--- commands.cc	f1e78f7e76f517a0011691ac5cad18b6d76a62ac
+++ commands.cc	d8eb728253d2abcd8c9ca02c7433acb9a1458780
@@ -909,22 +909,22 @@ CMD_GROUP(top, "top", "", CMD_REF(__root
 #include "unit_tests.hh"
 
 CMD_GROUP(top, "top", "", CMD_REF(__root__),
-          "", "", options::opts::none);
+          "", "");
 
-CMD(test, "test"1, "alias1", CMD_REF(top),
+CMD(test1, "test1", "alias1", CMD_REF(top),
     "", "", "", options::opts::none) {}
-CMD(test, "test"2, "alias2", CMD_REF(top),
+CMD(test2, "test2", "alias2", CMD_REF(top),
     "", "", "", options::opts::none) {}
-CMD_HIDDEN(test, "test"3, "", CMD_REF(top),
+CMD_HIDDEN(test3, "test3", "", CMD_REF(top),
            "", "", "", options::opts::none) {}
 
 CMD_GROUP(testg, "testg", "aliasg", CMD_REF(top),
-          "", "", options::opts::none);
-CMD(testg, "testg"1, "", CMD_REF(testg),
+          "", "");
+CMD(testg1, "testg1", "", CMD_REF(testg),
     "", "", "", options::opts::none) {}
-CMD(testg, "testg"2, "", CMD_REF(testg),
+CMD(testg2, "testg2", "", CMD_REF(testg),
     "", "", "", options::opts::none) {}
-CMD_HIDDEN(testg, "testg"3, "", CMD_REF(testg),
+CMD_HIDDEN(testg3, "testg3", "", CMD_REF(testg),
            "", "", "", options::opts::none) {}
 
 static args_vector
============================================================
--- sha1.cc	60cca14abc15c37e5c93959e0bc189cecda2e705
+++ sha1.cc	19586d394326fcd517f08de8e8f4362da1895aa0
@@ -92,7 +92,7 @@ void hook_botan_sha1()
   Botan::global_state().add_engine(new Monotone_SHA1_Engine);
 }
 
-CMD_HIDDEN(benchmark_sha, "benchmark_sha1", "", CMD_REF(debug), "",
+CMD_HIDDEN(benchmark_sha1, "benchmark_sha1", "", CMD_REF(debug), "",
            N_("Benchmarks SHA-1 cores"),
            N_(""),
            options::opts::none)