refresh (create temporary patch)

diff --git a/meta b/meta
index b43f7563f68096cc3758ad44320175c2ce12280a..b00062432fcb31a46a26885dbe33be367664e94b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a99c147a1fff776b6f277d828b1343065d8c586f
-Head: 6736f595501aa1a59bdb8635eeb46fdcbe267083
+Previous: 0d445b9933e88d99e9f298b0371a923df98ddedb
+Head: 429bd82d8aabe949bf20cdce9b46501a158b55e5
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -18,6 +18,7 @@ Applied:
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
   addrinfo: 6736f595501aa1a59bdb8635eeb46fdcbe267083
+  refresh-temp: 429bd82d8aabe949bf20cdce9b46501a158b55e5
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..fd2552d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,54 @@
+Bottom: ad882cbf5ccb5b39d50b3d141607e262852a2abd
+Top:    17081f2d187536d1e27e7772e7b9141334fc2e07
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-07 15:49:58 -0800
+
+Refresh of addrinfo
+
+---
+
+diff --git a/man/ib_acme.1 b/man/ib_acme.1
+index 91d959d..e5256a0 100644
+--- a/man/ib_acme.1
++++ b/man/ib_acme.1
+@@ -18,16 +18,18 @@ create address and configuration files for the ib_acm service.
+ .TP\r
+ \-f addr_format\r
+ Specifies the format of the src_addr and dest_addr parameters.  Valid\r
+-address formats are: 'i', 'n', and 'p', which indicate that the src_addr\r
+-and dest_addr parameters are ip addresses, system network names, or LIDs,\r
+-respectively.  If the -f option is omitted, ip addressing is assumed.\r
++address formats are: 'i', 'n', 'p', and 'u', which indicate that the src_addr\r
++and dest_addr parameters are ip addresses, system network names, LIDs,\r
++or the format is unspecified, respectively.  If the -f option is omitted,\r
++an unspecified address format is assumed.  ib_acme will use getaddrinfo or\r
++other mechanisms to determine which format the address uses.\r
+ .TP\r
+ \-s src_addr\r
+ Specifies the local source address of the path to resolve.  The source\r
+ address can be an IP address, system network name, or LID, as indicated by\r
+ the addr_format option.\r
+ .TP\r
+-\-s dest_addr\r
++\-d dest_addr\r
+ Specifies the destination address of the path to resolve.  The destination\r
+ address can be an IP address, system network name, or LID, as indicated by\r
+ the addr_format option.\r
+diff --git a/src/acme.c b/src/acme.c
+index 6aa256a..727222c 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -67,10 +67,10 @@ extern char **parse(char *args, int *count);
+ static void show_usage(char *program)
+ {
+       printf("usage 1: %s\n", program);
+-      printf("   [-f addr_format] - i(p), n(ame), or l(id)\n");
+-      printf("                      default: 'i'\n");
++      printf("   [-f addr_format] - i(p), n(ame), l(id), or u(nspecified)\n");
++      printf("                      default: 'u'\n");
+       printf("   [-s src_addr]    - format defined by -f option\n");
+-      printf("   -d dest_addr     - format defined by -f option\n");
++      printf("   [-d] dest_addr   - format defined by -f option\n");
+       printf("   [-v]             - verify ACM response against SA query response\n");
+       printf("   [-c]             - read ACM cached data only\n");
+       printf("usage 2: %s\n", program);