(refix) Bug 1949 - iproute build failed
authorHajime Tazaki <tazaki@sfc.wide.ad.jp>
Mon, 15 Sep 2014 00:23:51 +0900
changeset 631 f7b41f41fd45
parent 630 c9644cbddd14
child 632 0e1a63f9f773
(refix) Bug 1949 - iproute build failed
utils/iproute-2.6.38-fix-01.patch
utils/iproute-2.6.38.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/utils/iproute-2.6.38-fix-01.patch	Mon Sep 15 00:23:51 2014 +0900
@@ -0,0 +1,33 @@
+ tc/m_xt.c |   12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/tc/m_xt.c b/tc/m_xt.c
+index ede9913..268938b 100644
+--- a/tc/m_xt.c
++++ b/tc/m_xt.c
+@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
+ 					return -1;
+ 				}
+ 				tcipt_globals.opts =
+-				    xtables_merge_options(tcipt_globals.opts,
++				    xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++				                          tcipt_globals.orig_opts,
++#endif
++				                          tcipt_globals.opts,
+ 				                          m->extra_opts,
+ 				                          &m->option_offset);
+ 			} else {
+@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
+ 			}
+ 
+ 			tcipt_globals.opts =
+-			    xtables_merge_options(tcipt_globals.opts,
++			    xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++			                          tcipt_globals.orig_opts,
++#endif
++			                          tcipt_globals.opts,
+ 			                          m->extra_opts,
+ 			                          &m->option_offset);
+ 		} else {
--- a/utils/iproute-2.6.38.patch	Wed Sep 10 19:51:03 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
- tc/m_xt.c |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/tc/m_xt.c b/tc/m_xt.c
-index ede9913..268938b 100644
---- a/tc/m_xt.c
-+++ b/tc/m_xt.c
-@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- 					return -1;
- 				}
- 				tcipt_globals.opts =
--				    xtables_merge_options(tcipt_globals.opts,
-+				    xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+				                          tcipt_globals.orig_opts,
-+#endif
-+				                          tcipt_globals.opts,
- 				                          m->extra_opts,
- 				                          &m->option_offset);
- 			} else {
-@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
- 			}
- 
- 			tcipt_globals.opts =
--			    xtables_merge_options(tcipt_globals.opts,
-+			    xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+			                          tcipt_globals.orig_opts,
-+#endif
-+			                          tcipt_globals.opts,
- 			                          m->extra_opts,
- 			                          &m->option_offset);
- 		} else {