[arch-commits] Commit in linux-grsec/trunk (PKGBUILD config config.x86_64)

[Daniel Micay]

    Date: Saturday, October 17, 2015 @ 01:04:03
  Author: thestinger
Revision: 144254

match core/linux MROUTE changes

Modified:
  linux-grsec/trunk/PKGBUILD
  linux-grsec/trunk/config
  linux-grsec/trunk/config.x86_64

---------------+
 PKGBUILD      |    4 ++--
 config        |    6 ++++--
 config.x86_64 |    6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-16 23:02:21 UTC (rev 144253)
+++ PKGBUILD	2015-10-16 23:04:03 UTC (rev 144254)
@@ -38,8 +38,8 @@
             'SKIP'
             'bd2e0c17e53c9f9c072603c9a4b7e8cb9f19893ec39c08b36b5448f4c89f60eb'
             'SKIP'
-            'be7b7837098cb3f80a43760362648d327d74427b3f49d0b11286918923c3c029'
-            'f74e8757076b1cc272928790a55383ae5abb45975db7a76cdc442a431e46da68'
+            'f58098b4fa53cd20278b55f77a89b13d60c3a9c8f3ca06865121914ac09de7b9'
+            'e37351f8068b91723520bff31a164be8e9aa98dbbd440aaafc3407d707b5f569'
             'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '0b1e41ba59ae45f5929963aa22fdc53bc8ffb4534e976cec046269d1a462197b'

Modified: config
===================================================================
--- config	2015-10-16 23:02:21 UTC (rev 144253)
+++ config	2015-10-16 23:04:03 UTC (rev 144254)
@@ -798,7 +798,7 @@
 CONFIG_NET_IPGRE=m
 # CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
@@ -860,7 +860,9 @@
 CONFIG_IPV6_GRE=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y

Modified: config.x86_64
===================================================================
--- config.x86_64	2015-10-16 23:02:21 UTC (rev 144253)
+++ config.x86_64	2015-10-16 23:04:03 UTC (rev 144254)
@@ -784,7 +784,7 @@
 CONFIG_NET_IPGRE=m
 # CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
@@ -846,7 +846,9 @@
 CONFIG_IPV6_GRE=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y