joborun-pkg/jobcore
joborun-pkg/jobcore
Template
2
1
Fork 0
Code Issues Pull requests Projects Releases Activity

upg grub

Browse source
This commit is contained in:
joborun linux 2023-12-21 07:38:13 +02:00
parent cc68976d30
commit d277e5d93d
2 changed files with 11 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
grub/PKGBUILD
View file

@ -20,11 +20,11 @@ _GRUB_EMU_BUILD="0"
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2
_tag='bb59f566e1e5c387dbfd342bb3767f761422c744' # git rev-parse grub-${_pkgver}
_pkgver=2.12rc1
_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver}
_pkgver=2.12
_unifont_ver='15.1.04'
pkgver=${_pkgver/-/}
pkgrel=07
pkgrel=01
url='https://www.gnu.org/software/grub/'
backup=('etc/default/grub'
'etc/grub.d/40_custom')
@ -55,17 +55,15 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
'0001-00_header-add-GRUB_COLOR_-variables.patch'
'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'
'sbat.csv')
_backports=(
'aa7c1322671eef48ba72d3b733da37e63eb37328'
'07318ee7e11a00b9c1dea4c6b4edf62af35a511a'
'ad7fb8e2e02bb1dd0475ead9919c1c82514d2ef8'
# 'aa7c1322671eef48ba72d3b733da37e63eb37328'
# '07318ee7e11a00b9c1dea4c6b4edf62af35a511a'
# 'ad7fb8e2e02bb1dd0475ead9919c1c82514d2ef8'
)
_reverts=(
@ -121,15 +119,6 @@ prepare() {
echo "Patch to support dropins for default configuration..."
patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
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"
@ -340,8 +329,6 @@ sha256sums=(SKIP
5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch
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
@ -352,4 +339,5 @@ 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
## 7c19b53d25a7772afefb1fec73c76ad959c81a43db3137bd641e37e01d486105 grub-2_2.12rc1-07-x86_64.pkg.tar.lz
## b7ea9d6bd75040af69c380a6ff1b185047475191bcf920ffd03f3ec5a86deecd grub-2_2.12-01-x86_64.pkg.tar.lz

19
grub/PKGBUILD-arch
View file

@ -18,11 +18,11 @@ _GRUB_EMU_BUILD="0"
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2
_tag='bb59f566e1e5c387dbfd342bb3767f761422c744' # git rev-parse grub-${_pkgver}
_pkgver=2.12rc1
_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver}
_pkgver=2.12
_unifont_ver='15.1.04'
pkgver=${_pkgver/-/}
pkgrel=7
pkgrel=1
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
license=('GPL-3.0-or-later')
@ -63,7 +63,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
'0001-00_header-add-GRUB_COLOR_-variables.patch'
'0002-10_linux-detect-archlinux-initramfs.patch'
'0003-support-dropins-for-default-configuration.patch'
'0004-ntfs-module-security.patch'
'grub.default'
'sbat.csv')
@ -74,14 +73,10 @@ sha256sums=('SKIP'
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47'
'4bdd5ceb13dbd4c41fde24163f16a0ba05447d821e74d938a0b9e5fce0431140'
'7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
'f34c2b0aa2ed4ab9c7e7bcab5197470c30fedc6c2148f337839dd24bceae35fd')
_backports=(
'aa7c1322671eef48ba72d3b733da37e63eb37328'
'07318ee7e11a00b9c1dea4c6b4edf62af35a511a'
'ad7fb8e2e02bb1dd0475ead9919c1c82514d2ef8'
)
_reverts=(
@ -137,14 +132,6 @@ 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"
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"