refresh (create temporary patch)

diff --git a/meta b/meta
index 03abe3f8d3e2d4faf09495bfc5133de7e1c8c094..a566fcd6fcbd87928a42f4cb47400ff54174d3fd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 84e267aa7db4f3adcc96d9744598941484c4b95f
-Head: b6da9eef0fd7963c826eca9cc0d1a23487511e5c
+Previous: afabd043e7a6b9cda9171a37f417670da8109582
+Head: 0aa7b8edf43bcc877c221227afe1fa9a6634634d
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,6 +13,7 @@ Applied:
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
   log_port: b6da9eef0fd7963c826eca9cc0d1a23487511e5c
+  refresh-temp: 0aa7b8edf43bcc877c221227afe1fa9a6634634d
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..9070932
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,47 @@
+Bottom: 1a7c076e90a9883cc440631deac5dd82810649dc
+Top:    03a0e5459709b2fb584adeb4e7f8996886fe1ef7
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-06 12:40:51 -0800
+
+Refresh of log_port
+
+---
+
+diff --git a/src/libacm.c b/src/libacm.c
+index e693e48..3ce0cd0 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -57,7 +57,7 @@ extern lock_t lock;
+ static SOCKET sock = INVALID_SOCKET;
+ static short server_port = 6125;
+ 
+-static short acm_get_server_port(void)
++static void acm_set_server_port(void)
+ {
+       FILE *f;
+ 
+@@ -65,7 +65,6 @@ static short acm_get_server_port(void)
+               fscanf(f, "%hu", (unsigned short *) &server_port);
+               fclose(f);
+       }
+-      return server_port;
+ }
+ 
+ int libacm_init(void)
+@@ -77,6 +76,7 @@ int libacm_init(void)
+       if (ret)
+               return ret;
+ 
++      acm_set_server_port();
+       sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+       if (sock == INVALID_SOCKET) {
+               ret = socket_errno();
+@@ -86,7 +86,7 @@ int libacm_init(void)
+       memset(&addr, 0, sizeof addr);
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+-      addr.sin_port = htons(acm_get_server_port());
++      addr.sin_port = htons(server_port);
+       ret = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
+       if (ret)
+               goto err2;