Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
syslinux
Commits:
b7a4bd39 by Christian Hesse at 2024-09-30T10:36:27+02:00
upgpkg: 6.04.pre2.r11.gbf6db5b4-6: use a better fix...
- - - - -
4 changed files:
- .SRCINFO
- − 0027-cast.patch
- + 0027-type-size-t.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = syslinux
pkgdesc = Collection of boot loaders that boot from FAT, ext2/3/4 and
btrfs filesystems, from CDs and via PXE
pkgver = 6.04.pre2.r11.gbf6db5b4
- pkgrel = 5
+ pkgrel = 6
url = https://www.syslinux.org/
install = syslinux.install
arch = x86_64
@@ -34,7 +34,7 @@ pkgbase = syslinux
source = 0005-Workaround-multiple-definition-of-symbol-errors.patch
source = 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
source = 0026-include.patch
- source = 0027-cast.patch
+ source = 0027-type-size-t.patch
sha256sums =
68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd
sha256sums =
b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08
sha256sums =
5f86b5813465c48ba7bd178389aacb5149ff0b5f2467ab1772a4f862c5b15d41
@@ -48,7 +48,7 @@ pkgbase = syslinux
sha256sums =
7e41e17e8cbc7287d6c3c9eb0a7b682cd8d3252030856b338050c21dff9bf05a
sha256sums =
d7410d0ff89a15e2a100faf1546d730e043dde15c295974564144e00a93f03a3
sha256sums =
a33897c9aa687482e5daa501ed4e30e6057d3b4f3e356e61ccffbf43ef7a37e6
- sha256sums =
0f44310f5fae3e08e21190784bfc19bf0f87cf0f79962df7713510281d166e60
+ sha256sums =
bf699f6bb0f3a61e5024f0a0afd4405366c2e9d54c9c21ff658ab82eae070379
makedepends_x86_64 = lib32-glibc
pkgname = syslinux
=====================================
0027-cast.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/com32/chain/chain.c b/com32/chain/chain.c
-index 4e9e32d2..568923cd 100644
---- a/com32/chain/chain.c
-+++ b/com32/chain/chain.c
-@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
- if (opt.file) {
- fdat.base = (opt.fseg << 4) + opt.foff;
-
-- if (loadfile(opt.file, &fdat.data, &fdat.size)) {
-+ if (loadfile(opt.file, &fdat.data, (size_t*) &fdat.size)) {
- error("Couldn't read the boot file.");
- goto bail;
- }
=====================================
0027-type-size-t.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/com32/chain/chain.h b/com32/chain/chain.h
+index 5e155b39..7e319b4e 100644
+--- a/com32/chain/chain.h
++++ b/com32/chain/chain.h
+@@ -21,7 +21,7 @@
+ struct data_area {
+ void *data;
+ addr_t base;
+- addr_t size;
++ size_t size;
+ };
+
+ #endif
=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@ pkgname=syslinux
pkgver=6.04.pre2.r11.gbf6db5b4
#_tag=syslinux-$pkgver
_commit=bf6db5b48ec25f83939f1fdebb59028bc3c40b00
-pkgrel=5
+pkgrel=6
pkgdesc='Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE'
url='https://www.syslinux.org/'
arch=(x86_64)
@@ -42,7 +42,7 @@ source=(git+https://repo.or.cz/syslinux.git#commit=$_commit
0005-Workaround-multiple-definition-of-symbol-errors.patch
0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
0026-include.patch
- 0027-cast.patch
+ 0027-type-size-t.patch
)
sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd'
'b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08'
@@ -57,7 +57,7 @@
sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd'
'7e41e17e8cbc7287d6c3c9eb0a7b682cd8d3252030856b338050c21dff9bf05a'
'd7410d0ff89a15e2a100faf1546d730e043dde15c295974564144e00a93f03a3'
'a33897c9aa687482e5daa501ed4e30e6057d3b4f3e356e61ccffbf43ef7a37e6'
- '0f44310f5fae3e08e21190784bfc19bf0f87cf0f79962df7713510281d166e60')
+ 'bf699f6bb0f3a61e5024f0a0afd4405366c2e9d54c9c21ff658ab82eae070379')
_targets='bios efi64 efi32'
@@ -84,7 +84,7 @@ prepare() {
patch -p1 <
../0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
patch -p1 < ../0026-include.patch
- patch -p1 < ../0027-cast.patch
+ patch -p1 < ../0027-type-size-t.patch
# do not swallow efi compilation output to make debugging easier
sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/b7a4bd390aff0844f5aff21e6436729f6b685cbe
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/b7a4bd390aff0844f5aff21e6436729f6b685cbe
You're receiving this email because of your account on gitlab.archlinux.org.
