diff --git a/desktop/font/noto-fonts/pspec.xml b/desktop/font/noto-fonts/pspec.xml index e126245cd4..8505d0b8a6 100644 --- a/desktop/font/noto-fonts/pspec.xml +++ b/desktop/font/noto-fonts/pspec.xml @@ -53,6 +53,13 @@ + + 2020-12-09 + 20190623 + Rebuild. + Mustafa Cinasal + muscnsl@pisilinux.org + 2020-02-07 20190623 diff --git a/hardware/disk/dosfstools/pspec.xml b/hardware/disk/dosfstools/pspec.xml index 9f7e364178..942ee640c1 100644 --- a/hardware/disk/dosfstools/pspec.xml +++ b/hardware/disk/dosfstools/pspec.xml @@ -31,6 +31,13 @@ + + 2020-12-09 + 4.1 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + 2020-02-01 4.1 diff --git a/hardware/disk/gptfdisk/actions.py b/hardware/disk/gptfdisk/actions.py index ca21e6776c..c257a42191 100644 --- a/hardware/disk/gptfdisk/actions.py +++ b/hardware/disk/gptfdisk/actions.py @@ -5,8 +5,11 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get def build(): + shelltools.system("sed -i '/^#include /s|ncursesw/||' gptcurses.cc") autotools.make() def install(): @@ -20,4 +23,4 @@ def install(): pisitools.doman("gdisk.8") pisitools.doman("sgdisk.8") - pisitools.dodoc("COPYING", "NEWS", "README") \ No newline at end of file + pisitools.dodoc("COPYING", "NEWS", "README") diff --git a/hardware/disk/gptfdisk/pspec.xml b/hardware/disk/gptfdisk/pspec.xml index 9bf45e2c1d..f55cfbfae2 100644 --- a/hardware/disk/gptfdisk/pspec.xml +++ b/hardware/disk/gptfdisk/pspec.xml @@ -16,7 +16,7 @@ popt-devel libutil-linux-devel - http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.4/gptfdisk-1.0.4.tar.gz + http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.5/gptfdisk-1.0.5.tar.gz @@ -35,6 +35,13 @@ + + 2020-11-07 + 1.0.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-02-01 1.0.4 diff --git a/network/share/rsync/actions.py b/network/share/rsync/actions.py index cc87b20f03..43ef107ddb 100644 --- a/network/share/rsync/actions.py +++ b/network/share/rsync/actions.py @@ -11,7 +11,9 @@ from pisi.actionsapi import get def setup(): autotools.configure("--without-included-zlib \ + --with-included-zlib=no \ --with-included-popt=no \ + --disable-xxhash \ --disable-debug") def build(): @@ -23,4 +25,4 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("NEWS","README","TODO") + pisitools.dodoc("NEWS*","README*","TODO") diff --git a/network/share/rsync/pspec.xml b/network/share/rsync/pspec.xml index 0b7e00389d..59134f3523 100644 --- a/network/share/rsync/pspec.xml +++ b/network/share/rsync/pspec.xml @@ -13,12 +13,15 @@ app:console File transfer program to keep local copies in sync with remote files rsync is a tool to keep local copies of remote files in sync (i.e. make sure local files are exact copies of remote files). - https://www.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz + https://www.samba.org/ftp/rsync/src/rsync-3.2.3.tar.gz acl-devel attr-devel popt-devel + lz4-devel zlib-devel + zstd-devel + openssl-devel @@ -27,8 +30,11 @@ acl attr + lz4 popt zlib + zstd + openssl /usr/bin @@ -46,6 +52,13 @@ + + 2020-11-08 + 3.2.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-02-09 3.1.3 diff --git a/office/misc/docutils/pspec.xml b/office/misc/docutils/pspec.xml index 853d00ed65..80608c5da2 100644 --- a/office/misc/docutils/pspec.xml +++ b/office/misc/docutils/pspec.xml @@ -54,6 +54,13 @@ + + 2020-12-09 + 0.15.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-11 0.15.2 diff --git a/programming/language/ocaml/ocaml/pspec.xml b/programming/language/ocaml/ocaml/pspec.xml index 1161844b9d..fbfe13b62a 100644 --- a/programming/language/ocaml/ocaml/pspec.xml +++ b/programming/language/ocaml/ocaml/pspec.xml @@ -73,6 +73,13 @@ + + 2020-11-07 + 4.11.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-09-23 4.11.1 diff --git a/programming/library/gnu-efi/pspec.xml b/programming/library/gnu-efi/pspec.xml index f907b5163c..60094e6ce5 100644 --- a/programming/library/gnu-efi/pspec.xml +++ b/programming/library/gnu-efi/pspec.xml @@ -26,7 +26,14 @@ - + + 2020-11-07 + 3.0.11 + Version bump. + İdris Kalp + idriskalp@gmail.com + + 2020-01-15 3.0.11 Version bump. diff --git a/programming/misc/autoconf213/pspec.xml b/programming/misc/autoconf213/pspec.xml index 1658fc0549..fd6e4b1d69 100644 --- a/programming/misc/autoconf213/pspec.xml +++ b/programming/misc/autoconf213/pspec.xml @@ -39,6 +39,13 @@ + + 2020-12-09 + 2.13 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-12-29 2.13 diff --git a/programming/misc/libedit/pspec.xml b/programming/misc/libedit/pspec.xml index bad9d1b0aa..6c10228264 100644 --- a/programming/misc/libedit/pspec.xml +++ b/programming/misc/libedit/pspec.xml @@ -44,6 +44,13 @@ + + 2020-11-07 + 3.1.20191231 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-10 3.1.20191231 @@ -87,4 +94,4 @@ ertugrulerata@gmail.com - \ No newline at end of file + diff --git a/programming/misc/openmp/actions.py b/programming/misc/openmp/actions.py index aa9cacdba6..3569694467 100644 --- a/programming/misc/openmp/actions.py +++ b/programming/misc/openmp/actions.py @@ -13,9 +13,9 @@ from pisi.actionsapi import pisitools def setup(): - shelltools.export("CC", "clang") - shelltools.export("CXX", "clang++") - pisitools.ldflags.add("-fuse-ld=lld -rtlib=compiler-rt -stdlib=libc++") + #shelltools.export("CC", "clang") + #shelltools.export("CXX", "clang++") + #pisitools.ldflags.add("-fuse-ld=lld -rtlib=compiler-rt -stdlib=libc++") options = "-DCMAKE_BUILD_TYPE=Release \ -DLIBOMP_ENABLE_ASSERTIONS=ON \ diff --git a/programming/misc/openmp/pspec.xml b/programming/misc/openmp/pspec.xml index bb17ca9f25..dd74fff864 100644 --- a/programming/misc/openmp/pspec.xml +++ b/programming/misc/openmp/pspec.xml @@ -12,15 +12,16 @@ library LLVM OpenMP runtime library openmp provides runtime for OpenMP by LLVM - https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/openmp-10.0.0.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/openmp-11.0.0.src.tar.xz - llvm + cmake - libcxx-devel + libffi-devel + elfutils-devel @@ -42,8 +43,10 @@ emul32 emul32 - libcxx-32bit - llvm-32bit + libffi-32bit + elfutils-32bit + + openmp @@ -69,12 +72,19 @@ + + 2020-11-14 + 11.0.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-03-28 - 10.0.0 + 10.0.0 First release Idris Kalp idriskalp@gmail.com - \ No newline at end of file + diff --git a/server/auth/mit-kerberos/pspec.xml b/server/auth/mit-kerberos/pspec.xml index 87ae4b6f56..887b196f01 100644 --- a/server/auth/mit-kerberos/pspec.xml +++ b/server/auth/mit-kerberos/pspec.xml @@ -61,6 +61,13 @@ + + 2020-11-07 + 1.17 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-08 1.17 diff --git a/server/database/libtdb/pspec.xml b/server/database/libtdb/pspec.xml index 2016fd468b..4647194aa4 100644 --- a/server/database/libtdb/pspec.xml +++ b/server/database/libtdb/pspec.xml @@ -70,7 +70,7 @@ - 2020-11-28 + 2020-12-17 1.4.3 Rebuild 32bit. Mustafa Cinasal diff --git a/system/boot/efibootmgr/pspec.xml b/system/boot/efibootmgr/pspec.xml index fc3e9d8abf..249ce4e7f5 100644 --- a/system/boot/efibootmgr/pspec.xml +++ b/system/boot/efibootmgr/pspec.xml @@ -46,6 +46,13 @@ + + 2020-12-09 + 16 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-25 16 diff --git a/system/boot/efitools/pspec.xml b/system/boot/efitools/pspec.xml index 844c0360b5..611f284f69 100644 --- a/system/boot/efitools/pspec.xml +++ b/system/boot/efitools/pspec.xml @@ -38,6 +38,13 @@ + + 2020-11-07 + 1.9.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-25 1.9.2 diff --git a/system/boot/gfxboot/pspec.xml b/system/boot/gfxboot/pspec.xml index af286eecfc..d188726a0b 100644 --- a/system/boot/gfxboot/pspec.xml +++ b/system/boot/gfxboot/pspec.xml @@ -42,6 +42,13 @@ + + 2020-11-07 + 4.5.64 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-25 4.5.64 diff --git a/system/boot/memtest86/pspec.xml b/system/boot/memtest86/pspec.xml index ba9d7af23d..53301208a2 100644 --- a/system/boot/memtest86/pspec.xml +++ b/system/boot/memtest86/pspec.xml @@ -30,6 +30,13 @@ + + 2020-11-07 + 5.01 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-25 5.01 diff --git a/system/boot/refind/pspec.xml b/system/boot/refind/pspec.xml index 653bcafda3..7bc791c54e 100644 --- a/system/boot/refind/pspec.xml +++ b/system/boot/refind/pspec.xml @@ -28,6 +28,13 @@ + + 2020-11-07 + 0.10.3 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-25 0.10.3 diff --git a/system/boot/syslinux/files/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch b/system/boot/syslinux/files/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch index 2eb14d20f1..78cceb6674 100644 --- a/system/boot/syslinux/files/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch +++ b/system/boot/syslinux/files/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch @@ -8,11 +8,11 @@ Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE. 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile -index fb387c5..3429058 100644 +index b472945..6606d31 100644 --- a/Makefile +++ b/Makefile -@@ -273,6 +273,16 @@ efi64: - FIRMWARE=EFI64 \ +@@ -275,6 +275,16 @@ efi64: + FIRMWARE=EFI64 FWCLASS=EFI \ $(MAKECMDGOALS) +install-all: @@ -25,9 +25,8 @@ index fb387c5..3429058 100644 + +all: + - else # ifeq($(HAVE_FIRMWARE),) + else # FIRMWARE all: all-local subdirs -- -1.9.3 - +2.5.5 diff --git a/system/boot/syslinux/files/0003-include-sysmacros-h.patch b/system/boot/syslinux/files/0003-include-sysmacros-h.patch new file mode 100644 index 0000000000..a39019e610 --- /dev/null +++ b/system/boot/syslinux/files/0003-include-sysmacros-h.patch @@ -0,0 +1,33 @@ +From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 19 Apr 2016 06:50:31 -0400 +Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev + +These functions are defined in sys/sysmacros.h, so add the include to +main.c. This is already handled correctly in mountinfo.c. Otherwise +we get build failures like: + +main.o: In function 'find_device_sysfs': +extlinux/main.c:1131: undefined reference to 'minor' + +Signed-off-by: Mike Frysinger +Signed-off-by: Gene Cumm +--- + extlinux/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extlinux/main.c b/extlinux/main.c +index a7ebd49..ebff7ea 100644 +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.10.5.GIT + diff --git a/system/boot/syslinux/files/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch b/system/boot/syslinux/files/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch new file mode 100644 index 0000000000..e55c490dab --- /dev/null +++ b/system/boot/syslinux/files/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch @@ -0,0 +1,76 @@ +From 5c24d725d5a5f50f0544fbcc544f08a3f9e90e5d Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 8 Aug 2019 05:41:36 -0400 +Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff. + +--- + extlinux/Makefile | 4 ++-- + linux/Makefile | 4 ++-- + mtools/Makefile | 4 ++-- + utils/Makefile | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/extlinux/Makefile b/extlinux/Makefile +index 1721ee54aff..d504e23133e 100644 +--- a/extlinux/Makefile ++++ b/extlinux/Makefile +@@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk + + OPTFLAGS = -g -Os + INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller +-CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ ++CFLAGS = $(RPMCFLAGS) $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ + $(OPTFLAGS) $(INCLUDES) +-LDFLAGS = ++LDFLAGS = $(RPMLDFLAGS) + + SRCS = main.c \ + mountinfo.c \ +diff --git a/linux/Makefile b/linux/Makefile +index 5a49d813de1..9fed68d02c6 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk + + OPTFLAGS = -g -Os + INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller +-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) +-LDFLAGS = ++CFLAGS = $(RPMCFLAGS) $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) ++LDFLAGS = $(RPMLDFLAGS) + + SRCS = syslinux.c \ + ../libinstaller/syslxopt.c \ +diff --git a/mtools/Makefile b/mtools/Makefile +index 632b185ba2f..b6e5ebdba6b 100755 +--- a/mtools/Makefile ++++ b/mtools/Makefile +@@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk + + OPTFLAGS = -g -Os + INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libfat -I$(SRC)/../libinstaller +-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) +-LDFLAGS = ++CFLAGS = $(RPMCFLAGS) $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) ++LDFLAGS = $(RPMLDFLAGS) + + SRCS = syslinux.c \ + ../libinstaller/fs.c \ +diff --git a/utils/Makefile b/utils/Makefile +index dfe625902ce..b4962353f20 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -17,8 +17,8 @@ + VPATH = $(SRC) + include $(MAKEDIR)/syslinux.mk + +-CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC) +-LDFLAGS = -O2 ++CFLAGS = $(RPMCFLAGS) $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC) ++LDFLAGS = $(RPMLDFLAGS) -O2 + + C_TARGETS = isohybrid gethostip memdiskfind + SCRIPT_TARGETS = mkdiskimage +-- +2.21.0 + diff --git a/system/boot/syslinux/files/0005-Workaround-multiple-definition-of-symbol-errors.patch b/system/boot/syslinux/files/0005-Workaround-multiple-definition-of-symbol-errors.patch new file mode 100644 index 0000000000..b5bbad0ac0 --- /dev/null +++ b/system/boot/syslinux/files/0005-Workaround-multiple-definition-of-symbol-errors.patch @@ -0,0 +1,109 @@ +From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001 +From: Merlin Mathesius +Date: Wed, 13 May 2020 08:02:27 -0500 +Subject: [PATCH] Workaround multiple definition of symbol errors + +--- + com32/cmenu/Makefile | 2 +- + com32/elflink/ldlinux/Makefile | 2 +- + com32/gpllib/Makefile | 2 +- + com32/hdt/Makefile | 2 +- + core/Makefile | 2 +- + dos/Makefile | 2 +- + efi/Makefile | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile +index b81b68ed..2ae989c4 100644 +--- a/com32/cmenu/Makefile ++++ b/com32/cmenu/Makefile +@@ -49,7 +49,7 @@ makeoutputdirs: + @mkdir -p $(OBJ)/libmenu + + libmenu/libmenu.elf: $(LIBMENU) +- $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) \ ++ $(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) \ + -o $@ $^ + + tidy dist: +diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile +index 87c0d362..2be2a01a 100644 +--- a/com32/elflink/ldlinux/Makefile ++++ b/com32/elflink/ldlinux/Makefile +@@ -33,7 +33,7 @@ endif + all: $(BTARGET) ldlinux_lnx.a + + ldlinux.elf : $(OBJS) +- $(LD) $(LDFLAGS) -soname $(SONAME) -o $@ $^ $(LIBS) ++ $(LD) $(LDFLAGS) -z muldefs -soname $(SONAME) -o $@ $^ $(LIBS) + + LNXCFLAGS += -D__export='__attribute__((visibility("default")))' + LNXLIBOBJS = get_key.lo +diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile +index 1fec9145..2d764d0b 100644 +--- a/com32/gpllib/Makefile ++++ b/com32/gpllib/Makefile +@@ -24,7 +24,7 @@ makeoutputdirs: + $(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b)) + + libgpl.elf : $(LIBOBJS) +- $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^ ++ $(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^ + + tidy dist clean: + find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ +diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile +index 61736d05..1d947857 100644 +--- a/com32/hdt/Makefile ++++ b/com32/hdt/Makefile +@@ -52,7 +52,7 @@ QEMU ?= qemu-kvm + all: $(MODULES) $(TESTFILES) + + hdt.elf : $(OBJS) $(LIBS) $(C_LIBS) +- $(LD) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) -z muldefs -o $@ $^ + + memtest: + -[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST) +diff --git a/core/Makefile b/core/Makefile +index 46cb037c..f0cfcbe9 100644 +--- a/core/Makefile ++++ b/core/Makefile +@@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld + NASM_ELF = elf + + %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS) +- $(LD) $(LDFLAGS) -pie -Bsymbolic \ ++ $(LD) $(LDFLAGS) -z muldefs -pie -Bsymbolic \ + -T $(LDSCRIPT) \ + --unresolved-symbols=report-all \ + -E --hash-style=gnu -M -o $@ $< \ +diff --git a/dos/Makefile b/dos/Makefile +index 4c930d19..5d1c72ca 100644 +--- a/dos/Makefile ++++ b/dos/Makefile +@@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk + CFLAGS += -D__MSDOS__ -mregparm=3 -DREGPARM=3 + # CFLAGS += -DDEBUG + +-LDFLAGS = -T $(SRC)/dosexe.ld ++LDFLAGS = -T $(SRC)/dosexe.ld -z muldefs + OPTFLAGS = -g + INCLUDES = -include code16.h -nostdinc -iwithprefix include \ + -I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \ +diff --git a/efi/Makefile b/efi/Makefile +index bbf23f24..3dd922d5 100644 +--- a/efi/Makefile ++++ b/efi/Makefile +@@ -69,7 +69,7 @@ $(OBJS): | $(OBJ)/$(ARCH) + BTARGET = syslinux.efi + + syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS) +- $(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi ++ $(LD) $(LDFLAGS) -z muldefs --strip-debug -o $@ $^ -lgnuefi -lefi + + # We need to rename the .hash section because the EFI firmware + # linker really doesn't like it. +-- +2.25.1 + diff --git a/system/boot/syslinux/files/0005-gnu-efi-version-compatibility.patch b/system/boot/syslinux/files/0005-gnu-efi-version-compatibility.patch new file mode 100644 index 0000000000..f50ad006db --- /dev/null +++ b/system/boot/syslinux/files/0005-gnu-efi-version-compatibility.patch @@ -0,0 +1,25 @@ +From: Lukas Schwaighofer +Date: Mon, 3 Dec 2018 22:45:44 +0100 +Subject: Fix compatibility with new gnu-efi version + +Allow multiple definitions when linking the syslinux binary so the +memset and memcpy symbols which are included by gnu-efi since 3.0.8 are +ignored (we still use the definitions from syslinux) but linking +succeeds. +--- + efi/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/efi/Makefile b/efi/Makefile +index f4501e7..0d1a673 100644 +--- a/efi/Makefile ++++ b/efi/Makefile +@@ -71,7 +71,7 @@ $(OBJS): | $(OBJ)/$(ARCH) + BTARGET = syslinux.efi + + syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS) +- $(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi ++ $(LD) $(LDFLAGS) -zmuldefs --strip-debug -o $@ $^ -lgnuefi -lefi + + # We need to rename the .hash section because the EFI firmware + # linker really doesn't like it. diff --git a/system/boot/syslinux/files/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch b/system/boot/syslinux/files/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch new file mode 100644 index 0000000000..11160bb80a --- /dev/null +++ b/system/boot/syslinux/files/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch @@ -0,0 +1,40 @@ +From eae06bdce9468d7fde263de1c53f80f2faff0c9e Mon Sep 17 00:00:00 2001 +From: Merlin Mathesius +Date: Wed, 13 May 2020 11:58:37 -0500 +Subject: [PATCH] Replace builtin strlen that appears to get optimized away + +--- + dos/string.h | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/dos/string.h b/dos/string.h +index f648de2d..407d0233 100644 +--- a/dos/string.h ++++ b/dos/string.h +@@ -5,12 +5,22 @@ + #ifndef _STRING_H + #define _STRING_H + ++#include ++ + /* Standard routines */ + #define memcpy(a,b,c) __builtin_memcpy(a,b,c) + #define memmove(a,b,c) __builtin_memmove(a,b,c) + #define memset(a,b,c) __builtin_memset(a,b,c) + #define strcpy(a,b) __builtin_strcpy(a,b) +-#define strlen(a) __builtin_strlen(a) ++#define strlen(a) inline_strlen(a) ++ ++/* replacement for builtin strlen that appears to get optimized away */ ++static inline size_t inline_strlen(const char *str) ++{ ++ size_t l; ++ for (l = 0; *str++; l++); ++ return l; ++} + + /* This only returns true or false */ + static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) +-- +2.25.1 + diff --git a/system/boot/syslinux/files/0025-reproducible-build.patch b/system/boot/syslinux/files/0025-reproducible-build.patch new file mode 100644 index 0000000000..965a9d946a --- /dev/null +++ b/system/boot/syslinux/files/0025-reproducible-build.patch @@ -0,0 +1,39 @@ +diff --git a/core/Makefile b/core/Makefile +index 50ff35af..f1af71b7 100644 +--- a/core/Makefile ++++ b/core/Makefile +@@ -112,7 +112,7 @@ CFLAGS += -D__SYSLINUX_CORE__ -D__FIRMWARE_$(FIRMWARE)__ \ + # official release. Otherwise, substitute a hex string that is pretty much + # guaranteed to be unique to be unique from build to build. + ifndef HEXDATE +-HEXDATE := $(shell $(PERL) $(SRC)/../now.pl $(SRCS)) ++HEXDATE := $(shell printf '0x%x\n' $(git log -1 --format=%ct)) # make the build more predictable + endif + ifndef DATE + DATE := $(shell sh $(SRC)/../gen-id.sh $(VERSION) $(HEXDATE)) +diff --git a/mk/lib.mk b/mk/lib.mk +index f3fb07c7..bece24a0 100644 +--- a/mk/lib.mk ++++ b/mk/lib.mk +@@ -58,8 +58,8 @@ CFLAGS += -mregparm=3 -DREGPARM=3 + endif + + ARCH_MATH_OBJS = \ +- $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/math/*.c)) \ +- $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/math/*.S)) ++ $(patsubst $(com32)/lib/%.c,%.o,$(sort $(wildcard $(com32)/lib/$(ARCH)/math/*.c))) \ ++ $(patsubst $(com32)/lib/%.S,%.o,$(sort $(wildcard $(com32)/lib/$(ARCH)/math/*.S))) + + VPATH = $(SRC) + LIBOTHER_OBJS = \ +@@ -130,8 +130,8 @@ LIBENTRY_OBJS = \ + exit.o + + LIBGCC_OBJS = \ +- $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c)) \ +- $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S)) ++ $(patsubst $(com32)/lib/%.c,%.o,$(sort $(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c))) \ ++ $(patsubst $(com32)/lib/%.S,%.o,$(sort $(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S))) + + LIBCONSOLE_OBJS = \ + \ diff --git a/system/boot/syslinux/pspec.xml b/system/boot/syslinux/pspec.xml index bbe3947bee..4cbecb1e99 100644 --- a/system/boot/syslinux/pspec.xml +++ b/system/boot/syslinux/pspec.xml @@ -27,8 +27,18 @@ syslinux.git-138e850fab106b5235178848b3e0d33e25f4d3a2.patch - syslinux-6.03-sysmacros.patch + 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch 0002-ext4-64bit-feature.patch + 0003-include-sysmacros-h.patch + 0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch + 0005-Workaround-multiple-definition-of-symbol-errors.patch + 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch + + + + + + @@ -59,6 +69,13 @@ + + 2020-11-07 + 6.04 + Rebuild + Kamil Atlı + suvari@pisilinux.org + 2020-01-25 6.04 diff --git a/util/crypt/sbsigntools/pspec.xml b/util/crypt/sbsigntools/pspec.xml index 1792ef5582..71cb989dec 100644 --- a/util/crypt/sbsigntools/pspec.xml +++ b/util/crypt/sbsigntools/pspec.xml @@ -39,7 +39,14 @@ - + + 2020-11-07 + 0.9.3 + Rebuild + İdris Kalp + idriskalp@gmail.com + + 2020-01-15 0.9.3 Version bump