X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=280b902fef845055a4c1e2b22c10cb5888b1557b;hb=1d9ad34298fbb15b6572f4d3d88419e8eca20f17;hp=b00d9ed8bb546e573390628e25dbc7e9d517911d;hpb=c776bcc9cb636d0cfc7a3253182095f0a4fbed54;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index b00d9ed8..280b902f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@
 %bcond_without	esfq		# esfq support
 %bcond_without	ipv6		# ipv6 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
 
@@ -72,7 +72,7 @@
 
 %define		rel		1
 %define		basever		4.4
-%define		postver		.40
+%define		postver		.113
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -124,7 +124,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	717be4305bb4b6d026582f13ae986ba2
+# Patch0-md5:	b480cea7675b9f0394ecb99061bb0793
 %endif
 Source1:	kernel.sysconfig
 
@@ -192,8 +192,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.4.111-vs2.3.9.6
+# http://vserver.13thfloor.at/Experimental/patch-4.4.113-vs2.3.9.6.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)
@@ -252,7 +252,7 @@ BuildRequires:	elftoaout
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	/sbin/depmod
-BuildRequires:	gcc >= 5:3.2
+BuildRequires:	gcc >= 6:7.2.0-6
 BuildRequires:	xz >= 1:4.999.7
 AutoReqProv:	no
 BuildRequires:	hostname
@@ -316,7 +316,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