upg eudev glib2 grub linux linux-firmware
This commit is contained in:
parent
02a42e6674
commit
ca28e7d573
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
pkgbase=eudev
|
||||
pkgname=(eudev libeudev)
|
||||
pkgver=3.2.12
|
||||
pkgrel=05 ## correct description of pkg version
|
||||
pkgver=3.2.14
|
||||
pkgrel=01 ## correct description of pkg version
|
||||
_udev_ver=251
|
||||
pkgdesc="The userspace dev tools (udev) - sticky patched as udev-251"
|
||||
# This is the old official gentoo fork source location
|
||||
|
|
@ -17,7 +17,7 @@ pkgdesc="The userspace dev tools (udev) - sticky patched as udev-251"
|
|||
#source=("git+https://anongit.gentoo.org/git/proj/eudev.git"
|
||||
url="https://github.com/eudev-project/eudev/releases/download"
|
||||
source=($url/v$pkgver/$pkgbase-$pkgver.tar.gz{,.asc}
|
||||
https://github.com/orbea/gentoo/raw/089352efcf0f31fc0d9829976bad2ae3049d031c/sys-fs/eudev/files/eudev-3.2.12-sticky-tags.patch
|
||||
# https://github.com/orbea/gentoo/raw/089352efcf0f31fc0d9829976bad2ae3049d031c/sys-fs/eudev/files/eudev-3.2.12-sticky-tags.patch
|
||||
initcpio_hooks
|
||||
initcpio_install
|
||||
udev-hwdb.hook )
|
||||
|
|
@ -35,7 +35,7 @@ prepare(){
|
|||
|
||||
## https://github.com/orbea/gentoo/blob/089352efcf0f31fc0d9829976bad2ae3049d031c/sys-fs/eudev/files/eudev-3.2.12-sticky-tags.patch
|
||||
## https://github.com/KenjiBrown/without-systemd/commit/2b6f3b42897f2d1d71afa3f2ada60f2b22db449f#diff-22b39d4a24ab8aeca2a195b4f97229cd70df46cd88f1bfb4afd1c14d8a163a8e
|
||||
patch -Np1 < ../eudev-3.2.12-sticky-tags.patch
|
||||
## patch -Np1 < ../eudev-3.2.12-sticky-tags.patch
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ build() {
|
|||
}
|
||||
|
||||
package_eudev() {
|
||||
pkgdesc="The userspace dev tools (udev) - sticky patched as udev-251"
|
||||
pkgdesc="The userspace dev tools (udev)"
|
||||
backup=(
|
||||
'etc/udev/udev.conf'
|
||||
'usr/lib/udev/rules.d/80-net-name-slot.rules'
|
||||
|
|
@ -91,7 +91,7 @@ package_eudev() {
|
|||
}
|
||||
|
||||
package_libeudev() {
|
||||
pkgdesc="The userspace dev tools library (libudev) - sticky patched as udev-251"
|
||||
pkgdesc="The userspace dev tools library (libudev)"
|
||||
depends=(glib2 glibc)
|
||||
conflicts=('libudev.so' 'libeudev-git' 'libudev-zero')
|
||||
replaces=('libudev-zero' 'libudev')
|
||||
|
|
@ -110,12 +110,13 @@ license=(GPL)
|
|||
|
||||
validpgpkeys=('BA60BC20F37E59444D6D25001365720913D2F22D') # Boian Bonev (GnuPG Release Key) <bbonev@ipacct.com>
|
||||
|
||||
sha256sums=(ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8 # eudev-3.2.12.tar.gz
|
||||
dcd34d674f98c436a757d335f153a7768eed74a8b7fe7330b03be1164cf590d1 # eudev-3.2.12.tar.gz.asc
|
||||
SKIP # eudev-3.2.12-sticky-tags.patch
|
||||
sha256sums=(8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f # eudev-3.2.14.tar.gz
|
||||
515f81eb968c7580fdea3023dee5e1e136aeb77fbef4e8a86ad76b933b1cf722 # eudev-3.2.14.tar.gz.asc
|
||||
# SKIP # eudev-3.2.12-sticky-tags.patch
|
||||
892ce43218e0a458981bbce451252c8987dc398e60b8de288e7542b8f2409c13 # initcpio_hooks
|
||||
77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875 # initcpio_install
|
||||
846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151) # udev-hwdb.hook
|
||||
|
||||
## cb26ca9f8860e169c29c3c40fcd4514d194145dbe1e8742f0e4730627b4b71f1 eudev-3.2.12-05-x86_64.pkg.tar.lz
|
||||
## e05e5786cd5b8c2bd7fb0fd57495ee4ffe7cff6ab702669da82fb30d40687547 libeudev-3.2.12-05-x86_64.pkg.tar.lz
|
||||
## 86e19e2fe6d989fdb051a00a3764132b67b8f8477b6cf7893916a6f9fa2d830a eudev-3.2.14-01-x86_64.pkg.tar.lz
|
||||
## a56274c8275f9b9f41486f1a7ea2e3be6c3aa8ac1e444643c4102cef408b01f5 libeudev-3.2.14-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,5 @@ gtk-doc
|
|||
intltool
|
||||
gperf
|
||||
kbd
|
||||
autoconf
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#pkgname=(glib2 glib2-docs)
|
||||
pkgname=glib2
|
||||
pkgver=2.78.0
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
depends=(pcre2 libffi util-linux-libs zlib) # libsysprof-capture)
|
||||
|
|
@ -121,4 +121,4 @@ sha256sums=(SKIP
|
|||
557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8 # gio-querymodules.hook
|
||||
64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook
|
||||
|
||||
## 606bdcc63ef0466783903412d7e2e2cedd5c212650a25aef68109a4fc6ae30af glib2-2.78.0-02-x86_64.pkg.tar.lz
|
||||
## e46f3a46774d5fd05360d7ac82cba5d3df6db8fde0956a5d4fd56c2ec807e7d4 glib2-2.78.0-03-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pkgname=(
|
|||
glib2-docs
|
||||
)
|
||||
pkgver=2.78.0
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
license=(LGPL)
|
||||
|
|
|
|||
|
|
@ -12,3 +12,4 @@ gtk-doc
|
|||
libglvnd
|
||||
|
||||
|
||||
graphite
|
||||
|
|
|
|||
|
|
@ -0,0 +1,214 @@
|
|||
[PATCH v3] Fix XFS directory extent parsing
|
||||
From: Jon DeVree
|
||||
Subject: [PATCH v3] Fix XFS directory extent parsing
|
||||
Date: Wed, 27 Sep 2023 20:43:55 -0400
|
||||
|
||||
The XFS directory entry parsing code has never been completely correct
|
||||
for extent based directories. The parser correctly handles the case
|
||||
where the directory is contained in a single extent, but then mistakenly
|
||||
assumes the data blocks for the multiple extent case are each identical
|
||||
to the single extent case. The difference in the format of the data
|
||||
blocks between the two cases is tiny enough that its gone unnoticed for
|
||||
a very long time.
|
||||
|
||||
A recent change introduced some additional bounds checking into the XFS
|
||||
parser. Like GRUB's existing parser, it is correct for the single extent
|
||||
case but incorrect for the multiple extent case. When parsing a
|
||||
directory with multiple extents, this new bounds checking is sometimes
|
||||
(but not always) tripped and triggers an "invalid XFS diretory entry"
|
||||
error. This probably would have continued to go unnoticed but the
|
||||
/boot/grub/<arch> directory is large enough that it often has multiple
|
||||
extents.
|
||||
|
||||
The difference between the two cases is that when there are multiple
|
||||
extents, the data blocks do not contain a trailer nor do they contain
|
||||
any leaf information. That information is stored in a separate set of
|
||||
extents dedicated to just the leaf information. These extents come after
|
||||
the directory entry extents and are not included in the inode size. So
|
||||
the existing parser already ignores the leaf extents.
|
||||
|
||||
The only reason to read the trailer/leaf information at all is so that
|
||||
the parser can avoid misinterpreting that data as directory entries. So
|
||||
this updates the parser as follows:
|
||||
|
||||
For the single extent case the parser doesn't change much:
|
||||
1. Read the size of the leaf information from the trailer
|
||||
2. Set the end pointer for the parser to the start of the leaf
|
||||
information. (The previous bounds checking set the end pointer to the
|
||||
start of the trailer, so this is actually a small improvement.)
|
||||
3. Set the entries variable to the expected number of directory entries.
|
||||
|
||||
For the multiple extent case:
|
||||
1. Set the end pointer to the end of the block.
|
||||
2. Do not set up the entries variable. Figuring out how many entries are
|
||||
in each individual block is complex and does not seem worth it when
|
||||
it appears to be safe to just iterate over the entire block.
|
||||
|
||||
Notes:
|
||||
* When there is only one extent there will only ever be one block. If
|
||||
more than one block is required then XFS will always switch to holding
|
||||
leaf information in a separate extent.
|
||||
* B-tree based directories seems to be parsed properly by the same code
|
||||
that handles multiple extents. This is unlikely to ever occur within
|
||||
/boot though because its only used when there are an extremely large
|
||||
number of directory entries.
|
||||
|
||||
Fixes: ef7850c75 (fs/xfs: Fix issues found while fuzzing the XFS filesystem)
|
||||
Fixes: b2499b29c (Adds support for the XFS filesystem.)
|
||||
Fixes: https://savannah.gnu.org/bugs/?64376
|
||||
|
||||
Signed-off-by: Jon DeVree <nuxi@vault24.org>
|
||||
---
|
||||
|
||||
Notes:
|
||||
Changes from v2:
|
||||
* Fix bounds check on filename
|
||||
|
||||
Changes from v1:
|
||||
* Address review feedback
|
||||
|
||||
grub-core/fs/xfs.c | 51 +++++++++++++++++++++++++++++++++-------------
|
||||
1 file changed, 37 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
|
||||
index b91cd32b4..acdfb1a7b 100644
|
||||
--- a/grub-core/fs/xfs.c
|
||||
+++ b/grub-core/fs/xfs.c
|
||||
@@ -223,6 +223,12 @@ struct grub_xfs_inode
|
||||
/* Size of struct grub_xfs_inode v2, up to unused4 member included. */
|
||||
#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 76)
|
||||
|
||||
+struct grub_xfs_dir_leaf_entry
|
||||
+{
|
||||
+ grub_uint32_t hashval;
|
||||
+ grub_uint32_t address;
|
||||
+} GRUB_PACKED;
|
||||
+
|
||||
struct grub_xfs_dirblock_tail
|
||||
{
|
||||
grub_uint32_t leaf_count;
|
||||
@@ -877,9 +883,8 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
||||
{
|
||||
struct grub_xfs_dir2_entry *direntry =
|
||||
grub_xfs_first_de(dir->data, dirblock);
|
||||
- int entries;
|
||||
- struct grub_xfs_dirblock_tail *tail =
|
||||
- grub_xfs_dir_tail(dir->data, dirblock);
|
||||
+ int entries = -1;
|
||||
+ char *end = dirblock + dirblk_size;
|
||||
|
||||
numread = grub_xfs_read_file (dir, 0, 0,
|
||||
blk << dirblk_log2,
|
||||
@@ -890,14 +895,27 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
||||
return 0;
|
||||
}
|
||||
|
||||
- entries = (grub_be_to_cpu32 (tail->leaf_count)
|
||||
- - grub_be_to_cpu32 (tail->leaf_stale));
|
||||
+ /* leaf and tail information are only in the data block if the number
|
||||
+ * of extents is 1 */
|
||||
+ if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1))
|
||||
+ {
|
||||
+ struct grub_xfs_dirblock_tail *tail =
|
||||
+ grub_xfs_dir_tail(dir->data, dirblock);
|
||||
+ end = (char *)tail;
|
||||
|
||||
- if (!entries)
|
||||
- continue;
|
||||
+ /* subtract the space used by leaf nodes */
|
||||
+ end -= grub_be_to_cpu32 (tail->leaf_count) *
|
||||
+ sizeof (struct grub_xfs_dir_leaf_entry);
|
||||
+
|
||||
+ entries = (grub_be_to_cpu32 (tail->leaf_count)
|
||||
+ - grub_be_to_cpu32 (tail->leaf_stale));
|
||||
+
|
||||
+ if (!entries)
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
/* Iterate over all entries within this block. */
|
||||
- while ((char *)direntry < (char *)tail)
|
||||
+ while ((char *)direntry < (char *)end)
|
||||
{
|
||||
grub_uint8_t *freetag;
|
||||
char *filename;
|
||||
@@ -917,7 +935,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
||||
}
|
||||
|
||||
filename = (char *)(direntry + 1);
|
||||
- if (filename + direntry->len - 1 > (char *) tail)
|
||||
+ if (filename + direntry->len + 1 > (char *) end)
|
||||
return grub_error (GRUB_ERR_BAD_FS, "invalid XFS directory entry");
|
||||
|
||||
/* The byte after the filename is for the filetype, padding, or
|
||||
@@ -931,11 +949,16 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
||||
return 1;
|
||||
}
|
||||
|
||||
- /* Check if last direntry in this block is
|
||||
- reached. */
|
||||
- entries--;
|
||||
- if (!entries)
|
||||
- break;
|
||||
+ /* the expected number of directory entries is only tracked for the
|
||||
+ * single extent case */
|
||||
+ if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1))
|
||||
+ {
|
||||
+ /* Check if last direntry in this block is
|
||||
+ reached. */
|
||||
+ entries--;
|
||||
+ if (!entries)
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
/* Select the next directory entry. */
|
||||
direntry = grub_xfs_next_de(dir->data, direntry);
|
||||
--
|
||||
2.40.1
|
||||
|
||||
[PATCH 1/1] fs/xfs: Incorrect short form directory data boundary check
|
||||
From: Lidong Chen
|
||||
Subject: [PATCH 1/1] fs/xfs: Incorrect short form directory data boundary check
|
||||
Date: Thu, 28 Sep 2023 22:33:44 +0000
|
||||
|
||||
After parsing of the current entry, the entry pointer is advanced
|
||||
to the next entry at the end of the 'for' loop. In case where the
|
||||
last entry is at the end of the data boundary, the advanced entry
|
||||
pointer can point off the data boundary. The subsequent boundary
|
||||
check for the advanced entry pointer can cause a failure.
|
||||
|
||||
The fix is to include the boundary check into the 'for' loop
|
||||
condition.
|
||||
|
||||
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
||||
---
|
||||
grub-core/fs/xfs.c | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
|
||||
index b91cd32b4..ebf962793 100644
|
||||
--- a/grub-core/fs/xfs.c
|
||||
+++ b/grub-core/fs/xfs.c
|
||||
@@ -816,7 +816,8 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
||||
if (iterate_dir_call_hook (parent, "..", &ctx))
|
||||
return 1;
|
||||
|
||||
- for (i = 0; i < head->count; i++)
|
||||
+ for (i = 0; i < head->count &&
|
||||
+ (grub_uint8_t *) de < ((grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data)); i++)
|
||||
{
|
||||
grub_uint64_t ino;
|
||||
grub_uint8_t *inopos = grub_xfs_inline_de_inopos(dir->data, de);
|
||||
@@ -852,10 +852,6 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
||||
de->name[de->len] = c;
|
||||
|
||||
de = grub_xfs_inline_next_de(dir->data, head, de);
|
||||
-
|
||||
- if ((grub_uint8_t *) de >= (grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data))
|
||||
- return grub_error (GRUB_ERR_BAD_FS, "invalid XFS directory entry");
|
||||
-
|
||||
}
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.30.2
|
||||
|
|
@ -24,7 +24,7 @@ _tag='bb59f566e1e5c387dbfd342bb3767f761422c744' # git rev-parse grub-${_pkgver}
|
|||
_pkgver=2.12rc1
|
||||
_unifont_ver='15.1.02'
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=03
|
||||
pkgrel=04
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
backup=('etc/default/grub'
|
||||
'etc/grub.d/40_custom')
|
||||
|
|
@ -60,6 +60,7 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
|
|||
'0002-10_linux-detect-archlinux-initramfs.patch'
|
||||
'0003-support-dropins-for-default-configuration.patch'
|
||||
'0004-ntfs-module-security.patch'
|
||||
'0005-fix-xfs-boundary-check.patch'
|
||||
'grub.default'
|
||||
'grub.default.run'
|
||||
'grub.default.66'
|
||||
|
|
@ -125,6 +126,12 @@ prepare() {
|
|||
echo "Patch to fix ntfs module security vulnerabilities"
|
||||
patch -Np1 -i "${srcdir}/0004-ntfs-module-security.patch"
|
||||
|
||||
# #79857
|
||||
# https://lists.gnu.org/archive/html/grub-devel/2023-09/msg00113.html
|
||||
# https://savannah.gnu.org/bugs/?64514
|
||||
echo "Patch to fo fix XFS incorrect short form directory data boundary check"
|
||||
patch -Np1 -i "${srcdir}/0005-fix-xfs-boundary-check.patch"
|
||||
|
||||
echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
|
||||
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
|
||||
|
||||
|
|
@ -322,7 +329,7 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL3')
|
||||
license=('GPL-3.0-or-later')
|
||||
|
||||
validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
||||
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
|
||||
|
|
@ -336,6 +343,7 @@ sha256sums=(SKIP
|
|||
8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch
|
||||
b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47 # 0003-support-dropins-for-default-configuration.patch
|
||||
4bdd5ceb13dbd4c41fde24163f16a0ba05447d821e74d938a0b9e5fce0431140 # 0004-ntfs-module-security.patch
|
||||
9f8921b2bacd69bde7ab0c3aff88c678d52c2a625c89264fb92184e7427b819b # 0005-fix-xfs-boundary-check.patch
|
||||
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
|
||||
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
|
||||
adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
|
||||
|
|
@ -346,5 +354,4 @@ sha256sums=(SKIP
|
|||
#echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
|
||||
## 95ee50a5c5d266d576dda6dbf10a3ae1395599bb1bf4ae59263f0217c41f281b grub-2:2.12rc1-03-x86_64.pkg.tar.lz
|
||||
|
||||
## 962d1adff84a5fd66225a4da62af225f28740c7f3caa1f24ffffb125f9a28977 grub-2:2.12rc1-04-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ _tag='bb59f566e1e5c387dbfd342bb3767f761422c744' # git rev-parse grub-${_pkgver}
|
|||
_pkgver=2.12rc1
|
||||
_unifont_ver='15.1.02'
|
||||
pkgver=${_pkgver/-/}
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
url='https://www.gnu.org/software/grub/'
|
||||
arch=('x86_64')
|
||||
license=('GPL3')
|
||||
license=('GPL-3.0-or-later')
|
||||
backup=('etc/default/grub'
|
||||
'etc/grub.d/40_custom')
|
||||
install="${pkgname}.install"
|
||||
|
|
@ -64,6 +64,7 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
|
|||
'0002-10_linux-detect-archlinux-initramfs.patch'
|
||||
'0003-support-dropins-for-default-configuration.patch'
|
||||
'0004-ntfs-module-security.patch'
|
||||
'0005-fix-xfs-boundary-check.patch'
|
||||
'grub.default'
|
||||
'sbat.csv')
|
||||
|
||||
|
|
@ -75,6 +76,7 @@ sha256sums=('SKIP'
|
|||
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
|
||||
'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47'
|
||||
'4bdd5ceb13dbd4c41fde24163f16a0ba05447d821e74d938a0b9e5fce0431140'
|
||||
'9f8921b2bacd69bde7ab0c3aff88c678d52c2a625c89264fb92184e7427b819b'
|
||||
'7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
|
||||
'98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
|
||||
|
||||
|
|
@ -134,9 +136,16 @@ prepare() {
|
|||
echo "Patch to support dropins for default configuration..."
|
||||
patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
|
||||
|
||||
# #79857
|
||||
# https://lists.gnu.org/archive/html/grub-devel/2023-09/msg00113.html
|
||||
# https://savannah.gnu.org/bugs/?64514
|
||||
echo "Patch to fo fix XFS incorrect short form directory data boundary check"
|
||||
patch -Np1 -i "${srcdir}/0005-fix-xfs-boundary-check.patch"
|
||||
|
||||
echo "Patch to fix ntfs module security vulnerabilities"
|
||||
patch -Np1 -i "${srcdir}/0004-ntfs-module-security.patch"
|
||||
|
||||
|
||||
echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
|
||||
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ pkgname=(linux-firmware-whence linux-firmware amd-ucode
|
|||
linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x})
|
||||
_tag=20230804
|
||||
pkgver=20230804.7be2766d
|
||||
pkgrel=2
|
||||
pkgrel=02
|
||||
pkgdesc="Firmware files for Linux"
|
||||
url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
|
||||
makedepends=(git)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ pkgver=5.10.197
|
|||
pkgrel=01
|
||||
pkgdesc='LTS Linux 5.10 + nvme-fix patch w/o zstd & ipv6'
|
||||
_url="https://www.kernel.org/"
|
||||
makedepends=(bc kmod libelf pahole cpio perl tar xz python)
|
||||
makedepends=(bc kmod libelf pahole cpio perl tar xz)
|
||||
# python)
|
||||
# xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick python-six ) ## for docs
|
||||
options=('!strip')
|
||||
_srcname=linux-$pkgver
|
||||
|
|
@ -58,12 +59,13 @@ build() {
|
|||
## make htmldocs
|
||||
|
||||
_package() {
|
||||
pkgdesc="The $pkgdesc kernel and modules w/o zstd ipv6 touchscreen"
|
||||
pkgdesc="The $pkgdesc kernel and modules w/o zstd ipv6"
|
||||
depends=(coreutils kmod initramfs)
|
||||
optdepends=('wireless-regdb: to set the correct wireless channels of your country'
|
||||
'linux-firmware: firmware images needed for some devices')
|
||||
provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
|
||||
replaces=(virtualbox-guest-modules wireguard)
|
||||
provides=(KSMBD-MODULE VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
|
||||
replaces=(virtualbox-guest-modules wireguard
|
||||
virtualbox-guest-modules-arch wireguard-arch)
|
||||
|
||||
cd $_srcname
|
||||
local kernver="$(<version)"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,17 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgbase=linux
|
||||
pkgver=5.15.133
|
||||
pkgver=5.15.134
|
||||
pkgrel=01
|
||||
pkgdesc='Linux LTS 5.15 w/o zstd ipv6 + vfio i915 patch'
|
||||
url="https://www.kernel.org/"
|
||||
makedepends=(bc libelf pahole cpio perl tar xz gettext)
|
||||
# python-sphinx python-sphinx_rtd_theme graphviz imagemagick)
|
||||
makedepends=(bc kmod libelf pahole cpio perl tar xz)
|
||||
# gettext python-sphinx python-sphinx_rtd_theme graphviz imagemagick)
|
||||
# texlive-latexextra) ## for building docs
|
||||
options=('!strip')
|
||||
_srcname=linux-$pkgver
|
||||
source=(https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
|
||||
url="https://cdn.kernel.org/pub/linux/kernel"
|
||||
source=($url/v5.x/$_srcname.tar.{xz,sign}
|
||||
config # the main kernel config file
|
||||
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
|
||||
0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
|
||||
|
|
@ -29,10 +30,10 @@ export KBUILD_BUILD_HOST=joborun
|
|||
export KBUILD_BUILD_USER=$pkgbase
|
||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
||||
|
||||
_make() {
|
||||
test -s version
|
||||
make KERNELRELEASE="$(<version)" "$@"
|
||||
}
|
||||
#_make() {
|
||||
# test -s version
|
||||
# make KERNELRELEASE="$(<version)" "$@"
|
||||
#}
|
||||
|
||||
prepare() {
|
||||
cd $_srcname
|
||||
|
|
@ -41,9 +42,9 @@ prepare() {
|
|||
scripts/setlocalversion --save-scmversion
|
||||
echo "-$pkgrel" > localversion.10-pkgrel
|
||||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||
make defconfig
|
||||
make -s kernelrelease > version
|
||||
make mrproper
|
||||
# make defconfig
|
||||
# make -s kernelrelease > version
|
||||
# make mrproper
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
|
|
@ -56,45 +57,43 @@ prepare() {
|
|||
|
||||
echo "Setting joborun config..."
|
||||
cp ../config .config
|
||||
_make olddefconfig
|
||||
diff -u ../config .config || :
|
||||
make olddefconfig
|
||||
# diff -u ../config .config || :
|
||||
|
||||
# make -s kernelrelease > version
|
||||
make -s kernelrelease > version
|
||||
echo "Prepared $pkgbase version $(<version)"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $_srcname
|
||||
_make all
|
||||
# _make htmldocs
|
||||
make all
|
||||
}
|
||||
## _make htmldocs
|
||||
|
||||
_package() {
|
||||
pkgdesc="The $pkgdesc kernel and modules"
|
||||
depends=(coreutils initramfs kmod)
|
||||
optdepends=(
|
||||
'wireless-regdb: to set the correct wireless channels of your country'
|
||||
'linux-firmware: firmware images needed for some devices'
|
||||
)
|
||||
provides=(KSMBD-MODULE VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE )
|
||||
pkgdesc="The $pkgdesc kernel and modules w/o zstd ipv6"
|
||||
depends=(coreutils kmod initramfs)
|
||||
optdepends=('wireless-regdb: to set the correct wireless channels of your country'
|
||||
'linux-firmware: firmware images needed for some devices')
|
||||
provides=(KSMBD-MODULE VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
|
||||
replaces=(virtualbox-guest-modules wireguard
|
||||
virtualbox-guest-modules-arch
|
||||
wireguard-arch)
|
||||
virtualbox-guest-modules-arch wireguard-arch)
|
||||
|
||||
cd $_srcname
|
||||
local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
|
||||
local kernver="$(<version)"
|
||||
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
|
||||
|
||||
echo "Installing boot image..."
|
||||
# systemd expects to find the kernel here to allow hibernation
|
||||
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
|
||||
install -Dm644 "$(_make -s image_name)" "$modulesdir/vmlinuz"
|
||||
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
|
||||
|
||||
# Used by mkinitcpio to name the kernel
|
||||
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
|
||||
|
||||
echo "Installing modules..."
|
||||
_make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
|
||||
DEPMOD=/doesnt/exist modules_install # Suppress depmod
|
||||
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
|
||||
DEPMOD=/doesnt/exist modules_install # Suppress depmod
|
||||
|
||||
# remove build and source links
|
||||
rm "$modulesdir"/{source,build}
|
||||
|
|
@ -205,7 +204,7 @@ _package-headers() {
|
|||
# ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
|
||||
#}
|
||||
|
||||
pkgname=("$pkgbase" "$pkgbase-headers" ) # "$pkgbase-docs")
|
||||
pkgname=("$pkgbase" "$pkgbase-headers") # "$pkgbase-docs")
|
||||
for _p in "${pkgname[@]}"; do
|
||||
eval "package_$_p() {
|
||||
$(declare -f "_package${_p#$pkgbase}")
|
||||
|
|
@ -223,18 +222,16 @@ validpgpkeys=(ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
|
|||
647F28654894E3BD457199BE38DBBDC86092693E) # Greg Kroah-Hartman
|
||||
|
||||
# https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc --> sha256sums
|
||||
# sha256sums:ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz
|
||||
# sha256sums:f37182aecb57ed6853d01e1074d3a60a653331e35f3115728381e08be050b9d3 linux-5.15.134.tar.xz
|
||||
|
||||
sha256sums=(ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd # linux-5.15.133.tar.xz
|
||||
e5ff9fcd263e39bcaf16cf09a34c36557b78bd2b8ac9200389d21fedeff5b5b1 # linux-5.15.133.tar.sign
|
||||
b5da221c8c32091fc59c5f1acb358e2649b20c06259cef90c55d9698302d8452 # config
|
||||
sha256sums=(f37182aecb57ed6853d01e1074d3a60a653331e35f3115728381e08be050b9d3 # linux-5.15.134.tar.xz
|
||||
24b245ecafa96a61f8f37cdf2159ae29523b193662b658c66ea0d94cf20b6842 # linux-5.15.134.tar.sign
|
||||
617ff2f2bc3f790dcb5ecbb4da958f2ee442256005469ad7185694ad36d33dfa # config
|
||||
3b5cfc9ca9cf778ea2c4b619b933cda26519969df2d764b5a687f63cf59974cd # 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
|
||||
c175fbb141c3cec013c799f694d88310375ac5456042f6a4a1adc7667836d786 # 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
|
||||
8357f000b2b622e73dcfd41c2bad42b5e99fffe8f7ee64f774aa771f86cef43c # 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
|
||||
5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde # 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
|
||||
067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9 # 0005-lg-laptop-Recognize-more-models.patch
|
||||
856230cfbdc2bb53a4920dfbcb6fb2d58427b7b184e5f94e21f08011d0a2fcc6 # i915-vga-arbiter.patch
|
||||
c2ff5ff08c10c1fe7a473ce80a665eb28f70ec616d5e258a04a27cfc17198613) # sha256sums
|
||||
436279faa9bef342b4a455288f79449cd450812e77b33154dc9a5a6a2287932a) # sha256sums
|
||||
|
||||
## 67a6426baee512ee07636efc5437cca8bb05dc3cef369f45540088bc87d3cb3f linux-5.15.133-01-x86_64.pkg.tar.lz
|
||||
## 2c76c03beb7e745dac6bdc01f91befdc740a56238baf75e9ffd7fa24c230bc05 linux-headers-5.15.133-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
15
linux/config
15
linux/config
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 5.15.133 Kernel Configuration
|
||||
# Linux/x86 5.15.134 Kernel Configuration
|
||||
#
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230804"
|
||||
|
|
@ -2506,15 +2506,16 @@ CONFIG_BLK_DEV_FD=m
|
|||
CONFIG_CDROM=m
|
||||
# CONFIG_PARIDE is not set
|
||||
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
|
||||
CONFIG_ZRAM=m
|
||||
CONFIG_ZRAM_DEF_COMP_LZORLE=y
|
||||
CONFIG_ZRAM_DEF_COMP_ZSTD=n
|
||||
CONFIG_ZRAM_DEF_COMP_LZ4=y
|
||||
CONFIG_ZRAM=n
|
||||
# those with #C are turned off with zram=n
|
||||
#CONFIG_ZRAM_DEF_COMP_LZORLE=y
|
||||
#CONFIG_ZRAM_DEF_COMP_ZSTD=n
|
||||
#CONFIG_ZRAM_DEF_COMP_LZ4=y
|
||||
# CONFIG_ZRAM_DEF_COMP_LZO is not set
|
||||
# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
|
||||
# CONFIG_ZRAM_DEF_COMP_842 is not set
|
||||
CONFIG_ZRAM_DEF_COMP="lzo-rle"
|
||||
CONFIG_ZRAM_WRITEBACK=y
|
||||
#CONFIG_ZRAM_DEF_COMP="lzo-rle"
|
||||
#CONFIG_ZRAM_WRITEBACK=y
|
||||
# CONFIG_ZRAM_MEMORY_TRACKING is not set
|
||||
CONFIG_BLK_DEV_LOOP=m
|
||||
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
|
||||
|
|
|
|||
12
linux/deps
12
linux/deps
|
|
@ -1,13 +1,11 @@
|
|||
bc
|
||||
pahole
|
||||
cpio
|
||||
xmlto
|
||||
python-sphinx
|
||||
python-sphinx_rtd_theme
|
||||
graphviz
|
||||
imagemagick
|
||||
bison
|
||||
gettext
|
||||
pahole
|
||||
libgit2
|
||||
libjpeg-turbo
|
||||
graphite
|
||||
python
|
||||
|
||||
|
||||
python-fuse
|
||||
|
|
|
|||
|
|
@ -857,6 +857,7 @@ b4846c8e3c0b3ee97d84fce74e67093c286483034a634c526128397e85f5de28 ChangeLog-5.15
|
|||
eb9231a8edbb65c2cb995d5533c5d114845e08f43f5456583835bd468001a026 ChangeLog-5.15.131
|
||||
d73492ca45b313a503a7ba5b78622399dd889b6d06de385bfafdbe4d728225ee ChangeLog-5.15.132
|
||||
e80cf447d0f283922328045dcf698d8342bebebfb913b4cd56e14d4e3be716c8 ChangeLog-5.15.133
|
||||
56ee68d983f931aff056f12c805f069640a84e82bac795218ed648266f26f5ba ChangeLog-5.15.134
|
||||
8973679b5da41c4f9f3a12edf2598bcea3ee4a4988a179f36c4c8d4ec9c96e6f ChangeLog-5.16
|
||||
694254b586ab67c329bc79a3b0a60f74771b97aebe314aff66c944ec454acb98 ChangeLog-5.16.1
|
||||
5f029a42102d90a5ca51c2d7d64095dbd846fbf6391582ac9e2f7a791e33b3dd ChangeLog-5.16.2
|
||||
|
|
@ -2645,6 +2646,8 @@ b6e864da04436d35bcdafbfd3546c67691488c479e8890b09c614e3b9f2dd44a linux-5.15.132
|
|||
4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac linux-5.15.132.tar.xz
|
||||
ba1965b132c2a20ec7daea0c2fba1502f7b528397cb328daaa62ca7c65180090 linux-5.15.133.tar.gz
|
||||
ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz
|
||||
5398e612ecda1ea39d14242767fd74625a236699f1ae9e0b41a16672237993e9 linux-5.15.134.tar.gz
|
||||
f37182aecb57ed6853d01e1074d3a60a653331e35f3115728381e08be050b9d3 linux-5.15.134.tar.xz
|
||||
d4791f2eddeb25c4e6ae0b2f9b3f5fb3fd394d7f9a57fa3e33de6dd9761480f6 linux-5.16.tar.gz
|
||||
027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz
|
||||
5c91875fd84393b6a8a6352f5f7a2fedbed3708e06dc8cc465a9f5a86d1324f5 linux-5.16.1.tar.gz
|
||||
|
|
@ -3653,6 +3656,7 @@ ea551fa64a48e34ba03e7349436a9bf998b19444845129819a6074d785892025 patch-5.15.125
|
|||
83c41f12a8e9a870a272a7b69eba21e1843df3a108029fdd45480ea3eae16df1 patch-5.15.131.xz
|
||||
5817a2669b18da67e99a0d079347b8a4cca4c5e46b1e932e4fa56170604b3207 patch-5.15.132.xz
|
||||
84e89fca135831bcfd64321bcc5e5619da130a3367a8713c84f37ba0ace4f9e9 patch-5.15.133.xz
|
||||
870267c6c9d47534c083c51adcc2e423d7bd52950173ca2cc23586a4902aed07 patch-5.15.134.xz
|
||||
cdc44e99ee873ef2fe27f1ca62120ad225e8d59a99506db3ebfd31e0c7f6796b patch-5.16.xz
|
||||
9ff97f3a01ec8744863ff611315c44c1f5d1ff551769f7d8359c85561dee1b1d patch-5.16.1.xz
|
||||
3a09c2f1ad410c09cf03921abeed1a6ca7c38138fb508171ee673d429d179171 patch-5.16.2.xz
|
||||
|
|
@ -3732,17 +3736,17 @@ fdabf20292982e808a26b87f2f29493ba9f20a87d958dc592018ba1a381669df patch-5.19.15.
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCAAGBQJlDq3NAAoJEGMtOgZYnaax/p0P/1lnvLtSDWBE7BuuOWLkdNdB
|
||||
Tioc6QHVvC2k1mu6ZKGgmnJoN/au497vmiaNtyKHcsfLZtTzOOJh32U7buSO5gys
|
||||
TSu67cceIa+4MR25Bgx6K9JyH/WMMFM4EcHmz0Q6svrCWDid+b4AIxgY6c3qSVaJ
|
||||
01lkxX9xOSd6j+JuapigjLiCXPrJKwsOUNwyNVpRxgmUuOF6DK0+FPADMuVuRhIJ
|
||||
zdW1ZeWs90WgVydG+9Q//Ug+LNXolybGkqjGskef9GCcxJmDPQAWJTXAF/Ww9p9y
|
||||
+jCNjUfc2nHbssm9vOBVOJ4yi5Ha2Dpm+dfJJ/d1xjPcznnw9syMidM6m+wLpZ9x
|
||||
B2ubNis66QKQyWJnH3v/uqtjkp3EFYzjE7jKnqBp4Z6SY5hdpj9VlREEjyndIp+J
|
||||
YkvtOoKEqaouxU9Ip92dRaxwmn0UcK3xVAmMECeUlrCWBOmB38kZ2s4Q9CbTpWDy
|
||||
664OAC4hTYXj2Zsi2W++WUPO2QlloWytGg3bkbJiahY2BY08rKVR7AWnmYV8N9p8
|
||||
NWIUvsDrMFmoj6IX9VWRpfAyByfAEp1mQvSZnoXjPeC6s53pW/S3dDrSB7Bq1X9/
|
||||
JE4q7gEqagCzoZi7tYhwH7thmyxbqCbh8kxIuK4bcklg4d5eMwIGM+lUu97GuHu+
|
||||
BY6BXQeyDNTx9HpLrlHK
|
||||
=9Kun
|
||||
iQIcBAEBCAAGBQJlH+/EAAoJEGMtOgZYnaax6aoP/0QAB9DxkXb34GIGsotMgHv2
|
||||
w5ZYqrzYGkNSmXQkBtICIDr73PPyNiGLvl9UpUtsS+QVG3Bmqg12K3DZ452xpw99
|
||||
8O3NS9gspPnweiJyzIdecnqyoJ4WubHdMMRn9GNxELHPRr9YZ0MplW25mAD+9zb2
|
||||
12b4qHgPxnkHCxEktcrBWfdh0BdFUXCi7kwvnoAi5wXxZ7ONvX/BOoCH+68gJyTp
|
||||
Y/U/5dU3/+VZYKDv7Vrxr+th6qCTFSGJTp1t+oydRY7rmOcXdzBx8WQU7s4XJxlp
|
||||
dPyksfKR9kqJv/oNt6G/C8oRUsByU+Qe2hDU1owCj+x77gOPeuf4X3GIpQvITNbY
|
||||
Tcrd4N3K2AL+UEO0et9ea1lP7htv8Kkta39rWR4ue3THIiOtkpl8sB1i6VUWEfuc
|
||||
QJ5u9i1UqDH5raqnoyKAnZ1mctvHDQtexNncVIieHd/WPsdSDnjB0E+RgZUhR2ce
|
||||
eKXxawfV/eFo4t4IGCnnNCq1FwqVpbCQ4tWhT4/bVbjS20FOFwDercyScy6KoUKy
|
||||
2t9mbGDcE1vfUWXeVXYDmO6XN97RY8aTnE+N3q/9c0geJ+zyRwl24IIqZAtyi95C
|
||||
k4/QrI/M/bseZOjFR0qIIxBt3/Xao8EUh/tGDmm2nxEQcdso3PvbYSQmDGV6oJpA
|
||||
X6GijPs3U/rLlKRz/LCV
|
||||
=rfFM
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
Loading…
Reference in New Issue