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

upg b43-fwcutter btrfs-progs dialog

This commit is contained in:
joborun linux 2023-01-01 02:49:26 +02:00
parent 540c9c5c9d
commit 8805091492
10 changed files with 104 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
b43-fwcutter/PKGBUILD
View File

@ -1,12 +1,13 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=b43-fwcutter
pkgver=019
pkgrel=03
pkgrel=04
pkgdesc="firmware extractor for the b43 kernel module"
url="https://wireless.wiki.kernel.org/en/users/Drivers/b43"
depends=('glibc')
@ -30,8 +31,10 @@ license=('GPL')
validpgpkeys=('757FAB7CED1814AE15B4836E5FB027474203454C') # Michael Büsch (Git tag signing key) <m@bues.ch>
md5sums=('19d1f4226a625756726bdf7ed5dc2a0a'
'SKIP')
sha256sums=(d6ea85310df6ae08e7f7e46d8b975e17fc867145ee249307413cfbe15d7121ce # b43-fwcutter-019.tar.bz2
f4dc7a63e6fc858058c5ce38bd36d0ead45c5e9710648c702dea2cccf7e0f32b) # b43-fwcutter-019.tar.bz2.asc
## f4dc7a63e6fc858058c5ce38bd36d0ead45c5e9710648c702dea2cccf7e0f32b b43-fwcutter-019.tar.bz2.asc

6
b43-fwcutter/PKGBUILD-arch
View File

