Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
syslinux
Commits:
661320c3 by Christian Hesse at 2024-09-30T22:36:06+02:00
upgpkg: 6.04.pre3.r3.g05ac953c-2: pull in latest upstream commits
- - - - -
3 changed files:
- .SRCINFO
- 0005-Workaround-multiple-definition-of-symbol-errors.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 = 7
+ pkgver = 6.04.pre3.r3.g05ac953c
+ pkgrel = 2
url = https://www.syslinux.org/
install = syslinux.install
arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = syslinux
optdepends = dosfstools: For EFI support
options = !makeflags
options = !buildflags
- source =
git+https://repo.or.cz/syslinux.git#commit=bf6db5b48ec25f83939f1fdebb59028bc3c40b00
+ source =
git+https://repo.or.cz/syslinux.git#commit=05ac953c23f90b2328d393f7eecde96e41aed067
source = syslinux.cfg
source = syslinux-install_update
source = 0002-gfxboot-menu-label.patch
@@ -34,7 +34,7 @@ pkgbase = syslinux
source = 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
source = 0026-add-missing-include.patch
source = 0027-use-correct-type-for-size.patch
- sha256sums =
68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd
+ sha256sums =
deec61086a2cb73163d50e150d1ef32bd56c8a3faa1fc4322d11080ba0cbe63a
sha256sums =
b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08
sha256sums =
6b7a1dae92052226d4958f28f8302b8bf7725ce75895986105d4799234efcbbe
sha256sums =
d1fe9084ce2526619f94b8a07b89fb0194e874beef9f202f8b974879d77f2e1a
@@ -44,7 +44,7 @@ pkgbase = syslinux
sha256sums =
7facb5c2abc71c9bfe01bf4db388306ed7b7abf6654009af336262839527f962
sha256sums =
755cd7062fe8495f6f62053ce664451c12ae65dba9fb5c75062a495fbe040fb1
sha256sums =
9a76f6f75a42485bc337163ba38068b09f7889bdc1a4e191408898f10de36662
- sha256sums =
7e41e17e8cbc7287d6c3c9eb0a7b682cd8d3252030856b338050c21dff9bf05a
+ sha256sums =
a3b5ee376f9ab56313932ce7fb363cd702fe503276ab84702ae0bb7eef10eb91
sha256sums =
d7410d0ff89a15e2a100faf1546d730e043dde15c295974564144e00a93f03a3
sha256sums =
e16e051d17ead7e6457a479a1e2226160ca9aae3d607c0c25fa3677522aa9280
sha256sums =
7f2ce9e16ddcca1a55b32bddfd39c7f190eed9d8df4319bbd6b07e0a2607e662
=====================================
0005-Workaround-multiple-definition-of-symbol-errors.patch
=====================================
@@ -72,7 +72,7 @@ index 46cb037c..f0cfcbe9 100644
@@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
NASM_ELF = elf
- %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
+ %.elf: %.o %-c.o lib%.a $(LIBDEP) $(LDSCRIPT)
- $(LD) $(LDFLAGS) -pie -Bsymbolic \
+ $(LD) $(LDFLAGS) -z muldefs -pie -Bsymbolic \
-T $(LDSCRIPT) \
=====================================
PKGBUILD
=====================================
@@ -4,10 +4,10 @@
# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)>
pkgname=syslinux
-pkgver=6.04.pre2.r11.gbf6db5b4
+pkgver=6.04.pre3.r3.g05ac953c
#_tag=syslinux-$pkgver
-_commit=bf6db5b48ec25f83939f1fdebb59028bc3c40b00
-pkgrel=7
+_commit='05ac953c23f90b2328d393f7eecde96e41aed067'
+pkgrel=2
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)
@@ -43,7 +43,7 @@ source=(git+https://repo.or.cz/syslinux.git#commit=$_commit
0026-add-missing-include.patch
0027-use-correct-type-for-size.patch
)
-sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd'
+sha256sums=('deec61086a2cb73163d50e150d1ef32bd56c8a3faa1fc4322d11080ba0cbe63a'
'b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08'
'6b7a1dae92052226d4958f28f8302b8bf7725ce75895986105d4799234efcbbe'
'd1fe9084ce2526619f94b8a07b89fb0194e874beef9f202f8b974879d77f2e1a'
@@ -53,7 +53,7 @@
sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd'
'7facb5c2abc71c9bfe01bf4db388306ed7b7abf6654009af336262839527f962'
'755cd7062fe8495f6f62053ce664451c12ae65dba9fb5c75062a495fbe040fb1'
'9a76f6f75a42485bc337163ba38068b09f7889bdc1a4e191408898f10de36662'
- '7e41e17e8cbc7287d6c3c9eb0a7b682cd8d3252030856b338050c21dff9bf05a'
+ 'a3b5ee376f9ab56313932ce7fb363cd702fe503276ab84702ae0bb7eef10eb91'
'd7410d0ff89a15e2a100faf1546d730e043dde15c295974564144e00a93f03a3'
'e16e051d17ead7e6457a479a1e2226160ca9aae3d607c0c25fa3677522aa9280'
'7f2ce9e16ddcca1a55b32bddfd39c7f190eed9d8df4319bbd6b07e0a2607e662')
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/661320c3c21e17538fc5b23892ed1e853e61ca0c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/661320c3c21e17538fc5b23892ed1e853e61ca0c
You're receiving this email because of your account on gitlab.archlinux.org.
