X-Original-To: alpine-aports@lists.alpinelinux.org Received: from newmail.tetrasec.net (unknown [172.21.74.12]) by lists.alpinelinux.org (Postfix) with ESMTP id 40D5C5C516A for ; Mon, 20 Mar 2017 13:45:26 +0000 (GMT) Received: from ncopa-desktop.copa.dup.pw (15.63.200.37.customer.cdi.no [37.200.63.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by newmail.tetrasec.net (Postfix) with ESMTPSA id 366AF5A0826; Mon, 20 Mar 2017 13:45:24 +0000 (GMT) Date: Mon, 20 Mar 2017 14:45:17 +0100 From: Natanael Copa To: Ivan Tham Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/linux-grsec: Add support for hid wacom tablets Message-ID: <20170320144517.79035661@ncopa-desktop.copa.dup.pw> In-Reply-To: <20170317113756.14827-1-pickfire@riseup.net> References: <20170317113756.14827-1-pickfire@riseup.net> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 17 Mar 2017 19:37:56 +0800 Ivan Tham wrote: > --- > main/linux-grsec/APKBUILD | 4 ++-- > main/linux-grsec/config-grsec.x86 | 46 +++++++++++++----------------------- > main/linux-grsec/config-grsec.x86_64 | 30 +++++------------------ > 3 files changed, 24 insertions(+), 56 deletions(-) I missed this when upgrading to 4.9.16. Do you think you can rebase it? Sorry. Thanks! -nc > diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD > index fbc87c8d..a91f3554 100644 > --- a/main/linux-grsec/APKBUILD > +++ b/main/linux-grsec/APKBUILD > @@ -202,8 +202,8 @@ sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a > 95fbeff3b6cba1e273ea889b96c7cc8750f85587b7abe8f5b6fd29aca10a0105dd8ec7bae9c6a65b1aa8f37a98a67d0cecebe4bf98430d1f0576c21d687d007f patch-4.9.15.xz > 35c9986293abb35f8e8aab3db42cc1a30285e85a39ad102d02c51d554690fb9c1806933b2a12bfc6577430b813882c3d0c327ebb55ee9d05d93210499459017a grsecurity-3.1-4.9.15-201703150049.patch > 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d zfs-fix.patch > -ea609fcb18af50a9cb2ded0de78bcab22467e982b7f659e165ff3f47f5cb24c156a658324fbe9a4399509eaa38f60b97bc696e78fdf988f4bd189d5255941236 config-grsec.x86 > -bf3941e27ecfdcb86859f959be3b8a56458a1f705b8950d84dddc4cc5ac21ce2226941706f11e00fd213da8409ca986d3e544d7f649a7f17c5d0c7717e2c58ae config-grsec.x86_64 > +bb967f6116d1f076ec5517ed907cd0cfe02ffb7fd80bf6769c9eb581431d7989452f355579e977124d41ee506904da8fd11ac6934f45393590daf28bddf98054 config-grsec.x86 > +1f7604d6aa922dd5af55b6ee87dda246798befc9ca38879220781ca06c04da9eab00788f46121c710d53c701ed81a6f6ba3223d751c10b32c1b9940779df8381 config-grsec.x86_64 > 0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277 config-grsec.armhf > 1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4 config-virtgrsec.x86 > 0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0 config-virtgrsec.x86_64" > diff --git a/main/linux-grsec/config-grsec.x86 b/main/linux-grsec/config-grsec.x86 > index 279e5b30..bb21d04c 100644 > --- a/main/linux-grsec/config-grsec.x86 > +++ b/main/linux-grsec/config-grsec.x86 > @@ -1,6 +1,6 @@ > # > # Automatically generated file; DO NOT EDIT. > -# Linux/x86 4.9.8 Kernel Configuration > +# Linux/x86 4.9.15 Kernel Configuration > # > # CONFIG_64BIT is not set > CONFIG_X86_32=y > @@ -105,6 +105,7 @@ CONFIG_TICK_ONESHOT=y > CONFIG_NO_HZ_COMMON=y > # CONFIG_HZ_PERIODIC is not set > CONFIG_NO_HZ_IDLE=y > +# CONFIG_NO_HZ_FULL is not set > CONFIG_NO_HZ=y > CONFIG_HIGH_RES_TIMERS=y > > @@ -112,6 +113,7 @@ CONFIG_HIGH_RES_TIMERS=y > # CPU/Task time and stats accounting > # > CONFIG_TICK_CPU_ACCOUNTING=y > +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set > CONFIG_IRQ_TIME_ACCOUNTING=y > CONFIG_BSD_PROCESS_ACCT=y > CONFIG_BSD_PROCESS_ACCT_V3=y > @@ -267,6 +269,9 @@ CONFIG_GCC_PLUGINS=y > # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set > # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set > # CONFIG_CC_STACKPROTECTOR is not set > +# CONFIG_CC_STACKPROTECTOR_NONE is not set > +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set > +# CONFIG_CC_STACKPROTECTOR_STRONG is not set > CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y > CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y > CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y > @@ -341,6 +346,7 @@ CONFIG_IOSCHED_NOOP=y > CONFIG_IOSCHED_DEADLINE=m > CONFIG_IOSCHED_CFQ=y > CONFIG_CFQ_GROUP_IOSCHED=y > +# CONFIG_DEFAULT_DEADLINE is not set > CONFIG_DEFAULT_CFQ=y > # CONFIG_DEFAULT_NOOP is not set > CONFIG_DEFAULT_IOSCHED="cfq" > @@ -413,8 +419,10 @@ CONFIG_M586=y > # CONFIG_MCYRIXIII is not set > # CONFIG_MVIAC3_2 is not set > # CONFIG_MVIAC7 is not set > +# CONFIG_MPSC is not set > # CONFIG_MCORE2 is not set > # CONFIG_MATOM is not set > +# CONFIG_GENERIC_CPU is not set > CONFIG_X86_GENERIC=y > CONFIG_X86_INTERNODE_CACHE_SHIFT=6 > CONFIG_X86_L1_CACHE_SHIFT=6 > @@ -546,6 +554,8 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 > CONFIG_HOTPLUG_CPU=y > # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set > # CONFIG_DEBUG_HOTPLUG_CPU0 is not set > +# CONFIG_LEGACY_VSYSCALL_EMULATE is not set > +# CONFIG_LEGACY_VSYSCALL_NONE is not set > # CONFIG_CMDLINE_BOOL is not set > CONFIG_MODIFY_LDT_SYSCALL=y > # CONFIG_DEFAULT_MODIFY_LDT_SYSCALL is not set > @@ -2950,34 +2960,6 @@ CONFIG_WIMAX_I2400M=m > CONFIG_WIMAX_I2400M_USB=m > CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 > # CONFIG_WAN is not set > -# CONFIG_HOSTESS_SV11 is not set > -# CONFIG_COSA is not set > -CONFIG_LANMEDIA=m > -# CONFIG_SEALEVEL_4021 is not set > -CONFIG_HDLC=m > -CONFIG_HDLC_RAW=m > -CONFIG_HDLC_RAW_ETH=m > -CONFIG_HDLC_CISCO=m > -CONFIG_HDLC_FR=m > -CONFIG_HDLC_PPP=m > -CONFIG_HDLC_X25=m > -CONFIG_PCI200SYN=m > -CONFIG_WANXL=m > -# CONFIG_WANXL_BUILD_FIRMWARE is not set > -CONFIG_PC300TOO=m > -# CONFIG_N2 is not set > -# CONFIG_C101 is not set > -CONFIG_FARSYNC=m > -CONFIG_DSCC4=m > -CONFIG_DSCC4_PCISYNC=y > -CONFIG_DSCC4_PCI_RST=y > -CONFIG_DLCI=m > -CONFIG_DLCI_MAX=8 > -# CONFIG_SDLA is not set > -CONFIG_LAPBETHER=m > -CONFIG_X25_ASY=m > -CONFIG_SBNI=m > -CONFIG_SBNI_MULTILINE=y > CONFIG_IEEE802154_DRIVERS=m > CONFIG_IEEE802154_FAKELB=m > # CONFIG_IEEE802154_AT86RF230 is not set > @@ -5306,7 +5288,7 @@ CONFIG_HID_HYPERV_MOUSE=m > # CONFIG_HID_TOPSEED is not set > CONFIG_HID_THINGM=m > # CONFIG_HID_THRUSTMASTER is not set > -# CONFIG_HID_WACOM is not set > +CONFIG_HID_WACOM=m > CONFIG_HID_WIIMOTE=m > # CONFIG_HID_XINMO is not set > # CONFIG_HID_ZEROPLUS is not set > @@ -6595,6 +6577,9 @@ CONFIG_HAVE_C_RECORDMCOUNT=y > CONFIG_TRACE_CLOCK=y > CONFIG_RING_BUFFER=y > CONFIG_RING_BUFFER_ALLOW_SWAP=y > +# CONFIG_BRANCH_PROFILE_NONE is not set > +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set > +# CONFIG_PROFILE_ALL_BRANCHES is not set > > # > # Runtime Testing > @@ -6841,6 +6826,7 @@ CONFIG_SECURITYFS=y > # CONFIG_INTEL_TXT is not set > CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y > CONFIG_HARDENED_USERCOPY=y > +# CONFIG_DEFAULT_SECURITY_SELINUX is not set > CONFIG_DEFAULT_SECURITY_DAC=y > CONFIG_DEFAULT_SECURITY="" > CONFIG_XOR_BLOCKS=m > diff --git a/main/linux-grsec/config-grsec.x86_64 b/main/linux-grsec/config-grsec.x86_64 > index 636df60f..af56a3c3 100644 > --- a/main/linux-grsec/config-grsec.x86_64 > +++ b/main/linux-grsec/config-grsec.x86_64 > @@ -1,6 +1,6 @@ > # > # Automatically generated file; DO NOT EDIT. > -# Linux/x86 4.9.8 Kernel Configuration > +# Linux/x86 4.9.15 Kernel Configuration > # > CONFIG_64BIT=y > CONFIG_X86_64=y > @@ -11,6 +11,10 @@ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" > CONFIG_LOCKDEP_SUPPORT=y > CONFIG_STACKTRACE_SUPPORT=y > CONFIG_MMU=y > +CONFIG_ARCH_MMAP_RND_BITS_MIN=28 > +CONFIG_ARCH_MMAP_RND_BITS_MAX=32 > +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 > +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 > CONFIG_NEED_DMA_MAP_STATE=y > CONFIG_NEED_SG_DMA_LENGTH=y > CONFIG_GENERIC_ISA_DMA=y > @@ -2935,28 +2939,6 @@ CONFIG_WIMAX_I2400M=m > CONFIG_WIMAX_I2400M_USB=m > CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 > # CONFIG_WAN is not set > -CONFIG_LANMEDIA=m > -CONFIG_HDLC=m > -CONFIG_HDLC_RAW=m > -CONFIG_HDLC_RAW_ETH=m > -CONFIG_HDLC_CISCO=m > -CONFIG_HDLC_FR=m > -CONFIG_HDLC_PPP=m > -CONFIG_HDLC_X25=m > -CONFIG_PCI200SYN=m > -CONFIG_WANXL=m > -# CONFIG_WANXL_BUILD_FIRMWARE is not set > -CONFIG_PC300TOO=m > -CONFIG_FARSYNC=m > -CONFIG_DSCC4=m > -CONFIG_DSCC4_PCISYNC=y > -CONFIG_DSCC4_PCI_RST=y > -CONFIG_DLCI=m > -CONFIG_DLCI_MAX=8 > -CONFIG_LAPBETHER=m > -CONFIG_X25_ASY=m > -CONFIG_SBNI=m > -CONFIG_SBNI_MULTILINE=y > CONFIG_IEEE802154_DRIVERS=m > CONFIG_IEEE802154_FAKELB=m > # CONFIG_IEEE802154_AT86RF230 is not set > @@ -5170,7 +5152,7 @@ CONFIG_HID_HYPERV_MOUSE=m > # CONFIG_HID_TOPSEED is not set > CONFIG_HID_THINGM=m > # CONFIG_HID_THRUSTMASTER is not set > -# CONFIG_HID_WACOM is not set > +CONFIG_HID_WACOM=m > CONFIG_HID_WIIMOTE=m > # CONFIG_HID_XINMO is not set > # CONFIG_HID_ZEROPLUS is not set --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---