diff options
author | Timo Teras <timo.teras@iki.fi> | 2009-08-25 16:47:59 +0400 |
---|---|---|
committer | Timo Teras <timo.teras@iki.fi> | 2009-08-25 16:47:59 +0400 |
commit | cfc69a7e5f5c25b0d6e8189d369642082b29276d (patch) | |
tree | 20f72c809f2ad1ba8232e182fd89f8cba596dd94 /main/linux-grsec | |
parent | bb6d632bbc2d6fb65e4570788dea4eb1cf8b9609 (diff) | |
download | aports-cfc69a7e5f5c25b0d6e8189d369642082b29276d.tar.bz2 aports-cfc69a7e5f5c25b0d6e8189d369642082b29276d.tar.xz |
main/acf-samba: upgrade to 0.3.1
Diffstat (limited to 'main/linux-grsec')
-rw-r--r-- | main/linux-grsec/APKBUILD | 2 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig | 24 |
2 files changed, 21 insertions, 5 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 44122ce943..8670e32eb0 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -116,6 +116,6 @@ d0fc44b54ba5953140b3f2aa9a1f2580 patch-2.6.30.4.bz2 624831f0d2b2caeb2b4756a5b6290c7d grsecurity-2.1.14-2.6.30.4-200908132040.patch 7420c0b1095335990313656b114e1379 linux-nbma-mroute-v4-2.6.30.diff ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch -60adb085be0ab268c0f27279ae2b2bab kernelconfig +d9461120ad8657df4bcf0112f8fb2bb8 kernelconfig 2834240b15805b248ef2a973b1ad4416 linux-grsec.post-install 2834240b15805b248ef2a973b1ad4416 linux-grsec.post-upgrade" diff --git a/main/linux-grsec/kernelconfig b/main/linux-grsec/kernelconfig index 5fd6c53ce4..70334349fb 100644 --- a/main/linux-grsec/kernelconfig +++ b/main/linux-grsec/kernelconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30.4 -# Fri Aug 7 08:30:31 2009 +# Mon Aug 17 10:23:22 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -132,8 +132,11 @@ CONFIG_PCI_QUIRKS=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -# CONFIG_PROFILING is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y # CONFIG_MARKERS is not set +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_IBS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y @@ -895,6 +898,7 @@ CONFIG_NET_SCH_FIFO=y # Network testing # CONFIG_NET_PKTGEN=m +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set CONFIG_CAN=m CONFIG_CAN_RAW=m @@ -1017,6 +1021,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m CONFIG_WIMAX_DEBUG_LEVEL=8 @@ -1464,6 +1469,7 @@ CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -1775,7 +1781,9 @@ CONFIG_R8169=m CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m @@ -3897,7 +3905,9 @@ CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_FS_XIP=y CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=m CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set @@ -4143,9 +4153,10 @@ CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +CONFIG_STACKTRACE=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y @@ -4154,12 +4165,15 @@ CONFIG_FRAME_POINTER=y # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_RING_BUFFER=y +CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y # @@ -4177,9 +4191,11 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_KMEMTRACE is not set # CONFIG_WORKQUEUE_TRACER is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_MMIOTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y @@ -4470,7 +4486,7 @@ CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines |