refresh

diff --git a/meta b/meta
index e072d2e52bea579238f31a1ab7c333bc59a5b011..39dc2911e893307c32faeaf8bd0d153f68e646a2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: d8509aff4f798925b0fe97589cce1520ded79855
-Head: b94a22f4ea0d385f9643272dafa3cd21def65b41
+Previous: fe158b42b056a7980cd8c1a41f949db6520226df
+Head: e733d04dcaf637e600b3f1873befa4e8eaef4f83
 Applied:
-  typo: 0b7be051d7bcb46b37fe7d95282831949b2fd9e3
-  refresh-temp: b94a22f4ea0d385f9643272dafa3cd21def65b41
+  typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
 Unapplied:
   daemon: d181ac6bc8261d6f0fe4935d2035e0beff560bd9
   cfg: 40e4f86ae3897a335dc63c358e29a98480bed111

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ec1cadd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 7ba4916f6ef28f711b42fb3c392b5c0f267a8104
-Top:    82cf5456563f4ef5acc5fe39b35ecb4674312f35
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-23 18:00:38 -0700
-
-Refresh of typo
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 5a5a09a..d9d9871 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -61,7 +61,7 @@ static void show_usage(char *program)
-       printf("   [-v]             - verify ACM response against SA query response\n");
-       printf("usage 2: %s\n", program);
-       printf("   -A               - generate local acm_addr.cfg configuration file\n");
--      printf("   -O               - generate local acm_ops.cfg options file\n");
-+      printf("   -O               - generate local acm_opts.cfg options file\n");
- }
- 
- static void gen_opts_temp(FILE *f)

diff --git a/patches/typo b/patches/typo
index bd82c9fcd51f857ad6a035b2a1c288c711f45fca..70fbc1f236f2a2bc218c6351de6c0c6dc6c396ca 100644 (file)
--- a/patches/typo
+++ b/patches/typo
@@ -1,5 +1,5 @@
 Bottom: 7ba4916f6ef28f711b42fb3c392b5c0f267a8104
-Top:    7ba4916f6ef28f711b42fb3c392b5c0f267a8104
+Top:    82cf5456563f4ef5acc5fe39b35ecb4674312f35
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:59:51 -0700
 
@@ -10,4 +10,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acme.c b/src/acme.c
+index 5a5a09a..d9d9871 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -61,7 +61,7 @@ static void show_usage(char *program)
+       printf("   [-v]             - verify ACM response against SA query response\n");
+       printf("usage 2: %s\n", program);
+       printf("   -A               - generate local acm_addr.cfg configuration file\n");
+-      printf("   -O               - generate local acm_ops.cfg options file\n");
++      printf("   -O               - generate local acm_opts.cfg options file\n");
+ }
+ 
+ static void gen_opts_temp(FILE *f)