From 3f499f5da4d822756a713436bfe4522128ed45bd Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 6 Dec 2010 11:31:56 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/no_addr | 6 +++--- patches/refresh-temp | 22 ---------------------- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 0eb0614..464c102 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: b833f067db070811ce0ab6a50f493f7faa16eb8f -Head: 3a05a77bc26206ba51038800b05049700ab0562b +Previous: 7093e8a25d49f7aaa0ba4a12d08d43680ea60321 +Head: 7bea6bc2d2183b000b6f30518787bcc585756128 Applied: logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7 acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638 @@ -11,8 +11,7 @@ Applied: locking: 558e5577364aec3531c54b28def6e16f0c926524 verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7 dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d - no_addr: e069cf53cf858b5d0fc09b98e0b1dac3460ca877 - refresh-temp: 3a05a77bc26206ba51038800b05049700ab0562b + no_addr: 7bea6bc2d2183b000b6f30518787bcc585756128 Unapplied: acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6 1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37 diff --git a/patches/no_addr b/patches/no_addr index 683ead9..ecc3879 100644 --- a/patches/no_addr +++ b/patches/no_addr @@ -1,5 +1,5 @@ Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4 -Top: 1efcf9e821c180f96719436b53c1a8345c5d6a78 +Top: c2070b7b82944dcc5fbd4c3e2f8594004721c60f Author: Sean Hefty Date: 2010-12-06 11:06:47 -0800 @@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 9ff81c4..3285473 100644 +index 9ff81c4..3a8e9df 100644 --- a/src/acm.c +++ b/src/acm.c @@ -203,6 +203,7 @@ static SOCKET listen_socket; @@ -57,7 +57,7 @@ index 9ff81c4..3285473 100644 +{ + FILE *f; + -+ if ((f = fopen(addr_file, "r")) ++ if ((f = fopen(addr_file, "r"))) + return f; + + acm_log(0, "notice - generating acm_addr.cfg file\n"); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index bd69598..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: 1efcf9e821c180f96719436b53c1a8345c5d6a78 -Top: c2070b7b82944dcc5fbd4c3e2f8594004721c60f -Author: Sean Hefty -Date: 2010-12-06 11:31:55 -0800 - -Refresh of no_addr - ---- - -diff --git a/src/acm.c b/src/acm.c -index 3285473..3a8e9df 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -2722,7 +2722,7 @@ static FILE *acm_open_addr_file(void) - { - FILE *f; - -- if ((f = fopen(addr_file, "r")) -+ if ((f = fopen(addr_file, "r"))) - return f; - - acm_log(0, "notice - generating acm_addr.cfg file\n"); -- 2.41.0