From e1cc2511d04693165deec22fb448bac9838f57c2 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Tue, 17 Mar 2020 12:55:24 +0300 Subject: meta: sync core with KISS --- core/binutils/build | 3 ++ core/binutils/depends | 1 - core/bison/depends | 3 +- core/bzip2/build | 4 +- core/curl/build | 7 ++- core/curl/version | 2 +- core/flex/depends | 3 +- core/gcc/build | 12 ++++- core/gcc/checksums | 1 - core/gcc/depends | 5 +- core/gcc/patches/static-pie.patch | 88 ---------------------------------- core/gcc/sources | 3 +- core/gcc/version | 2 +- core/gzip/build | 10 ++-- core/gzip/checksums | 2 +- core/gzip/sources | 2 +- core/gzip/version | 2 +- core/libressl/checksums | 2 +- core/libressl/files/update-certdata.sh | 2 - core/libressl/sources | 2 +- core/libressl/version | 2 +- core/make/version | 2 +- core/musl/build | 2 +- core/pkgconf/sources | 2 +- core/rsync/build | 6 ++- core/zlib/version | 2 +- 26 files changed, 48 insertions(+), 124 deletions(-) delete mode 100644 core/gcc/patches/static-pie.patch diff --git a/core/binutils/build b/core/binutils/build index bad01b2f..0b10222e 100755 --- a/core/binutils/build +++ b/core/binutils/build @@ -15,7 +15,10 @@ export PATH=$PATH:$PWD --enable-targets=x86_64-pep \ --disable-multilib \ --disable-werror \ + --disable-gdb \ --disable-nls \ + --disable-readline \ + --disable-gprof \ --with-mmap \ --with-system-zlib diff --git a/core/binutils/depends b/core/binutils/depends index fd0e8f1f..84f56ea4 100644 --- a/core/binutils/depends +++ b/core/binutils/depends @@ -1,3 +1,2 @@ -bison make flex zlib diff --git a/core/bison/depends b/core/bison/depends index 3e9da3a6..e8fb4a13 100644 --- a/core/bison/depends +++ b/core/bison/depends @@ -1,2 +1 @@ -m4 -perl make +m4 make diff --git a/core/bzip2/build b/core/bzip2/build index 3f08f33b..ac1055b2 100755 --- a/core/bzip2/build +++ b/core/bzip2/build @@ -1,7 +1,7 @@ #!/bin/sh -e -make CC="${CC:-gcc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so -make CC="${CC:-gcc} $CFLAGS -fPIC $LDFLAGS" bzip2recover libbz2.a +make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so +make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" bzip2recover libbz2.a for bin in bzip2-shared bzdiff bzgrep bzip2recover bzmore; do install -Dm755 "$bin" "$1/usr/bin/${bin%%-shared}" diff --git a/core/curl/build b/core/curl/build index ac041c31..6a0914a4 100755 --- a/core/curl/build +++ b/core/curl/build @@ -12,7 +12,10 @@ --disable-ares \ --without-libidn \ --without-librtmp \ - --with-pic + --without-icu \ + --without-libpsl \ + --with-pic \ + --with-ca-fallback -make +make curl_LDFLAGS=-all-static make DESTDIR="$1" install diff --git a/core/curl/version b/core/curl/version index 017bd18c..7cff44b8 100644 --- a/core/curl/version +++ b/core/curl/version @@ -1 +1 @@ -7.69.1 1 +7.69.1 0 diff --git a/core/flex/depends b/core/flex/depends index 1df8599d..e8fb4a13 100644 --- a/core/flex/depends +++ b/core/flex/depends @@ -1,2 +1 @@ -bison -m4 +m4 make diff --git a/core/gcc/build b/core/gcc/build index 29c1226c..cabb73b7 100755 --- a/core/gcc/build +++ b/core/gcc/build @@ -1,7 +1,6 @@ #!/bin/sh -e patch -p1 < invalid_tls_model.patch -patch -p1 < static-pie.patch # Make sure gmp is built with generic options. cp -v gcc/gmp/configfsf.guess gcc/gmp/config.guess @@ -27,6 +26,8 @@ export libat_cv_have_ifunc=no --disable-werror \ --disable-fixed-point \ --disable-libstdcxx-pch \ + --disable-nls \ + --without-included-gettext \ --enable-checking=release \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ @@ -54,3 +55,12 @@ ln -s gcc "$1/usr/bin/cc" # POSIX compliance. install -Dm755 ../c99 "$1/usr/bin/c99" + +# Symlink for LTO. +{ + mkdir -p "$1/usr/lib/bfd-plugins" + + ln -s /usr/libexec/gcc/x86_64-pc-linux-musl/9.2.0/liblto_plugin.so \ + "$1/usr/lib/bfd-plugins/liblto_plugin.so" +} + diff --git a/core/gcc/checksums b/core/gcc/checksums index 35213a18..eb703466 100644 --- a/core/gcc/checksums +++ b/core/gcc/checksums @@ -4,4 +4,3 @@ 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e mpc-1.1.0.tar.gz 765614b3396d70bca3fa0ae4a813632486c6dca320e2bd13c8c39dca52be4a4c c99 b0bf792c3f5278e768b7199cc94e8c57e364eb0b70dc5a226d47eb9e25e1dac9 invalid_tls_model.patch -0d1e72a788dea767057893f63112ccc69755c40239c8ae141cf55e4075affad3 static-pie.patch diff --git a/core/gcc/depends b/core/gcc/depends index 11c84767..ca8b7e57 100644 --- a/core/gcc/depends +++ b/core/gcc/depends @@ -1,5 +1,4 @@ binutils -bison -flex -linux-headers +bison make +flex make zlib diff --git a/core/gcc/patches/static-pie.patch b/core/gcc/patches/static-pie.patch deleted file mode 100644 index e759f375..00000000 --- a/core/gcc/patches/static-pie.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/gcc/common.opt b/gcc/common.opt -index b52ef0b38c8..0ce5857e01d 100644 ---- a/gcc/gcc/common.opt -+++ b/gcc/gcc/common.opt -@@ -3197,11 +3197,11 @@ Driver - - no-pie - Driver RejectNegative Negative(shared) --Don't create a dynamically linked position independent executable. -+Don't create a position independent executable. - - pie - Driver RejectNegative Negative(no-pie) --Create a dynamically linked position independent executable. -+Create a position independent executable. - - static-pie - Driver RejectNegative Negative(pie) -diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h -index 8620de3e42d..235328a2642 100644 ---- a/gcc/gcc/config/gnu-user.h -+++ b/gcc/gcc/config/gnu-user.h -@@ -51,13 +51,12 @@ - #define GNU_USER_TARGET_STARTFILE_SPEC \ - "%{shared:; \ - pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \ -- static:crt1.o%s; \ -- static-pie:rcrt1.o%s; \ -+ static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \ - " PIE_SPEC ":Scrt1.o%s; \ - :crt1.o%s} " \ - GNU_USER_TARGET_CRTI " \ -- %{static:crtbeginT.o%s; \ -- shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \ -+ %{shared|" PIE_SPEC ":crtbeginS.o%s; \ -+ static:crtbeginT.o%s; \ - :crtbegin.o%s} \ - %{fvtable-verify=none:%s; \ - fvtable-verify=preinit:vtv_start_preinit.o%s; \ -@@ -76,8 +75,7 @@ - "%{fvtable-verify=none:%s; \ - fvtable-verify=preinit:vtv_end_preinit.o%s; \ - fvtable-verify=std:vtv_end.o%s} \ -- %{static:crtend.o%s; \ -- shared|static-pie|" PIE_SPEC ":crtendS.o%s; \ -+ %{shared|" PIE_SPEC ":crtendS.o%s; \ - :crtend.o%s} " \ - GNU_USER_TARGET_CRTN " " \ - CRTOFFLOADEND -@@ -106,7 +104,7 @@ - #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC - - #if defined(HAVE_LD_EH_FRAME_HDR) --#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} " -+#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} " - #endif - - #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index eb1610ba8b0..87560afb03c 100644 ---- a/gcc/gcc/gcc.c -+++ b/gcc/gcc/gcc.c -@@ -900,7 +900,7 @@ proper position among the other output files. */ - #define NO_FPIE_AND_FPIC_SPEC NO_FPIE_SPEC "|" NO_FPIC_SPEC - #define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;" - #else --#define PIE_SPEC "pie" -+#define PIE_SPEC "pie|static-pie" - #define FPIE1_SPEC "fpie" - #define NO_FPIE1_SPEC FPIE1_SPEC ":;" - #define FPIE2_SPEC "fPIE" -@@ -924,12 +924,12 @@ proper position among the other output files. */ - #ifndef LINK_PIE_SPEC - #ifdef HAVE_LD_PIE - #ifndef LD_PIE_SPEC --#define LD_PIE_SPEC "-pie" -+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" - #endif - #else - #define LD_PIE_SPEC "" - #endif --#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " -+#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " - #endif - - #ifndef LINK_BUILDID_SPEC --- -2.17.1 diff --git a/core/gcc/sources b/core/gcc/sources index 754131b8..f0bcc41b 100644 --- a/core/gcc/sources +++ b/core/gcc/sources @@ -1,7 +1,6 @@ -https://gcc.gnu.org/pub/gcc/releases/gcc-9.3.0/gcc-9.3.0.tar.xz gcc +https://mirrors.kernel.org/gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz gcc https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz gcc/gmp https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz gcc/mpfr https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz gcc/mpc files/c99 patches/invalid_tls_model.patch -patches/static-pie.patch diff --git a/core/gcc/version b/core/gcc/version index 4f197549..67abdd4c 100644 --- a/core/gcc/version +++ b/core/gcc/version @@ -1 +1 @@ -9.3.0 2 +9.3.0 1 diff --git a/core/gzip/build b/core/gzip/build index 6daf22f8..8d190a07 100755 --- a/core/gzip/build +++ b/core/gzip/build @@ -1,7 +1,9 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +make CC="${CC:-cc} -static" -make -make DESTDIR="$1" install +install -Dm755 pigz "$1/usr/bin/pigz" +install -Dm644 pigz.1 "$1/usr/share/man/man1/pigz.1" + +ln -sf pigz "$1/usr/bin/gzip" +ln -sf pigz.1 "$1/usr/share/man/man1/gzip.1" diff --git a/core/gzip/checksums b/core/gzip/checksums index 54032f3b..6b76bdf9 100644 --- a/core/gzip/checksums +++ b/core/gzip/checksums @@ -1 +1 @@ -8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0 gzip-1.10.tar.xz +a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73 pigz-2.4.tar.gz diff --git a/core/gzip/sources b/core/gzip/sources index 6bff4586..13397dbb 100644 --- a/core/gzip/sources +++ b/core/gzip/sources @@ -1 +1 @@ -https://ftp.gnu.org/pub/gnu/gzip/gzip-1.10.tar.xz +https://zlib.net/pigz/pigz-2.4.tar.gz diff --git a/core/gzip/version b/core/gzip/version index 82096ecf..d3d93b8d 100644 --- a/core/gzip/version +++ b/core/gzip/version @@ -1 +1 @@ -1.10 1 +1.10 2 diff --git a/core/libressl/checksums b/core/libressl/checksums index 9f96fb3b..5d28022d 100644 --- a/core/libressl/checksums +++ b/core/libressl/checksums @@ -1,2 +1,2 @@ df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e libressl-3.0.2.tar.gz -6b52d834cfae6539450e75142ff0898405c948a02db8949da8c53782ae7f9f77 update-certdata.sh +57cedb6745330bc52df27fd5e80a0c7c757ad36beb3fe16a709cdb990e96087a update-certdata.sh diff --git a/core/libressl/files/update-certdata.sh b/core/libressl/files/update-certdata.sh index 3002b05e..0c333e7a 100755 --- a/core/libressl/files/update-certdata.sh +++ b/core/libressl/files/update-certdata.sh @@ -9,8 +9,6 @@ cd /etc/ssl && { wget https://curl.haxx.se/ca/cacert.pem - mkdir -p /etc/ssl/certs - cp -f cacert.pem certs/ca-certificates.crt mv -f cacert.pem cert.pem printf '%s\n' "${0##*/}: updated cert.pm" } diff --git a/core/libressl/sources b/core/libressl/sources index 3746774e..3a74fbbf 100644 --- a/core/libressl/sources +++ b/core/libressl/sources @@ -1,2 +1,2 @@ -https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.0.2.tar.gz +https://fossies.org/linux/misc/libressl-3.0.2.tar.gz files/update-certdata.sh diff --git a/core/libressl/version b/core/libressl/version index 1e96c2b8..b0b71c8f 100644 --- a/core/libressl/version +++ b/core/libressl/version @@ -1 +1 @@ -3.0.2 3 +3.0.2 1 diff --git a/core/make/version b/core/make/version index e47357bf..aead5414 100644 --- a/core/make/version +++ b/core/make/version @@ -1 +1 @@ -4.3 2 +4.3 1 diff --git a/core/musl/build b/core/musl/build index b2c7144f..f2150a2f 100755 --- a/core/musl/build +++ b/core/musl/build @@ -8,7 +8,7 @@ make make DESTDIR="$1" install mkdir -p "$1/usr/bin" -ln -s "/usr/lib/ld-musl-x86_64.so.1" "$1/usr/bin/ldd" +ln -s /usr/lib/ld-musl-x86_64.so.1 "$1/usr/bin/ldd" # Install BSD compatibility headers. install -Dm 755 cdefs.h "$1/usr/include/sys/cdefs.h" diff --git a/core/pkgconf/sources b/core/pkgconf/sources index 201af1ec..1f6c87bf 100644 --- a/core/pkgconf/sources +++ b/core/pkgconf/sources @@ -1 +1 @@ -https://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz +http://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz diff --git a/core/rsync/build b/core/rsync/build index 6a623847..8b4a7e2c 100755 --- a/core/rsync/build +++ b/core/rsync/build @@ -1,9 +1,11 @@ #!/bin/sh -e -export CFLAGS="-static $CFLAGS" - +# Swap to awk script instead of perl script +# for building rsync. See files/mkproto.awk. sed -i 's/perl/awk -f/;s/mkproto.pl/mkproto.awk/' Makefile.in +export CFLAGS="-static $CFLAGS" + ./configure \ --prefix=/usr \ --with-included-popt \ diff --git a/core/zlib/version b/core/zlib/version index 90288038..41acf3fe 100644 --- a/core/zlib/version +++ b/core/zlib/version @@ -1 +1 @@ -1.2.11 1 +1.2.11 3 -- cgit v1.2.3