summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Jonglez2016-03-22 13:28:44 +0100
committerBaptiste Jonglez2016-03-22 13:28:44 +0100
commit7d4786e823353caa55a1fef981d1fba11137d571 (patch)
tree479f189859064eed2adf928d46819645bbd52413
parenta1a666590e37775af0c7930adaf88c3f6f020e81 (diff)
downloadaur-7d4786e823353caa55a1fef981d1fba11137d571.tar.gz
linux-mptcp: #46714 update MROUTE options for IPV4 and IPV6
See r249341 in upstream arch packages.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--config6
-rw-r--r--config.x86_648
4 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 848213a8628f..4252eedbf0cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Mar 22 12:12:31 UTC 2016
+# Tue Mar 22 12:28:44 UTC 2016
pkgbase = linux-mptcp
pkgver = 0.91.525000.c6ba013
- pkgrel = 6
+ pkgrel = 7
url = http://www.multipath-tcp.org/
arch = i686
arch = x86_64
@@ -20,8 +20,8 @@ pkgbase = linux-mptcp
source = linux.preset
source = change-default-console-loglevel.patch
md5sums = SKIP
- md5sums = 66d14ef493bcaa511d30971f6700b1fd
- md5sums = c57269218f72871358034ad80fccfca2
+ md5sums = 4ae449d62080bbb6bafa187b9ed61583
+ md5sums = dc3a39f20cc762c09c7a161c98d62fae
md5sums = eb14dcfd80c00852ef81ded6e826826a
md5sums = 92562f0a5d8cc0e5972ab58523dbe0a4
diff --git a/PKGBUILD b/PKGBUILD
index e05ae29cda12..bbf6f887b359 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=linux-mptcp
_srcname=mptcp
_mptcpv=0.91
pkgver=0.91.525000.c6ba013
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url="http://www.multipath-tcp.org/"
license=('GPL2')
@@ -21,8 +21,8 @@ source=("git://github.com/multipath-tcp/mptcp#branch=mptcp_v${_mptcpv}"
'linux.preset'
'change-default-console-loglevel.patch')
md5sums=('SKIP'
- '66d14ef493bcaa511d30971f6700b1fd'
- 'c57269218f72871358034ad80fccfca2'
+ '4ae449d62080bbb6bafa187b9ed61583'
+ 'dc3a39f20cc762c09c7a161c98d62fae'
'eb14dcfd80c00852ef81ded6e826826a'
'92562f0a5d8cc0e5972ab58523dbe0a4')
diff --git a/config b/config
index 2bff5db8625d..3e6ad15118b2 100644
--- a/config
+++ b/config
@@ -814,7 +814,7 @@ CONFIG_NET_IP_TUNNEL=m
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
@@ -883,7 +883,9 @@ CONFIG_IPV6_TUNNEL=m
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_MPTCP=y
CONFIG_MPTCP_PM_ADVANCED=y
diff --git a/config.x86_64 b/config.x86_64
index bca530d9f046..4b2e8c0fb704 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.20-6 Kernel Configuration
+# Linux/x86 4.1.20-7 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -806,7 +806,7 @@ CONFIG_NET_IP_TUNNEL=m
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
@@ -875,7 +875,9 @@ CONFIG_IPV6_TUNNEL=m
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_MPTCP=y
CONFIG_MPTCP_PM_ADVANCED=y