X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=adee46d3b5d3caa9f7e1fadd9287a211ac5639b2;hb=dd927ed92d390e901378d99390ce39681b0864e7;hp=ed9ff8c3e406997c8ade3295a08a325c41489527;hpb=671f53166a1e84703d5e71f6b21b7c3aceedaceb;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index ed9ff8c3..adee46d3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -31,7 +31,7 @@
 
 %bcond_without	aufs		# aufs4 support
 
-%bcond_with	vserver		# support for VServer
+%bcond_without	vserver		# support for VServer
 
 %bcond_with	rt		# real-time kernel (CONFIG_PREEMPT_RT) for low latencies
 
@@ -73,7 +73,7 @@
 
 %define		rel		1
 %define		basever		4.9
-%define		postver		.47
+%define		postver		.124
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -125,7 +125,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	b3c2f0a15f538597811e7389bd553f38
+# Patch0-md5:	a80f1ffe5fed53d15ca14246e8923488
 %endif
 Source1:	kernel.sysconfig
 
@@ -187,8 +187,8 @@ Patch59:	kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	kernel-hostap.patch
 
-%define	vserver_patch 3.18.5-vs2.3.7.3
-# http://vserver.13thfloor.at/Experimental/patch-3.18.5-vs2.3.7.3.diff
+%define	vserver_patch 4.9.82-vs2.3.9.7
+# http://vserver.13thfloor.at/Experimental/patch-4.9.80-vs2.3.9.7.diff
 # note there are additional patches from above url:
 # - *fix* are real fixes (we want these)
 # - *feat* are new features/tests (we don't want these)
@@ -213,7 +213,7 @@ Patch146:	kernel-aufs4+vserver.patch
 Patch250:	kernel-fix_256colors_menuconfig.patch
 
 # https://rt.wiki.kernel.org/
-# https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.27-rt18.patch.xz
+# http://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.68-rt60.patch.xz
 Patch500:	kernel-rt.patch
 
 Patch2000:	kernel-small_fixes.patch
@@ -242,7 +242,7 @@ BuildRequires:	binutils >= 3:2.18
 BuildRequires:	elftoaout
 %endif
 BuildRequires:	elfutils-devel
-BuildRequires:	gcc >= 5:3.2
+BuildRequires:	gcc >= 6:7.2.0-6
 BuildRequires:	hostname
 BuildRequires:	kmod >= 12-2
 BuildRequires:	openssl-devel
@@ -309,7 +309,7 @@ Conflicts:	reiserfsprogs < 3.6.3
 Conflicts:	rpm < 4.4.2-0.2
 Conflicts:	udev < 1:081
 Conflicts:	util-linux < 2.10o
-Conflicts:	util-vserver < 0.30.216
+Conflicts:	util-vserver < 0.30.216-1.pre3126.3
 Conflicts:	xfsprogs < 2.6.0
 %if %{without pae}
 ExclusiveArch:	i686 pentium3 pentium4 athlon