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

upg archlinux-keyring zsh grub

Browse source
This commit is contained in:
joborun linux 2023-07-04 16:35:49 +03:00
parent f9802be8f3
commit 56492d8581
11 changed files with 81 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
archlinux-keyring/PKGBUILD
View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=archlinux-keyring
_tag='402794057267604ef3b5900a23f5934e10bdfcae' # git rev-parse ${pkgver}
pkgver=20230629
_tag='40df671d4ba5a23a03624ecb1d5c4a6629b2dc54' # git rev-parse ${pkgver}
pkgver=20230704
pkgrel=01
pkgdesc='Arch Linux PGP keyring'
url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/'
@ -55,4 +55,5 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse <ewo
sha256sums=(SKIP)
## 5cab82d4d57d0f25a1aae6d0af17ec68d93e083ce454ab0e9a30c137bddabbe3 archlinux-keyring-20230629-01-x86_64.pkg.tar.lz
## d0e2f538f57e315598a03d52ccf6809591d150bbdda795d40ae085e529c526c2 archlinux-keyring-20230704-01-x86_64.pkg.tar.lz

4
archlinux-keyring/PKGBUILD-arch
View file

@ -2,8 +2,8 @@
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=archlinux-keyring
_tag='402794057267604ef3b5900a23f5934e10bdfcae' # git rev-parse ${pkgver}
pkgver=20230629
_tag='40df671d4ba5a23a03624ecb1d5c4a6629b2dc54' # git rev-parse ${pkgver}
pkgver=20230704
pkgrel=1
pkgdesc='Arch Linux PGP keyring'
arch=('any')

1
grub/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/src-lib

16
grub/PKGBUILD
View file

