upg sudo libgpg-error grub

This commit is contained in:
joborun linux 2022-06-10 01:04:16 +03:00
parent 0adb64a998
commit 4c6402a155
12 changed files with 185 additions and 44 deletions

View file

@ -20,11 +20,11 @@ _GRUB_EMU_BUILD="0"
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2
_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
_unifont_ver='14.0.02'
_pkgver=2.06
_commit='2f4430cc0a44fd8c8aa7aee5c51887667ad3d6c3'
_unifont_ver='14.0.04'
_pkgver=2.06.r261.g2f4430cc0
pkgver=${_pkgver/-/}
pkgrel=06
pkgrel=01
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
backup=('etc/default/grub'
@ -53,23 +53,23 @@ if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
'sdl: For grub-emu SDL support')
fi
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
#"git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
'git+https://git.savannah.gnu.org/git/gnulib.git'
"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
'0001-00_header-add-GRUB_COLOR_-variables.patch'
'0002-10_linux-detect-archlinux-initramfs.patch'
'grub.default'
'grub.default.run'
'grub.default.66'
'sbat.csv')
_backports=(
# fs/xfs: Fix unreadable filesystem with v4 superblock
'a4b495520e4dc41a896a8b916a64eda9970c50ea'
# fs/btrfs: Use full btrfs bootloader area
'b0f06a81c6f31b6fa20be67a96b6683bba8210c9'
)
#_backports=(
#
#)
_configure_options=(
PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
FREETYPE="pkg-config freetype2"
BUILD_FREETYPE="pkg-config freetype2"
--enable-mm-debug
@ -104,10 +104,10 @@ prepare() {
echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.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"
@ -252,6 +252,8 @@ _package_grub-common_and_bios() {
echo "Install /etc/default/grub (used by grub-mkconfig)..."
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
install -D -m0644 "${srcdir}/grub.default.66" "${pkgdir}/etc/default/grub.66"
install -D -m0644 "${srcdir}/grub.default.run" "${pkgdir}/etc/default/grub.run"
}
_package_grub-efi() {
@ -265,7 +267,7 @@ _package_grub-efi() {
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
sed -e "s/%PKGVER%/${pkgver}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
}
_package_grub-emu() {
@ -310,9 +312,11 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
sha256sums=(SKIP
SKIP
5b314364d23143755a4b11b641a953c07837f48fefcc7454318e334265e4974b # unifont-14.0.02.bdf.gz
c80ed535fa607fca0f137c42b17f8dec763385d157f99eac9223c9b75dff47ae # unifont-14.0.02.bdf.gz.sig
0bad2b8a46fcc4864c7b4cee4072653a58b9f36e2f54a5a395c7d6dc97766526 # unifont-14.0.04.bdf.gz
c43bf8ae5ca345aff1e7bd7e1aa50834a90db99c8cc1cdc6b0b65a3f71f45797 # unifont-14.0.04.bdf.gz.sig
5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch
8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch
16377fa6bbe007bbbb15ecab98c4ffd4638763e3b034bb4d3e53f764de3c66b1 # grub.default
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df) # sbat.csv

View file

@ -18,11 +18,11 @@ _GRUB_EMU_BUILD="0"
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2
_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
_unifont_ver='14.0.02'
_pkgver=2.06
_commit='2f4430cc0a44fd8c8aa7aee5c51887667ad3d6c3'
_unifont_ver='14.0.04'
_pkgver=2.06.r261.g2f4430cc0
pkgver=${_pkgver/-/}
pkgrel=5
pkgrel=1
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
license=('GPL3')
@ -57,7 +57,7 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
'95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
'git+https://git.savannah.gnu.org/git/gnulib.git'
"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
'0001-00_header-add-GRUB_COLOR_-variables.patch'
@ -67,7 +67,7 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
sha256sums=('SKIP'
'SKIP'
'5b314364d23143755a4b11b641a953c07837f48fefcc7454318e334265e4974b'
'0bad2b8a46fcc4864c7b4cee4072653a58b9f36e2f54a5a395c7d6dc97766526'
'SKIP'
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
@ -75,14 +75,10 @@ sha256sums=('SKIP'
'98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
_backports=(
# fs/xfs: Fix unreadable filesystem with v4 superblock
'a4b495520e4dc41a896a8b916a64eda9970c50ea'
# fs/btrfs: Use full btrfs bootloader area
'b0f06a81c6f31b6fa20be67a96b6683bba8210c9'
)
_configure_options=(
PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
FREETYPE="pkg-config freetype2"
BUILD_FREETYPE="pkg-config freetype2"
--enable-mm-debug
@ -278,7 +274,7 @@ _package_grub-efi() {
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
sed -e "s/%PKGVER%/${pkgver}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
}
_package_grub-emu() {

View file

@ -14,3 +14,5 @@ autoconf
automake
bison
os-prober

View file

@ -2,7 +2,7 @@
GRUB_DEFAULT=0
GRUB_TIMEOUT=8
GRUB_DISTRIBUTOR="joborun linux"
GRUB_DISTRIBUTOR="joborun linux w/runit"
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet init=/usr/bin/runit-init"
GRUB_CMDLINE_LINUX=""
@ -61,3 +61,4 @@ GRUB_INIT_TUNE="333 565 2"
# functionality install os-prober and uncomment to detect and include other
# operating systems.
GRUB_DISABLE_OS_PROBER=false

63
grub/grub.default.66 Normal file
View file

@ -0,0 +1,63 @@
# GRUB boot loader configuration
GRUB_DEFAULT=0
GRUB_TIMEOUT=8
GRUB_DISTRIBUTOR="joborun linux with 66"
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet "
GRUB_CMDLINE_LINUX=""
# Preload both GPT and MBR modules so that they are not missed
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
# Uncomment to enable booting from LUKS encrypted devices
#GRUB_ENABLE_CRYPTODISK=y
# Set to 'countdown' or 'hidden' to change timeout behavior,
# press ESC key to display menu.
GRUB_TIMEOUT_STYLE=menu
# Uncomment to use basic console
GRUB_TERMINAL_INPUT=console
# Uncomment to disable graphical terminal
#GRUB_TERMINAL_OUTPUT=console
# The resolution used on graphical terminal
# note that you can use only modes which your graphic card supports via VBE
# you can see them in real GRUB with the command `vbeinfo'
GRUB_GFXMODE=auto
# Uncomment to allow the kernel use the same resolution used by grub
GRUB_GFXPAYLOAD_LINUX=keep
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
#GRUB_DISABLE_LINUX_UUID=true
# Uncomment to disable generation of recovery mode menu entries
GRUB_DISABLE_RECOVERY=true
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
GRUB_COLOR_NORMAL="light-cyan/black"
GRUB_COLOR_HIGHLIGHT="yellow/blue"
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
#GRUB_BACKGROUND="/path/to/wallpaper"
#GRUB_THEME="/path/to/gfxtheme"
# Uncomment to get a beep at GRUB start
GRUB_INIT_TUNE="333 565 2"
# Uncomment to make GRUB remember the last selection. This requires
# setting 'GRUB_DEFAULT=saved' above.
#GRUB_SAVEDEFAULT=true
# Uncomment to disable submenus in boot menu
#GRUB_DISABLE_SUBMENU=y
# Probing for other operating systems is disabled for security reasons. Read
# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this
# functionality install os-prober and uncomment to detect and include other
# operating systems.
GRUB_DISABLE_OS_PROBER=false

64
grub/grub.default.run Normal file
View file

@ -0,0 +1,64 @@
# GRUB boot loader configuration
GRUB_DEFAULT=0
GRUB_TIMEOUT=8
GRUB_DISTRIBUTOR="joborun linux w/runit"
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 ipv6.disable=1 loglevel=0 quiet init=/usr/bin/runit-init"
GRUB_CMDLINE_LINUX=""
# Preload both GPT and MBR modules so that they are not missed
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
# Uncomment to enable booting from LUKS encrypted devices
#GRUB_ENABLE_CRYPTODISK=y
# Set to 'countdown' or 'hidden' to change timeout behavior,
# press ESC key to display menu.
GRUB_TIMEOUT_STYLE=menu
# Uncomment to use basic console
GRUB_TERMINAL_INPUT=console
# Uncomment to disable graphical terminal
#GRUB_TERMINAL_OUTPUT=console
# The resolution used on graphical terminal
# note that you can use only modes which your graphic card supports via VBE
# you can see them in real GRUB with the command `vbeinfo'
GRUB_GFXMODE=auto
# Uncomment to allow the kernel use the same resolution used by grub
GRUB_GFXPAYLOAD_LINUX=keep
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
#GRUB_DISABLE_LINUX_UUID=true
# Uncomment to disable generation of recovery mode menu entries
GRUB_DISABLE_RECOVERY=true
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
GRUB_COLOR_NORMAL="light-cyan/black"
GRUB_COLOR_HIGHLIGHT="yellow/blue"
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
#GRUB_BACKGROUND="/path/to/wallpaper"
#GRUB_THEME="/path/to/gfxtheme"
# Uncomment to get a beep at GRUB start
GRUB_INIT_TUNE="333 565 2"
# Uncomment to make GRUB remember the last selection. This requires
# setting 'GRUB_DEFAULT=saved' above.
#GRUB_SAVEDEFAULT=true
# Uncomment to disable submenus in boot menu
#GRUB_DISABLE_SUBMENU=y
# Probing for other operating systems is disabled for security reasons. Read
# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this
# functionality install os-prober and uncomment to detect and include other
# operating systems.
GRUB_DISABLE_OS_PROBER=false

View file

@ -7,7 +7,7 @@
pkgname=libgpg-error
pkgver=1.45
pkgrel=01
pkgrel=02
pkgdesc="Support library for libgcrypt"
arch=(x86_64)
url="https://www.gnupg.org"
@ -41,13 +41,19 @@ package() {
license=('LGPL')
validpgpkeys=(D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 # Werner Koch
AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
#validpgpkeys=(D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 # Werner Koch
# AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
# 031EC2536E580D8EA286A9F22071B08A33BD3F06 # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
6DAA6E64A76D2840571B4902528897B826403ADA) # "Werner Koch (dist signing 2020)"
# 6DAA6E64A76D2840571B4902528897B826403ADA) # "Werner Koch (dist signing 2020)"
validpgpkeys=(6DAA6E64A76D2840571B4902528897B826403ADA # Werner Koch (dist signing 2020)
AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD) # Niibe Yutaka (GnuPG Release Key)
# Arch lists a different key than what the package is signed by, nevertheless their package is built, which
# indicates they are building disregarding signature errors. And I thought it was only Obarun being negligent!
## with 1.45-2 they corrected the error.
sha256sums=(570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 # libgpg-error-1.45.tar.bz2
51736fef75ae3c020512f6987b046698bd418d960eb0e2fe1a0860749da21444) # libgpg-error-1.45.tar.bz2.sig

View file

@ -3,7 +3,7 @@
pkgname=libgpg-error
pkgver=1.45
pkgrel=1
pkgrel=2
pkgdesc="Support library for libgcrypt"
arch=(x86_64)
url="https://www.gnupg.org"
@ -13,9 +13,8 @@ source=(https://www.gnupg.org/ftp/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.b
# https://www.gnupg.org/download/integrity_check.html
sha1sums=('fe724ed37b4935964059a47b7c64d5f8246659d8'
'SKIP')
validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
'6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)"
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
validpgpkeys+=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
prepare() {
cd ${pkgname}-${pkgver}

View file

@ -1,3 +1,6 @@
autoconf
gettext
automake

View file

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=sudo
_sudover=1.9.11
_sudover=1.9.11p1
pkgrel=01
pkgver=${_sudover/p/.p}
pkgdesc="Give certain users the ability to run some commands as root w/o systemd"
@ -78,6 +78,8 @@ license=('custom')
validpgpkeys=('59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB') # "Todd C. Miller <Todd.Miller@sudo.ws>"
sha256sums=(b5476e30d83ca14734da9370f2206beb21c8a33fc85a504fb8a61d18d8b351be # sudo-1.9.11.tar.gz
ba80ffa7fe55ec4b0d644b1253c7cf1a32a35e7b5cc28f6b75f6490901b5f002 # sudo-1.9.11.tar.gz.sig
sha256sums=(eb8b6c1a69a9adf4b82030b66d99d79214d7cba5031a0be43103a6176b16254b # sudo-1.9.11p1.tar.gz
9afde6ea51f346963fdece12fe3190a8c321f68146c3215924ba4fcde596a624 # sudo-1.9.11p1.tar.gz.sig
d1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2) # sudo.pam

View file

@ -3,7 +3,7 @@
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
_sudover=1.9.11
_sudover=1.9.11p1
pkgrel=1
pkgver=${_sudover/p/.p}
pkgdesc="Give certain users the ability to run some commands as root"
@ -20,7 +20,7 @@ install=$pkgname.install
source=(https://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
sudo_logsrvd.service
sudo.pam)
sha256sums=('b5476e30d83ca14734da9370f2206beb21c8a33fc85a504fb8a61d18d8b351be'
sha256sums=('eb8b6c1a69a9adf4b82030b66d99d79214d7cba5031a0be43103a6176b16254b'
'SKIP'
'8b91733b73171827c360a3e01f4692772b78e62ceca0cf0fd4b770aba35081a1'
'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')

View file

@ -1,2 +1,3 @@