diff --git a/syslinux-4.03-lua.diff b/syslinux-4.03-lua.diff deleted file mode 100644 index cc1bed3..0000000 --- a/syslinux-4.03-lua.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c -index fa54d7f..a744e17 100644 ---- a/com32/lua/src/syslinux.c -+++ b/com32/lua/src/syslinux.c -@@ -385,7 +385,7 @@ static int sl_initramfs_add_file(lua_State * L) - size_t file_len = 0; - - if (initramfs_add_file(initramfs, file_data, file_len, file_len, -- "/testfile1", 0, 0755)) -+ "/testfile1", 0, 0755)); - - return 0; - } diff --git a/syslinux-4.03.tar.bz2 b/syslinux-4.03.tar.bz2 deleted file mode 100644 index fa3e0d0..0000000 --- a/syslinux-4.03.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38 -size 4381187 diff --git a/syslinux-4.03-cwd.diff b/syslinux-4.04-cwd.diff similarity index 82% rename from syslinux-4.03-cwd.diff rename to syslinux-4.04-cwd.diff index 78f0417..9453c58 100644 --- a/syslinux-4.03-cwd.diff +++ b/syslinux-4.04-cwd.diff @@ -1,8 +1,8 @@ diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c -index 2323f8e..8cace82 100644 +index 3749920..00d168a 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c -@@ -100,6 +100,8 @@ typedef struct __attribute__ ((packed)) { +@@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed)) { // 0: GFX_CB_MENU_INIT accepts 32 bit addresses // 1: knows about xmem_start, xmem_end uint16_t reserved_1; // 62: @@ -11,7 +11,7 @@ index 2323f8e..8cace82 100644 } gfx_config_t; -@@ -185,6 +187,7 @@ int main(int argc, char **argv) +@@ -181,6 +183,7 @@ int main(int argc, char **argv) { int menu_index; const union syslinux_derivative_info *sdi; @@ -19,7 +19,7 @@ index 2323f8e..8cace82 100644 openconsole(&dev_stdcon_r, &dev_stdcon_w); -@@ -228,6 +231,10 @@ int main(int argc, char **argv) +@@ -224,6 +227,10 @@ int main(int argc, char **argv) return 0; } @@ -30,7 +30,7 @@ index 2323f8e..8cace82 100644 if(gfx_init(argv[1])) { printf("Error setting up gfxboot\n"); if(argc > 2) show_message(argv[2]); -@@ -815,6 +822,12 @@ void boot(int index) +@@ -806,6 +813,12 @@ void boot(int index) int i, label_len; unsigned ipapp; const struct syslinux_ipappend_strings *ipappend; diff --git a/syslinux-4.03-iso9660.diff b/syslinux-4.04-iso9660.diff similarity index 91% rename from syslinux-4.03-iso9660.diff rename to syslinux-4.04-iso9660.diff index 23d543a..7541a65 100644 --- a/syslinux-4.03-iso9660.diff +++ b/syslinux-4.04-iso9660.diff @@ -1,8 +1,8 @@ diff --git a/core/fs/iso9660/iso9660.c b/core/fs/iso9660/iso9660.c -index 46f5f17..70c6910 100644 +index 3cd3ac4..9bbc299 100644 --- a/core/fs/iso9660/iso9660.c +++ b/core/fs/iso9660/iso9660.c -@@ -275,14 +275,25 @@ static int iso_readdir(struct file *file, struct dirent *dirent) +@@ -228,14 +228,25 @@ static int iso_readdir(struct file *file, struct dirent *dirent) /* Load the config file, return 1 if failed, or 0 */ static int iso_load_config(void) { diff --git a/syslinux-4.04.tar.bz2 b/syslinux-4.04.tar.bz2 new file mode 100644 index 0000000..753b52d --- /dev/null +++ b/syslinux-4.04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e186a21cb1b3b1874f253df21546e8d0595d803bd6a60f38cfafbc10bee90e0b +size 5340791 diff --git a/syslinux.changes b/syslinux.changes index 2bab0f7..651ec9b 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Tue Apr 19 10:48:40 CEST 2011 - snwint@suse.de + +- update to version 4.04 + * PXELINUX: Fix handling of unqualified DNS names. + * PXELINUX: Fix timer bug when PXELINUX might be unloaded + (Gene Cumm). + * core/writedec.inc: Fix duplicate declaration and overflow + (Gene Cumm). + * GCC 4.5 fixes. + * sample directory: Fix Makefile include (Gene Cumm). + * ver.com: New universal DOS/COMBOOT application to display + version information (includes DRMK) (Gene Cumm). + * rosh.c32: updated; Using getopt() for internal commands to aid + parsing options; Fix bugs in ls; add warm reboot and echo + (Gene Cumm). + * com32: fix a file descriptor leak. + * gfxboot.c32: handle TEXT..ENDTEXT; error out on no LABELs + found (Sebastian Herbszt). + * Fix booting on non-partitioned devices. + * MBR, isohybrid: Workaround for a BIOS issue on Acer + Travelmate and possibly other machines. + * COM32: Adding ACPI parsing libary + * HDT: Release 0.4.1 to support ACPI parsing, + improved mutli-core/cpu reporting + * LUA: Updating to 5.1.4-2 + * SYSLINUX: core/diskstart.inc: Reset DS after checksum in case + it isn't 0 (Gene Cumm). + * win64: Script update for additional mingw compiler names + (Gene Cumm). + * diag: New directory for diagnostic-related tools. Add a + handoff MBR/VBR and geometry display images (Gene Cumm). + * MEMDISK: use "mem=" parameter to mark available memory above + this point as reserved (core already does alignment) (Gene Cumm). + * MEMDISK: Additional disk probe checks and debug output + (Shao Miller, Gene Cumm). + * gpxe: add gpxelinuxk.0, based off of undionly.kpxe + new + script (Gene Cumm). + * isohybrid: install the isohdpfx*.bin/isohdppx*.bin files to + make isohybrid images in one step with GNU xorriso. + * PXELINUX: disable a hack that would make localboot work on + some machines, but break just about as many. Some machines + which worked with "localboot 0" in previous versions may + need "localboot -1" in this one. If you have a machine + which requires "localboot -1", a copy of the dmidecode + or sysdump output would be appreciated. + * Include a set of diagnostics by Gene Cumm. + * Fixes for gcc 4.6 and binutils 2.21.51. + * chain.c32: Allow "uuid" as a synonym to "guid". + * Handle directory names starting with .. for vfat and + iso9660. + * New MENU HIDDENKEY command to provide a one-keystroke way to + activate a boot option from a hidden menu intro screen. + + ------------------------------------------------------------------- Mon Apr 18 17:35:01 CEST 2011 - snwint@suse.de diff --git a/syslinux.spec b/syslinux.spec index 7bc0042..eca35ee 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -26,14 +26,13 @@ Group: System/Boot Requires: mtools AutoReqProv: on Summary: Boot Loader for Linux -Version: 4.03 +Version: 4.04 Release: 4 Source: %{name}-%{version}.tar.bz2 Source1: isolinux-config Source2: README.gfxboot Patch0: %{name}-%{version}-iso9660.diff Patch1: %{name}-%{version}-cwd.diff -Patch2: %{name}-%{version}-lua.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,7 +51,6 @@ Authors: %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build cp %{SOURCE2} .