[arch-commits] Commit in kernel26/repos (4 files)

[Tobias Powalowski]

    Date: Saturday, June 13, 2009 @ 05:35:31
  Author: tpowa
Revision: 42333

Merged revisions 42329 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kernel26/trunk

........
  r42329 | tpowa | 2009-06-13 09:14:44 +0000 (Sa, 13 Jun 2009) | 1 line
  
  upgpkg: kernel26 2.6.30-3
........

Modified:
  kernel26/repos/testing-i686/	(properties)
  kernel26/repos/testing-i686/PKGBUILD
  kernel26/repos/testing-i686/config
  kernel26/repos/testing-i686/config.x86_64

---------------+
 PKGBUILD      |   11 +++++------
 config        |   17 ++++++++++++++++-
 config.x86_64 |   17 ++++++++++++++++-
 3 files changed, 37 insertions(+), 8 deletions(-)


Property changes on: kernel26/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26/trunk:1-42283
   + /kernel26/trunk:1-42332

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-06-13 09:15:59 UTC (rev 42332)
+++ testing-i686/PKGBUILD	2009-06-13 09:35:31 UTC (rev 42333)
@@ -6,8 +6,8 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.30
 pkgver=${_basekernel}
-pkgrel=2
-_patchname="patch-${pkgver}-2-ARCH"
+pkgrel=3
+_patchname="patch-${pkgver}-3-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -32,9 +32,9 @@
         kernel26.preset)
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('7a80058a6382e5108cdb5554d1609615'
-         'fbd34383c58d890f847afa71f17eddbb'
-         '008d7fbbbf7cad976579f9a160024215'
-         '120929395e90ac29b2c6dea26a78b081'
+         'f9b19a983b736f80abc89e9b3a555243'
+         '981f853be98fa303ec57b049942abe39'
+         'c71fd6e0ff9c04a40fbc09d02f69c5e9'
          '25584700a0a679542929c4bed31433b6')
 
 build() {
@@ -186,4 +186,3 @@
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
 }
-

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2009-06-13 09:15:59 UTC (rev 42332)
+++ testing-i686/config	2009-06-13 09:35:31 UTC (rev 42333)
@@ -782,7 +782,22 @@
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_IP_DCCP is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2009-06-13 09:15:59 UTC (rev 42332)
+++ testing-i686/config.x86_64	2009-06-13 09:35:31 UTC (rev 42333)
@@ -749,7 +749,22 @@
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_IP_DCCP is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set