@ -2,15 +2,15 @@
pkgname=b43-fwcutter
pkgver=019
pkgrel=3
pkgrel=4
pkgdesc="firmware extractor for the b43 kernel module"
url="https://wireless.wiki.kernel.org/en/users/Drivers/b43"
depends=('glibc')
license=('GPL')
arch=('x86_64')
source=("https://bues.ch/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2"{,.asc})
md5sums=('19d1f4226a625756726bdf7ed5dc2a0a'
'SKIP')
sha256sums=('d6ea85310df6ae08e7f7e46d8b975e17fc867145ee249307413cfbe15d7121ce'
'SKIP')
validpgpkeys=('757FAB7CED1814AE15B4836E5FB027474203454C') # Michael Büsch (Git tag signing key) <m@bues.ch>
build() {

1
b43-fwcutter/deps
View File

@ -1 +1,2 @@

10
btrfs-progs/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgname=btrfs-progs
pkgver=6.1
pkgrel=01
pkgrel=02
pkgdesc='Btrfs filesystem utilities w/o systemd'
arch=('x86_64')
makedepends=('git' 'asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
@ -23,7 +23,9 @@ provides=('btrfs-progs-unstable')
options=(!staticlibs)
source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{xz,sign}
'initcpio-install-btrfs'
'initcpio-hook-btrfs')
'initcpio-hook-btrfs'
# fix #76955
'fd138f8678808717635a145832c1b13320ce6cd2.patch')
install=btrfs-progs.install
prepare() {
@ -72,5 +74,7 @@ validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
sha256sums=(378bcafabdb64c453ac64fef3d4cf8c8d5e47f310319743f580667f9c1114657 # btrfs-progs-v6.1.tar.xz
885675e321d6c2eb88d609f788215e5b238fd54323fd0ac53ae8df56947fc465 # btrfs-progs-v6.1.tar.sign
bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs
35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs
35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5 # initcpio-hook-btrfs
037147213e18d03931aae7bc54ef826e6847fafa4bb642f099a1cc5a782f3a75) # fd138f8678808717635a145832c1b13320ce6cd2.patch

10
btrfs-progs/PKGBUILD-arch
View File

@ -4,7 +4,7 @@
pkgname=btrfs-progs
pkgver=6.1
pkgrel=1
pkgrel=2
pkgdesc='Btrfs filesystem utilities'
arch=('x86_64')
makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
@ -22,7 +22,10 @@ source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-
'initcpio-install-btrfs'
'initcpio-hook-btrfs'
'btrfs-scrub@.service'
'btrfs-scrub@.timer')
'btrfs-scrub@.timer'
# fix #76955
'fd138f8678808717635a145832c1b13320ce6cd2.patch'
)
install=btrfs-progs.install
options=(!staticlibs debug)
sha256sums=('SKIP'
@ -30,7 +33,8 @@ sha256sums=('SKIP'
'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4'
'35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5'
'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252'
'9a0b6cc23f7bd97b83b6c38dd2b4e4373fead8bd3ccfb82a47c72971e9d6f8ad')
'9a0b6cc23f7bd97b83b6c38dd2b4e4373fead8bd3ccfb82a47c72971e9d6f8ad'
'037147213e18d03931aae7bc54ef826e6847fafa4bb642f099a1cc5a782f3a75')
prepare() {
cd $pkgname-v$pkgver

2
btrfs-progs/deps
View File

@ -8,3 +8,5 @@ asciidoc
python-sphinx

70
btrfs-progs/fd138f8678808717635a145832c1b13320ce6cd2.patch Normal file
View File

@ -0,0 +1,70 @@
From fd138f8678808717635a145832c1b13320ce6cd2 Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu@suse.com>
Date: Tue, 27 Dec 2022 13:25:12 +0800
Subject: [PATCH] btrfs-progs: fix the wrong timestamp and UUID check for root
items
[BUG]
Since commit d729048be6ef ("btrfs-progs: stop using
btrfs_root_item_v0"), "btrfs subvolume list" not longer correctly report
UUID nor timestamp, while older (btrfs-progs v6.0.2) still works
correct:
v6.0.2:
# btrfs subv list -u /mnt/btrfs/
ID 256 gen 12 top level 5 uuid ed4af580-d512-2644-b392-2a71aaeeb99e path subv1
ID 257 gen 13 top level 5 uuid a22ccba7-0a0a-a94f-af4b-5116ab58bb61 path subv2
v6.1:
# ./btrfs subv list -u /mnt/btrfs/
ID 256 gen 12 top level 5 uuid - path subv1
ID 257 gen 13 top level 5 uuid - path subv2
[CAUSE]
Commit d729048be6ef ("btrfs-progs: stop using btrfs_root_item_v0")
removed old btrfs_root_item_v0, but incorrectly changed the check for
v0 root item.
Now we will treat v0 root items as latest root items, causing possible
out-of-bound access. while treat current root items as older v0 root
items, ignoring the UUID nor timestamp.
[FIX]
Fix the bug by using correct checks, and add extra comments on the
branches.
Issue: #562
Fixes: d729048be6ef ("btrfs-progs: stop using btrfs_root_item_v0")
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
cmds/subvolume-list.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/cmds/subvolume-list.c b/cmds/subvolume-list.c
index 6d5ef509a..7cdb0402b 100644
--- a/cmds/subvolume-list.c
+++ b/cmds/subvolume-list.c
@@ -870,14 +870,21 @@ static int list_subvol_search(int fd, struct rb_root *root_lookup)
ri = (struct btrfs_root_item *)(args.buf + off);
gen = btrfs_root_generation(ri);
flags = btrfs_root_flags(ri);
- if(sh.len <
- sizeof(struct btrfs_root_item)) {
+ if(sh.len >= sizeof(struct btrfs_root_item)) {
+ /*
+ * The new full btrfs_root_item with
+ * timestamp and UUID.
+ */
otime = btrfs_stack_timespec_sec(&ri->otime);
ogen = btrfs_root_otransid(ri);
memcpy(uuid, ri->uuid, BTRFS_UUID_SIZE);
memcpy(puuid, ri->parent_uuid, BTRFS_UUID_SIZE);
memcpy(ruuid, ri->received_uuid, BTRFS_UUID_SIZE);
} else {
+ /*
+ * The old v0 root item, which doesn't
+ * has timestamp nor UUID.
+ */
otime = 0;
ogen = 0;
memset(uuid, 0, BTRFS_UUID_SIZE);

7
dialog/PKGBUILD
View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=dialog
pkgver=1.3_20220728
pkgver=1.3_20221229
pkgrel=01
epoch=1
pkgdesc="A tool to display dialog boxes from shell scripts"
@ -38,6 +38,7 @@ license=('LGPL2.1')
validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas E. Dickey (self-signed w/o SHA1) <dickey@invisible-island.net>
sha256sums=(54418973d559a461b00695fafe68df62f2bc73d506b436821d77ca3df454190b # dialog-1.3-20220728.tgz
975e7f855eae69e9f8470ea575eebf572b751bbc89e0415118d84b849700fb93) # dialog-1.3-20220728.tgz.asc
sha256sums=(d5663d016003e5260fa485f5e9c2ddffb386508f3bd0687d4fa3635ea9942b8e # dialog-1.3-20220728.tgz
7171fd2463ea6df4f12a2e492ad14213ad4ae8208f603a45243df071119e0700) # dialog-1.3-20221229.tgz.asc

4
dialog/PKGBUILD-arch
View File

@ -4,7 +4,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=dialog
pkgver=1.3_20220728
pkgver=1.3_20221229
pkgrel=1
epoch=1
pkgdesc="A tool to display dialog boxes from shell scripts"
@ -14,7 +14,7 @@ license=('LGPL2.1')
depends=('sh' 'ncurses')
provides=('libdialog.so')
source=(https://invisible-mirror.net/archives/$pkgname/$pkgname-${pkgver/_/-}.tgz{,.asc})
sha256sums=('54418973d559a461b00695fafe68df62f2bc73d506b436821d77ca3df454190b'
sha256sums=('d5663d016003e5260fa485f5e9c2ddffb386508f3bd0687d4fa3635ea9942b8e'
'SKIP')
validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas E. Dickey (self-signed w/o SHA1) <dickey@invisible-island.net>

1
dialog/deps
View File

@ -1,3 +1,2 @@