syslinux: version bump to 6.04

system/boot/syslinux/files/0002-ext4-64bit-feature.patch

@@ -0,0 +1,101 @@
+From af7e95c32cea40c1e443ae301e64b27f068b4915 Mon Sep 17 00:00:00 2001
+From: Paulo Alcantara <pcacjr@zytor.com>
+Date: Wed, 11 Oct 2017 07:00:31 -0400
+Subject: [PATCH] ext4: Fix 64bit feature
+
+As per ext4 specification:
+
+> In ext2, ext3, and ext4 (when the 64bit feature is not enabled), the
+> block group descriptor was only 32 bytes long and therefore ends at
+> bg_checksum. On an ext4 filesystem with the 64bit feature enabled, the
+> block group descriptor expands to at least the 64 bytes described below;
+> the size is stored in the superblock.
+
+Since block group descriptor has been expanded to 64 bytes long (when 64
+bit feature is enabled), we cannot index ext2_group_desc and return it
+*directly* -- as we did it in ext2_get_group_desc -- it's still 32 bytes
+long.
+
+Instead, use s_desc_size field from superblock to correctly index and
+return block group descriptors.
+
+Cc: H. Peter Anvin <hpa@zytor.com>
+Cc: Gene Cumm <gene.cumm@gmail.com>
+Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
+---
+ core/fs/ext2/ext2.c    | 23 ++++++++++++++---------
+ core/fs/ext2/ext2_fs.h |  1 +
+ 2 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/core/fs/ext2/ext2.c b/core/fs/ext2/ext2.c
+index 76bd1d5..4bc0a53 100644
+--- a/core/fs/ext2/ext2.c
++++ b/core/fs/ext2/ext2.c
+@@ -25,22 +25,17 @@ static enum dirent_type ext2_cvt_type(unsigned int d_file_type)
+ 	return inode_type[d_file_type];
+ }
+ 
+-/*
+- * get the group's descriptor of group_num
+- */
+-static const struct ext2_group_desc *
+-ext2_get_group_desc(struct fs_info *fs, uint32_t group_num)
++static const void *__ext2_get_group_desc(struct fs_info *fs, uint32_t group_num)
+ {
+     struct ext2_sb_info *sbi = EXT2_SB(fs);
+     uint32_t desc_block, desc_index;
+-    const struct ext2_group_desc *desc_data_block;
++    uint8_t *p;
+ 
+     if (group_num >= sbi->s_groups_count) {
+ 	printf ("ext2_get_group_desc"
+ 		"block_group >= groups_count - "
+ 		"block_group = %d, groups_count = %d",
+ 		group_num, sbi->s_groups_count);
+-
+ 	return NULL;
+     }
+ 
+@@ -49,8 +44,17 @@ ext2_get_group_desc(struct fs_info *fs, uint32_t group_num)
+ 
+     desc_block += sbi->s_first_data_block + 1;
+ 
+-    desc_data_block = get_cache(fs->fs_dev, desc_block);
+-    return &desc_data_block[desc_index];
++    p = get_cache(fs->fs_dev, desc_block);
++    return p + sbi->s_desc_size * desc_index;
++}
++
++/*
++ * get the group's descriptor of group_num
++ */
++static inline const struct ext2_group_desc *
++ext2_get_group_desc(struct fs_info *fs, uint32_t group_num)
++{
++    return __ext2_get_group_desc(fs, group_num);
+ }
+ 
+ /*
+@@ -306,6 +310,7 @@ static int ext2_fs_init(struct fs_info *fs)
+     if (sb.s_desc_size < sizeof(struct ext2_group_desc))
+ 	sb.s_desc_size = sizeof(struct ext2_group_desc);
+     sbi->s_desc_per_block   = BLOCK_SIZE(fs) / sb.s_desc_size;
++    sbi->s_desc_size = sb.s_desc_size;
+     sbi->s_groups_count     = (sb.s_blocks_count - sb.s_first_data_block
+ 			       + EXT2_BLOCKS_PER_GROUP(fs) - 1)
+ 	                      / EXT2_BLOCKS_PER_GROUP(fs);
+diff --git a/core/fs/ext2/ext2_fs.h b/core/fs/ext2/ext2_fs.h
+index 803a995..d8d07eb 100644
+--- a/core/fs/ext2/ext2_fs.h
++++ b/core/fs/ext2/ext2_fs.h
+@@ -278,6 +278,7 @@ struct ext2_sb_info {
+     uint32_t s_first_data_block;	/* First Data Block */
+     int      s_inode_size;
+     uint8_t  s_uuid[16];	/* 128-bit uuid for volume */
++    int      s_desc_size;	/* size of group descriptor */
+ };
+ 
+ static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs)
+-- 
+2.7.4.GIT
+

