[Glibc-bsd-commits] r3073 - trunk/kfreebsd-8/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2010-07-26 06:13:24 +0000 (Mon, 26 Jul 2010)
New Revision: 3073

Removed:
   trunk/kfreebsd-8/debian/patches/916_ip6.accept_rtadv.diff
Modified:
   trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
   trunk/kfreebsd-8/debian/patches/series
Log:
update ip6.v6only patches



Modified: trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff	2010-07-26 05:59:40 UTC (rev 3072)
+++ trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff	2010-07-26 06:13:24 UTC (rev 3073)
@@ -1,11 +1,20 @@
---- a/sys/netinet6/ip6_input.c
-+++ b/sys/netinet6/ip6_input.c
-@@ -205,7 +205,7 @@
- 	V_ip6_rr_prune = 5;	 /* router renumbering prefix
-                                   * walk list every 5 sec. */
- 	V_ip6_mcast_pmtu = 0;	 /* enable pMTU discovery for multicast? */
--	V_ip6_v6only = 1;
-+	V_ip6_v6only = 0;
- 	V_ip6_keepfaith = 0;
- 	V_ip6_log_time = (time_t)0L;
- #ifdef IPSTEALTH
+--- a/sys/netinet6/in6_proto.c
++++ b/sys/netinet6/in6_proto.c
+@@ -393,7 +393,7 @@
+ VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
+ VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
+ VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
+-VNET_DEFINE(int, ip6_accept_rtadv) = 0;
++VNET_DEFINE(int, ip6_accept_rtadv) = 1;
+ VNET_DEFINE(int, ip6_maxfragpackets);	/* initialized in frag6.c:frag6_init() */
+ VNET_DEFINE(int, ip6_maxfrags);		/* initialized in frag6.c:frag6_init() */
+ VNET_DEFINE(int, ip6_log_interval) = 5;
+@@ -406,7 +406,7 @@
+ VNET_DEFINE(int, ip6_rr_prune) = 5;	/* router renumbering prefix
+ 					 * walk list every 5 sec. */
+ VNET_DEFINE(int, ip6_mcast_pmtu) = 0;	/* enable pMTU discovery for multicast? */
+-VNET_DEFINE(int, ip6_v6only) = 1;
++VNET_DEFINE(int, ip6_v6only) = 0;
+ 
+ VNET_DEFINE(int, ip6_keepfaith) = 0;
+ VNET_DEFINE(time_t, ip6_log_time) = (time_t)0L;

Deleted: trunk/kfreebsd-8/debian/patches/916_ip6.accept_rtadv.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/916_ip6.accept_rtadv.diff	2010-07-26 05:59:40 UTC (rev 3072)
+++ trunk/kfreebsd-8/debian/patches/916_ip6.accept_rtadv.diff	2010-07-26 06:13:24 UTC (rev 3073)
@@ -1,11 +0,0 @@
---- a/sys/netinet6/ip6_input.c
-+++ b/sys/netinet6/ip6_input.c
-@@ -196,7 +196,7 @@
- 	V_ip6_sendredirects = IPV6_SENDREDIRECTS;
- 	V_ip6_defhlim = IPV6_DEFHLIM;
- 	V_ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
--	V_ip6_accept_rtadv = 0;	 /* "IPV6FORWARDING ? 0 : 1" is dangerous */
-+	V_ip6_accept_rtadv = 1;	 /* "IPV6FORWARDING ? 0 : 1" is dangerous */
- 	V_ip6_log_interval = 5;
- 	V_ip6_hdrnestlimit = 15; /* How many header options will we process? */
- 	V_ip6_dad_count = 1;	 /* DupAddrDetectionTransmits */

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2010-07-26 05:59:40 UTC (rev 3072)
+++ trunk/kfreebsd-8/debian/patches/series	2010-07-26 06:13:24 UTC (rev 3073)
@@ -21,6 +21,5 @@
 913_uudecode.diff
 914_psm.diff
 915_ip6.v6only.diff
-916_ip6.accept_rtadv.diff
 950_no_stack_protector.diff
 999_config.diff