commit

diff --git a/meta b/meta
index 3812e7c0d15a830bae17834a844b8b40b3abb890..c145e51ab87155445181022b56a455e55de67896 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 21e1bb0614d96ce20875d2fa78e676a3b07ae15a
+Previous: 165b6a5e6b396c82a250e1707f446e5cfc5c63f5
 Head: 825da3ccd25ac19167814e811fc79b0309c5b524
 Applied:
-  addr: 825da3ccd25ac19167814e811fc79b0309c5b524
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/addr b/patches/addr
deleted file mode 100644 (file)
index 37ccae8..0000000
--- a/patches/addr
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 7e2475ff5b009491e7771c2f4b9ed9f5923a8985
-Top:    4df8fa519baf0e24c5af25c6000d5277b1798cff
-Author: Ilya Nelkenbaum <ilyan@mellanox.com>
-Date:   2015-06-16 22:39:51 -0700
-
-acme.c: Fix IPv6 address handling in inet_any_pton
-
-In inet_any_pton() routine, src_addr was used by mistake
-instead of addr argument.
-
-Signed-off-by: Ilya Nelkenbaum <ilyan@mellanox.com>
-Signed-off-by: Hal Rosenstock <hal@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 8279b65..f1b0d01 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -535,7 +535,7 @@ static int inet_any_pton(char *addr, struct sockaddr *sa)
-       if (ret <= 0) {
-               sin6 = (struct sockaddr_in6 *) sa;
-               sa->sa_family = AF_INET6;
--              ret = inet_pton(AF_INET6, src_addr, &sin6->sin6_addr);
-+              ret = inet_pton(AF_INET6, addr, &sin6->sin6_addr);
-       }
- 
-       return ret;