@ -20,8 +20,8 @@ _GRUB_EMU_BUILD="0"
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2
_commit='857af0e17b3f8df8a2e1b355e159c48ddb801419'
_pkgver=2.06.r566.g857af0e17
_commit='6425c12cd77ad51ad24be84c092aefacf0875089'
_pkgver=2.06.r591.g6425c12cd
_unifont_ver='15.0.06'
pkgver=${_pkgver/-/}
pkgrel=01
@ -36,10 +36,10 @@ replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-liberation' 'python' 'autogen'
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2')
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse3')
depends=('sh' 'xz' 'gettext' 'device-mapper' 'os-prober')
optdepends=('freetype2: For grub-mkfont usage'
'fuse2: For grub-mount usage'
'fuse3: For grub-mount usage'
'dosfstools: For grub-mkrescue FAT FS and EFI support'
'lzop: For grub-mkrescue LZO support'
'efibootmgr: For grub-install EFI support'
@ -59,7 +59,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
'0001-00_header-add-GRUB_COLOR_-variables.patch'
'0002-10_linux-detect-archlinux-initramfs.patch'
'0003-support-dropins-for-default-configuration.patch'
'0004-efi-Add-missing-__grub_efi_api-attributes.patch'
'grub.default'
'grub.default.run'
'grub.default.66'
@ -122,9 +121,6 @@ prepare() {
echo "Patch to support dropins for default configuration..."
patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
echo "Patch to efi: Add missing __grub_efi_api attributes..."
patch -Np1 -i "${srcdir}/0004-efi-Add-missing-__grub_efi_api-attributes.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"
@ -335,10 +331,10 @@ 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
dc892edc59817bdb474e960c645a8bdde60e6cb31e9a399359e883d0a3335738 # 0004-efi-Add-missing-__grub_efi_api-attributes.patch
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df) # sbat.csv
## 4351ae4dab77618b655f18bad2992067abef8ac83b9ea5d804a114ca85e79b11 grub-2:2.06.r566.g857af0e17-01-x86_64.pkg.tar.lz
## 075a16bc00ad94ac08abe76b1c59e8bffdd6b75863e9c655ff287bff403b61d5 grub-2:2.06.r591.g6425c12cd-01-x86_64.pkg.tar.lz

14
grub/PKGBUILD-arch
View file

@ -18,8 +18,8 @@ _GRUB_EMU_BUILD="0"
pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2
_commit='857af0e17b3f8df8a2e1b355e159c48ddb801419'
_pkgver=2.06.r566.g857af0e17
_commit='6425c12cd77ad51ad24be84c092aefacf0875089'
_pkgver=2.06.r591.g6425c12cd
_unifont_ver='15.0.06'
pkgver=${_pkgver/-/}
pkgrel=1
@ -36,10 +36,10 @@ replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2')
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse3')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
'fuse2: For grub-mount usage'
'fuse3: For grub-mount usage'
'dosfstools: For grub-mkrescue FAT FS and EFI support'
'lzop: For grub-mkrescue LZO support'
'efibootmgr: For grub-install EFI support'
@ -63,7 +63,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
'0001-00_header-add-GRUB_COLOR_-variables.patch'
'0002-10_linux-detect-archlinux-initramfs.patch'
'0003-support-dropins-for-default-configuration.patch'
'0004-efi-Add-missing-__grub_efi_api-attributes.patch'
'grub.default'
'sbat.csv')
@ -74,7 +73,6 @@ sha256sums=('SKIP'
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
'8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47'
'dc892edc59817bdb474e960c645a8bdde60e6cb31e9a399359e883d0a3335738'
'7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
'98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
@ -133,10 +131,6 @@ prepare() {
echo "Patch to support dropins for default configuration..."
patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch"
echo "Patch to efi: Add missing __grub_efi_api attributes..."
patch -Np1 -i "${srcdir}/0004-efi-Add-missing-__grub_efi_api-attributes.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"

2
grub/deps
View file

@ -9,7 +9,7 @@ device-mapper
libusb
sdl
help2man
fuse2
fuse3
autoconf
automake
bison

6
grub/time
View file

@ -1,6 +1,6 @@
real 9m11.244s
user 8m25.139s
sys 0m54.002s
real 25m46.603s
user 14m39.591s
sys 1m28.787s

16
zsh/PKGBUILD
View file

@ -9,12 +9,12 @@
#pkgname=('zsh' 'zsh-doc')
pkgname=zsh
pkgver=5.9
pkgrel=03
arch=('x86_64')
pkgrel=04
url='https://www.zsh.org/'
makedepends=(pcre libcap gdbm yodl)
source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'0001-50629-do-not-use-egrep-in-tests.patch'
'fix-autocompletion.patch'
'zprofile')
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@ -22,6 +22,10 @@ prepare() {
# 50629: do not use egrep in tests
patch -Np1 < ../0001-50629-do-not-use-egrep-in-tests.patch
# https://github.com/zsh-users/zsh/commit/3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54
# https://www.zsh.org/mla/workers/2022/msg00652.html
patch -Np1 < ../fix-autocompletion.patch
# Set correct keymap path
sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
@ -92,7 +96,9 @@ package_zsh() {
# install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
#}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('custom')
@ -105,7 +111,7 @@ sha256sums=(9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 #
6f7c091249575e68c177c5e8d5c3e9705660d0d3ca1647aea365fd00a0bd3e8a # zsh-5.9-doc.tar.xz
2fda22062a9dcbcb5e76a5b4b5a0f7b8d7e4cd08707b05f11d3b99e721a982b5 # zsh-5.9-doc.tar.xz.asc
bcce55ff5a81a321c501b7749a7d3e2031004c0ab999d80c35eeb4b9ce7efdf0 # 0001-50629-do-not-use-egrep-in-tests.patch
e7060f64936bcc94aeaf44e69b6d476917a8c14cd339a3bc779c080fb01bb2f7 # fix-autocompletion.patch
230832038c3b8f67fdb1b284ac5f68d709cdb7f1bc752b0e60657b9b9d091045) # zprofile
## 6fdd808ed14d8717289a8948c3d17ec4c5b7b0ac169d282341a9cc841136ec37 zsh-5.9-03-x86_64.pkg.tar.lz
## eeef58029f43f7e2b044f7e25bd9d641256530758991a55ea76e94bf1e037e2e zsh-5.9-04-x86_64.pkg.tar.lz

8
zsh/PKGBUILD-arch
View file

@ -3,19 +3,21 @@
pkgbase=zsh
pkgname=('zsh' 'zsh-doc')
pkgver=5.9
pkgrel=3
pkgrel=4
arch=('x86_64')
url='https://www.zsh.org/'
license=('custom')
makedepends=('pcre' 'libcap' 'gdbm' 'yodl')
source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'0001-50629-do-not-use-egrep-in-tests.patch'
'fix-autocompletion.patch'
'zprofile')
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e'
'SKIP'
'5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860'
'SKIP'
'af6a905e83807efb614a585ac1876e0a9cc8b745911b43915b06aab46757a6df6dfc64a7a60b53cc7e62e528c04aa7460e660a1de6720476030dd746af76c6e3'
'fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f'
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034')
validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
@ -27,6 +29,10 @@ prepare() {
# 50629: do not use egrep in tests
patch -Np1 < ../0001-50629-do-not-use-egrep-in-tests.patch
# https://github.com/zsh-users/zsh/commit/3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54
# https://www.zsh.org/mla/workers/2022/msg00652.html
patch -Np1 < ../fix-autocompletion.patch
# Set correct keymap path
sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys

37
zsh/fix-autocompletion.patch Normal file
View file

@ -0,0 +1,37 @@
From 3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54 Mon Sep 17 00:00:00 2001
From: Bart Schaefer <schaefer@zsh.org>
Date: Fri, 3 Jun 2022 20:08:15 -0700
Subject: [PATCH] 50325: revert 38150 and fix in calling function
cfp_matcher_range() instead
---
Src/Zle/compmatch.c | 2 +-
Src/Zle/computil.c | 2 +-
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
index bb8359f1d1..56e5509a45 100644
--- a/Src/Zle/compmatch.c
+++ b/Src/Zle/compmatch.c
@@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp, convchar_t wind, int wmtp,
convchar_t lchr;
int lmtp;
- if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) {
+ if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) {
/*
* No equivalent. No possible match; give up.
*/
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 59abb4cc40..77ccdebf7e 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
* word pattern.
*/
if ((ind = pattern_match_equivalence
- (m->word, ind, mt, addc)) != CHR_INVALID) {
+ (m->word, ind+1, mt, addc)) != CHR_INVALID) {
if (ret) {
if (imeta(ind)) {
*p++ = Meta;

5
zsh/time
View file

@ -1 +1,6 @@
real 1m23.593s
user 1m14.037s
sys 0m11.445s