Ticket #454: diff

File diff, 6.4 KB (added by jakllsch@…, 12 years ago)

patch for IPsec kmod ipkgs

  • target/linux/aruba-2.6/config

    diff -Nur openwrt/target/linux/aruba-2.6/config openwrt_patch/target/linux/aruba-2.6/config
    old new  
    241241CONFIG_PACKET=y 
    242242CONFIG_PACKET_MMAP=y 
    243243CONFIG_UNIX=y 
    244 # CONFIG_NET_KEY is not set 
     244CONFIG_NET_KEY=m 
    245245CONFIG_INET=y 
    246246# CONFIG_IP_MULTICAST is not set 
    247247# CONFIG_IP_ADVANCED_ROUTER is not set 
     
    252252# CONFIG_ARPD is not set 
    253253# CONFIG_SYN_COOKIES is not set 
    254254# CONFIG_IPSEC_NAT_TRAVERSAL is not set 
    255 # CONFIG_INET_AH is not set 
    256 # CONFIG_INET_ESP is not set 
     255CONFIG_INET_AH=m 
     256CONFIG_INET_ESP=m 
    257257# CONFIG_INET_IPCOMP is not set 
    258258# CONFIG_INET_TUNNEL is not set 
    259259# CONFIG_INET_DIAG is not set 
     
    266266# CONFIG_IP_VS is not set 
    267267CONFIG_IPV6=m 
    268268# CONFIG_IPV6_PRIVACY is not set 
    269 # CONFIG_INET6_AH is not set 
    270 # CONFIG_INET6_ESP is not set 
     269CONFIG_INET6_AH=m 
     270CONFIG_INET6_ESP=m 
    271271# CONFIG_INET6_IPCOMP is not set 
    272272# CONFIG_INET6_TUNNEL is not set 
    273273# CONFIG_IPV6_TUNNEL is not set 
  • target/linux/brcm-2.6/config

    diff -Nur openwrt/target/linux/brcm-2.6/config openwrt_patch/target/linux/brcm-2.6/config
    old new  
    259259CONFIG_UNIX=y 
    260260CONFIG_XFRM=y 
    261261# CONFIG_XFRM_USER is not set 
    262 # CONFIG_NET_KEY is not set 
     262CONFIG_NET_KEY=m 
    263263CONFIG_INET=y 
    264264CONFIG_IP_MULTICAST=y 
    265265CONFIG_IP_ADVANCED_ROUTER=y 
     
    279279# CONFIG_IP_MROUTE is not set 
    280280# CONFIG_ARPD is not set 
    281281# CONFIG_SYN_COOKIES is not set 
    282 # CONFIG_INET_AH is not set 
    283 # CONFIG_INET_ESP is not set 
     282CONFIG_INET_AH=m 
     283CONFIG_INET_ESP=m 
    284284# CONFIG_INET_IPCOMP is not set 
    285285CONFIG_INET_TUNNEL=m 
    286286CONFIG_INET_DIAG=m 
     
    305305# CONFIG_IP_VS is not set 
    306306CONFIG_IPV6=m 
    307307# CONFIG_IPV6_PRIVACY is not set 
    308 # CONFIG_INET6_AH is not set 
    309 # CONFIG_INET6_ESP is not set 
     308CONFIG_INET6_AH=m 
     309CONFIG_INET6_ESP=m 
    310310# CONFIG_INET6_IPCOMP is not set 
    311311# CONFIG_INET6_TUNNEL is not set 
    312312# CONFIG_IPV6_TUNNEL is not set 
  • target/linux/Config.in

    diff -Nur openwrt/target/linux/Config.in openwrt_patch/target/linux/Config.in
    old new  
    6060        help 
    6161          Kernel modules for IPv6 protocol support 
    6262 
     63config BR2_PACKAGE_KMOD_AF_KEY 
     64        prompt "kmod-af-key....................... IPsec AF_KEY support" 
     65        tristate 
     66        default m 
     67        depends BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA 
     68        select BR2_PACKAGE_KMOD_CRYPTO 
     69        help 
     70          Kernel module to support control of IPsec protocol 
     71 
     72config BR2_PACKAGE_KMOD_IPSEC4 
     73        prompt "kmod-ipsec4....................... IPv4 IPsec support" 
     74        tristate 
     75        default m 
     76        depends BR2_PACKAGE_KMOD_AF_KEY 
     77        help 
     78          Kernel modules for IPv4 IPsec protocol support 
     79 
     80config BR2_PACKAGE_KMOD_IPSEC6 
     81        prompt "kmod-ipsec6....................... IPv6 IPsec support" 
     82        tristate 
     83        default m 
     84        depends BR2_PACKAGE_KMOD_AF_KEY 
     85        select BR2_PACKAGE_KMOD_IPV6 
     86        help 
     87          Kernel modules for IPv6 IPsec protocol support 
     88 
    6389config BR2_PACKAGE_KMOD_PPP 
    6490        prompt "kmod-ppp.......................... PPP support" 
    6591        tristate 
  • target/linux/control/kmod-af-key.control

    diff -Nur openwrt/target/linux/control/kmod-af-key.control openwrt_patch/target/linux/control/kmod-af-key.control
    old new  
     1Package: kmod-af-key 
     2Priority: optional 
     3Section: net 
     4Maintainer: Jonathan Kollasch <jakllsch@kollasch.net> 
     5Source: buildroot internal 
     6Description: Kernel module for control of IPsec functions 
  • target/linux/control/kmod-ipsec4.control

    diff -Nur openwrt/target/linux/control/kmod-ipsec4.control openwrt_patch/target/linux/control/kmod-ipsec4.control
    old new  
     1Package: kmod-ipsec4 
     2Priority: optional 
     3Section: net 
     4Maintainer: Jonathan Kollasch <jakllsch@kollasch.net> 
     5Source: buildroot internal 
     6Description: Kernel modules for the IPv4 IPsec protocol 
  • target/linux/control/kmod-ipsec6.control

    diff -Nur openwrt/target/linux/control/kmod-ipsec6.control openwrt_patch/target/linux/control/kmod-ipsec6.control
    old new  
     1Package: kmod-ipsec6 
     2Priority: optional 
     3Section: net 
     4Maintainer: Jonathan Kollasch <jakllsch@kollasch.net> 
     5Source: buildroot internal 
     6Description: Kernel modules for the IPv6 IPsec protocol 
  • target/linux/generic-2.6/modules.mk

    diff -Nur openwrt/target/linux/generic-2.6/modules.mk openwrt_patch/target/linux/generic-2.6/modules.mk
    old new  
    127127        $(MODULES_DIR)/kernel/crypto/*.ko \ 
    128128)) 
    129129 
     130$(eval $(call KMOD_template,AF_KEY,af-key,\ 
     131        $(MODULES_DIR)/kernel/net/key/af_key.ko \ 
     132,CONFIG_NET_KEY,,30,af_key)) 
     133 
     134$(eval $(call KMOD_template,IPSEC4,ipsec4,\ 
     135        $(MODULES_DIR)/kernel/net/ipv4/ah4.ko \ 
     136        $(MODULES_DIR)/kernel/net/ipv4/esp4.ko \ 
     137,,,30,ah4 esp4)) 
     138 
     139$(eval $(call KMOD_template,IPSEC6,ipsec6,\ 
     140        $(MODULES_DIR)/kernel/net/ipv6/ah6.ko \ 
     141        $(MODULES_DIR)/kernel/net/ipv6/esp6.ko \ 
     142,,kmod-ipv6,30,ah6 esp6)) 
    130143 
    131144# Filesystems 
    132145 
  • target/linux/x86-2.6/config

    diff -Nur openwrt/target/linux/x86-2.6/config openwrt_patch/target/linux/x86-2.6/config
    old new  
    298298CONFIG_UNIX=y 
    299299CONFIG_XFRM=y 
    300300# CONFIG_XFRM_USER is not set 
    301 # CONFIG_NET_KEY is not set 
     301CONFIG_NET_KEY=m 
    302302CONFIG_INET=y 
    303303CONFIG_IP_MULTICAST=y 
    304304CONFIG_IP_ADVANCED_ROUTER=y 
     
    318318# CONFIG_ARPD is not set 
    319319# CONFIG_SYN_COOKIES is not set 
    320320CONFIG_IPSEC_NAT_TRAVERSAL=y 
    321 # CONFIG_INET_AH is not set 
    322 # CONFIG_INET_ESP is not set 
     321CONFIG_INET_AH=m 
     322CONFIG_INET_ESP=m 
    323323# CONFIG_INET_IPCOMP is not set 
    324324CONFIG_INET_TUNNEL=m 
    325325CONFIG_INET_DIAG=m 
     
    333333# CONFIG_IP_VS is not set 
    334334CONFIG_IPV6=m 
    335335# CONFIG_IPV6_PRIVACY is not set 
    336 # CONFIG_INET6_AH is not set 
    337 # CONFIG_INET6_ESP is not set 
     336CONFIG_INET6_AH=m 
     337CONFIG_INET6_ESP=m 
    338338# CONFIG_INET6_IPCOMP is not set 
    339339# CONFIG_INET6_TUNNEL is not set 
    340340# CONFIG_IPV6_TUNNEL is not set