summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoranthraxx2020-04-08 21:02:39 +0200
committeranthraxx2020-04-08 21:02:39 +0200
commit6375f3261e209ac4c77c9e6c48609400d60697c5 (patch)
tree319d34baf9ecb437629d8ecd328db928906911f0
parent5acee3b9f06ac7e02002caa674d862037933d290 (diff)
downloadaur-6375f3261e209ac4c77c9e6c48609400d60697c5.tar.gz
add patch for sphinx >=3
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--config4
-rw-r--r--sphinx-workaround.patch13
4 files changed, 28 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 41cd9e48bbc..574156ae689 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-hardened-git
pkgdesc = Security-Hardened Linux
- pkgver = 5.6.2.r902727.ga28803964450
- pkgrel = 2
+ pkgver = 5.6.3.r902758.gc0e0caa7d429
+ pkgrel = 1
url = https://github.com/anthraxx/linux-hardened
arch = x86_64
license = GPL2
@@ -17,12 +17,14 @@ pkgbase = linux-hardened-git
options = !strip
source = linux-hardened::git+https://github.com/anthraxx/linux-hardened#branch=5.6?signed
source = config
+ source = sphinx-workaround.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 65EEFE022108E2B708CBFCF7F9E712E59AF5F22A
validpgpkeys = E240B57E2C4630BA768E2F26FC1B547C8D8172C8
sha256sums = SKIP
- sha256sums = 4b634080227d5c00e0cbce15daeae45fb729cc20a41ca0edc92dd11953471d76
+ sha256sums = fe7154a72892a74a0e4163980f837d2547c3fcc254da634644a817324a6c20b8
+ sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
pkgname = linux-hardened-git
pkgdesc = The Security-Hardened Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 66291575227..ea7c18554e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
pkgbase=linux-hardened-git
_srcname=${pkgbase/-git/}
_gitbranch=5.6
-pkgver=5.6.2.r902727.ga28803964450
-pkgrel=2
+pkgver=5.6.3.r902758.gc0e0caa7d429
+pkgrel=1
pkgdesc='Security-Hardened Linux'
url='https://github.com/anthraxx/linux-hardened'
arch=(x86_64)
@@ -18,8 +18,10 @@ makedepends=(
git
)
options=('!strip')
-source=("${_srcname}::git+https://github.com/anthraxx/linux-hardened#branch=${_gitbranch}?signed"
- config # the main kernel config files
+source=(
+ "${_srcname}::git+https://github.com/anthraxx/linux-hardened#branch=${_gitbranch}?signed"
+ config # the main kernel config files
+ sphinx-workaround.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -28,7 +30,8 @@ validpgpkeys=(
'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
)
sha256sums=('SKIP'
- '4b634080227d5c00e0cbce15daeae45fb729cc20a41ca0edc92dd11953471d76')
+ 'fe7154a72892a74a0e4163980f837d2547c3fcc254da634644a817324a6c20b8'
+ '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 706de49004b..d3d9d93e4fe 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.0 Kernel Configuration
+# Linux/x86 5.6.3 Kernel Configuration
#
#
@@ -6665,7 +6665,7 @@ CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_DEBUG=y
# CONFIG_SND_DEBUG_VERBOSE is not set
# CONFIG_SND_PCM_XRUN_DEBUG is not set
-CONFIG_SND_CTL_VALIDATION=y
+# CONFIG_SND_CTL_VALIDATION is not set
CONFIG_SND_VMASTER=y
CONFIG_SND_DMA_SGBUF=y
CONFIG_SND_SEQUENCER=m
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 00000000000..1aa3f1c8f66
--- /dev/null
+++ b/sphinx-workaround.patch
@@ -0,0 +1,13 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 3c7bdf4cd31f..9a0ced58a3e9 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
+ 'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
+ 'maintainers_include']
+