system/boot/syslinux/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>SysLinux, IsoLinux and PXELinux bootloader</Summary>
         <Description>Lightweight bootloaders for floppy media (SYSLINUX), network booting (PXELINUX), and bootable "El Torito" CD-ROMs (ISOLINUX). The project also includes MEMDISK, a tool to boot legacy operating systems (such as DOS) from nontraditional media; it is usually used in conjunction with PXELINUX and ISOLINUX.</Description>
-        <Archive sha1sum="1bea76b97b4e32a017dd4168e819934b7c6592cc" type="tarxz">https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.03.tar.xz</Archive>
+        <Archive sha1sum="599b7a85d522b1b6658a1fe290e4d23dc64b1470" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>nasm</Dependency>
             <Dependency>asciidoc</Dependency>
@@ -23,25 +23,18 @@
             <Dependency>upx</Dependency><!--1-->
             <Dependency>libutil-linux-devel</Dependency>
             <Dependency>util-linux</Dependency>
+			<Dependency>python-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <!--Patch level="1">0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch</Patch>
-            <Patch level="1">0035-SYSAPPEND-Fix-space-stripping.patch</Patch-->
-            <Patch level="1">gcc-fix-alignment.patch</Patch>
-            <Patch level="1">dont-guess-alignment.patch</Patch>
-            <Patch level="1">btrfs-fix.patch</Patch>
             <Patch>syslinux.git-138e850fab106b5235178848b3e0d33e25f4d3a2.patch</Patch><!--kbd patch-->
-            <Patch>syslinux.git-83aad4f.patch</Patch><!--set-base patch-->
-            <Patch>syslinux.git-0a2dbb3.patch</Patch><!--set-mod patch-->
             <Patch>syslinux-6.03-sysmacros.patch</Patch>
-<!--             <Patch>syslinux-6.02-add-fno-stack-protector.patch</Patch> -->
+			<Patch>0002-ext4-64bit-feature.patch</Patch>
         </Patches>
     </Source>
 
     <Package>
         <Name>syslinux</Name>
         <RuntimeDependencies>
-            <Dependency>mtools</Dependency>
             <Dependency>libutil-linux</Dependency>
             <Dependency>mtools</Dependency>
             <Dependency>efibootmgr</Dependency>
@@ -61,11 +54,18 @@
         <AdditionalFiles>
             <AdditionalFile target="/usr/lib/syslinux/isolinux.cfg" permission="0644" owner="root">pisi-iso/isolinux.cfg</AdditionalFile>
             <AdditionalFile target="/usr/lib/syslinux/background.png" permission="0644" owner="root">pisi-iso/background.png</AdditionalFile>
-            <!--AdditionalFile target="/usr/bin/syslinux-install_update" permission="0755" owner="root">syslinux-install_update</AdditionalFile-->
+<!--             <AdditionalFile target="/usr/bin/syslinux-install_update" permission="0755" owner="root">syslinux-install_update</AdditionalFile> -->
         </AdditionalFiles>
     </Package>
 
     <History>
+		<Update release="5">
+            <Date>2018-08-24</Date>
+            <Version>6.04</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-13</Date>
             <Version>6.03</Version>