summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--experimental/erlang/APKBUILD57
-rw-r--r--experimental/erlang/fix-wx-linking.patch11
-rw-r--r--legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch (renamed from system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch)0
-rw-r--r--legacy/busybox/0001-ash-exec-busybox.static.patch (renamed from system/busybox/0001-ash-exec-busybox.static.patch)0
-rw-r--r--legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch (renamed from system/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch)0
-rw-r--r--legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch (renamed from system/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch)0
-rw-r--r--legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch (renamed from system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch)0
-rw-r--r--legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch (renamed from system/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch)0
-rw-r--r--legacy/busybox/0003-ash-exec-busybox.static.patch (renamed from system/busybox/0003-ash-exec-busybox.static.patch)0
-rw-r--r--legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch (renamed from system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch)0
-rw-r--r--legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch (renamed from system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch)0
-rw-r--r--legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch (renamed from system/busybox/0004-ping-make-ping-work-without-root-privileges.patch)0
-rw-r--r--legacy/busybox/0005-fbsplash-support-console-switching.patch (renamed from system/busybox/0005-fbsplash-support-console-switching.patch)0
-rw-r--r--legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch (renamed from system/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch)0
-rw-r--r--legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch (renamed from system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch)0
-rw-r--r--legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch (renamed from system/busybox/0006-ping-make-ping-work-without-root-privileges.patch)0
-rw-r--r--legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch (renamed from system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch)0
-rw-r--r--legacy/busybox/0007-fbsplash-support-console-switching.patch (renamed from system/busybox/0007-fbsplash-support-console-switching.patch)0
-rw-r--r--legacy/busybox/0008-diff-add-support-for-no-dereference.patch (renamed from system/busybox/0008-diff-add-support-for-no-dereference.patch)0
-rw-r--r--legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch (renamed from system/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch)0
-rw-r--r--legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch (renamed from system/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch)0
-rw-r--r--legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch (renamed from system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch)0
-rw-r--r--legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch (renamed from system/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch)0
-rw-r--r--legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch (renamed from system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch)0
-rw-r--r--legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch (renamed from system/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch)0
-rw-r--r--legacy/busybox/0011-testsuite-fix-cpio-tests.patch (renamed from system/busybox/0011-testsuite-fix-cpio-tests.patch)0
-rw-r--r--legacy/busybox/0012-microcom-segfault.patch (renamed from system/busybox/0012-microcom-segfault.patch)0
-rw-r--r--legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch (renamed from system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch)0
-rw-r--r--legacy/busybox/0013-testsuite-fix-cpio-tests.patch (renamed from system/busybox/0013-testsuite-fix-cpio-tests.patch)0
-rw-r--r--legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch (renamed from system/busybox/0014-miscutils-microcom-Fixed-segfault.patch)0
-rw-r--r--legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch (renamed from system/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch)0
-rw-r--r--legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch (renamed from system/busybox/0016-top-handle-much-larger-VSZ-values.patch)0
-rw-r--r--legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch (renamed from system/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch)0
-rw-r--r--legacy/busybox/APKBUILD (renamed from system/busybox/APKBUILD)0
-rw-r--r--legacy/busybox/acpid.logrotate (renamed from system/busybox/acpid.logrotate)0
-rw-r--r--legacy/busybox/bbsuid.c (renamed from system/busybox/bbsuid.c)0
-rw-r--r--legacy/busybox/busybox-extras.post-install (renamed from system/busybox/busybox-extras.post-install)0
-rw-r--r--legacy/busybox/busybox-extras.pre-deinstall (renamed from system/busybox/busybox-extras.pre-deinstall)0
-rw-r--r--legacy/busybox/busybox.post-install (renamed from system/busybox/busybox.post-install)0
-rw-r--r--legacy/busybox/busybox.post-upgrade (renamed from system/busybox/busybox.post-upgrade)0
-rw-r--r--legacy/busybox/busybox.pre-deinstall (renamed from system/busybox/busybox.pre-deinstall)0
-rw-r--r--legacy/busybox/busybox.trigger (renamed from system/busybox/busybox.trigger)0
-rw-r--r--legacy/busybox/busyboxconfig (renamed from system/busybox/busyboxconfig)0
-rw-r--r--legacy/busybox/busyboxconfig-extras (renamed from system/busybox/busyboxconfig-extras)0
-rw-r--r--legacy/busybox/dad.if-up (renamed from system/busybox/dad.if-up)0
-rw-r--r--legacy/busybox/external_ssl_client.patch (renamed from system/busybox/external_ssl_client.patch)0
-rw-r--r--legacy/busybox/nologin.c (renamed from system/busybox/nologin.c)0
-rw-r--r--legacy/busybox/ssl_client.c (renamed from system/busybox/ssl_client.c)0
-rw-r--r--legacy/busybox/top-buffer-overflow.patch (renamed from system/busybox/top-buffer-overflow.patch)0
-rw-r--r--system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch31
-rw-r--r--system/abuild/0001-newapkbuild-fix-typo.patch25
-rw-r--r--system/abuild/0002-newapkbuild-move-checksum-call-to-after-fetch.patch40
-rw-r--r--system/abuild/APKBUILD32
-rw-r--r--system/abuild/checkapk-libarchive-tar.patch11
-rw-r--r--system/abuild/use-pigz.patch19
-rw-r--r--system/adelie-base/APKBUILD7
-rw-r--r--system/apk-tools/APKBUILD2
-rw-r--r--system/asciidoctor/APKBUILD2
-rw-r--r--system/at/APKBUILD8
-rw-r--r--system/atf/APKBUILD3
-rw-r--r--system/attr/APKBUILD8
-rw-r--r--system/autoconf/APKBUILD4
-rw-r--r--system/automake/APKBUILD3
-rw-r--r--system/bash/APKBUILD17
-rw-r--r--system/bc/APKBUILD16
-rw-r--r--system/binutils/APKBUILD23
-rw-r--r--system/binutils/CVE-2018-19931.patch31
-rw-r--r--system/binutils/CVE-2018-19932.patch47
-rw-r--r--system/binutils/ppc64-test-failure.patch12
-rw-r--r--system/binutils/remove-no-static-plt-test.patch21
-rw-r--r--system/bison/APKBUILD2
-rw-r--r--system/byacc/APKBUILD4
-rw-r--r--system/bzip2/APKBUILD2
-rw-r--r--system/ca-certificates/APKBUILD23
-rw-r--r--system/ca-certificates/certhash2
-rw-r--r--system/cflow/APKBUILD6
-rw-r--r--system/cmake/APKBUILD8
-rw-r--r--system/console-setup/APKBUILD7
-rw-r--r--system/coreutils/APKBUILD11
-rw-r--r--system/cryptsetup/APKBUILD13
-rw-r--r--system/cryptsetup/flush-stdout.patch17
-rw-r--r--system/cvs/APKBUILD4
-rw-r--r--system/db/APKBUILD8
-rw-r--r--system/db/atomics.patch22
-rw-r--r--system/debianutils/APKBUILD10
-rw-r--r--system/diffutils/APKBUILD22
-rw-r--r--system/e2fsprogs/APKBUILD10
-rw-r--r--system/e2fsprogs/header-fix.patch9
-rw-r--r--system/easy-kernel-power8-64k/APKBUILD5
-rw-r--r--system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch84
-rw-r--r--system/easy-kernel-power8/APKBUILD5
-rw-r--r--system/easy-kernel-power8/ppc64-epapr-gcc8.patch84
-rw-r--r--system/easy-kernel/APKBUILD5
-rw-r--r--system/easy-kernel/config-ppc131
-rw-r--r--system/easy-kernel/ppc64-epapr-gcc8.patch84
-rw-r--r--system/execline/APKBUILD48
-rw-r--r--system/expat/APKBUILD2
-rw-r--r--system/expect/APKBUILD2
-rw-r--r--system/fakeroot/APKBUILD9
-rw-r--r--system/file/APKBUILD13
-rw-r--r--system/findutils/APKBUILD8
-rw-r--r--system/flex/APKBUILD2
-rw-r--r--system/gcc/0002-posix_memalign.patch42
-rw-r--r--system/gcc/0008-s390x-muslldso.patch26
-rw-r--r--system/gcc/0009-microblaze-pr65649.patch34
-rw-r--r--system/gcc/0010-ldbl128-config.patch76
-rw-r--r--system/gcc/0011-m68k.patch40
-rw-r--r--system/gcc/0012-static-pie.patch138
-rw-r--r--system/gcc/001_all_default-ssp-strong.patch215
-rw-r--r--system/gcc/002_all_default-relro.patch2
-rw-r--r--system/gcc/003_all_default-fortify-source.patch40
-rw-r--r--system/gcc/005_all_default-as-needed.patch157
-rw-r--r--system/gcc/011_all_default-warn-format-security.patch38
-rw-r--r--system/gcc/012_all_default-warn-trampolines.patch2
-rw-r--r--system/gcc/050_all_libiberty-asprintf.patch18
-rw-r--r--system/gcc/053_all_libitm-no-fortify-source.patch27
-rw-r--r--system/gcc/067_all_gcc-poison-system-directories.patch194
-rw-r--r--system/gcc/090_all_pr55930-dependency-tracking.patch18
-rw-r--r--system/gcc/201-cilkrts.patch59
-rw-r--r--system/gcc/203-libgcc_s.patch56
-rw-r--r--system/gcc/204-linux_libc_has_function.patch25
-rw-r--r--system/gcc/207-static-pie.patch40
-rw-r--r--system/gcc/300-main-gcc-add-musl-s390x-dynamic-linker.patch32
-rw-r--r--system/gcc/310-build-gcj-s390x.patch28
-rw-r--r--system/gcc/332-gccgo-remove-ustat.patch190
-rw-r--r--system/gcc/332-gccgo-sysinfo.patch12
-rw-r--r--system/gcc/333-gccgo-signal-ppc64.patch11
-rw-r--r--system/gcc/334-gccgo-signal-shell.patch25
-rw-r--r--system/gcc/335-gccgo-signal-ppc32.patch14
-rw-r--r--system/gcc/336-gccgo-mmap64.patch29
-rw-r--r--system/gcc/337-gccgo-signal-sig34.patch11
-rw-r--r--system/gcc/APKBUILD202
-rw-r--r--system/gcc/ada-aarch64-multiarch.patch16
-rw-r--r--system/gcc/ada-fixes.patch35
-rw-r--r--system/gcc/backport-r267157-posix-conformant-snprintf.patch80
-rw-r--r--system/gcc/backport-r268048-memcpy-bounds.patch21
-rw-r--r--system/gcc/boehm-gc-musl.patch62
-rw-r--r--system/gcc/disable-multiarch-ppc32.patch15
-rw-r--r--system/gcc/fix-gcj-iconv-musl.patch120
-rw-r--r--system/gcc/fix-gcj-musl.patch49
-rw-r--r--system/gcc/fix-gcj-stdgnu14-link.patch35
-rw-r--r--system/gcc/fix-rs6000-pie.patch59
-rw-r--r--system/gcc/gcc-4.8-build-args.patch41
-rw-r--r--system/gcc/lra-pentium.patch48
-rw-r--r--system/gettys-openrc/APKBUILD2
-rw-r--r--system/git/APKBUILD12
-rw-r--r--system/git/dont-test-other-encodings.patch224
-rw-r--r--system/grep/APKBUILD18
-rw-r--r--system/groff/APKBUILD13
-rw-r--r--system/gzip/APKBUILD10
-rw-r--r--system/heirloom-devtools/APKBUILD2
-rw-r--r--system/help2man/APKBUILD2
-rw-r--r--system/icu/APKBUILD4
-rw-r--r--system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch28
-rw-r--r--system/iproute2/APKBUILD20
-rw-r--r--system/iproute2/musl-fixes.patch214
-rw-r--r--system/isl/APKBUILD22
-rw-r--r--system/kmod/APKBUILD12
-rw-r--r--system/kyua/APKBUILD3
-rw-r--r--system/libaio/APKBUILD19
-rw-r--r--system/libaio/improper-strncpy-usage.patch26
-rw-r--r--system/libaio/posix-header.patch11
-rw-r--r--system/libarchive/APKBUILD4
-rw-r--r--system/libcap-ng/APKBUILD4
-rw-r--r--system/libcap/APKBUILD2
-rw-r--r--system/libedit/APKBUILD12
-rw-r--r--system/libelf/APKBUILD9
-rw-r--r--system/libexecinfo/APKBUILD2
-rw-r--r--system/libffi/APKBUILD4
-rw-r--r--system/libgcrypt/APKBUILD4
-rw-r--r--system/libgpg-error/APKBUILD10
-rw-r--r--system/libidn/APKBUILD2
-rw-r--r--system/libmnl/APKBUILD4
-rw-r--r--system/libpipeline/APKBUILD17
-rw-r--r--system/libssh2/APKBUILD7
-rw-r--r--system/libtool/APKBUILD5
-rw-r--r--system/libtool/libtool.patch41
-rw-r--r--system/libucontext/APKBUILD2
-rw-r--r--system/libuv/APKBUILD11
-rw-r--r--system/libxml2/APKBUILD14
-rw-r--r--system/libxslt/APKBUILD10
-rw-r--r--system/linenoise/APKBUILD8
-rw-r--r--system/linenoise/build-shared-lib.patch5
-rw-r--r--system/linux-pam/APKBUILD4
-rw-r--r--system/lutok/APKBUILD2
-rw-r--r--system/lvm2/APKBUILD24
-rw-r--r--system/lz4/APKBUILD17
-rw-r--r--system/lzip/APKBUILD14
-rw-r--r--system/lzo/APKBUILD (renamed from user/lzo/APKBUILD)0
-rw-r--r--system/lzop/APKBUILD (renamed from user/lzop/APKBUILD)0
-rw-r--r--system/m4/APKBUILD2
-rw-r--r--system/mailx/APKBUILD2
-rw-r--r--system/make/APKBUILD7
-rw-r--r--system/man-db/APKBUILD20
-rw-r--r--system/man-db/man-db-2.8.5-iconv.patch (renamed from system/man-db/man-db-2.8.3-iconv.patch)32
-rw-r--r--system/man-pages/APKBUILD10
-rw-r--r--system/mpc1/APKBUILD2
-rw-r--r--system/mpfr3/APKBUILD2
-rw-r--r--system/musl/APKBUILD4
-rw-r--r--system/nspr/APKBUILD9
-rw-r--r--system/nss/APKBUILD12
-rw-r--r--system/openrc/APKBUILD3
-rw-r--r--system/openssh/APKBUILD4
-rw-r--r--system/openssl/0002-busybox-basename.patch34
-rw-r--r--system/openssl/APKBUILD12
-rw-r--r--system/parted/APKBUILD7
-rw-r--r--system/patch/APKBUILD2
-rw-r--r--system/pax-utils/APKBUILD2
-rw-r--r--system/perl-authen-sasl/APKBUILD2
-rw-r--r--system/perl-cpanel-json-xs/APKBUILD2
-rw-r--r--system/perl-dbd-sqlite/APKBUILD2
-rw-r--r--system/perl-dbi/APKBUILD2
-rw-r--r--system/perl-digest-hmac/APKBUILD2
-rw-r--r--system/perl-digest-sha1/APKBUILD2
-rw-r--r--system/perl-encode-locale/APKBUILD2
-rw-r--r--system/perl-error/APKBUILD2
-rw-r--r--system/perl-extutils-config/APKBUILD2
-rw-r--r--system/perl-extutils-helpers/APKBUILD2
-rw-r--r--system/perl-extutils-installpaths/APKBUILD2
-rw-r--r--system/perl-file-listing/APKBUILD2
-rw-r--r--system/perl-file-remove/APKBUILD2
-rw-r--r--system/perl-html-parser/APKBUILD2
-rw-r--r--system/perl-html-tagset/APKBUILD2
-rw-r--r--system/perl-http-cookies/APKBUILD2
-rw-r--r--system/perl-http-daemon/APKBUILD2
-rw-r--r--system/perl-http-date/APKBUILD2
-rw-r--r--system/perl-http-message/APKBUILD2
-rw-r--r--system/perl-http-negotiate/APKBUILD2
-rw-r--r--system/perl-io-html/APKBUILD2
-rw-r--r--system/perl-io-socket-ssl/APKBUILD2
-rw-r--r--system/perl-json-maybexs/APKBUILD2
-rw-r--r--system/perl-json/APKBUILD2
-rw-r--r--system/perl-lwp-mediatypes/APKBUILD2
-rw-r--r--system/perl-module-build-tiny/APKBUILD2
-rw-r--r--system/perl-module-build/APKBUILD2
-rw-r--r--system/perl-module-install/APKBUILD2
-rw-r--r--system/perl-module-scandeps/APKBUILD2
-rw-r--r--system/perl-net-http/APKBUILD2
-rw-r--r--system/perl-net-libidn/APKBUILD4
-rw-r--r--system/perl-net-smtp-ssl/APKBUILD2
-rw-r--r--system/perl-net-ssleay/APKBUILD2
-rw-r--r--system/perl-sgmls/APKBUILD2
-rw-r--r--system/perl-sub-uplevel/APKBUILD2
-rw-r--r--system/perl-test-exception/APKBUILD2
-rw-r--r--system/perl-test-fatal/APKBUILD2
-rw-r--r--system/perl-test-harness/APKBUILD2
-rw-r--r--system/perl-test-leaktrace/APKBUILD2
-rw-r--r--system/perl-test-nowarnings/APKBUILD2
-rw-r--r--system/perl-test-pod/APKBUILD2
-rw-r--r--system/perl-test-requires/APKBUILD2
-rw-r--r--system/perl-test-requiresinternet/APKBUILD2
-rw-r--r--system/perl-test-simple/APKBUILD2
-rw-r--r--system/perl-test-warn/APKBUILD2
-rw-r--r--system/perl-test-without-module/APKBUILD2
-rw-r--r--system/perl-try-tiny/APKBUILD2
-rw-r--r--system/perl-unicode-linebreak/APKBUILD4
-rw-r--r--system/perl-www-robotrules/APKBUILD2
-rw-r--r--system/perl-yaml-tiny/APKBUILD2
-rw-r--r--system/perl/APKBUILD4
-rw-r--r--system/pkgconf/APKBUILD15
-rw-r--r--system/pkgconf/personality.patch55
-rw-r--r--system/po4a/APKBUILD7
-rw-r--r--system/python3/APKBUILD12
-rw-r--r--system/rhash/APKBUILD14
-rw-r--r--system/rsync/APKBUILD8
-rw-r--r--system/ruby/APKBUILD27
-rw-r--r--system/ruby/ruby-2.5.3-rubygems-v2.patch408
-rw-r--r--system/s6/APKBUILD45
-rw-r--r--system/s6/s6.post-upgrade15
-rw-r--r--system/sed/APKBUILD10
-rw-r--r--system/skalibs/APKBUILD40
-rw-r--r--system/sqlite/APKBUILD35
-rw-r--r--system/ssmtp/APKBUILD2
-rw-r--r--system/strace/APKBUILD15
-rw-r--r--system/sudo/APKBUILD15
-rw-r--r--system/sudo/test-suite.patch407
-rw-r--r--system/sysvinit/APKBUILD2
-rw-r--r--system/tcl/APKBUILD4
-rw-r--r--system/texinfo/APKBUILD11
-rw-r--r--system/tzdata/APKBUILD24
-rw-r--r--system/util-linux/APKBUILD17
-rw-r--r--system/utmps/APKBUILD48
-rw-r--r--system/uucp/APKBUILD2
-rw-r--r--system/vim/APKBUILD2
-rw-r--r--system/xfsprogs/APKBUILD7
-rw-r--r--system/yaml/APKBUILD2
-rw-r--r--system/zlib/APKBUILD4
-rw-r--r--system/zsh/APKBUILD24
-rw-r--r--user/fastjar/APKBUILD51
-rw-r--r--user/fastjar/efficiency.patch104
-rw-r--r--user/fastjar/null-terminate.patch14
-rw-r--r--user/fastjar/write-return.patch15
-rw-r--r--user/gpgme/1.12.0-fix-t-tofuinfo.patch100
-rw-r--r--user/gpgme/APKBUILD27
-rw-r--r--user/java-cacerts/APKBUILD24
-rw-r--r--user/java-cacerts/java-cacerts3
-rw-r--r--user/java-common/APKBUILD22
-rw-r--r--user/java-common/java-common.trigger13
-rw-r--r--user/java-gcj-compat/APKBUILD65
-rw-r--r--user/libxp/APKBUILD38
-rw-r--r--user/lksctp-tools/APKBUILD38
-rw-r--r--user/netqmail/APKBUILD4
-rw-r--r--user/openjdk7/APKBUILD286
-rw-r--r--user/openjdk7/icedtea-cpio.patch11
-rw-r--r--user/openjdk7/icedtea-hotspot-musl-ppc.patch169
-rw-r--r--user/openjdk7/icedtea-hotspot-musl.patch79
-rw-r--r--user/openjdk7/icedtea-hotspot-noagent-musl.patch54
-rw-r--r--user/openjdk7/icedtea-hotspot-uclibc-fixes.patch93
-rw-r--r--user/openjdk7/icedtea-jdk-execinfo.patch40
-rw-r--r--user/openjdk7/icedtea-jdk-fix-build.patch56
-rw-r--r--user/openjdk7/icedtea-jdk-fix-ipv6-init.patch42
-rw-r--r--user/openjdk7/icedtea-jdk-musl.patch116
-rw-r--r--user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch84
-rw-r--r--user/openjdk7/icedtea-jdk-no-soname.patch12
-rw-r--r--user/openjdk7/icedtea-remove-gawk.patch22
-rw-r--r--user/openjdk7/icedtea-tar.patch22
-rw-r--r--user/openjdk7/icedtea-xattr.patch11
-rw-r--r--user/openjdk7/remove-gawk.patch125
-rw-r--r--user/openjdk7/xattr.patch11
-rw-r--r--user/perl-test-differences/APKBUILD4
-rw-r--r--user/s6-dns/APKBUILD48
-rw-r--r--user/s6-networking/APKBUILD46
-rw-r--r--user/xorgproto/APKBUILD12
-rw-r--r--user/xorgproto/xprint.patch424
324 files changed, 4982 insertions, 3208 deletions
diff --git a/experimental/erlang/APKBUILD b/experimental/erlang/APKBUILD
new file mode 100644
index 000000000..82832e96e
--- /dev/null
+++ b/experimental/erlang/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=erlang
+pkgver=21.2
+pkgrel=0
+pkgdesc="Soft real-time system programming language"
+url="https://www.erlang.org/"
+arch="all"
+license="Apache-2.0"
+depends=""
+makedepends="libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl
+ unixodbc-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://erlang.org/download/otp_src_$pkgver.tar.gz
+ fix-wx-linking.patch
+ "
+builddir="$srcdir/otp_src_$pkgver"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --enable-shared-zlib \
+ --enable-ssl=dynamic-ssl-lib \
+ --enable-threads
+ make
+}
+
+check() {
+ local _header
+
+ cd "$builddir"
+ export ERL_TOP=$builddir
+
+ make release_tests
+
+ for _header in erl_fixed_size_int_types.h \
+ ${CHOST}/erl_int_sizes_config.h \
+ erl_memory_trace_parser.h; do
+ cp erts/include/$_header erts/emulator/beam/
+ done
+ cd release/tests/test_server
+ $ERL_TOP/bin/erl -s ts install -s ts smoke_test batch -s init stop
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="5707ef0d49a9af12cd9d93c3e4fd200092773645838bbe0163782d0fa40562d2b48bdb07f0e650311bfec896ed9e3c9621b4d0ba114c578d7ca3209c2a96ac24 otp_src_21.2.tar.gz
+5f1b05d8be71d5e3d7e8c5ad019329af8f68174251b5b6e0a9ee9cb3da51a10983b8696e23b3954c19de5d54783ec16f38c80c74724341dbafb22fcac83c77d4 fix-wx-linking.patch"
diff --git a/experimental/erlang/fix-wx-linking.patch b/experimental/erlang/fix-wx-linking.patch
new file mode 100644
index 000000000..eb5649164
--- /dev/null
+++ b/experimental/erlang/fix-wx-linking.patch
@@ -0,0 +1,11 @@
+--- otp_src_21.2/lib/wx/configure.old 2018-12-10 20:11:00.000000000 +0000
++++ otp_src_21.2/lib/wx/configure 2019-02-24 22:16:37.340000000 +0000
+@@ -5765,7 +5765,7 @@
+ // it isn't in too old wxWidgets versions
+ wxString test = wxString::FromUTF8((const char *)"foo");
+ wxStyledTextCtrl * foo = new wxStyledTextCtrl();
+- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1,
++ wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, NULL,
+ wxDefaultPosition,wxDefaultSize,0);
+ return true;
+ };
diff --git a/system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch b/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
index 929370b9d..929370b9d 100644
--- a/system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
+++ b/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
diff --git a/system/busybox/0001-ash-exec-busybox.static.patch b/legacy/busybox/0001-ash-exec-busybox.static.patch
index fdf134960..fdf134960 100644
--- a/system/busybox/0001-ash-exec-busybox.static.patch
+++ b/legacy/busybox/0001-ash-exec-busybox.static.patch
diff --git a/system/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch b/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch
index 4680b920e..4680b920e 100644
--- a/system/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch
+++ b/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch
diff --git a/system/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch b/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch
index 3780b039e..3780b039e 100644
--- a/system/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch
+++ b/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch
diff --git a/system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch b/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
index 8c8e4ee7a..8c8e4ee7a 100644
--- a/system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
+++ b/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
diff --git a/system/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
index 72df8ecf9..72df8ecf9 100644
--- a/system/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+++ b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
diff --git a/system/busybox/0003-ash-exec-busybox.static.patch b/legacy/busybox/0003-ash-exec-busybox.static.patch
index 94239a2eb..94239a2eb 100644
--- a/system/busybox/0003-ash-exec-busybox.static.patch
+++ b/legacy/busybox/0003-ash-exec-busybox.static.patch
diff --git a/system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch b/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
index 5671ee1b0..5671ee1b0 100644
--- a/system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
+++ b/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
diff --git a/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
index 7f105cb67..7f105cb67 100644
--- a/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ b/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
diff --git a/system/busybox/0004-ping-make-ping-work-without-root-privileges.patch b/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch
index 77fa5ed76..77fa5ed76 100644
--- a/system/busybox/0004-ping-make-ping-work-without-root-privileges.patch
+++ b/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch
diff --git a/system/busybox/0005-fbsplash-support-console-switching.patch b/legacy/busybox/0005-fbsplash-support-console-switching.patch
index 792c2d6c8..792c2d6c8 100644
--- a/system/busybox/0005-fbsplash-support-console-switching.patch
+++ b/legacy/busybox/0005-fbsplash-support-console-switching.patch
diff --git a/system/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
index 181acdb9a..181acdb9a 100644
--- a/system/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
+++ b/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
diff --git a/system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
index 65c423178..65c423178 100644
--- a/system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ b/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
diff --git a/system/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch
index 630619b4a..630619b4a 100644
--- a/system/busybox/0006-ping-make-ping-work-without-root-privileges.patch
+++ b/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch
diff --git a/system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
index 8b89902de..8b89902de 100644
--- a/system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
+++ b/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
diff --git a/system/busybox/0007-fbsplash-support-console-switching.patch b/legacy/busybox/0007-fbsplash-support-console-switching.patch
index ef226d009..ef226d009 100644
--- a/system/busybox/0007-fbsplash-support-console-switching.patch
+++ b/legacy/busybox/0007-fbsplash-support-console-switching.patch
diff --git a/system/busybox/0008-diff-add-support-for-no-dereference.patch b/legacy/busybox/0008-diff-add-support-for-no-dereference.patch
index 95063a863..95063a863 100644
--- a/system/busybox/0008-diff-add-support-for-no-dereference.patch
+++ b/legacy/busybox/0008-diff-add-support-for-no-dereference.patch
diff --git a/system/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch b/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
index b0cb5cc3d..b0cb5cc3d 100644
--- a/system/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ b/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
diff --git a/system/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch b/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
index 2034f5c88..2034f5c88 100644
--- a/system/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
+++ b/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
diff --git a/system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
index 2624675c4..2624675c4 100644
--- a/system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
+++ b/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
diff --git a/system/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
index a45c46d09..a45c46d09 100644
--- a/system/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
+++ b/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
diff --git a/system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch b/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
index 75fe62dfd..75fe62dfd 100644
--- a/system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
diff --git a/system/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch
index b4ba240c4..b4ba240c4 100644
--- a/system/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch
+++ b/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch
diff --git a/system/busybox/0011-testsuite-fix-cpio-tests.patch b/legacy/busybox/0011-testsuite-fix-cpio-tests.patch
index a6eb803de..a6eb803de 100644
--- a/system/busybox/0011-testsuite-fix-cpio-tests.patch
+++ b/legacy/busybox/0011-testsuite-fix-cpio-tests.patch
diff --git a/system/busybox/0012-microcom-segfault.patch b/legacy/busybox/0012-microcom-segfault.patch
index 4789079b3..4789079b3 100644
--- a/system/busybox/0012-microcom-segfault.patch
+++ b/legacy/busybox/0012-microcom-segfault.patch
diff --git a/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
index 50719b003..50719b003 100644
--- a/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
diff --git a/system/busybox/0013-testsuite-fix-cpio-tests.patch b/legacy/busybox/0013-testsuite-fix-cpio-tests.patch
index a9ba0c4d0..a9ba0c4d0 100644
--- a/system/busybox/0013-testsuite-fix-cpio-tests.patch
+++ b/legacy/busybox/0013-testsuite-fix-cpio-tests.patch
diff --git a/system/busybox/0014-miscutils-microcom-Fixed-segfault.patch b/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch
index 59114460a..59114460a 100644
--- a/system/busybox/0014-miscutils-microcom-Fixed-segfault.patch
+++ b/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch
diff --git a/system/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch b/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch
index 9fc6f7e68..9fc6f7e68 100644
--- a/system/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch
+++ b/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch
diff --git a/system/busybox/0016-top-handle-much-larger-VSZ-values.patch b/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch
index c8013403f..c8013403f 100644
--- a/system/busybox/0016-top-handle-much-larger-VSZ-values.patch
+++ b/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch
diff --git a/system/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch b/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
index bdf24b783..bdf24b783 100644
--- a/system/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
+++ b/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
diff --git a/system/busybox/APKBUILD b/legacy/busybox/APKBUILD
index 44b3e352d..44b3e352d 100644
--- a/system/busybox/APKBUILD
+++ b/legacy/busybox/APKBUILD
diff --git a/system/busybox/acpid.logrotate b/legacy/busybox/acpid.logrotate
index a37763540..a37763540 100644
--- a/system/busybox/acpid.logrotate
+++ b/legacy/busybox/acpid.logrotate
diff --git a/system/busybox/bbsuid.c b/legacy/busybox/bbsuid.c
index 24d0d7d3e..24d0d7d3e 100644
--- a/system/busybox/bbsuid.c
+++ b/legacy/busybox/bbsuid.c
diff --git a/system/busybox/busybox-extras.post-install b/legacy/busybox/busybox-extras.post-install
index a0327a691..a0327a691 100644
--- a/system/busybox/busybox-extras.post-install
+++ b/legacy/busybox/busybox-extras.post-install
diff --git a/system/busybox/busybox-extras.pre-deinstall b/legacy/busybox/busybox-extras.pre-deinstall
index 15461302c..15461302c 100644
--- a/system/busybox/busybox-extras.pre-deinstall
+++ b/legacy/busybox/busybox-extras.pre-deinstall
diff --git a/system/busybox/busybox.post-install b/legacy/busybox/busybox.post-install
index a986b2f76..a986b2f76 100644
--- a/system/busybox/busybox.post-install
+++ b/legacy/busybox/busybox.post-install
diff --git a/system/busybox/busybox.post-upgrade b/legacy/busybox/busybox.post-upgrade
index 291ed7a6d..291ed7a6d 100644
--- a/system/busybox/busybox.post-upgrade
+++ b/legacy/busybox/busybox.post-upgrade
diff --git a/system/busybox/busybox.pre-deinstall b/legacy/busybox/busybox.pre-deinstall
index f1e10ba92..f1e10ba92 100644
--- a/system/busybox/busybox.pre-deinstall
+++ b/legacy/busybox/busybox.pre-deinstall
diff --git a/system/busybox/busybox.trigger b/legacy/busybox/busybox.trigger
index e531a45b8..e531a45b8 100644
--- a/system/busybox/busybox.trigger
+++ b/legacy/busybox/busybox.trigger
diff --git a/system/busybox/busyboxconfig b/legacy/busybox/busyboxconfig
index d2ea6fd75..d2ea6fd75 100644
--- a/system/busybox/busyboxconfig
+++ b/legacy/busybox/busyboxconfig
diff --git a/system/busybox/busyboxconfig-extras b/legacy/busybox/busyboxconfig-extras
index ed9c572a9..ed9c572a9 100644
--- a/system/busybox/busyboxconfig-extras
+++ b/legacy/busybox/busyboxconfig-extras
diff --git a/system/busybox/dad.if-up b/legacy/busybox/dad.if-up
index e76bb60bf..e76bb60bf 100644
--- a/system/busybox/dad.if-up
+++ b/legacy/busybox/dad.if-up
diff --git a/system/busybox/external_ssl_client.patch b/legacy/busybox/external_ssl_client.patch
index 8adb7b41b..8adb7b41b 100644
--- a/system/busybox/external_ssl_client.patch
+++ b/legacy/busybox/external_ssl_client.patch
diff --git a/system/busybox/nologin.c b/legacy/busybox/nologin.c
index 75ad89eda..75ad89eda 100644
--- a/system/busybox/nologin.c
+++ b/legacy/busybox/nologin.c
diff --git a/system/busybox/ssl_client.c b/legacy/busybox/ssl_client.c
index 8aa558e70..8aa558e70 100644
--- a/system/busybox/ssl_client.c
+++ b/legacy/busybox/ssl_client.c
diff --git a/system/busybox/top-buffer-overflow.patch b/legacy/busybox/top-buffer-overflow.patch
index 14b23c648..14b23c648 100644
--- a/system/busybox/top-buffer-overflow.patch
+++ b/legacy/busybox/top-buffer-overflow.patch
diff --git a/system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch b/system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch
deleted file mode 100644
index d3bcb70ca..000000000
--- a/system/abuild/0001-abuild-continue-faking-POSIX-support-for-now.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2a696e782445c020db606e92f49a7afb8b9bda1a Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 20 May 2018 02:10:36 -0500
-Subject: [PATCH] abuild: continue faking POSIX support for now
-
----
- abuild.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index bd32f4e..e3a35ca 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1,4 +1,4 @@
--#!/bin/ash -e
-+#!/bin/sh -e
-
- # abuild - build apk packages (light version of makepkg)
- # Copyright (c) 2008-2015 Natanael Copa <ncopa@alpinelinux.org>
-@@ -441,7 +441,7 @@ default_unpack() {
- tar -C "$srcdir" -xf "$s" || return 1;;
- *.tar.gz|*.tgz)
- msg "Unpacking $s..."
-- $gunzip -c "$s" | tar -C "$srcdir" -x || return 1;;
-+ $gunzip -c "$s" | tar -C "$srcdir" -f - -x || return 1;;
- *.tar.bz2)
- msg "Unpacking $s..."
- tar -C "$srcdir" -jxf "$s" || return 1;;
---
-2.15.0
-
diff --git a/system/abuild/0001-newapkbuild-fix-typo.patch b/system/abuild/0001-newapkbuild-fix-typo.patch
deleted file mode 100644
index 9df4f8526..000000000
--- a/system/abuild/0001-newapkbuild-fix-typo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15299d6c47c3a0fdd0091691ad3461680f1cadff Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Tue, 22 May 2018 21:50:06 -0500
-Subject: [PATCH 1/2] newapkbuild: fix typo
-
----
- newapkbuild.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index 541f261..1a005c3 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -170,7 +170,7 @@ newaport() {
- pkgname=$pn
- fi
- if [ -e "$pkgname"/APKBUILD ] && [ -z "$force" ]; then
-- error "$pkgname/APKBUILD already exist"
-+ error "$pkgname/APKBUILD already exists"
- return 1
- fi
- mkdir -p "$pkgname"
---
-2.15.0
-
diff --git a/system/abuild/0002-newapkbuild-move-checksum-call-to-after-fetch.patch b/system/abuild/0002-newapkbuild-move-checksum-call-to-after-fetch.patch
deleted file mode 100644
index 338aff758..000000000
--- a/system/abuild/0002-newapkbuild-move-checksum-call-to-after-fetch.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d3040cca076e187259e4aa4b1d613752d7254fcd Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Tue, 22 May 2018 21:50:55 -0500
-Subject: [PATCH 2/2] newapkbuild: move checksum call to after fetch
-
-unpack will no longer unpack without a checksum, even with -f. This
-means that newapkbuild will not be able to deduce what kind of build
-system is contained within, so the templates for CMake, Perl, etc are
-never used.
-
-This patch ensures checksumming is done right after fetch, so that
-unpack works properly.
----
- newapkbuild.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index 1a005c3..77d1a8b 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -228,7 +228,7 @@ subpackages="\$pkgname-dev \$pkgname-doc"
- source="$source"
- __EOF__
-
-- abuild -f fetch unpack
-+ abuild -f fetch checksum unpack
- # Figure out the builddir
- for i in src/*; do
- if [ -d "$i" ]; then
-@@ -339,7 +339,6 @@ __EOF__
- }
-
- __EOF__
-- abuild -f checksum
- }
-
- usage() {
---
-2.15.0
-
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index 5e462a8c9..7e4693246 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abuild
-pkgver=3.2.0_rc1
-pkgrel=5
+pkgver=3.3.1
+pkgrel=0
pkgdesc="Script to build APK packages"
url="https://code.foxkit.us/adelie/aports"
arch="all"
@@ -15,17 +15,10 @@ makedepends_build="pkgconfig"
makedepends_host="openssl-dev zlib-dev"
makedepends="$makedepends_host $makedepends_build"
install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="apkbuild-cpan:cpan:noarch abuild-rootbld:_rootbld:noarch
- $pkgname-doc"
+subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc"
options="suid !check"
pkggroups="abuild"
-source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
- 0001-abuild-continue-faking-POSIX-support-for-now.patch
- 0001-newapkbuild-fix-typo.patch
- 0002-newapkbuild-move-checksum-call-to-after-fetch.patch
- use-pigz.patch
- checkapk-libarchive-tar.patch
- "
+source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz"
builddir="$srcdir/$pkgname-$pkgver+adelie"
prepare() {
@@ -50,14 +43,8 @@ package() {
# hardcoded to use Alpine repositories and URLs.
# maybe rewrite some day, pending user demand.
rm "$pkgdir"/usr/bin/apkbuild-gem-resolver
-}
-
-cpan() {
- pkgdesc="Script to generate perl APKBUILD from CPAN"
- depends="perl perl-libwww perl-json perl-module-build-tiny"
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
+ # very broken
+ rm "$pkgdir"/usr/bin/apkbuild-cpan
}
_rootbld() {
@@ -66,9 +53,4 @@ _rootbld() {
mkdir -p "$subpkgdir"
}
-sha512sums="8d9e66ec6a4e814f9be0a10b53c4b183afa97c9969d9bb86fdec0b9096756d6343cec4840fb61a5812eb4879e61c106adbdd286e63d9cfc4f8b66b6cad79557b abuild-3.2.0_rc1+adelie.tar.xz
-b7aa7ff9858eee2ff20eeed3b8da60d40e608b4da2676acb9c8b16ca6639283e5d70884888efd505fcd239bb462f726203e4773a4f706b16d07742b2a8631b6c 0001-abuild-continue-faking-POSIX-support-for-now.patch
-4ef673998b8f28469eeb4d1448a664f7052686466a67b1a3f3cab1e249ad44308df92737da4eae3c3ffea06806f460e23fc1c0ddccd7f9e82c4e308cb63be029 0001-newapkbuild-fix-typo.patch
-c6ebe8219c2e8ec9fc75da1c597b2d8d960e632286a6c7f1d1ffb6623b4d4acca54ae90a6c07637c589cbbe3ed2fb0da0c26a41df20cac0318b4894991e2dbf4 0002-newapkbuild-move-checksum-call-to-after-fetch.patch
-b428baddee9b719898a6e7f87d3a990aa1000cac0b6bcf3890e7cafd0ee164164551e7c4699d12f29ea9b6364cc18722a5560b0b65b9d8f586caf739a5432313 use-pigz.patch
-0acff1a66e327236aad85ab3b77724dd1ac398cc4db305fee82c6ead64ab9c9332c9ffa5d08c8607494e5925ced8d7b315670b2fe589c0df3b3fc61caea3acba checkapk-libarchive-tar.patch"
+sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz"
diff --git a/system/abuild/checkapk-libarchive-tar.patch b/system/abuild/checkapk-libarchive-tar.patch
deleted file mode 100644
index fb5243d02..000000000
--- a/system/abuild/checkapk-libarchive-tar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abuild-3.2.0_rc1+adelie/checkapk.in 2017-08-13 13:39:10.730229975 -0400
-+++ abuild-3.2.0_rc1+adelie/checkapk.in 2018-09-15 17:52:51.160104742 -0400
-@@ -72,7 +72,7 @@
- fi
-
- apk fetch --quiet --repositories-file $tmpdir/repositories --stdout $_pkgname \
-- | tar -zt | grep -v '^\.SIGN\.' | sort > filelist-$_pkgname-old \
-+ | tar -ztf - | grep -v '^\.SIGN\.' | sort > filelist-$_pkgname-old \
- || die "failed to download old pkg, maybe run 'apk update'?"
-
- tar -ztf "$filepath" | grep -v '^\.SIGN\.' | sort > "filelist-$_pkgname"
diff --git a/system/abuild/use-pigz.patch b/system/abuild/use-pigz.patch
deleted file mode 100644
index a917c8f81..000000000
--- a/system/abuild/use-pigz.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- abuild-3.2.0_rc1+adelie/abuild.in.old 2018-05-20 03:17:19.884154704 +0000
-+++ abuild-3.2.0_rc1+adelie/abuild.in 2018-08-31 17:42:34.900000000 +0000
-@@ -1466,6 +1466,7 @@
- local datadir="$pkgbasedir"/$name
- local subpkgname=$name
- local subpkgarch=$(pkginfo_val arch $file)
-+ local _mygzip=$(command -v pigz gzip | head -1)
-
- trace_apk_deps "$name" "$dir" "$subpkgarch" || return 1
- msg "Package size: ${size}"
-@@ -1478,7 +1479,7 @@
- touch .dummy
- set -- .dummy
- fi
-- tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
-+ tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | $_mygzip -9 >"$dir"/data.tar.gz
-
- msg "Create checksum..."
- # append the hash for data.tar.gz
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index 4954aa8f8..23b2250d7 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adelie-base
-pkgver=0.9.1
-pkgrel=3
+pkgver=0.9.2_pre1
+pkgrel=0
pkgdesc="The Adélie Linux Base System"
url="https://www.adelielinux.org/"
arch="noarch"
@@ -37,7 +37,6 @@ build() {
}
package() {
- cd "$builddir"
mkdir -p "$pkgdir"
make install DESTDIR="$pkgdir"
install -m644 "$srcdir"/group "$pkgdir"/etc/group
@@ -100,7 +99,7 @@ docs() {
return 0
}
-sha512sums="be6f4375d4bc3f014b33a536c24c84ab288c6d3fb525a7a069723e8e522342ce6c6cd800417ada28ecb6f31550c73c12075e2e1eb9e7734fc0d37bb3e9471434 adelie-base-0.9.1.tar.xz
+sha512sums="178af31b3712def38a46e855934fe7a503a85c279cedcff41d4738078e5c99ec93e3cdf4438a7d4a172322c33f32608f18078b5c8789af89526d33c4236b38c7 adelie-base-0.9.2_pre1.tar.xz
37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group
1288d9d1ee77e1159bacbc94a44b2ae9c6dff94c5001be6e560cd5859f86181c47341317025d4999bc7d57cfcebb7974804514d981b7bd66ffd00c5edaf5360c passwd
5b87e0c73e7d73715467b09c9c228b14abfdc1567b3d8a3e6ef86694a9d016c798c22411c9c8ccf41920fbe185199f6d6dbd45d4bceb6652ab4a7bea87c4fe51 addgroup
diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD
index 40dfcb272..c6b0b479a 100644
--- a/system/apk-tools/APKBUILD
+++ b/system/apk-tools/APKBUILD
@@ -12,7 +12,7 @@ makedepends_build=""
makedepends_host="zlib-dev openssl openssl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-static"
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
pmmx.patch
"
diff --git a/system/asciidoctor/APKBUILD b/system/asciidoctor/APKBUILD
index 16e257f54..3b05ab44d 100644
--- a/system/asciidoctor/APKBUILD
+++ b/system/asciidoctor/APKBUILD
@@ -9,7 +9,7 @@ arch="noarch"
options="!check" # can't test in this packaging format; package differently
license="MIT"
depends="ruby"
-source="http://gems.rubyforge.org/gems/$pkgname-$pkgver.gem"
+source="https://rubygems.org/downloads/$pkgname-$pkgver.gem"
package() {
local gemdir="$(ruby -e 'puts Gem.default_dir')"
diff --git a/system/at/APKBUILD b/system/at/APKBUILD
index f876de3ca..d4bdb4f2e 100644
--- a/system/at/APKBUILD
+++ b/system/at/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=at
pkgver=3.1.23
-pkgrel=0
+pkgrel=1
pkgdesc="Delayed job execution and batch processing daemon"
url="https://packages.qa.debian.org/a/at.html"
arch="all"
options="!check suid" # No test suite.
license="GPL-2.0+"
-makedepends="cmd:sendmail flex-dev byacc"
-depends_dev=""
+depends="cmd:sendmail"
+makedepends="byacc flex-dev ssmtp"
install="${pkgname}.pre-install"
pkgusers="at"
pkggroups="at"
@@ -31,7 +31,6 @@ prepare() {
}
build() {
- cd "$builddir"
LEXLIB=-lfl \
./configure \
--build=$CBUILD \
@@ -47,7 +46,6 @@ build() {
}
package() {
- cd "$builddir"
install -D -o root -g at -m 640 "$srcdir"/at.allow \
"$pkgdir"/etc/at.allow
make IROOT="$pkgdir" install
diff --git a/system/atf/APKBUILD b/system/atf/APKBUILD
index 921ddf4a2..5b4f82a92 100644
--- a/system/atf/APKBUILD
+++ b/system/atf/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
pkgname=atf
pkgver=0.21
pkgrel=1
@@ -8,7 +8,6 @@ arch="all"
license="BSD-2-Clause AND BSD-3-Clause"
depends=""
makedepends=""
-install=""
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/jmmv/atf/releases/download/atf-$pkgver/atf-$pkgver.tar.gz"
builddir="$srcdir/atf-$pkgver"
diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD
index ac91b0e12..9dccb1415 100644
--- a/system/attr/APKBUILD
+++ b/system/attr/APKBUILD
@@ -6,24 +6,20 @@ pkgdesc="Utilities for managing filesystem extended attributes"
url="https://savannah.nongnu.org/projects/attr"
arch="all"
license="GPL-2.0+ AND LGPL-2.1+"
-options="!checkroot"
depends=""
makedepends="libtool autoconf automake bash gettext-tiny gettext-tiny-dev"
checkdepends="perl"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libattr"
-source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz
+source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz
test-runner-musl.patch
test-runner-perl.patch
"
prepare() {
- cd "$builddir"
default_prepare
}
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
diff --git a/system/autoconf/APKBUILD b/system/autoconf/APKBUILD
index cd40635f5..262087d79 100644
--- a/system/autoconf/APKBUILD
+++ b/system/autoconf/APKBUILD
@@ -5,10 +5,10 @@ pkgrel=2
pkgdesc="A GNU tool for automatically configuring source code"
arch="noarch"
license="GPL-2.0+"
-url="http://www.gnu.org/software/autoconf"
+url="https://www.gnu.org/software/autoconf"
depends="m4 perl"
subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
autoconf-2.69-fix-perl-regex.patch
"
diff --git a/system/automake/APKBUILD b/system/automake/APKBUILD
index c37d64456..6612e9e19 100644
--- a/system/automake/APKBUILD
+++ b/system/automake/APKBUILD
@@ -11,8 +11,7 @@ depends="perl"
makedepends="autoconf"
#checkdepends="bash gzip coreutils diffutils"
subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
cd "$builddir"
diff --git a/system/bash/APKBUILD b/system/bash/APKBUILD
index 455bd5fbf..ccdf8ab13 100644
--- a/system/bash/APKBUILD
+++ b/system/bash/APKBUILD
@@ -6,19 +6,18 @@ pkgver=4.4.23
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU Bourne Again shell"
-url="http://www.gnu.org/software/bash/bash.html"
+url="https://www.gnu.org/software/bash/bash.html"
arch="all"
license="GPL-3.0+"
-makedepends_build="bison flex"
+makedepends_build="byacc flex"
makedepends_host="ncurses-dev"
depends=""
-options="!checkroot"
install="$pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang
$pkgname-binsh:binsh:noarch"
-source="http://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz
+source="https://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz
bash-noinfo.patch
bash44-sensible-defaults.patch
bashrc
@@ -29,7 +28,7 @@ _pad="00"
while [ $_i -le $_patchlevel ]; do
[ $_i -ge 10 ] && _pad="0"
[ $_i -ge 100 ] && _pad=
- source="$source http://ftp.gnu.org/gnu/bash/bash-$_myver-patches/bash$_patchbase-$_pad$_i"
+ source="$source https://ftp.gnu.org/gnu/bash/bash-$_myver-patches/bash$_patchbase-$_pad$_i"
_i=$(( $_i + 1))
done
@@ -40,8 +39,6 @@ done
builddir="$srcdir"/$pkgname-$_myver
prepare() {
- cd "$builddir"
-
# NOTE: This section is for applying the vendor patches, which are required to fix
# security holes. `default_prepare` does *not* apply vendor patches in the format
# shipped with bash. We also need to make sure vendor patches are applied before
@@ -62,7 +59,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -77,14 +73,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd ${startdir}/src/${pkgname}-${_myver}
make DESTDIR=${pkgdir} install
-
install -D -m755 "$srcdir"/bashrc "$pkgdir"/etc/bash/bashrc
}
diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD
index 269a6f8d0..d234fa61f 100644
--- a/system/bc/APKBUILD
+++ b/system/bc/APKBUILD
@@ -1,27 +1,29 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bc
-pkgver=1.0_rc7
+pkgver=1.1.4
pkgrel=0
pkgdesc="An arbitrary precision numeric processing language (calculator)"
url="https://github.com/gavinhoward/bc"
arch="all"
-options="!check" # No test suite.
license="BSD-0-Clause"
depends=""
makedepends=""
-subpackages=""
+subpackages="$pkgname-doc"
source="https://github.com/gavinhoward/bc/releases/download/${pkgver/_/-}/bc-${pkgver/_/-}.tar.xz"
builddir="$srcdir"/$pkgname-${pkgver/_/-}
build() {
- cd "$builddir"
- make PREFIX="/usr"
+ PREFIX="/usr" ./configure.sh -g -G -O3
+ make
+}
+
+check() {
+ make test
}
package() {
- cd "$builddir"
make PREFIX="/usr" DESTDIR="$pkgdir" install
}
-sha512sums="58d50f6a369dd5aded16d9c9384f896a5a683bd1923c116fefe2dd8af24221c55a728d006c9cac9c9992ad6e04031173ce456fca61151b8b5d568ad0a3b39333 bc-1.0-rc7.tar.xz"
+sha512sums="fa67325cc3cb5df7513e6d0ae74d3476d7d9e87722db2f24d0cf0781622f02ec99e6ab27d3e2d57866830dd18dc43eb3c52d460be6c6ec0260ce2bad7765d7aa bc-1.1.4.tar.xz"
diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index 67f81db9d..fb077c41e 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
pkgname=binutils
-pkgver=2.31.1
-pkgrel=2
+pkgver=2.32
+pkgrel=0
pkgdesc="Tools necessary to build programs"
-url="http://www.gnu.org/software/binutils/"
+url="https://www.gnu.org/software/binutils/"
depends=""
-makedepends_build="bison flex texinfo"
+makedepends_build="byacc flex texinfo"
makedepends_host="zlib-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="dejagnu"
@@ -14,14 +14,12 @@ license="GPL-2.0+ AND GPL-3.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND LGPL-3.0+ AND BSD
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
# non-PIC is unsupported by musl/ppc
[ "${CARCH}" != "ppc" ] || options='!check'
-source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
binutils-ld-fix-static-linking.patch
- CVE-2018-19931.patch
- CVE-2018-19932.patch
disable-gnu-mbind.patch
disable-ifunc-tests.patch
disable-preinit-array-tests.patch
- remove-no-static-plt-test.patch
+ ppc64-test-failure.patch
remove-pr2404-tests.patch
remove-pr19719-test.patch
remove-pr19553c-test.patch
@@ -85,7 +83,8 @@ build() {
$_arch_configure \
$_hash_style_configure \
--disable-werror \
- --with-system-zlib
+ --with-system-zlib \
+ --enable-lto
make
}
@@ -117,14 +116,12 @@ libs() {
mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
}
-sha512sums="0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz
+sha512sums="d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz
ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch
-4cfece75605ea17df676692e9ed2a5f8b3221fdb93fca9655f67260a9f4fd4f9e5a62141f51ba9bb7819f4628cdda4fd3f2f82e947ba197980f2b0c2c58a147c CVE-2018-19931.patch
-68d1699d66aeb9dabb76d2e56e881fe73e55cc9594741107bf9f1a23fd2c1dc4421d02317bfc0218b02ad1372d3a8a577044578fffbfd8504ca238be835c5ff0 CVE-2018-19932.patch
d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6 disable-gnu-mbind.patch
474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2 disable-ifunc-tests.patch
3537752e63cef0b5ef136d003ff7e814ba66b12624d817430112d0f291a792e8960fa69a78036f526af835441b3ee483d6a53d55c7b3dd8ee96f0399682dbcbe disable-preinit-array-tests.patch
-b40f9a3841a7af8fc12e8a4044cd672df5614bfda8461b0ca45efa57a42c3bc8490e491ea490c6c05d319a52d69993c4fca33a0aeb044090e7b7f4e4e30c6517 remove-no-static-plt-test.patch
+11e5dcb67fa39236e69f2ea0bd5147a188ebddb60972215aad62e40bf2030d8ace85ef13defab87f7b4fa99c118af4eb249d9a58c23f287cf0c043ebecaeb032 ppc64-test-failure.patch
32ab4215669c728648179c124632467573a3d4675e79f0f0d221c22eb2ec1ca5488b79910bd09142f90a1e0d0b81d99ca4846297f4f9561f158db63745facb66 remove-pr2404-tests.patch
a193d1fa7f42d91915960460a15e4d24e0df529d81e23014bcf45d283fae76bb7b300fdcb0d0a9d521cdb9137322efa1dc357112596d6ae7a7fd05988ac359b9 remove-pr19719-test.patch
39ef9c76dd5db6b15f11ffa8061f7ca844fb79c3fb9879c3b1466eef332a28b833597c87003ab9f260b1b85023fae264659088aee27cad7e5aa77b2d58b9a3f6 remove-pr19553c-test.patch"
diff --git a/system/binutils/CVE-2018-19931.patch b/system/binutils/CVE-2018-19931.patch
deleted file mode 100644
index 99a9797e3..000000000
--- a/system/binutils/CVE-2018-19931.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5f60af5d24d181371d67534fa273dd221df20c07 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Fri, 30 Nov 2018 11:45:33 +0000
-Subject: [PATCH] Fix a memory exhaustion bug when attempting to allocate room
- for an impossible number of program headers.
-
- * elfcode.h (elf_object_p): Check for corrupt input files with
- more program headers than can actually fit in the file.
----
- bfd/elfcode.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/bfd/elfcode.h b/bfd/elfcode.h
-index f224c8b..16ed8e5 100644
---- a/bfd/elfcode.h
-+++ b/bfd/elfcode.h
-@@ -784,6 +784,11 @@ elf_object_p (bfd *abfd)
- if (i_ehdrp->e_phnum > ((bfd_size_type) -1) / sizeof (*i_phdr))
- goto got_wrong_format_error;
- #endif
-+ /* Check for a corrupt input file with an impossibly large number
-+ of program headers. */
-+ if (bfd_get_file_size (abfd) > 0
-+ && i_ehdrp->e_phnum > bfd_get_file_size (abfd))
-+ goto got_no_match;
- amt = (bfd_size_type) i_ehdrp->e_phnum * sizeof (*i_phdr);
- elf_tdata (abfd)->phdr = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt);
- if (elf_tdata (abfd)->phdr == NULL)
---
-2.9.3
-
diff --git a/system/binutils/CVE-2018-19932.patch b/system/binutils/CVE-2018-19932.patch
deleted file mode 100644
index 383aae70f..000000000
--- a/system/binutils/CVE-2018-19932.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From beab453223769279cc1cef68a1622ab8978641f7 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Fri, 30 Nov 2018 11:43:12 +0000
-Subject: [PATCH] Remove an abort in the bfd library and add a check for an
- integer overflow when mapping sections to segments.
-
- PR 23932
- * elf.c (IS_CONTAINED_BY_LMA): Add a check for a negative section
- size.
- (rewrite_elf_program_header): If no sections are mapped into a
- segment return an error.
----
- bfd/elf.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf.c b/bfd/elf.c
-index 604971d..79a76be 100644
---- a/bfd/elf.c
-+++ b/bfd/elf.c
-@@ -6644,6 +6644,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
- the given segment. LMA addresses are compared. */
- #define IS_CONTAINED_BY_LMA(section, segment, base) \
- (section->lma >= base \
-+ && (section->lma + SECTION_SIZE (section, segment) >= section->lma) \
- && (section->lma + SECTION_SIZE (section, segment) \
- <= SEGMENT_END (segment, base)))
-
-@@ -7167,7 +7168,15 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
- suggested_lma = output_section;
- }
-
-- BFD_ASSERT (map->count > 0);
-+ /* PR 23932. A corrupt input file may contain sections that cannot
-+ be assigned to any segment - because for example they have a
-+ negative size - or segments that do not contain any sections. */
-+ if (map->count == 0)
-+ {
-+ bfd_set_error (bfd_error_bad_value);
-+ free (sections);
-+ return FALSE;
-+ }
-
- /* Add the current segment to the list of built segments. */
- *pointer_to_map = map;
---
-2.9.3
-
diff --git a/system/binutils/ppc64-test-failure.patch b/system/binutils/ppc64-test-failure.patch
new file mode 100644
index 000000000..f88b20401
--- /dev/null
+++ b/system/binutils/ppc64-test-failure.patch
@@ -0,0 +1,12 @@
+Upstream bug report: https://sourceware.org/bugzilla/show_bug.cgi?id=24311
+
+--- binutils-2.32/ld/testsuite/ld-srec/srec.exp.old 2019-01-19 16:01:34.000000000 +0000
++++ binutils-2.32/ld/testsuite/ld-srec/srec.exp 2019-03-07 07:19:17.650000000 +0000
+@@ -464,6 +464,7 @@
+ setup_xfail "bfin-*-linux-uclibc"
+ setup_xfail "tile*-*-*"
+ setup_xfail "csky*-*-*"
++setup_xfail "powerpc64-*-musl"
+
+ run_srec_test $test2 "tmpdir/sr3.o"
+
diff --git a/system/binutils/remove-no-static-plt-test.patch b/system/binutils/remove-no-static-plt-test.patch
deleted file mode 100644
index ab6bc02e6..000000000
--- a/system/binutils/remove-no-static-plt-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The compiler generates relative addresses instead of absolute, confusing the
-regex used. Disable this test since it would pass anyway.
-
---- binutils-2.29/ld/testsuite/ld-x86-64/no-plt.exp.old 2017-07-04 08:43:21.000000000 +0000
-+++ binutils-2.29/ld/testsuite/ld-x86-64/no-plt.exp 2017-08-19 18:13:48.566481023 +0000
-@@ -100,15 +100,6 @@
- "no-plt-1c" \
- ] \
- [list \
-- "No PLT (static 1d)" \
-- "-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
-- tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-- "" \
-- {dummy.s} \
-- {{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
-- "no-plt-1d" \
-- ] \
-- [list \
- "No PLT (PIE 1e)" \
- "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
- tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD
index a0a27f08f..37d5fcba7 100644
--- a/system/bison/APKBUILD
+++ b/system/bison/APKBUILD
@@ -13,7 +13,7 @@ checkdepends="bison flex"
makedepends="perl"
provider_priority=1
subpackages="$pkgname-doc $pkgname-lang"
-source="ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz"
+source="https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz"
build() {
cd "$builddir"
diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD
index ff756eb4a..c2769268e 100644
--- a/system/byacc/APKBUILD
+++ b/system/byacc/APKBUILD
@@ -6,14 +6,12 @@ pkgrel=2
pkgdesc="The Berkeley Yacc general-purpose parser generator"
url="https://invisible-island.net/byacc/byacc.html"
arch="all"
-options="!checkroot"
license="Public-Domain"
depends="!bison"
subpackages="$pkgname-doc"
source="https://invisible-mirror.net/archives/byacc/byacc-$pkgver.tgz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +23,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/system/bzip2/APKBUILD b/system/bzip2/APKBUILD
index c28a598fe..54b3e4d66 100644
--- a/system/bzip2/APKBUILD
+++ b/system/bzip2/APKBUILD
@@ -8,7 +8,7 @@ arch="all"
license="BSD-4-Clause"
depends=""
subpackages="$pkgname-dev $pkgname-doc libbz2"
-source="http://www.bzip.org/$pkgver/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/bzip2/$pkgname-$pkgver.tar.gz
bzip2-1.0.4-makefile-CFLAGS.patch
bzip2-1.0.6-saneso.patch
bzip2-1.0.4-man-links.patch
diff --git a/system/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD
index 3dab0f01b..d5af2b91c 100644
--- a/system/ca-certificates/APKBUILD
+++ b/system/ca-certificates/APKBUILD
@@ -1,9 +1,7 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ca-certificates
-pkgver=20180411
-pkgrel=1
+pkgver=20190131
+pkgrel=0
pkgdesc="CA root certificates"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
@@ -13,20 +11,18 @@ depends="debianutils"
makedepends_build="python3"
makedepends_host="openssl-dev"
subpackages="$pkgname-doc"
-# c_rehash is either in libcrypto1.0 or openssl depending on package, grr. replace both of them
-replaces="libcrypto1.0 openssl"
triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
install="$pkgname.post-deinstall"
-source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz"
+source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz
+ certhash
+ "
build() {
- cd "$builddir"
export CFLAGS="$CFLAGS -DSYMLINK_MAX=PATH_MAX"
make
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
(
@@ -44,11 +40,8 @@ package() {
-etc/ssl/certs/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[r0-9]*
EOF
- cat > "$pkgdir"/etc/ca-certificates/update.d/certhash <<-EOF
- #!/bin/sh
- exec /usr/bin/c_rehash /etc/ssl/certs
- EOF
- chmod +x "$pkgdir"/etc/ca-certificates/update.d/certhash
+ install -D -m755 "$srcdir"/certhash "$pkgdir"/etc/ca-certificates/update.d/certhash
}
-sha512sums="e7c0a8c4d876181f1826bcf1ed91554430af51751ad4d24911e5bf445c374b3592fd25242e5ae02b3eaa68e720f16e9af40a3d9a6098c8eeaa4479ecb880b153 ca-certificates-20180411.tar.xz"
+sha512sums="aec43296636887a8ebefc08abe60c123b67002eb8cf450662b5ff8fcbd2ea10d3d24d17080b5924b13aed9a52b91ba55e93d306e27ed3196ca67cbbe30146328 ca-certificates-20190131.tar.xz
+1efe48235f150052da6b872d2ebff174359825ab3bd66086c9d7f4c18dcd8aa8953c634dbf1aa8416d30d5623babf589660a25cf6e3a4cdcce707c14cc2f348a certhash"
diff --git a/system/ca-certificates/certhash b/system/ca-certificates/certhash
new file mode 100644
index 000000000..8943cd53f
--- /dev/null
+++ b/system/ca-certificates/certhash
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/c_rehash /etc/ssl/certs
diff --git a/system/cflow/APKBUILD b/system/cflow/APKBUILD
index 644be2e42..d2516b9b7 100644
--- a/system/cflow/APKBUILD
+++ b/system/cflow/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cflow
-pkgver=1.5
-pkgrel=2
+pkgver=1.6
+pkgrel=0
pkgdesc="Chart control flow in a C program"
url="https://www.gnu.org/software/cflow/"
arch="all"
@@ -34,4 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d3fd027122d9e5ec67712e2ddcea8a3480407b188bf07506b043b874ba21dedb3f1b8eb737673d211da354109869057aa6c40cd3cb66b6cbbad17f87d89cf945 cflow-1.5.tar.xz"
+sha512sums="8f15503b0f94385641039bd05d65aa3c9a91bc032be26963279022d32136e12a583d15fdcb8e9d5ef0d31662334f994fd50b014baf7d8b221a1877172576e305 cflow-1.6.tar.xz"
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD
index 672ed2e3d..d1ac9176d 100644
--- a/system/cmake/APKBUILD
+++ b/system/cmake/APKBUILD
@@ -1,12 +1,11 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cmake
-pkgver=3.12.3
+pkgver=3.13.4
pkgrel=0
pkgdesc="Cross-platform build system"
url="https://cmake.org"
arch="all"
-options="!checkroot"
license="CMake"
makedepends="ncurses-dev curl-dev expat-dev zlib-dev bzip2-dev libarchive-dev
libuv-dev xz-dev rhash-dev"
@@ -31,7 +30,6 @@ _parallel_opt() {
}
build() {
- cd "$builddir"
# jsoncpp needs cmake to build so to avoid recursive build
# dependency, we use the bundled version of jsoncpp
./bootstrap \
@@ -46,13 +44,11 @@ build() {
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE bin/ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c cmake-3.12.3.tar.gz"
+sha512sums="5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93 cmake-3.13.4.tar.gz"
diff --git a/system/console-setup/APKBUILD b/system/console-setup/APKBUILD
index 8097133b7..6b6d1a393 100644
--- a/system/console-setup/APKBUILD
+++ b/system/console-setup/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=console-setup
-pkgver=1.187
+pkgver=1.190
pkgrel=0
pkgdesc="Set up console font and keyboard layout"
url="https://salsa.debian.org/installer-team/console-setup"
@@ -10,7 +10,6 @@ options="!check" # No test suite.
license="MIT AND GPL-2.0+ AND BSD-3-Clause"
depends="kbd"
makedepends="perl"
-install=""
subpackages="$pkgname-doc console-fonts:fonts console-keymaps:keymaps
$pkgname-openrc ckbcomp"
source="http://ftp.de.debian.org/debian/pool/main/c/$pkgname/${pkgname}_$pkgver.tar.xz
@@ -18,12 +17,10 @@ source="http://ftp.de.debian.org/debian/pool/main/c/$pkgname/${pkgname}_$pkgver.
"
build() {
- cd "$builddir"
make build-linux
}
package() {
- cd "$builddir"
make prefix="$pkgdir/usr" etcdir="$pkgdir/etc" xkbdir= install-linux
install -D -m755 "$srcdir"/console-setup.initd "$pkgdir"/etc/init.d/console-setup
}
@@ -47,5 +44,5 @@ ckbcomp() {
mv "$pkgdir"/usr/bin/ckbcomp "$subpkgdir"/usr/bin/
}
-sha512sums="7bdf9ccfea9d78540ecd37510fea559f0570bc4867db4636e74203b7c5a584fbe33a7847a6b87baf243e420d67d8b051266782c6a87c9ffd1062a2b03b1d131c console-setup_1.187.tar.xz
+sha512sums="c5777485cff2bfefe451d3060b1a87fef186ede7f39a4351ba8dea291b39ad169fde8c987837413b24bd0eb6368a52c050ad3d30fdb34aa5a4790e88acce5598 console-setup_1.190.tar.xz
3b8e2c9d8551f9a51bcd33e58771a4f55ff2840f8fe392e0070bd2b6a3911cd9ed9377873538f6904fd99836ac4e0280c712be69d275aae9183dd12ff7efddae console-setup.initd"
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 840c55421..66f8e0d4d 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -5,17 +5,16 @@ pkgname=coreutils
pkgver=8.30
pkgrel=0
pkgdesc="Basic file, shell, and text manipulation utilities"
-url="http://www.gnu.org/software/coreutils/"
+url="https://www.gnu.org/software/coreutils/"
arch="all"
license="GPL-3.0+"
-options="!checkroot"
makedepends="bash acl-dev attr-dev"
[ ${CBUILD} == ${CHOST} ] && makedepends="$makedepends perl gettext-tiny
gettext-tiny-dev utmps-dev"
subpackages="$pkgname-doc"
[ ${CBUILD} == ${CHOST} ] && subpackages="$subpackages $pkgname-lang"
install="$pkgname.post-deinstall"
-source="http://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
disable-csplit-io-err-test.patch
disable-mbrtowc-test.patch
localename-test-fix.patch
@@ -25,7 +24,6 @@ source="http://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
"
build() {
- cd "$builddir"
LIBS="-lutmps -lskarnet" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -48,12 +46,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias
@@ -80,8 +76,7 @@ sha512sums="25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31
bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b disable-csplit-io-err-test.patch
532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b disable-mbrtowc-test.patch
86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf localename-test-fix.patch"
-
-[ ${CBUILD} != ${CHOST} ] && sha512sums="$sha512sums
+[ ${CBUILD} != ${CHOST} ] && sha512sums="
bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch
"
return 0
diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD
index d3ba1d2ee..533f036f8 100644
--- a/system/cryptsetup/APKBUILD
+++ b/system/cryptsetup/APKBUILD
@@ -1,29 +1,25 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=cryptsetup
-pkgver=2.0.6
+pkgver=2.1.0
pkgrel=0
pkgdesc="Setup tool for block device encryption"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
-options="!checkroot"
license="GPL-2.0+"
depends=""
makedepends_build=""
makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev json-c-dev
argon2-dev"
makedepends="$makedepends_build $makedepends_host"
-checkdepends="device-mapper sharutils cmd:which bash"
+checkdepends="device-mapper sharutils debianutils-which bash"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs $pkgname-openrc"
source="https://www.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
- flush-stdout.patch
dmcrypt.confd
dmcrypt.initd
"
-builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
--build="$CBUILD" \
--host="$CHOST" \
@@ -37,12 +33,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR=$pkgdir install
mkdir -p "$pkgdir"/usr/lib
@@ -62,7 +56,6 @@ libs() {
mv "$pkgdir"/lib "$subpkgdir"/
}
-sha512sums="9e3458122e34c86d21b9a9c0c648e8e6134d7e2058bc00514137c5136782cea493cf0db5b0c2884fac759c0c2ea185e99d4a223d6f338c1cb3f5281eadd6626e cryptsetup-2.0.6.tar.gz
-301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch
+sha512sums="c8bfe5aa59acbe8c9f8a859dbe2f10c1f3194d578ada8081c4ede0dda0c991f9ef4fde2d268e322e283fbd35e9470e0631c44439d69693965ecc35bb73986dcb cryptsetup-2.1.0.tar.gz
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd"
diff --git a/system/cryptsetup/flush-stdout.patch b/system/cryptsetup/flush-stdout.patch
deleted file mode 100644
index ae21a235f..000000000
--- a/system/cryptsetup/flush-stdout.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/utils_tools.c.orig 2014-10-24 12:58:35.151717616 -0200
-+++ ./src/utils_tools.c 2014-10-24 13:00:42.716855265 -0200
-@@ -105,10 +105,13 @@
-
- case CRYPT_LOG_NORMAL:
- fputs(msg, stdout);
-+ fflush(stdout);
- break;
- case CRYPT_LOG_VERBOSE:
-- if (opt_verbose)
-+ if (opt_verbose) {
- fputs(msg, stdout);
-+ fflush(stdout);
-+ }
- break;
- case CRYPT_LOG_ERROR:
- fputs(msg, stderr);
diff --git a/system/cvs/APKBUILD b/system/cvs/APKBUILD
index bbf6fe4e9..8dfcca172 100644
--- a/system/cvs/APKBUILD
+++ b/system/cvs/APKBUILD
@@ -4,7 +4,7 @@ pkgname=cvs
pkgver=1.11.23
pkgrel=1
pkgdesc="Concurrent Versions System"
-url="http://www.nongnu.org/cvs/"
+url="https://www.nongnu.org/cvs/"
arch="all"
options="!check" # "Note that the test can take an hour or more to run"
license="GPL-2.0+"
@@ -12,7 +12,7 @@ depends=""
makedepends="zlib-dev"
install=
subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.gz
+source="https://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.gz
cvs-musl.patch
"
diff --git a/system/db/APKBUILD b/system/db/APKBUILD
index bf920315f..a9beb8acb 100644
--- a/system/db/APKBUILD
+++ b/system/db/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=db
pkgver=5.3.28
-pkgrel=0
+pkgrel=1
pkgdesc="The Berkeley DB embedded database system"
url="https://www.oracle.com/technology/software/products/berkeley-db/index.html"
arch="all"
@@ -10,7 +10,8 @@ options="!check" # "check target not available"
depends=
makedepends=
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-c++:cxx"
-source="http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz
+source="https://download.oracle.com/berkeley-db/db-$pkgver.tar.gz
+ atomics.patch
"
prepare() {
@@ -57,4 +58,5 @@ cxx() {
mv "$pkgdir"/usr/lib/libdb_cxx*.so "$subpkgdir"/usr/lib/
}
-sha512sums="e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 db-5.3.28.tar.gz"
+sha512sums="e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 db-5.3.28.tar.gz
+8ba96cfc3e484a839b8651214f0769b35273c6235de7e53d5118eb0347f5a477f75e3336a12f1399b7748c6b6ab95aec39c8b813d7b227dd61f37ed4ab52f7d5 atomics.patch"
diff --git a/system/db/atomics.patch b/system/db/atomics.patch
new file mode 100644
index 000000000..ad3da2786
--- /dev/null
+++ b/system/db/atomics.patch
@@ -0,0 +1,22 @@
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
+index 0034dcc..fa7ba93 100644
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define atomic_inc(env, p) __atomic_inc(p)
+ #define atomic_dec(env, p) __atomic_dec(p)
+ #define atomic_compare_exchange(env, p, o, n) \
+- __atomic_compare_exchange((p), (o), (n))
++ __db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ int temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+ * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+ * which configure could be changed to use.
+ */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ atomic_value_t was;
diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD
index 8e79a7eef..01a665967 100644
--- a/system/debianutils/APKBUILD
+++ b/system/debianutils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=debianutils
-pkgver=4.8.6
-pkgrel=1
+pkgver=4.8.6.1
+pkgrel=0
pkgdesc="Useful utilities from Debian"
url="https://packages.qa.debian.org/d/debianutils.html"
arch="all"
@@ -10,12 +10,11 @@ options="!check" # No test suite.
license="BSD-3-Clause AND GPL-2.0+"
depends="coreutils mawk" # awk, cat, and rm are required by add-shell
makedepends="grep" # early package, declare these
-install=""
subpackages="$pkgname-doc $pkgname-which::noarch"
source="http://ftp.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.xz"
+builddir="$srcdir/$pkgname"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +26,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -40,4 +38,4 @@ which() {
mv "${pkgdir}-doc"/usr/share/man/man1/which* "$subpkgdir"/usr/share/man/man1/
}
-sha512sums="5913729cc3c56962e8939b71803258952df0d7204df8090a7504fbefc7f5d1da8e749d606fe23148ea3294909ef172bc1f4f821690169e861729caab70921a2f debianutils_4.8.6.tar.xz"
+sha512sums="158f024311b3de292bd20df966c0f61285c748597101cee61e81883e0032c1e6a4baccb5c231b28f00ce3afc58a4aaedd64a65641351974c37fdb5f4952b0d2a debianutils_4.8.6.1.tar.xz"
diff --git a/system/diffutils/APKBUILD b/system/diffutils/APKBUILD
index 65d7bfde8..b47acbe37 100644
--- a/system/diffutils/APKBUILD
+++ b/system/diffutils/APKBUILD
@@ -1,28 +1,18 @@
# Maintainer:
pkgname=diffutils
-pkgver=3.6
-pkgrel=2
+pkgver=3.7
+pkgrel=0
pkgdesc="Show differences among files"
subpackages="$pkgname-doc $pkgname-lang"
-url="http://www.gnu.org/software/diffutils/"
+url="https://www.gnu.org/software/diffutils/"
arch="all"
license="GPL-3.0+"
-source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
disable-mbrtowc-test.patch
gnulib-tests-dont-require-gpg-passphrase.patch
"
-prepare() {
- cd "$builddir"
- default_prepare
-
- # fix eglibc-2.16 build issue
- sed -i -e '/gets is a/d' \
- lib/stdio.in.h
-}
-
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,18 +23,16 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make install DESTDIR=$pkgdir
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1 diffutils-3.6.tar.xz
+sha512sums="7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c diffutils-3.7.tar.xz
2602dabf0ac52a273b84160032416613da7ad111541fe25466cf9d4ce1eb2630f0ba0cb0b3013967965d8359a11a5f390f0486b4526b35516d9de1c8975f720d disable-mbrtowc-test.patch
d45ab939e70b8b6e80d8950a8436be81e34e1067741196229edc7fbe33db92aa14532cf7490379741e779ae2cfc6010bec22dda2b2a046a3bc9eb68b94a0ff11 gnulib-tests-dont-require-gpg-passphrase.patch"
diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD
index 211cf9aa9..9a3679b33 100644
--- a/system/e2fsprogs/APKBUILD
+++ b/system/e2fsprogs/APKBUILD
@@ -1,12 +1,11 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer:
pkgname=e2fsprogs
-pkgver=1.44.4
+pkgver=1.45.0
pkgrel=0
pkgdesc="Standard ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
arch="all"
-options="!checkroot"
license="GPL-2.0-only AND LGPL-2.0-only AND MIT"
depends=""
depends_dev="util-linux-dev"
@@ -17,7 +16,6 @@ source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$
"
build () {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +31,10 @@ build () {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 LDCONFIG=: DESTDIR="$pkgdir" install install-libs
}
@@ -58,5 +54,5 @@ libcom_err() {
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
-sha512sums="52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f e2fsprogs-1.44.4.tar.xz
-583c9133ea9df1fdffd2ec3d0234fbb3f36d180172a34ab5d8572434841690a08f1e045e189dc7e46b9396f49d4bd696335ef8625a033f969e26799f9b5c8a5b header-fix.patch"
+sha512sums="208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014 e2fsprogs-1.45.0.tar.xz
+e24dc45a68b0bd57cf4b8a90ecf35f48ded8731293750723c2cfe1e156ddcf747691452fb5aaf69858063dc467592341c8ff2445f924a6d9c62b8c1e1773625e header-fix.patch"
diff --git a/system/e2fsprogs/header-fix.patch b/system/e2fsprogs/header-fix.patch
index cc78a39d0..e3f4fe3b5 100644
--- a/system/e2fsprogs/header-fix.patch
+++ b/system/e2fsprogs/header-fix.patch
@@ -127,16 +127,17 @@
#endif
--- e2fsprogs-1.44.4/debugfs/set_fields.c.old 2018-08-19 02:26:58.000000000 +0000
+++ e2fsprogs-1.44.4/debugfs/set_fields.c 2018-10-22 22:22:34.510000000 +0000
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,8 @@
static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
char *arg);
--#if __GNUC_PREREQ (4, 6)
-+#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+-#if __GNUC_PREREQ (4, 6) || defined(__clang__)
++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) \
++ || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
-@@ -291,7 +291,7 @@
+@@ -291,7 +292,7 @@
{ "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
{ 0, 0, 0, 0 }
};
diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD
index 4ccc016fe..fb2fcda0b 100644
--- a/system/easy-kernel-power8-64k/APKBUILD
+++ b/system/easy-kernel-power8-64k/APKBUILD
@@ -13,7 +13,6 @@ options="!check !dbg !strip !tracedeps"
license="GPL-2.0-only"
depends=""
makedepends="bc gzip kmod lzop openssl-dev xz"
-install=""
provides="easy-kernel$_kflavour=$pkgver-r$pkgrel"
subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
$_pkgname-src-$pkgver-mc$pkgrel:src
@@ -25,6 +24,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin
ast-endianness.patch
config-ppc64
futex-cmpxchg.patch
+ ppc64-epapr-gcc8.patch
"
builddir="$srcdir/linux-${_pkgminver}"
@@ -94,4 +94,5 @@ sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8
bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
6e155f1109666ee907baf7f586d856366ba8afb6f008d48489c0bc269438a8280534266d3e37b449e44ce964688ea48f041bb36214eb495d59b84e55cdf49c19 config-ppc64
-64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch"
+64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch
+0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch"
diff --git a/system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch b/system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch
new file mode 100644
index 000000000..192e83845
--- /dev/null
+++ b/system/easy-kernel-power8-64k/ppc64-epapr-gcc8.patch
@@ -0,0 +1,84 @@
+From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Thu, 28 Sep 2017 09:33:39 -0400
+Subject: powerpc: Always initialize input array when calling epapr_hypercall()
+
+Several callers to epapr_hypercall() pass an uninitialized stack
+allocated array for the input arguments, presumably because they
+have no input arguments. However this can produce errors like
+this one
+
+ arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ unsigned long register r3 asm("r3") = in[0];
+ ~~^~~
+
+Fix callers to this function to always zero-initialize the input
+arguments array to prevent this.
+
+Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+---
+ arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h
+index 334459ad145b..90863245df53 100644
+--- a/arch/powerpc/include/asm/epapr_hcalls.h
++++ b/arch/powerpc/include/asm/epapr_hcalls.h
+@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in,
+
+ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+ unsigned long r;
+
+@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
+
+ static inline long epapr_hypercall0(unsigned int nr)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ return epapr_hypercall(in, out, nr);
+@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr)
+
+ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
+ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
+ unsigned long p2)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
+ static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,
+ unsigned long p2, unsigned long p3)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1,
+ unsigned long p2, unsigned long p3,
+ unsigned long p4)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD
index 34f8faddd..f06424d1a 100644
--- a/system/easy-kernel-power8/APKBUILD
+++ b/system/easy-kernel-power8/APKBUILD
@@ -13,7 +13,6 @@ options="!check !dbg !strip !tracedeps"
license="GPL-2.0-only"
depends=""
makedepends="bc gzip kmod lzop openssl-dev xz"
-install=""
provides="easy-kernel$_kflavour=$pkgver-r$pkgrel"
subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
$_pkgname-src-$pkgver-mc$pkgrel:src
@@ -25,6 +24,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin
ast-endianness.patch
config-ppc64
futex-cmpxchg.patch
+ ppc64-epapr-gcc8.patch
"
builddir="$srcdir/linux-${_pkgminver}"
@@ -94,4 +94,5 @@ sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8
bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
70c09aaa7e75ef04389d69768874bc243f351a63f481b191d5708f74f1ceccf32dbbc286415aff4eaf44040a0fd75e90487a50f0c53a32f6d1c0dc779cb56fec config-ppc64
-64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch"
+64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch
+0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch"
diff --git a/system/easy-kernel-power8/ppc64-epapr-gcc8.patch b/system/easy-kernel-power8/ppc64-epapr-gcc8.patch
new file mode 100644
index 000000000..192e83845
--- /dev/null
+++ b/system/easy-kernel-power8/ppc64-epapr-gcc8.patch
@@ -0,0 +1,84 @@
+From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Thu, 28 Sep 2017 09:33:39 -0400
+Subject: powerpc: Always initialize input array when calling epapr_hypercall()
+
+Several callers to epapr_hypercall() pass an uninitialized stack
+allocated array for the input arguments, presumably because they
+have no input arguments. However this can produce errors like
+this one
+
+ arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ unsigned long register r3 asm("r3") = in[0];
+ ~~^~~
+
+Fix callers to this function to always zero-initialize the input
+arguments array to prevent this.
+
+Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+---
+ arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h
+index 334459ad145b..90863245df53 100644
+--- a/arch/powerpc/include/asm/epapr_hcalls.h
++++ b/arch/powerpc/include/asm/epapr_hcalls.h
+@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in,
+
+ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+ unsigned long r;
+
+@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
+
+ static inline long epapr_hypercall0(unsigned int nr)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ return epapr_hypercall(in, out, nr);
+@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr)
+
+ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
+ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
+ unsigned long p2)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
+ static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,
+ unsigned long p2, unsigned long p3)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1,
+ unsigned long p2, unsigned long p3,
+ unsigned long p4)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 294644b01..983506858 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -13,7 +13,6 @@ options="!check !dbg !strip !tracedeps"
license="GPL-2.0-only"
depends=""
makedepends="bc gzip kmod lzop openssl-dev xz"
-install=""
provides="easy-kernel$_kflavour=$pkgver-r$pkgrel"
subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
$_pkgname-src-$pkgver-mc$pkgrel:src
@@ -31,6 +30,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin
config-aarch64
futex-cmpxchg.patch
kernel.h
+ ppc64-epapr-gcc8.patch
uapi-ether.patch
"
builddir="$srcdir/linux-${_pkgminver}"
@@ -135,10 +135,11 @@ bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5f
6ede43cf169e79d8a08f7a9d79bb4bdf15618ec450b42a67a53a75bc5f5cb4d5a8c82d2b95c27a80567999876d103091bc104104f0494ca34707b5ccae5da725 0502-muqss-smt-fix.patch
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
cfa1c2b523875967c42bfd8fcfeeb80b1c4c9887c4399b4767f0ac0525769a9e8c5cddaec831e1adfa546ac2d66f68ef23dc594a286532f4b9890401efd75c67 config-ppc64
-1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc
+9d29a53cb03c0fcbf3d157680c41f4da422341a3f8e314f1aba8189475412a24a03e42d03eff606f882f4cfd5d93211d008278723577857aa407e73eef3220c3 config-ppc
1c5b4365da04a85ac994f123847cc69df0eda772e88b12914cd1e16ea9be62de2a46106f0f0b736f0e7bee746017d49f5671d1277793b5d383258f3d40b562f6 config-x86_64
69c737ecb6968ca567dfb52335a8a89e147c0b01f92b1e5239bd6d806c10cd7d4225f3cc8a703249020669d3e785df0c1350afda158b0e6c8e70b4805532f07e config-pmmx
c7573068450aff89101ef5aec683f4fee34476f072f9f7debcdc7398c646194b63e3d2fb63742631cdbff0d77d9fabf8d151cc260d80297d00b57c800c60ef6c config-aarch64
64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch
fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h
+0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch
af093e91e8c8371629948e2e574f8764078564bc027ba5b2f87886f8827d9a63ba7a43717552fe7e3cc9212b2fd55b8633b12900c3d8cdc6c035d52b389c39e5 uapi-ether.patch"
diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc
index f2226fc8e..56c023626 100644
--- a/system/easy-kernel/config-ppc
+++ b/system/easy-kernel/config-ppc
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.12-mc3 Kernel Configuration
+# Linux/powerpc 4.14.88-mc13 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -93,8 +93,11 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_FHANDLE=y
# CONFIG_USELIB is not set
-# CONFIG_AUDIT is not set
+CONFIG_AUDIT=y
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
#
# IRQ subsystem
@@ -212,6 +215,7 @@ CONFIG_PCSPKR_PLATFORM=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
+CONFIG_HAVE_FUTEX_CMPXCHG=y
CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
@@ -811,6 +815,7 @@ CONFIG_NETFILTER_XT_MARK=m
#
# Xtables targets
#
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
@@ -954,7 +959,22 @@ CONFIG_IPDDP_ENCAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
# CONFIG_IEEE802154 is not set
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
@@ -1017,6 +1037,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
+# CONFIG_BT_6LOWPAN is not set
# CONFIG_BT_LEDS is not set
# CONFIG_BT_SELFTEST is not set
CONFIG_BT_DEBUGFS=y
@@ -1036,7 +1057,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -1151,7 +1171,9 @@ CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_WANT_DEV_COREDUMP=y
CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
@@ -1291,7 +1313,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_CDROM_PKTCDVD_WCACHE=y
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_ATA_OVER_ETH=m
# CONFIG_BLK_DEV_RBD is not set
CONFIG_BLK_DEV_RSXX=y
CONFIG_NVME_CORE=y
@@ -1330,7 +1352,7 @@ CONFIG_TIFM_7XX1=m
# CONFIG_EEPROM_AT24 is not set
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
+CONFIG_EEPROM_93CX6=m
# CONFIG_EEPROM_IDT_89HPESX is not set
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
@@ -1528,7 +1550,7 @@ CONFIG_SATA_PMP=y
#
CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
CONFIG_AHCI_QORIQ=y
# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_ACARD_AHCI=y
@@ -1617,7 +1639,7 @@ CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
-# CONFIG_MD_RAID456 is not set
+CONFIG_MD_RAID456=m
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
# CONFIG_BCACHE is not set
@@ -1728,10 +1750,13 @@ CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-# CONFIG_NET_VENDOR_ADAPTEC is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_NET_VENDOR_AGERE is not set
# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
# CONFIG_ALTERA_TSE is not set
# CONFIG_NET_VENDOR_AMAZON is not set
CONFIG_NET_VENDOR_AMD=y
@@ -1745,7 +1770,12 @@ CONFIG_MACE=y
CONFIG_BMAC=y
# CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
# CONFIG_NET_VENDOR_AURORA is not set
CONFIG_NET_CADENCE=y
# CONFIG_MACB is not set
@@ -1811,7 +1841,14 @@ CONFIG_PCMCIA_PCNET=m
# CONFIG_NET_PACKET_ENGINE is not set
# CONFIG_NET_VENDOR_QLOGIC is not set
# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R8169 is not set
# CONFIG_NET_VENDOR_RENESAS is not set
# CONFIG_NET_VENDOR_RDC is not set
# CONFIG_NET_VENDOR_ROCKER is not set
@@ -1856,7 +1893,7 @@ CONFIG_LED_TRIGGER_PHY=y
#
# CONFIG_AMD_PHY is not set
# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=m
# CONFIG_BCM7XXX_PHY is not set
# CONFIG_BCM87XX_PHY is not set
# CONFIG_BROADCOM_PHY is not set
@@ -1935,9 +1972,54 @@ CONFIG_USB_IPHETH=m
# CONFIG_USB_VL600 is not set
# CONFIG_USB_NET_CH9200 is not set
CONFIG_WLAN=y
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-# CONFIG_WLAN_VENDOR_ATH is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+# CONFIG_ATH6KL_SDIO is not set
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+# CONFIG_WIL6210 is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+# CONFIG_WCN36XX is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
CONFIG_WLAN_VENDOR_BROADCOM=y
CONFIG_B43=m
CONFIG_B43_BCMA=y
@@ -1977,7 +2059,9 @@ CONFIG_BRCMFMAC_USB=y
# CONFIG_BRCMFMAC_PCIE is not set
# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
# CONFIG_WLAN_VENDOR_INTEL is not set
CONFIG_WLAN_VENDOR_INTERSIL=y
CONFIG_HOSTAP=m
@@ -4269,8 +4353,7 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_CONFIGFS_FS is not set
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ORANGEFS_FS is not set
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
+# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
# CONFIG_ECRYPT_FS is not set
CONFIG_HFS_FS=m
@@ -4434,8 +4517,6 @@ CONFIG_CRC8=m
CONFIG_XXHASH=y
# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
@@ -4663,6 +4744,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_PERCPU_TEST is not set
# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_TEST_HEXDUMP is not set
# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
@@ -4730,6 +4812,11 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
CONFIG_CRYPTO=y
#
@@ -4850,7 +4937,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
#
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_842=m
+# CONFIG_CRYPTO_842 is not set
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
diff --git a/system/easy-kernel/ppc64-epapr-gcc8.patch b/system/easy-kernel/ppc64-epapr-gcc8.patch
new file mode 100644
index 000000000..192e83845
--- /dev/null
+++ b/system/easy-kernel/ppc64-epapr-gcc8.patch
@@ -0,0 +1,84 @@
+From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Thu, 28 Sep 2017 09:33:39 -0400
+Subject: powerpc: Always initialize input array when calling epapr_hypercall()
+
+Several callers to epapr_hypercall() pass an uninitialized stack
+allocated array for the input arguments, presumably because they
+have no input arguments. However this can produce errors like
+this one
+
+ arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ unsigned long register r3 asm("r3") = in[0];
+ ~~^~~
+
+Fix callers to this function to always zero-initialize the input
+arguments array to prevent this.
+
+Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+---
+ arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h
+index 334459ad145b..90863245df53 100644
+--- a/arch/powerpc/include/asm/epapr_hcalls.h
++++ b/arch/powerpc/include/asm/epapr_hcalls.h
+@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in,
+
+ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+ unsigned long r;
+
+@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
+
+ static inline long epapr_hypercall0(unsigned int nr)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ return epapr_hypercall(in, out, nr);
+@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr)
+
+ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
+ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
+ unsigned long p2)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
+ static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,
+ unsigned long p2, unsigned long p3)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1,
+ unsigned long p2, unsigned long p3,
+ unsigned long p4)
+ {
+- unsigned long in[8];
++ unsigned long in[8] = {0};
+ unsigned long out[8];
+
+ in[0] = p1;
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 3bc4801be..79fca7177 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,16 +1,16 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.5.0.1
-pkgrel=2
+pkgver=2.5.1.0
+pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
-url="http://skarnet.org/software/$pkgname/"
+url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-depends_dev="skalibs-dev"
-makedepends="skalibs-dev>=2.7"
-subpackages="$pkgname-dev $pkgname-doc"
+_skalibs_version=2.8
+makedepends="skalibs-dev>=$_skalibs_version"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -18,6 +18,7 @@ build() {
./configure \
--enable-shared \
--enable-static \
+ --enable-allstatic \
--enable-static-libc \
--libdir=/usr/lib \
--with-dynlib=/lib
@@ -29,10 +30,37 @@ package() {
make DESTDIR="$pkgdir" install
}
+
+libs() {
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
+}
+
+
+dev() {
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr"
+ mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
+}
+
+
+libsdev() {
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
+}
+
+
doc() {
- default_doc
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="9e013a83844fc3f5b28c6aea44b446f550dafe52131facf0d7c0648c9ae62c4a62d895f72cedb010754319c0e298fb4c8396d2c6be019cd6218558934bffaea3 execline-2.5.0.1.tar.gz"
+sha512sums="461a91d0e790e96233179c89c783bb29d89592def451643265c97259db83056556cd5f231d668e8c460396c35a8792f56b30193171e85488e60e3cb4feb7379c execline-2.5.1.0.tar.gz"
diff --git a/system/expat/APKBUILD b/system/expat/APKBUILD
index f57096314..9ec053fcc 100644
--- a/system/expat/APKBUILD
+++ b/system/expat/APKBUILD
@@ -7,7 +7,7 @@ url="https://libexpat.github.io/"
arch="all"
license="MIT"
checkdepends="bash"
-source="http://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2"
subpackages="$pkgname-dev $pkgname-doc"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/system/expect/APKBUILD b/system/expect/APKBUILD
index 3abcd610e..aa52a2e81 100644
--- a/system/expect/APKBUILD
+++ b/system/expect/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
license="Public-Domain"
makedepends="tcl-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz"
builddir="$srcdir"/$pkgname$pkgver
prepare() {
diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD
index 18aedfd36..984739111 100644
--- a/system/fakeroot/APKBUILD
+++ b/system/fakeroot/APKBUILD
@@ -4,10 +4,9 @@ pkgver=1.22
pkgrel=0
pkgdesc="Utility to provide a 'fake' root environment as a non-privileged user"
arch="all"
-options="!checkroot"
license="GPL-3.0+"
-url="http://fakeroot.alioth.debian.org/"
-depends=
+url="https://wiki.debian.org/FakeRoot"
+depends=""
makedepends_build="libtool autoconf automake po4a"
makedepends_host="libcap-dev acl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
@@ -23,8 +22,6 @@ source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.o
"
build() {
- cd "$builddir"
-
if [ "$CLIBC" = "musl" ]; then
# musl does not have _STAT_VER, it's really not used for
# anything, so define it as zero (just like uclibc does)
@@ -44,12 +41,10 @@ build() {
}
check() {
- cd "$builddir"
bash -c 'make check'
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/system/file/APKBUILD b/system/file/APKBUILD
index 24d8af2e9..f8ba0ac8c 100644
--- a/system/file/APKBUILD
+++ b/system/file/APKBUILD
@@ -2,15 +2,20 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=file
-pkgver=5.35
+pkgver=5.36
pkgrel=0
pkgdesc="File type identification utility"
url="http://www.darwinsys.com/file/"
arch="all"
license="BSD-2-Clause"
subpackages="$pkgname-dev $pkgname-doc libmagic"
-source="ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver%.*}_${pkgver#*.}.tar.gz"
+builddir="$srcdir/$pkgname-FILE${pkgver%.*}_${pkgver#*.}"
+
+prepare() {
+ cd "$builddir"
+ autoreconf -vif
+}
build() {
cd "$builddir"
@@ -38,4 +43,4 @@ libmagic() {
mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
}
-sha512sums="cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38 file-5.35.tar.gz"
+sha512sums="2060219ee5eef286cb2e17bce892401b2e2e411db0f54991899ad895ae535a756c0775168731887ef147e830808dfc8f10f1b87d0a6b3cfaaad4b3e1329ff17e file-5.36.tar.gz"
diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD
index 71b3ecdb5..c64c309e2 100644
--- a/system/findutils/APKBUILD
+++ b/system/findutils/APKBUILD
@@ -11,17 +11,13 @@ license="GPL-3.0+"
depends=""
makedepends=""
checkdepends="coreutils diffutils dejagnu"
-install=
subpackages="$pkgname-doc $pkgname-lang"
-source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
localename-test-fix.patch
gnulib-tests-dont-require-gpg-passphrase.patch
"
-options="!checkroot"
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib
}
diff --git a/system/flex/APKBUILD b/system/flex/APKBUILD
index 808020cbf..f900c0a75 100644
--- a/system/flex/APKBUILD
+++ b/system/flex/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
license="BSD-2-Clause AND LGPL-2.0+"
depends="m4"
depends_dev="flex"
-makedepends="$depends_dev m4 bison help2man"
+makedepends="$depends_dev m4 byacc help2man"
subpackages="$pkgname-doc $pkgname-lang $pkgname-libs $pkgname-dev"
source="https://github.com/westes/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/system/gcc/0002-posix_memalign.patch b/system/gcc/0002-posix_memalign.patch
new file mode 100644
index 000000000..874f49b9b
--- /dev/null
+++ b/system/gcc/0002-posix_memalign.patch
@@ -0,0 +1,42 @@
+From 65eb86f3e110998d30489df009d44b4bc1043adc Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Fri, 26 Jan 2018 20:32:50 +0000
+Subject: [PATCH 02/12] posix_memalign
+
+---
+ gcc/config/i386/pmm_malloc.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
+index ffbb7f82cf5..b0b890d2403 100644
+--- a/gcc/config/i386/pmm_malloc.h
++++ b/gcc/config/i386/pmm_malloc.h
+@@ -27,12 +27,13 @@
+ #include <stdlib.h>
+
+ /* We can't depend on <stdlib.h> since the prototype of posix_memalign
+- may not be visible. */
++ may not be visible and we can't pollute the namespace either. */
+ #ifndef __cplusplus
+-extern int posix_memalign (void **, size_t, size_t);
++extern int _mm_posix_memalign (void **, size_t, size_t)
+ #else
+-extern "C" int posix_memalign (void **, size_t, size_t) throw ();
++extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
+ #endif
++__asm__("posix_memalign");
+
+ static __inline void *
+ _mm_malloc (size_t __size, size_t __alignment)
+@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
+ return malloc (__size);
+ if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
+ __alignment = sizeof (void *);
+- if (posix_memalign (&__ptr, __alignment, __size) == 0)
++ if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
+ return __ptr;
+ else
+ return NULL;
+--
+2.17.1
+
diff --git a/system/gcc/0008-s390x-muslldso.patch b/system/gcc/0008-s390x-muslldso.patch
new file mode 100644
index 000000000..64833f308
--- /dev/null
+++ b/system/gcc/0008-s390x-muslldso.patch
@@ -0,0 +1,26 @@
+From b693804c8dba92fea7beee98f0aa520853a0532b Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Thu, 22 Dec 2016 11:22:28 +0000
+Subject: [PATCH 08/12] s390x muslldso
+
+---
+ gcc/config/s390/linux.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index 525c17c2c9f..2d4f4a0654e 100644
+--- a/gcc/config/s390/linux.h
++++ b/gcc/config/s390/linux.h
+@@ -76,6 +76,9 @@ along with GCC; see the file COPYING3. If not see
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
++
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
+--
+2.17.1
+
diff --git a/system/gcc/0009-microblaze-pr65649.patch b/system/gcc/0009-microblaze-pr65649.patch
new file mode 100644
index 000000000..35bf88d69
--- /dev/null
+++ b/system/gcc/0009-microblaze-pr65649.patch
@@ -0,0 +1,34 @@
+From a0934d40a8ed3b6e82abb31d2f8d7c60548d4a05 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Fri, 26 Jan 2018 20:25:11 +0000
+Subject: [PATCH 09/12] microblaze-pr65649
+
+---
+ gcc/config/microblaze/microblaze.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
+index 9a4a287be23..60aadaf51f7 100644
+--- a/gcc/config/microblaze/microblaze.c
++++ b/gcc/config/microblaze/microblaze.c
+@@ -2399,7 +2399,7 @@ print_operand (FILE * file, rtx op, int letter)
+ unsigned long value_long;
+ REAL_VALUE_TO_TARGET_SINGLE (*CONST_DOUBLE_REAL_VALUE (op),
+ value_long);
+- fprintf (file, HOST_WIDE_INT_PRINT_HEX, value_long);
++ fprintf (file, "0x%lx", value_long);
+ }
+ else
+ {
+@@ -2458,7 +2458,7 @@ print_operand (FILE * file, rtx op, int letter)
+ print_operand_address (file, XEXP (op, 0));
+ }
+ else if (letter == 'm')
+- fprintf (file, HOST_WIDE_INT_PRINT_DEC, (1L << INTVAL (op)));
++ fprintf (file, "%ld", (1L << INTVAL (op)));
+ else
+ output_addr_const (file, op);
+ }
+--
+2.17.1
+
diff --git a/system/gcc/0010-ldbl128-config.patch b/system/gcc/0010-ldbl128-config.patch
new file mode 100644
index 000000000..b5a101052
--- /dev/null
+++ b/system/gcc/0010-ldbl128-config.patch
@@ -0,0 +1,76 @@
+From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Wed, 28 Feb 2018 00:54:05 +0000
+Subject: [PATCH 10/12] ldbl128 config
+
+---
+ gcc/configure | 13 +++++++++++++
+ gcc/configure.ac | 16 ++++++++++++++--
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index 6121e163259..07ff8597d48 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then :
+ withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
+ else
+
++ case "$target" in
++ s390*-*-linux-musl*)
++ gcc_cv_target_ldbl128=yes
++ ;;
++ powerpc*-*-linux-musl*)
++ gcc_cv_target_ldbl128=no
++ ;;
++ *)
++
+ if test $glibc_version_major -gt 2 \
+ || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
+ gcc_cv_target_ldbl128=yes
+@@ -29320,6 +29329,10 @@ else
+ && gcc_cv_target_ldbl128=yes
+
+ fi
++
++ ;;
++ esac
++
+ fi
+
+ ;;
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index b066cc609e1..6c15ed898c0 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5971,13 +5971,25 @@ case "$target" in
+ AC_ARG_WITH(long-double-128,
+ [AS_HELP_STRING([--with-long-double-128],
+ [use 128-bit long double by default])],
+- gcc_cv_target_ldbl128="$with_long_double_128",
++ gcc_cv_target_ldbl128="$with_long_double_128", [
++ case "$target" in
++ s390*-*-linux-musl*)
++ gcc_cv_target_ldbl128=yes
++ ;;
++ powerpc*-*-linux-musl*)
++ gcc_cv_target_ldbl128=no
++ ;;
++ *)]
+ [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [
+ [gcc_cv_target_ldbl128=no
+ grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \
+ $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
+ && gcc_cv_target_ldbl128=yes
+- ]])])
++ ]])]
++ [
++ ;;
++ esac
++ ])
+ ;;
+ esac
+ if test x$gcc_cv_target_ldbl128 = xyes; then
+--
+2.17.1
+
diff --git a/system/gcc/0011-m68k.patch b/system/gcc/0011-m68k.patch
new file mode 100644
index 000000000..74a5a98da
--- /dev/null
+++ b/system/gcc/0011-m68k.patch
@@ -0,0 +1,40 @@
+From cc44e95053140efe41212746882d410052b480a3 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sun, 1 Jul 2018 18:34:01 +0000
+Subject: [PATCH 11/12] m68k
+
+---
+ gcc/config/m68k/linux.h | 3 +++
+ libgcc/config/m68k/linux-unwind.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
+index f584d19e179..a3c215550fe 100644
+--- a/gcc/config/m68k/linux.h
++++ b/gcc/config/m68k/linux.h
+@@ -73,6 +73,9 @@ along with GCC; see the file COPYING3. If not see
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+
++#undef MUSL_DYNAMIC_LINKER
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1"
++
+ #undef LINK_SPEC
+ #define LINK_SPEC "-m m68kelf %{shared} \
+ %{!shared: \
+diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
+index 395e4b3212a..432b757541c 100644
+--- a/libgcc/config/m68k/linux-unwind.h
++++ b/libgcc/config/m68k/linux-unwind.h
+@@ -37,7 +37,7 @@ struct uw_ucontext {
+ stack_t uc_stack;
+ mcontext_t uc_mcontext;
+ unsigned long uc_filler[80];
+- __sigset_t uc_sigmask;
++ sigset_t uc_sigmask;
+ };
+
+ #define MD_FALLBACK_FRAME_STATE_FOR m68k_fallback_frame_state
+--
+2.17.1
+
diff --git a/system/gcc/0012-static-pie.patch b/system/gcc/0012-static-pie.patch
new file mode 100644
index 000000000..03a4f68f6
--- /dev/null
+++ b/system/gcc/0012-static-pie.patch
@@ -0,0 +1,138 @@
+From a4aa319f7c19e564dced3daeb7222c9315af936c Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sat, 18 Aug 2018 23:58:45 +0000
+Subject: [PATCH 12/12] static-pie
+
+in gcc-8 -static means static non-pie, even if -pie or -static-pie
+are specified, -static-pie can be used to build static pie.
+
+in musl toolchains -static -pie always meant static pie, so this
+patch fixes the link specs accordingly, the new -static-pie is just
+an alias to -static -pie.
+---
+ gcc/common.opt | 4 ++--
+ gcc/config/gnu-user.h | 12 +++++-------
+ gcc/config/rs6000/sysv4.h | 11 +++++------
+ gcc/gcc.c | 6 +++---
+ 4 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index b52ef0b38c8..0ce5857e01d 100644
+--- a/gcc/common.opt
++++ b/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/config/gnu-user.h
++++ b/gcc/config/gnu-user.h
+@@ -52,13 +52,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ #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} \
+ crti.o%s \
+- %{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; \
+@@ -92,8 +91,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ "%{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} \
+ crtn.o%s \
+ " CRTOFFLOADEND
+@@ -133,7 +131,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ #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
+
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index bb19d0dcd41..bb2a2324eb0 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -763,12 +763,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+ #define STARTFILE_LINUX_SPEC \
+ "%{shared:; \
+ pg|p|profile:gcrt1.o%s; \
+- static:crt1.o%s; \
+- static-pie|" PIE_SPEC ":Scrt1.o%s; \
++ static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
++ " PIE_SPEC ":Scrt1.o%s; \
+ :crt1.o%s} \
+ %{mnewlib:ecrti.o%s;:crti.o%s} \
+- %{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; \
+@@ -781,8 +781,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+ "%{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} \
+ %{mnewlib:ecrtn.o%s;:crtn.o%s} \
+ " CRTOFFLOADEND
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index eb1610ba8b0..87560afb03c 100644
+--- a/gcc/gcc.c
++++ b/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/system/gcc/001_all_default-ssp-strong.patch b/system/gcc/001_all_default-ssp-strong.patch
deleted file mode 100644
index 95949eb00..000000000
--- a/system/gcc/001_all_default-ssp-strong.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-# DP: Turn on -fstack-protector by default for C, C++, ObjC, ObjC++.
-# DP: Build libgcc using -fno-stack-protector.
-
----
- gcc/Makefile.in | 2 ++
- gcc/cp/lang-specs.h | 6 +++---
- gcc/doc/invoke.texi | 4 ++++
- gcc/gcc.c | 18 ++++++++++++++----
- gcc/objc/lang-specs.h | 10 +++++-----
- gcc/objcp/lang-specs.h | 8 ++++----
- 6 files changed, 32 insertions(+), 16 deletions(-)
-
-Index: b/gcc/gcc.c
-===================================================================
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -858,6 +858,14 @@ proper position among the other output f
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
- #endif
-
-+#ifndef SSP_DEFAULT_SPEC
-+#ifdef TARGET_LIBC_PROVIDES_SSP
-+#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:%{!fstack-protector:-fstack-protector-strong}}}}}"
-+#else
-+#define SSP_DEFAULT_SPEC ""
-+#endif
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1057,6 +1065,7 @@ static const char *cc1_spec = CC1_SPEC;
- static const char *cc1plus_spec = CC1PLUS_SPEC;
- static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
- static const char *link_ssp_spec = LINK_SSP_SPEC;
-+static const char *ssp_default_spec = SSP_DEFAULT_SPEC;
- static const char *asm_spec = ASM_SPEC;
- static const char *asm_final_spec = ASM_FINAL_SPEC;
- static const char *link_spec = LINK_SPEC;
-@@ -1112,7 +1121,7 @@ static const char *cpp_unique_options =
- static const char *cpp_options =
- "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
- %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
-- %{undef} %{save-temps*:-fpch-preprocess}";
-+ %{undef} %{save-temps*:-fpch-preprocess} %(ssp_default)";
-
- /* This contains cpp options which are not passed when the preprocessor
- output will be used by another program. */
-@@ -1301,9 +1310,9 @@ static const struct compiler default_com
- %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
- %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
- cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
-- %(cc1_options)}\
-+ %(cc1_options) %(ssp_default)}\
- %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
-- cc1 %(cpp_unique_options) %(cc1_options)}}}\
-+ cc1 %(cpp_unique_options) %(cc1_options) %(ssp_default)}}}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
- {"-",
- "%{!E:%e-E or -x required when input is from standard input}\
-@@ -1328,7 +1337,7 @@ static const struct compiler default_com
- %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
- {".i", "@cpp-output", 0, 0, 0},
- {"@cpp-output",
-- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(ssp_default) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {".s", "@assembler", 0, 0, 0},
- {"@assembler",
- "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1560,6 +1569,7 @@ static struct spec_list static_specs[] =
- INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
- INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec),
- INIT_STATIC_SPEC ("link_ssp", &link_ssp_spec),
-+ INIT_STATIC_SPEC ("ssp_default", &ssp_default_spec),
- INIT_STATIC_SPEC ("endfile", &endfile_spec),
- INIT_STATIC_SPEC ("link", &link_spec),
- INIT_STATIC_SPEC ("lib", &lib_spec),
-Index: b/gcc/cp/lang-specs.h
-===================================================================
---- a/gcc/cp/lang-specs.h
-+++ b/gcc/cp/lang-specs.h
-@@ -46,7 +46,7 @@ along with GCC; see the file COPYING3.
- %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
- cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(ssp_default) %2\
- %{!fsyntax-only:-o %g.s \
- %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}}%V}}}}",
-@@ -58,11 +58,11 @@ along with GCC; see the file COPYING3.
- %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
- cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(ssp_default) %2\
- %{!fsyntax-only:%(invoke_as)}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {".ii", "@c++-cpp-output", 0, 0, 0},
- {"@c++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1plus -fpreprocessed %i %(cc1_options) %2\
-+ cc1plus -fpreprocessed %i %(cc1_options) %(ssp_default) %2\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-Index: b/gcc/params.def
-===================================================================
---- a/gcc/params.def
-+++ b/gcc/params.def
-@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
- DEFPARAM (PARAM_SSP_BUFFER_SIZE,
- "ssp-buffer-size",
- "The lower bound for a buffer to be considered for stack smashing protection.",
-- 8, 1, 0)
-+ 4, 1, 0)
-
- DEFPARAM (PARAM_MIN_SIZE_FOR_STACK_SHARING,
- "min-size-for-stack-sharing",
-Index: b/gcc/objc/lang-specs.h
-===================================================================
---- a/gcc/objc/lang-specs.h
-+++ b/gcc/objc/lang-specs.h
-@@ -29,9 +29,9 @@ along with GCC; see the file COPYING3.
- %{traditional|traditional-cpp:\
- %eGNU Objective C no longer supports traditional compilation}\
- %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
-- cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
-+ cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}}\
- %{!save-temps*:%{!no-integrated-cpp:\
-- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
-+ cc1obj %(cpp_unique_options) %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}}}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objective-c-header",
- "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
-@@ -40,18 +40,18 @@ along with GCC; see the file COPYING3.
- %{traditional|traditional-cpp:\
- %eGNU Objective C no longer supports traditional compilation}\
- %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
-- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ cc1obj -fpreprocessed %b.mi %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
- -o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}%V}\
- %{!save-temps*:%{!no-integrated-cpp:\
-- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ cc1obj %(cpp_unique_options) %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
- -o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
- {".mi", "@objective-c-cpp-output", 0, 0, 0},
- {"@objective-c-cpp-output",
-- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objc-cpp-output",
- "%nobjc-cpp-output is deprecated; please use objective-c-cpp-output instead\n\
-- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-Index: b/gcc/objcp/lang-specs.h
-===================================================================
---- a/gcc/objcp/lang-specs.h
-+++ b/gcc/objcp/lang-specs.h
-@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3.
- %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
- cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(ssp_default) %2\
- -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {"@objective-c++",
-@@ -46,16 +46,16 @@ along with GCC; see the file COPYING3.
- %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
- cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(ssp_default) %2\
- %{!fsyntax-only:%(invoke_as)}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {".mii", "@objective-c++-cpp-output", 0, 0, 0},
- {"@objective-c++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1objplus -fpreprocessed %i %(cc1_options) %2\
-+ cc1objplus -fpreprocessed %i %(cc1_options) %(ssp_default) %2\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objc++-cpp-output",
- "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-output instead\n\
- %{!M:%{!MM:%{!E:\
-- cc1objplus -fpreprocessed %i %(cc1_options) %2\
-+ cc1objplus -fpreprocessed %i %(cc1_options) %(ssp_default) %2\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-Index: b/gcc/doc/invoke.texi
-===================================================================
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -9247,6 +9247,9 @@
- The minimum size of variables taking part in stack slot sharing when not
- optimizing. The default value is 32.
-
-+The Alpine Linux default is "4", to increase
-+the number of functions protected by the stack protector.
-+
- @item max-jump-thread-duplication-stmts
- Maximum number of statements allowed in a block that needs to be
- duplicated when threading jumps.
-@@ -10185,6 +10188,11 @@
- Like @option{-fstack-protector} but includes additional functions to
- be protected --- those that have local array definitions, or have
- references to local frame addresses.
-+
-+NOTE: In Alpine Linux,
-+@option{-fstack-protector-strong} is enabled by default for C,
-+C++, ObjC, ObjC++, if none of @option{-fno-stack-protector},
-+@option{-nostdlib}, nor @option{-ffreestanding} are found.
-
- @item -fstack-protector-explicit
- @opindex fstack-protector-explicit
diff --git a/system/gcc/002_all_default-relro.patch b/system/gcc/002_all_default-relro.patch
index c461017dc..284deef1a 100644
--- a/system/gcc/002_all_default-relro.patch
+++ b/system/gcc/002_all_default-relro.patch
@@ -13,7 +13,7 @@ Index: b/gcc/doc/invoke.texi
linker. When using the GNU linker, you can also get the same effect with
@option{-Wl,-Map=output.map}.
-+NOTE: In Alpine Linux, for LDFLAGS, the option
++NOTE: In Adelie Linux, for LDFLAGS, the option
+@option{-Wl,-z,relro,now} is used. To disable, use @option{-Wl,-z,norelro}.
+
@item -u @var{symbol}
diff --git a/system/gcc/003_all_default-fortify-source.patch b/system/gcc/003_all_default-fortify-source.patch
deleted file mode 100644
index 6ca803343..000000000
--- a/system/gcc/003_all_default-fortify-source.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# DP: Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, ObjC++,
-# DP: if the optimization level is > 0
-
----
- gcc/doc/invoke.texi | 6 ++++++
- gcc/c-family/c-cppbuiltin.c | 3 +
- 2 files changed, 9 insertions(+), 0 deletions(-)
-
-Index: b/gcc/doc/invoke.texi
-===================================================================
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -7840,6 +7840,12 @@ also turns on the following optimization
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
-
-+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
-+set by default, and is activated when @option{-O} is set to 2 or higher.
-+This enables additional compile-time and run-time checks for several libc
-+functions. To disable, specify either @option{-U_FORTIFY_SOURCE} or
-+@option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more. @option{-O3} turns on all optimizations specified
-Index: b/gcc/c-family/c-cppbuiltin.c
-===================================================================
---- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1176,6 +1176,10 @@ c_cpp_builtins (cpp_reader *pfile)
- builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
- builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
-
-+ /* Fortify Source enabled by default for optimization levels > 0 */
-+ if (optimize)
-+ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
- /* Misc. */
- if (flag_gnu89_inline)
- cpp_define (pfile, "__GNUC_GNU_INLINE__");
diff --git a/system/gcc/005_all_default-as-needed.patch b/system/gcc/005_all_default-as-needed.patch
index ee4f7962a..00852197f 100644
--- a/system/gcc/005_all_default-as-needed.patch
+++ b/system/gcc/005_all_default-as-needed.patch
@@ -1,9 +1,25 @@
# DP: On linux targets pass --as-needed by default to the linker, but always
# DP: link the sanitizer libraries with --no-as-needed.
+Index: b/gcc/gcc.c
+===================================================================
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
-@@ -568,8 +568,11 @@ proper position among the other output f
+@@ -692,8 +692,11 @@ proper position among the other output f
+ #ifdef LIBASAN_EARLY_SPEC
+ #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
+- "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
++#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
++ " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -lasan " \
++ " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBASAN_LIBS
+ #else
+ #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
+@@ -710,8 +713,11 @@ proper position among the other output f
#ifdef LIBTSAN_EARLY_SPEC
#define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
#elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -17,21 +33,53 @@
STATIC_LIBTSAN_LIBS
#else
#define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
+@@ -728,8 +734,11 @@ proper position among the other output f
+ #ifdef LIBLSAN_EARLY_SPEC
+ #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
+- "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
++ " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -llsan " \
++ " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBLSAN_LIBS
+ #else
+ #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
+@@ -744,8 +753,11 @@ proper position among the other output f
+ #define STATIC_LIBUBSAN_LIBS \
+ " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
+ #ifdef HAVE_LD_STATIC_DYNAMIC
+-#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
+- "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
++ " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++ " -lubsan " \
++ " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
++ " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ STATIC_LIBUBSAN_LIBS
+ #else
+ #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+Index: b/gcc/config/gnu-user.h
+===================================================================
--- a/gcc/config/gnu-user.h
+++ b/gcc/config/gnu-user.h
-@@ -124,13 +124,13 @@
+@@ -161,15 +161,15 @@ see the files COPYING3 and COPYING.RUNTI
#define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
"%{static-libasan:%{!shared:" \
LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
- LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
+ LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
#undef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_EARLY_SPEC "%{static-libtsan:%{!shared:" \
+ #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
+ "%{static-libtsan:%{!shared:" \
LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
- LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
+ LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
#undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{static-liblsan:%{!shared:" \
+ #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
+ "%{static-liblsan:%{!shared:" \
LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
- LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
+ LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
@@ -40,7 +88,8 @@ Index: b/gcc/config/aarch64/aarch64-linux.h
===================================================================
--- a/gcc/config/aarch64/aarch64-linux.h
+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -36,5 +36,6 @@
+@@ -35,6 +35,7 @@
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
#define LINUX_TARGET_LINK_SPEC "%{h*} \
+ --as-needed \
@@ -77,7 +126,7 @@ Index: b/gcc/config/s390/linux.h
===================================================================
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
-@@ -65,7 +65,7 @@ along with GCC; see the file COPYING3.
+@@ -78,7 +78,7 @@ along with GCC; see the file COPYING3.
#undef LINK_SPEC
#define LINK_SPEC \
@@ -90,26 +139,27 @@ Index: b/gcc/config/rs6000/linux64.h
===================================================================
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
-@@ -466,12 +466,12 @@ extern int dot_symbols;
+@@ -490,13 +490,13 @@ extern int dot_symbols;
" -m elf64ppc")
#endif
-#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \
+ %{!static-pie: \
+ %{rdynamic:-export-dynamic} \
+ -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
%(link_os_extra_spec32)"
-#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}} \
- %(link_os_extra_spec64)"
+ %{!static-pie: \
+ %{rdynamic:-export-dynamic} \
+ -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
Index: b/gcc/config/rs6000/sysv4.h
===================================================================
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
-@@ -784,7 +784,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+@@ -811,7 +811,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
MUSL_DYNAMIC_LINKER)
@@ -122,7 +172,8 @@ Index: b/gcc/config/i386/gnu-user64.h
===================================================================
--- a/gcc/config/i386/gnu-user64.h
+++ b/gcc/config/i386/gnu-user64.h
-@@ -57,5 +57,6 @@ see the files COPYING3 and COPYING.RUNTI
+@@ -56,6 +56,7 @@
+ "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
%{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
%{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
+ --as-needed \
@@ -141,7 +192,7 @@ Index: b/gcc/config/i386/gnu-user.h
+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
%{!shared: \
%{!static: \
- %{rdynamic:-export-dynamic} \
+ %{!static-pie: \
Index: b/gcc/config/alpha/linux-elf.h
===================================================================
--- a/gcc/config/alpha/linux-elf.h
@@ -151,7 +202,7 @@ Index: b/gcc/config/alpha/linux-elf.h
#define ELF_DYNAMIC_LINKER GNU_USER_DYNAMIC_LINKER
-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax} \
++#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax} \
%{O*:-O3} %{!O*:-O1} \
%{shared:-shared} \
%{!shared: \
@@ -159,7 +210,8 @@ Index: b/gcc/config/arm/linux-elf.h
===================================================================
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
-@@ -73,5 +73,6 @@
+@@ -70,6 +70,7 @@
+ %{rdynamic:-export-dynamic} \
%{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-X \
+ --as-needed \
@@ -178,64 +230,15 @@ Index: b/gcc/config/mips/gnu-user.h
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
-Index: b/libjava/Makefile.am
-===================================================================
---- a/libjava/Makefile.am
-+++ b/libjava/Makefile.am
-@@ -627,14 +631,14 @@
- rm .libs/libgcj_bc.so; \
- mv .libs/libgcj_bc.so.1.0.0 .libs/libgcj_bc.so; \
- $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
-- -o .libs/libgcj_bc.so.1.0.0 -lgcj || exit; \
-+ -o .libs/libgcj_bc.so.1.0.0 -Wl,--no-as-needed -lgcj || exit; \
- rm .libs/libgcj_bc.so.1; \
- $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1
-
- ## This rule creates the libgcj_bc library that is actually installed.
- install/libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) install/$(am__dirstamp)
- $(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \
-- $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS)
-+ $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS) -Wl,--no-as-needed -lgcj
-
- ## Note that property_files is defined in sources.am.
- propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
-@@ -762,7 +766,7 @@
- rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
- mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
- $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
-- -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
-+ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -Wl,--no-as-needed -lgcj || exit; \
- rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
- $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
- rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
-
-Index: b/libjava/Makefile.in
+Index: b/gcc/config/riscv/linux.h
===================================================================
---- a/libjava/Makefile.in
-+++ b/libjava/Makefile.in
-@@ -10644,13 +10648,13 @@
- rm .libs/libgcj_bc.so; \
- mv .libs/libgcj_bc.so.1.0.0 .libs/libgcj_bc.so; \
- $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
-- -o .libs/libgcj_bc.so.1.0.0 -lgcj || exit; \
-+ -o .libs/libgcj_bc.so.1.0.0 -Wl,--no-as-needed -lgcj || exit; \
- rm .libs/libgcj_bc.so.1; \
- $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1
-
- install/libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) install/$(am__dirstamp)
- $(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \
-- $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS)
-+ $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS) -Wl,--no-as-needed -lgcj
-
- $(propertyo_files): %.lo: classpath/resource/%
- $(mkinstalldirs) `dirname $@`; \
-@@ -12494,7 +12498,7 @@
- @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
- @USE_LIBGCJ_BC_TRUE@ mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
- @USE_LIBGCJ_BC_TRUE@ $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
--@USE_LIBGCJ_BC_TRUE@ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
-+@USE_LIBGCJ_BC_TRUE@ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -Wl,--no-as-needed -lgcj || exit; \
- @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
- @USE_LIBGCJ_BC_TRUE@ $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
- @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
-
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -50,6 +50,7 @@
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+
+ #define LINK_SPEC "\
++-as-needed \
+ -melf" XLEN_SPEC "lriscv \
+ %{mno-relax:--no-relax} \
+ %{shared} \
diff --git a/system/gcc/011_all_default-warn-format-security.patch b/system/gcc/011_all_default-warn-format-security.patch
index a58383a8e..1f400d026 100644
--- a/system/gcc/011_all_default-warn-format-security.patch
+++ b/system/gcc/011_all_default-warn-format-security.patch
@@ -3,41 +3,21 @@ Enable -Wformat and -Wformat-security by default.
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
-@@ -412,7 +412,7 @@ C ObjC C++ ObjC++ Var(warn_format_nonliteral) Warning LangEnabledBy(C ObjC C++ O
- Warn about format strings that are not literals
+@@ -459,7 +459,7 @@ C ObjC C++ ObjC++ Var(warn_format_nonliteral) Warning LangEnabledBy(C ObjC C++ O
+ Warn about format strings that are not literals.
Wformat-security
-C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
- Warn about possible security problems with format functions
+ Warn about possible security problems with format functions.
- Wformat-y2k
-@@ -424,7 +424,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
- Warn about zero-length formats
+ Wformat-signedness
+@@ -475,7 +475,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+ Warn about zero-length formats.
Wformat=
--C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0)
-+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0)
- Warn about printf/scanf/strftime/strfmon format string anomalies
+-C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
++C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
+ Warn about printf/scanf/strftime/strfmon format string anomalies.
Wignored-qualifiers
---- a/gcc/doc/gcc.info
-+++ b/gcc/doc/gcc.info
-@@ -3451,6 +3451,8 @@ compiler warns that an unrecognized option is present.
- '-Wno-format-contains-nul', '-Wno-format-extra-args', and
- '-Wno-format-zero-length'. '-Wformat' is enabled by '-Wall'.
-
-+ This option is enabled by default in Alpine Linux.
-+
- '-Wno-format-contains-nul'
- If '-Wformat' is specified, do not warn about format strings
- that contain NUL bytes.
-@@ -3496,6 +3498,8 @@ compiler warns that an unrecognized option is present.
- future warnings may be added to '-Wformat-security' that are
- not included in '-Wformat-nonliteral'.)
-
-+ This option is enabled by default in Alpine Linux.
-+
- '-Wformat-y2k'
- If '-Wformat' is specified, also warn about 'strftime' formats
- that may yield only a two-digit year.
diff --git a/system/gcc/012_all_default-warn-trampolines.patch b/system/gcc/012_all_default-warn-trampolines.patch
index 9ab4378d4..89ebfaccd 100644
--- a/system/gcc/012_all_default-warn-trampolines.patch
+++ b/system/gcc/012_all_default-warn-trampolines.patch
@@ -18,7 +18,7 @@ Enable -Wtrampolines by default.
and thus requires the stack to be made executable in order for the
program to work properly.
-+ This warning is enabled by default in Gentoo.
++ This warning is enabled by default in Gentoo, Alpine, and Adelie Linux.
+
'-Wfloat-equal'
Warn if floating-point values are used in equality comparisons.
diff --git a/system/gcc/050_all_libiberty-asprintf.patch b/system/gcc/050_all_libiberty-asprintf.patch
deleted file mode 100644
index bee0c4c23..000000000
--- a/system/gcc/050_all_libiberty-asprintf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-2008-07-25 Magnus Granberg <zorry@ume.nu>
-
- * include/libiberty.h (asprintf): Don't declare if defined as a macro
-
---- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -609,8 +609,11 @@ extern int pwait (int, int *, int);
- /* Like sprintf but provides a pointer to malloc'd storage, which must
- be freed by the caller. */
-
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
-
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/system/gcc/053_all_libitm-no-fortify-source.patch b/system/gcc/053_all_libitm-no-fortify-source.patch
deleted file mode 100644
index 5ab15afc3..000000000
--- a/system/gcc/053_all_libitm-no-fortify-source.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/508852
-https://gcc.gnu.org/PR61164
-
-2014-04-27 Magnus Granberg <zorry@gentoo.org>
-
- #508852
- * libitm/configure.tgt: Disable FORTIFY
-
---- a/libitm/configure.tgt
-+++ b/libitm/configure.tgt
-@@ -43,6 +43,16 @@ if test "$gcc_cv_have_tls" = yes ; then
- esac
- fi
-
-+# FIXME: error: inlining failed in call to always_inline
-+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’
-+# : function body can be overwritten at link time
-+# Disable Fortify in libitm for now. #508852
-+case "${target}" in
-+ *-*-linux*)
-+ XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE"
-+ ;;
-+esac
-+
- # Map the target cpu to an ARCH sub-directory. At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
diff --git a/system/gcc/067_all_gcc-poison-system-directories.patch b/system/gcc/067_all_gcc-poison-system-directories.patch
deleted file mode 100644
index 103671617..000000000
--- a/system/gcc/067_all_gcc-poison-system-directories.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/gcc/gcc-6.1/0010-gcc-poison-system-directories.patch
-
-From d76250323dad69212c958e4857a98d99ab51a39e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 10/46] gcc: poison-system-directories
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
----
- gcc/common.opt | 4 ++++
- gcc/config.in | 6 ++++++
- gcc/configure | 16 ++++++++++++++++
- gcc/configure.ac | 10 ++++++++++
- gcc/doc/invoke.texi | 9 +++++++++
- gcc/gcc.c | 2 ++
- gcc/incpath.c | 19 +++++++++++++++++++
- 7 files changed, 66 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 67048db..733185c 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -659,6 +659,10 @@ Wreturn-local-addr
- Common Var(warn_return_local_addr) Init(1) Warning
- Warn about returning a pointer/reference to a local or temporary variable.
-
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one local variable shadows another.
-diff --git a/gcc/config.in b/gcc/config.in
-index 115cb61..105b30f 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -187,6 +187,12 @@
- #endif
-
-
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
- optimizer and back end) to be checked for dynamic type safety at runtime.
- This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e340..8f83152 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -942,6 +942,7 @@ with_system_zlib
- enable_maintainer_mode
- enable_link_mutex
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1681,6 +1682,8 @@ Optional Features:
- --enable-version-specific-runtime-libs
- specify that runtime libraries should be installed
- in a compiler-specific directory
-+ --enable-poison-system-directories
-+ warn for use of native system header directories
- --enable-plugin enable plugin support
- --enable-host-shared build host code as shared libraries
- --disable-libquadmath-support
-@@ -28908,6 +28911,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
-
-
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+ enableval=$enable_poison_system_directories;
-+else
-+ enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
-
-
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9..0fccaef 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5861,6 +5861,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
- [specify that runtime libraries should be
- installed in a compiler-specific directory])])
-
-+AC_ARG_ENABLE([poison-system-directories],
-+ AS_HELP_STRING([--enable-poison-system-directories],
-+ [warn for use of native system header directories]),,
-+ [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+ [1],
-+ [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 821f8fd..8bb49e7 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -284,6 +284,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wparentheses -Wno-pedantic-ms-format @gol
- -Wplacement-new -Wplacement-new=@var{n} @gol
- -Wpointer-arith -Wno-pointer-to-int-cast @gol
-+-Wno-poison-system-directories @gol
- -Wno-pragmas -Wredundant-decls -Wno-return-local-addr @gol
- -Wreturn-type -Wsequence-point -Wshadow -Wno-shadow-ivar @gol
- -Wshift-overflow -Wshift-overflow=@var{n} @gol
-@@ -4723,6 +4724,14 @@ made up of data only and thus requires no special treatment. But, for
- most targets, it is made up of code and thus requires the stack to be
- made executable in order for the program to work properly.
-
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling. This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 1af5920..4cfef7f 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1017,6 +1017,8 @@ proper position among the other output files. */
- "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
- "%X %{o*} %{e*} %{N} %{n} %{r}\
- %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \
-+ %{Wno-poison-system-directories:--no-poison-system-directories} \
-+ %{Werror=poison-system-directories:--error-poison-system-directories} \
- %{static:} %{L*} %(mfwrap) %(link_libgcc) " \
- VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o " CHKP_SPEC " \
- %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.c b/gcc/incpath.c
-index ea40f4a..856da41 100644
---- a/gcc/incpath.c
-+++ b/gcc/incpath.c
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
-
- /* Microsoft Windows does not natively support inodes.
- VMS has non-numeric inodes. */
-@@ -381,6 +382,24 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- }
- fprintf (stderr, _("End of search list.\n"));
- }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+ if (flag_poison_system_directories)
-+ {
-+ struct cpp_dir *p;
-+
-+ for (p = heads[QUOTE]; p; p = p->next)
-+ {
-+ if ((!strncmp (p->name, "/usr/include", 12))
-+ || (!strncmp (p->name, "/usr/local/include", 18))
-+ || (!strncmp (p->name, "/usr/X11R6/include", 18)))
-+ warning (OPT_Wpoison_system_directories,
-+ "include location \"%s\" is unsafe for "
-+ "cross-compilation",
-+ p->name);
-+ }
-+ }
-+#endif
- }
-
- /* Use given -I paths for #include "..." but not #include <...>, and
---
-2.8.2
-
diff --git a/system/gcc/090_all_pr55930-dependency-tracking.patch b/system/gcc/090_all_pr55930-dependency-tracking.patch
deleted file mode 100644
index a8743e08c..000000000
--- a/system/gcc/090_all_pr55930-dependency-tracking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-libatomic build failure if configured with --disable-dependency-tracking
-load_n.c:115:1: fatal error: opening dependency file .deps/load_1_.lo.Ppo: No such file or directory
-
-https://bugs.gentoo.org/463463
-http://gcc.gnu.org/PR55930
-
---- a/libatomic/Makefile.in
-+++ b/libatomic/Makefile.in
-@@ -298,7 +298,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
- PAT_S = $(word 3,$(PAT_SPLIT))
- IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
- IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
--M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
-+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
-+@AMDEP_FALSE@M_DEPS =
- M_SIZE = -DN=$(PAT_N)
- M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
- M_FILE = $(PAT_BASE)_n.c
diff --git a/system/gcc/201-cilkrts.patch b/system/gcc/201-cilkrts.patch
deleted file mode 100644
index 4aac10d6d..000000000
--- a/system/gcc/201-cilkrts.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 594e3c1ab576daddeb86015efc8b1677020b1878 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 24 Oct 2015 20:39:30 +0000
-Subject: [PATCH 1/6] cilkrts
-
----
- libcilkrts/runtime/os-unix.c | 22 +++++++---------------
- 1 file changed, 7 insertions(+), 15 deletions(-)
-
-diff --git a/libcilkrts/runtime/os-unix.c b/libcilkrts/runtime/os-unix.c
-index cb582dd..e43d7d5 100644
---- a/libcilkrts/runtime/os-unix.c
-+++ b/libcilkrts/runtime/os-unix.c
-@@ -51,6 +51,7 @@
- #if defined __linux__
- # include <sys/sysinfo.h>
- # include <sys/syscall.h>
-+# include <sched.h>
- #elif defined __APPLE__
- # include <sys/sysctl.h>
- // Uses sysconf(_SC_NPROCESSORS_ONLN) in verbose output
-@@ -400,28 +401,19 @@ COMMON_SYSDEP void __cilkrts_sleep(void)
-
- COMMON_SYSDEP void __cilkrts_yield(void)
- {
--#if __APPLE__ || __FreeBSD__ || __VXWORKS__
-- // On MacOS, call sched_yield to yield quantum. I'm not sure why we
-- // don't do this on Linux also.
-- sched_yield();
--#elif defined(__DragonFly__)
-- // On DragonFly BSD, call sched_yield to yield quantum.
-- sched_yield();
--#elif defined(__MIC__)
-+#if defined(__MIC__)
- // On MIC, pthread_yield() really trashes things. Arch's measurements
- // showed that calling _mm_delay_32() (or doing nothing) was a better
- // option. Delaying 1024 clock cycles is a reasonable compromise between
- // giving up the processor and latency starting up when work becomes
- // available
- _mm_delay_32(1024);
--#elif defined(__ANDROID__) || (defined(__sun__) && defined(__svr4__))
-- // On Android and Solaris, call sched_yield to yield quantum. I'm not
-- // sure why we don't do this on Linux also.
-- sched_yield();
--#else
-- // On Linux, call pthread_yield (which in turn will call sched_yield)
-- // to yield quantum.
-+#elif defined(__sun__) && !defined(__svr4__)
-+ // On old SunOS call pthread_yield to yield a quantum.
- pthread_yield();
-+#else
-+ // On other platforms call sched_yield to yield a quantum.
-+ sched_yield();
- #endif
- }
-
---
-2.8.1
-
diff --git a/system/gcc/203-libgcc_s.patch b/system/gcc/203-libgcc_s.patch
deleted file mode 100644
index c74351c71..000000000
--- a/system/gcc/203-libgcc_s.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9e3eab51e518018d9d99b3123598b1e2322a6af3 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 3/6] libgcc_s
-
----
- gcc/config/i386/i386.c | 4 ++--
- libgcc/config/i386/cpuinfo.c | 6 +++---
- libgcc/config/i386/t-linux | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8..82523e1 100644
---- a/gcc/config/i386/i386.c
-+++ b/gcc/config/i386/i386.c
-@@ -40269,10 +40269,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
- {
- case IX86_BUILTIN_CPU_INIT:
- {
-- /* Make it call __cpu_indicator_init in libgcc. */
-+ /* Make it call __cpu_indicator_init_local in libgcc.a. */
- tree call_expr, fndecl, type;
- type = build_function_type_list (integer_type_node, NULL_TREE);
-- fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+ fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- call_expr = build_call_expr (fndecl, 0);
- return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
- }
-diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 8c2248d..6c82f15 100644
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -485,7 +485,7 @@ __cpu_indicator_init (void)
- return 0;
- }
-
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+ __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
-diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
-index 11bb46e..4f47f7b 100644
---- a/libgcc/config/i386/t-linux
-+++ b/libgcc/config/i386/t-linux
-@@ -3,4 +3,4 @@
- # t-slibgcc-elf-ver and t-linux
- SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
-
--HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER
-+HOST_LIBGCC2_CFLAGS += -mlong-double-80
---
-2.8.1
-
diff --git a/system/gcc/204-linux_libc_has_function.patch b/system/gcc/204-linux_libc_has_function.patch
deleted file mode 100644
index 2dcedc3a7..000000000
--- a/system/gcc/204-linux_libc_has_function.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From edec78452d693fb524daa9a6efd45c850b27b25c Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Fri, 6 Nov 2015 23:59:20 +0000
-Subject: [PATCH 4/6] linux_libc_has_function
-
----
- gcc/config/linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/config/linux.c b/gcc/config/linux.c
-index 250296b..16c3768 100644
---- a/gcc/config/linux.c
-+++ b/gcc/config/linux.c
-@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
- bool
- linux_libc_has_function (enum function_class fn_class)
- {
-- if (OPTION_GLIBC)
-+ if (OPTION_GLIBC || OPTION_MUSL)
- return true;
- if (OPTION_BIONIC)
- if (fn_class == function_c94
---
-2.8.1
-
diff --git a/system/gcc/207-static-pie.patch b/system/gcc/207-static-pie.patch
deleted file mode 100644
index 9355c584b..000000000
--- a/system/gcc/207-static-pie.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a..d4b56fe 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -51,10 +51,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #if defined HAVE_LD_PIE
- #define GNU_USER_TARGET_STARTFILE_SPEC \
- "%{!shared: %{pg|p|profile:gcrt1.o%s;: \
-- %{" PIE_SPEC ":Scrt1.o%s} %{" NO_PIE_SPEC ":crt1.o%s}}} \
-- crti.o%s %{static:crtbeginT.o%s;: %{shared:crtbeginS.o%s} \
-+ %{" PIE_SPEC ":%{static:rcrt1.o%s;:Scrt1.o%s}} %{" NO_PIE_SPEC ":crt1.o%s}}} \
-+ crti.o%s %{shared:crtbeginS.o%s;: \
- %{" PIE_SPEC ":crtbeginS.o%s} \
-- %{" NO_PIE_SPEC ":crtbegin.o%s}} \
-+ %{" NO_PIE_SPEC ":%{static:crtbeginT.o%s;:crtbegin.o%s}}} \
- %{fvtable-verify=none:%s; \
- fvtable-verify=preinit:vtv_start_preinit.o%s; \
- fvtable-verify=std:vtv_start.o%s} \
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 0208d61..731564e 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -870,7 +870,7 @@ proper position among the other output files. */
- #endif
-
- #ifdef ENABLE_DEFAULT_PIE
--#define NO_PIE_SPEC "no-pie|static"
-+#define NO_PIE_SPEC "no-pie"
- #define PIE_SPEC NO_PIE_SPEC "|r|shared:;"
- #define NO_FPIE1_SPEC "fno-pie"
- #define FPIE1_SPEC NO_FPIE1_SPEC ":;"
-@@ -916,7 +916,7 @@ 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:--no-dynamic-linker -Bsymbolic}"
- #endif
- #else
- #define LD_PIE_SPEC ""
diff --git a/system/gcc/300-main-gcc-add-musl-s390x-dynamic-linker.patch b/system/gcc/300-main-gcc-add-musl-s390x-dynamic-linker.patch
deleted file mode 100644
index 241957871..000000000
--- a/system/gcc/300-main-gcc-add-musl-s390x-dynamic-linker.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From be841c16dd544553c67faac79bd4cc3cd10a1dc0 Mon Sep 17 00:00:00 2001
-From: "Tuan M. Hoang" <tmhoang@flatglobe.org>
-Date: Mon, 21 Nov 2016 01:42:16 +0700
-Subject: [PATCH] main/gcc: add musl s390x dynamic linker
-
----
- gcc/config/s390/linux.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 1e3ed35..a244214 100644
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -63,6 +63,15 @@ along with GCC; see the file COPYING3. If not see
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-s390x.so.1"
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390x.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-s390x.so.1"
-+
- #undef LINK_SPEC
- #define LINK_SPEC \
- "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
---
-2.10.2
-
diff --git a/system/gcc/310-build-gcj-s390x.patch b/system/gcc/310-build-gcj-s390x.patch
deleted file mode 100644
index 1e522ee15..000000000
--- a/system/gcc/310-build-gcj-s390x.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 697a7ba791fce2ffab2ed723d909a89684019e3d Mon Sep 17 00:00:00 2001
-From: "Tuan M. Hoang" <tmhoang@flatglobe.org>
-Date: Sun, 19 Feb 2017 17:03:33 +0000
-Subject: [PATCH] main/gcc : when building gcc-java on s390x, libgcj.so
- complains about undefined reference to __data_start. Using
- SEARCH_FOR_DATA_START instead solved it. Credit to Andrew Haley at RedHat.
-
----
- boehm-gc/include/private/gcconfig.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
-index 4ca6a80..a15fff6 100644
---- a/boehm-gc/include/private/gcconfig.h
-+++ b/boehm-gc/include/private/gcconfig.h
-@@ -1837,8 +1837,7 @@
- # define OS_TYPE "LINUX"
- # define LINUX_STACKBOTTOM
- # define DYNAMIC_LOADING
-- extern int __data_start[];
--# define DATASTART ((ptr_t)(__data_start))
-+# define SEARCH_FOR_DATA_START
- extern int _end[];
- # define DATAEND (_end)
- # define CACHE_LINE_SIZE 256
---
-2.11.1
-
diff --git a/system/gcc/332-gccgo-remove-ustat.patch b/system/gcc/332-gccgo-remove-ustat.patch
deleted file mode 100644
index 90aa65ad7..000000000
--- a/system/gcc/332-gccgo-remove-ustat.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From bdead75ea02fa852a559f35b41453df0c47c9a66 Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant@golang.org>
-Date: Fri, 22 Jun 2018 06:24:48 -0700
-Subject: [PATCH] syscall: remove Ustat
-
-glibc 2.28 removes ustat.h and the ustat function entirely, which
-breaks syscall.Ustat.
-
-Updates golang/go#25990
-
-Change-Id: I430802c86389a02cb4a0cd6caff36fa542d98f2f
-Reviewed-on: https://go-review.googlesource.com/120535
-Reviewed-by: Than McIntosh <thanm@google.com>
----
- libgo/config.h.in | 3 ---
- libgo/configure | 33 ---------------------------------
- libgo/configure.ac | 18 ------------------
- libgo/go/syscall/libcall_linux_ustat.go | 12 ------------
- libgo/mksysinfo.sh | 14 --------------
- libgo/sysinfo.c | 3 ---
- 6 files changed, 83 deletions(-)
- delete mode 100644 libgo/go/syscall/libcall_linux_ustat.go
-
-diff --git a/libgo/config.h.in b/libgo/config.h.in
-index 57560cd0..de57d0cc 100644
---- a/libgo/config.h.in
-+++ b/libgo/config.h.in
-@@ -343,9 +343,6 @@
- /* Define to 1 if you have the `unshare' function. */
- #undef HAVE_UNSHARE
-
--/* Define to 1 if you have the <ustat.h> header file and it works. */
--#undef HAVE_USTAT_H
--
- /* Define to 1 if you have the `utimensat' function. */
- #undef HAVE_UTIMENSAT
-
-diff --git a/libgo/configure b/libgo/configure
-index 66942eda..7166f940 100755
---- a/libgo/configure
-+++ b/libgo/configure
-@@ -14760,39 +14760,6 @@ fi
- done
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <ustat.h> can be used" >&5
--$as_echo_n "checking whether <ustat.h> can be used... " >&6; }
--if test "${libgo_cv_c_ustat_h+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- CFLAGS_hold=$CFLAGS
--CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE $OSCFLAGS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <sys/types.h>
--#ifdef HAVE_LINUX_FILTER_H
--#include <linux/filter.h>
--#endif
--#include <ustat.h>
--
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-- libgo_cv_c_ustat_h=yes
--else
-- libgo_cv_c_ustat_h=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--CFLAGS=$CFLAGS_hold
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgo_cv_c_ustat_h" >&5
--$as_echo "$libgo_cv_c_ustat_h" >&6; }
--if test $libgo_cv_c_ustat_h = yes; then
--
--$as_echo "#define HAVE_USTAT_H 1" >>confdefs.h
--
--fi
--
- if test "$ac_cv_header_sys_mman_h" = yes; then
- HAVE_SYS_MMAN_H_TRUE=
- HAVE_SYS_MMAN_H_FALSE='#'
-diff --git a/libgo/configure.ac b/libgo/configure.ac
-index 3cee2c0f..1c192752 100644
---- a/libgo/configure.ac
-+++ b/libgo/configure.ac
-@@ -537,24 +537,6 @@ AC_CHECK_HEADERS([linux/filter.h linux/if_addr.h linux/if_ether.h linux/if_tun.h
- #endif
- ])
-
--AC_CACHE_CHECK([whether <ustat.h> can be used],
--[libgo_cv_c_ustat_h],
--[CFLAGS_hold=$CFLAGS
--CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE $OSCFLAGS"
--AC_COMPILE_IFELSE(
--[AC_LANG_SOURCE([
--#include <sys/types.h>
--#ifdef HAVE_LINUX_FILTER_H
--#include <linux/filter.h>
--#endif
--#include <ustat.h>
--])], [libgo_cv_c_ustat_h=yes], [libgo_cv_c_ustat_h=no])
--CFLAGS=$CFLAGS_hold])
--if test $libgo_cv_c_ustat_h = yes; then
-- AC_DEFINE(HAVE_USTAT_H, 1,
-- [Define to 1 if you have the <ustat.h> header file and it works.])
--fi
--
- AM_CONDITIONAL(HAVE_SYS_MMAN_H, test "$ac_cv_header_sys_mman_h" = yes)
-
- AC_CHECK_FUNCS(strerror_r strsignal wait4 mincore setenv unsetenv dl_iterate_phdr)
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 92ecb479..48bc71db 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -1164,20 +1164,6 @@ grep '^type _sysinfo ' gen-sysinfo.go | \
- -e 's/mem_unit/Unit/' \
- >> ${OUT}
-
--# The ustat struct.
--grep '^type _ustat ' gen-sysinfo.go | \
-- sed -e 's/_ustat/Ustat_t/' \
-- -e 's/f_tfree/Tfree/' \
-- -e 's/f_tinode/Tinoe/' \
-- -e 's/f_fname/Fname/' \
-- -e 's/f_fpack/Fpack/' \
-- >> ${OUT}
--# Force it to be defined, as on some older GNU/Linux systems the
--# header file fails when using with <linux/filter.h>.
--if ! grep 'type _ustat ' gen-sysinfo.go >/dev/null 2>&1; then
-- echo 'type Ustat_t struct { Tfree int32; Tinoe uint64; Fname [5+1]int8; Fpack [5+1]int8; }' >> ${OUT}
--fi
--
- # The utimbuf struct.
- grep '^type _utimbuf ' gen-sysinfo.go | \
- sed -e 's/_utimbuf/Utimbuf/' \
---- gcc-6.4.0/libgo/Makefile.am.old 2016-02-03 15:58:02.419872000 -0600
-+++ gcc-6.4.0/libgo/Makefile.am 2018-06-23 02:55:45.772611885 -0500
-@@ -1,4 +1,3 @@
--# Makefile.am -- Go library Makefile.
-
- # Copyright 2009 The Go Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style
-@@ -1989,17 +1988,6 @@
- syscall_lsf_file =
- endif
-
--# GNU/Linux specific ustat support.
--if LIBGO_IS_LINUX
--if LIBGO_IS_ARM64
--syscall_ustat_file =
--else
--syscall_ustat_file = go/syscall/libcall_linux_ustat.go
--endif
--else
--syscall_ustat_file =
--endif
--
- # GNU/Linux specific utimesnano support.
- if LIBGO_IS_LINUX
- syscall_utimesnano_file = go/syscall/libcall_linux_utimesnano.go
-@@ -2051,7 +2039,6 @@
- $(syscall_uname_file) \
- $(syscall_netlink_file) \
- $(syscall_lsf_file) \
-- $(syscall_ustat_file) \
- $(syscall_utimesnano_file) \
- $(GO_LIBCALL_OS_FILE) \
- $(GO_LIBCALL_OS_ARCH_FILE) \
---- gcc-6.4.0/libgo/Makefile.in.old 2016-02-03 15:58:02.419872000 -0600
-+++ gcc-6.4.0/libgo/Makefile.in 2018-06-23 02:56:04.842611681 -0500
-@@ -2080,11 +2080,6 @@
-
- # GNU/Linux specific socket filters.
- @LIBGO_IS_LINUX_TRUE@syscall_lsf_file = go/syscall/lsf_linux.go
--@LIBGO_IS_ARM64_FALSE@@LIBGO_IS_LINUX_TRUE@syscall_ustat_file = go/syscall/libcall_linux_ustat.go
--
--# GNU/Linux specific ustat support.
--@LIBGO_IS_ARM64_TRUE@@LIBGO_IS_LINUX_TRUE@syscall_ustat_file =
--@LIBGO_IS_LINUX_FALSE@syscall_ustat_file =
- @LIBGO_IS_LINUX_FALSE@syscall_utimesnano_file = go/syscall/libcall_posix_utimesnano.go
-
- # GNU/Linux specific utimesnano support.
-@@ -2122,7 +2117,6 @@
- $(syscall_uname_file) \
- $(syscall_netlink_file) \
- $(syscall_lsf_file) \
-- $(syscall_ustat_file) \
- $(syscall_utimesnano_file) \
- $(GO_LIBCALL_OS_FILE) \
- $(GO_LIBCALL_OS_ARCH_FILE) \
diff --git a/system/gcc/332-gccgo-sysinfo.patch b/system/gcc/332-gccgo-sysinfo.patch
new file mode 100644
index 000000000..822bc53c9
--- /dev/null
+++ b/system/gcc/332-gccgo-sysinfo.patch
@@ -0,0 +1,12 @@
+--- gcc-8.3.0/libgo/sysinfo.c.old 2018-06-22 14:25:34.000000000 +0000
++++ gcc-8.3.0/libgo/sysinfo.c 2019-02-27 20:18:38.740000000 +0000
+@@ -73,9 +73,6 @@
+ #include <sys/times.h>
+ #include <sys/wait.h>
+ #include <sys/un.h>
+-#if defined(HAVE_SYS_USER_H)
+-#include <sys/user.h>
+-#endif
+ #if defined(HAVE_SYS_UTSNAME_H)
+ #include <sys/utsname.h>
+ #endif
diff --git a/system/gcc/333-gccgo-signal-ppc64.patch b/system/gcc/333-gccgo-signal-ppc64.patch
new file mode 100644
index 000000000..304b71733
--- /dev/null
+++ b/system/gcc/333-gccgo-signal-ppc64.patch
@@ -0,0 +1,11 @@
+--- gcc-8.3.0/libgo/runtime/go-signal.c.old 2017-08-18 20:17:26.000000000 +0000
++++ gcc-8.3.0/libgo/runtime/go-signal.c 2019-02-27 20:25:02.560000000 +0000
+@@ -222,7 +222,7 @@
+ #endif
+ #ifdef __PPC__
+ #ifdef __linux__
+- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
+ #endif
+ #ifdef _AIX
+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
diff --git a/system/gcc/334-gccgo-signal-shell.patch b/system/gcc/334-gccgo-signal-shell.patch
new file mode 100644
index 000000000..5c7405c4f
--- /dev/null
+++ b/system/gcc/334-gccgo-signal-shell.patch
@@ -0,0 +1,25 @@
+--- gcc-8.3.0/libgo/mksigtab.sh.old 2017-11-22 00:27:29.000000000 +0000
++++ gcc-8.3.0/libgo/mksigtab.sh 2019-03-02 22:01:17.530000000 +0000
+@@ -82,7 +82,7 @@
+ checksig _SIGEMT '{_SigThrow, "SIGEMT: emulate instruction executed"}'
+ checksig _SIGINFO '{_SigNotify, "SIGINFO: status request from keyboard"}'
+ checksig _SIGTHR '{_SigNotify, "SIGTHR: reserved"}'
+-checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}'
++#checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}'
+ checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}'
+ checksig _SIGLWP '{_SigNotify, "SIGLWP: reserved signal no longer used by"}'
+ checksig _SIGFREEZE '{_SigNotify, "SIGFREEZE: special signal used by CPR"}'
+@@ -94,10 +94,12 @@
+
+ # Special handling of signals 32 and 33 on GNU/Linux systems,
+ # because they are special to glibc.
++# Signal 34 is additionally special to Linux systems with musl.
+ if test "${GOOS}" = "linux"; then
+- SIGLIST=$SIGLIST"_32__33_"
++ SIGLIST=$SIGLIST"_32__33__34_"
+ echo ' 32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */'
+ echo ' 33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */'
++ echo ' 34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */'
+ fi
+
+ if test "${GOOS}" = "aix"; then
diff --git a/system/gcc/335-gccgo-signal-ppc32.patch b/system/gcc/335-gccgo-signal-ppc32.patch
new file mode 100644
index 000000000..f44444948
--- /dev/null
+++ b/system/gcc/335-gccgo-signal-ppc32.patch
@@ -0,0 +1,14 @@
+--- gcc-8.3.0/libgo/runtime/go-signal.c.old 2019-03-02 22:02:02.250000000 +0000
++++ gcc-8.3.0/libgo/runtime/go-signal.c 2019-03-03 02:04:13.220000000 +0000
+@@ -222,7 +222,11 @@
+ #endif
+ #ifdef __PPC__
+ #ifdef __linux__
++ #ifdef __PPC64__
+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
++ #else
++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32];
++ #endif
+ #endif
+ #ifdef _AIX
+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
diff --git a/system/gcc/336-gccgo-mmap64.patch b/system/gcc/336-gccgo-mmap64.patch
new file mode 100644
index 000000000..23b4cebc8
--- /dev/null
+++ b/system/gcc/336-gccgo-mmap64.patch
@@ -0,0 +1,29 @@
+--- gcc-8.3.0/libgo/go/runtime/mem_gccgo.go.old 2018-01-09 01:23:08.000000000 +0000
++++ gcc-8.3.0/libgo/go/runtime/mem_gccgo.go 2019-03-03 05:15:33.010000000 +0000
+@@ -16,7 +16,7 @@
+ //go:linkname sysFree runtime.sysFree
+
+ //extern mmap
+-func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
+
+ //extern munmap
+ func munmap(addr unsafe.Pointer, length uintptr) int32
+@@ -41,7 +41,7 @@
+ }
+ }
+
+-func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
++func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
+ p := sysMmap(addr, n, prot, flags, fd, off)
+ if uintptr(p) == _MAP_FAILED {
+ return nil, errno()
+@@ -84,7 +84,7 @@
+ return true
+ }
+
+-func mmap_fixed(v unsafe.Pointer, n uintptr, prot, flags, fd int32, offset uintptr) (unsafe.Pointer, int) {
++func mmap_fixed(v unsafe.Pointer, n uintptr, prot, flags, fd int32, offset int64) (unsafe.Pointer, int) {
+ p, err := mmap(v, n, prot, flags, fd, offset)
+ // On some systems, mmap ignores v without
+ // MAP_FIXED, so retry if the address space is free.
diff --git a/system/gcc/337-gccgo-signal-sig34.patch b/system/gcc/337-gccgo-signal-sig34.patch
new file mode 100644
index 000000000..757d2f216
--- /dev/null
+++ b/system/gcc/337-gccgo-signal-sig34.patch
@@ -0,0 +1,11 @@
+--- gcc-8.3.0/libgo/go/runtime/signal_gccgo.go.old 2018-01-10 05:15:52.000000000 +0000
++++ gcc-8.3.0/libgo/go/runtime/signal_gccgo.go 2019-03-03 05:19:28.000000000 +0000
+@@ -111,7 +111,7 @@
+ if sigaction(i, nil, &sa) < 0 {
+ // On GNU/Linux glibc rejects attempts to call
+ // sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID).
+- if GOOS == "linux" && (i == 32 || i == 33) {
++ if GOOS == "linux" && (i == 32 || i == 33 || i == 34) {
+ return _SIG_DFL
+ }
+ throw("sigaction read failure")
diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD
index 0c97d5ef5..9132db501 100644
--- a/system/gcc/APKBUILD
+++ b/system/gcc/APKBUILD
@@ -1,20 +1,22 @@
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
pkgname=gcc
-pkgver=6.4.0
+pkgver=8.3.0
[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=10
+pkgrel=0
pkgdesc="The GNU Compiler Collection"
-url="http://gcc.gnu.org"
+url="https://gcc.gnu.org"
arch="all"
license="GPL-3.0+ AND LGPL-2.1+"
_gccrel=$pkgver-r$pkgrel
depends="binutils$_target isl"
-makedepends_build="gcc$_cross g++$_cross paxmark bison flex texinfo zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev libucontext-dev"
+makedepends_build="gcc$_cross g++$_cross byacc flex texinfo zip gmp-dev
+ mpfr-dev mpc1-dev zlib-dev"
+makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev
+ libucontext-dev"
subpackages=" "
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target gcc-lang$_target"
replaces="libstdc++ binutils"
@@ -22,7 +24,6 @@ options="$options !check !dbg strip toolchain"
: ${LANG_CXX:=true}
: ${LANG_OBJC:=true}
-: ${LANG_JAVA:=true}
: ${LANG_GO:=true}
: ${LANG_FORTRAN:=true}
: ${LANG_ADA:=false}
@@ -42,7 +43,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
_builddir="$srcdir/build-cross-final"
fi
LANG_OBJC=false
- LANG_JAVA=false
LANG_GO=false
LANG_FORTRAN=false
LIBGOMP=false
@@ -79,7 +79,6 @@ elif [ "$CBUILD" != "$CHOST" ]; then
# Languages that do not need bootstrapping
LANG_OBJC=false
- LANG_JAVA=false
LANG_GO=false
LANG_FORTRAN=false
@@ -123,10 +122,6 @@ if $LANG_OBJC; then
subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
_languages="$_languages,objc"
fi
-if $LANG_JAVA; then
- subpackages="$subpackages libgcj::$CTARGET_ARCH gcc-java$_target:java"
- _languages="$_languages,java"
-fi
if $LANG_GO; then
subpackages="$subpackages libgo::$CTARGET_ARCH gcc-go$_target:go"
_languages="$_languages,go"
@@ -142,60 +137,53 @@ if $LANG_ADA; then
fi
makedepends="$makedepends_build $makedepends_host"
-source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
- ftp://sourceware.org/pub/java/ecj-4.9.jar
+source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
+
+ 0002-posix_memalign.patch
+ 0008-s390x-muslldso.patch
+ 0009-microblaze-pr65649.patch
+ 0010-ldbl128-config.patch
+ 0011-m68k.patch
+ 0012-static-pie.patch
- 001_all_default-ssp-strong.patch
002_all_default-relro.patch
- 003_all_default-fortify-source.patch
005_all_default-as-needed.patch
011_all_default-warn-format-security.patch
012_all_default-warn-trampolines.patch
020_all_msgfmt-libstdc++-link.patch
- 050_all_libiberty-asprintf.patch
051_all_libiberty-pic.patch
- 053_all_libitm-no-fortify-source.patch
- 067_all_gcc-poison-system-directories.patch
- 090_all_pr55930-dependency-tracking.patch
- 201-cilkrts.patch
- 203-libgcc_s.patch
- 204-linux_libc_has_function.patch
205-nopie.patch
- 207-static-pie.patch
libgcc-always-build-gcceh.a.patch
gcc-4.9-musl-fortify.patch
gcc-6.1-musl-libssp.patch
- boehm-gc-musl.patch
gcc-pure64.patch
- fix-gcj-stdgnu14-link.patch
- fix-gcj-musl.patch
- fix-gcj-iconv-musl.patch
- gcc-4.8-build-args.patch
fix-cxxflags-passing.patch
- ada-fixes.patch
ada-shared.patch
ada-musl.patch
- ada-aarch64-multiarch.patch
- 300-main-gcc-add-musl-s390x-dynamic-linker.patch
- 310-build-gcj-s390x.patch
320-libffi-gnulinux.patch
330-gccgo-link-to-ucontext.patch
331-gccgo-use-real-off_t-type.patch
- 332-gccgo-remove-ustat.patch
+ 332-gccgo-sysinfo.patch
+ 333-gccgo-signal-ppc64.patch
+ 334-gccgo-signal-shell.patch
+ 335-gccgo-signal-ppc32.patch
+ 336-gccgo-mmap64.patch
+ 337-gccgo-signal-sig34.patch
- fix-rs6000-pie.patch
add-classic_table-support.patch
- lra-pentium.patch
-
+ disable-multiarch-ppc32.patch
gcc-5.4.0-locale.patch
+
+ backport-r267157-posix-conformant-snprintf.patch
+ backport-r268048-memcpy-bounds.patch
"
# we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_gccdir="$srcdir"/gcc-$pkgver
_gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver
_gcclibexec=/usr/libexec/gcc/${CTARGET}/$pkgver
@@ -220,12 +208,7 @@ prepare() {
return 1
fi
- # see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
- mv "$srcdir"/ecj-*.jar ecj.jar
-
echo ${pkgver} > gcc/BASE-VER
- echo "UNSUPPORTED=1" > libcilkrts/configure.tgt
- rm libgo/go/syscall/libcall_linux_ustat.go
}
build() {
@@ -304,15 +287,17 @@ build() {
--host=${CHOST} \
--target=${CTARGET} \
--with-pkgversion="Adelie ${pkgver}" \
- --with-bugurl="http://bts.adelielinux.org/" \
+ --with-bugurl="https://bts.adelielinux.org/" \
--enable-checking=release \
--disable-fixed-point \
--disable-libstdcxx-pch \
+ --disable-multiarch \
--disable-multilib \
--disable-werror \
$_symvers \
--enable-__cxa_atexit \
--enable-default-pie \
+ --enable-default-ssp \
--enable-cloog-backend \
--enable-languages=$_languages \
$_arch_configure \
@@ -335,14 +320,6 @@ package() {
ln -s gcc "$pkgdir"/usr/bin/cc
- # we dont support gcj -static
- # and saving 35MB is not bad.
- find "$pkgdir" -name libgcj.a -o -name libgtkpeer.a \
- -o -name libgjsmalsa.a -o -name libgcj-tools.a \
- -o -name libjvm.a -o -name libgij.a -o -name libgcj_bc.a \
- -o -name libjavamath.a \
- | xargs rm -f
-
# strip debug info from some static libs
${STRIP_FOR_TARGET} -g `find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
-o -name libmudflap.a -o -name libmudflapth.a \
@@ -351,11 +328,6 @@ package() {
-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
-a -type f`
- if $LANG_JAVA; then
- sed -i -e 's/lib: /&%{static:%eJava programs cannot be linked statically}/' \
- "$pkgdir"/usr/lib/libgcj.spec
- fi
-
if $LIBGOMP; then
mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
fi
@@ -373,8 +345,6 @@ package() {
mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/
done
- paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1
-
# move ada runtime libs
if $LANG_ADA; then
for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
@@ -428,7 +398,6 @@ gpp() {
"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
- paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus"
mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_target:+$CTARGET/}lib/
mv "$pkgdir"/usr/${_target:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_target:+$CTARGET/}include/
@@ -472,65 +441,6 @@ libgomp() {
mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
}
-java() {
- pkgdesc="Java support for GCC"
- depends="zlib-dev gcc=$_gccrel libgcj=$_gccrel"
-
- paxmark -pm "$pkgdir"/$_gcclibexec/ecj1
- mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib "$subpkgdir"/$_gcclibdir/
- cd "$pkgdir"/usr/bin
- mv *gcj *gcj-dbtool *gjavah *gcjh *jcf-dump "$subpkgdir"/usr/bin/
- cd "$pkgdir"
- for i in $(find usr/ -name ecj1 -o -name jc1 -o -name jvgenmain); do
- mkdir -p "$subpkgdir"/${i%/*}
- mv "$pkgdir"/$i "$subpkgdir"/$i
- done
- for i in "$pkgdir"/usr/lib/libgcj*.so; do
- if [ -L "$i" ]; then
- mv "$i" "$subpkgdir"/usr/lib/
- fi
- done
- mkdir -p "$subpkgdir"/usr/share/gcc-6.4.0/python
- mv "$pkgdir"/usr/share/gcc-6.4.0/python/libjava \
- "$subpkgdir"/usr/share/gcc-6.4.0/python
- mv "$pkgdir"/usr/lib/libgij.so "$subpkgdir"/usr/lib/
- mv "$pkgdir"/usr/lib/libgcj.spec "$subpkgdir"/$_gcclibdir/
-}
-
-libgcj() {
- pkgdesc="Java runtime library for gcc"
- # libgcj_bc.so moved from gcc-java to libgcj
- replaces="gcc-java"
- depends=
-
- mkdir -p "$subpkgdir"/usr/bin
- cd "$pkgdir"/usr/bin
- paxmark -pmse "$pkgdir"/usr/bin/gij
- mv aot-compile gappletviewer gc-analyze gij gjar gjarsigner gkeytool\
- gnative2ascii gorbd grmic grmid grmiregistry gserialver \
- gtnameserv jv-convert rebuild-gcj-db \
- "$subpkgdir"/usr/bin/
- cd "$pkgdir"
- for i in $(find usr/lib -name jc1 -o -name jvgenmain); do
- mkdir -p "$subpkgdir"/${i%/*}
- mv "$pkgdir"/$i "$subpkgdir"/$i
- done
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/gcj-* \
- "$pkgdir"/usr/lib/libgcj_bc.so \
- "$pkgdir"/usr/lib/libgcj*.so.* \
- "$pkgdir"/usr/lib/libgij.so.* \
- "$pkgdir"/usr/lib/logging.properties \
- "$pkgdir"/usr/lib/security \
- "$subpkgdir"/usr/lib/
-
- mkdir -p "$subpkgdir"/usr/lib/pkgconfig
- mv "$pkgdir"/usr/lib/pkgconfig/libgcj* "$subpkgdir"/usr/lib/pkgconfig/
-
- mkdir -p "$subpkgdir"/usr/share/
- mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/
-}
-
libgo() {
pkgdesc="Go runtime library for GCC"
depends=
@@ -552,11 +462,13 @@ go() {
mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
mv "$pkgdir"/usr/lib/libgo.a \
"$pkgdir"/usr/lib/libgo.so \
"$pkgdir"/usr/lib/libgobegin.a \
"$pkgdir"/usr/lib/libgolibbegin.a \
- "$pkgdir"/usr/lib/libnetgo.a \
"$subpkgdir"/usr/lib/
}
@@ -621,46 +533,38 @@ gnat() {
mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
}
-sha512sums="02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz
-28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226 ecj-4.9.jar
-a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d 001_all_default-ssp-strong.patch
-e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513 002_all_default-relro.patch
-f86466c62b8291fac46f9c250c7ad8fa5ab7b1cce2504442fd07ddc4543665b317ae28951f244e39aba29aeaf3fff252ec4f6a147aa16adb2b7aed747dd89188 003_all_default-fortify-source.patch
-51282fea54c7e616367bbeb2479ba13fec6f24eb47bd04e2071907b3b36273b2ff24676f46ef8d22f241c8ab4857307861eee076eab66797c3a50a8ecaa1809a 005_all_default-as-needed.patch
-3398386dd1e079d6545dd9799adc799c6b80e3984fac6899d0e1a7ee21b66d0c7e53cddf17a65d590c883db750f9f79aaedd857355a8b9f7fb9476c906237919 011_all_default-warn-format-security.patch
-9adb0d2b9b67dd957df6c609b8714c7c078efb52cd88770905c37c67827be8fc83d1125037b9c29d77db21ce78756aa2bb0bacdb0b98d869ac126da76a298e21 012_all_default-warn-trampolines.patch
+sha512sums="1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz
+6d84354e6df96d5ea244eb3bb5f044781796b88040b11c78fb6ee509e5aac19d46e0e92ca836e98e6495d9751f52439833b748efc419e4f5d5301fb549c4dcc9 0002-posix_memalign.patch
+7f434a7350c9b06d0ae7cc18a569d813238483afa34b0801d112844a0dfe6164ae36b0416955fd4da7a8caa54672247f319a8ec7ce4b6a97a5f4e17ec083112a 0008-s390x-muslldso.patch
+b8207c1be82b20fdad2596bb0a60469db52257456d0925bacf48b44899f4c6ece93c501347e1ffe92fd372c30f90d05a6d8d8078876abf4cf2deae3dbb1a1f58 0009-microblaze-pr65649.patch
+66085c5555e6b91b6874d1782d5a1dc0ab1792889f9400f48cde9483f82b51b9e3a5de1efbba21a19fc5e664334f2188d0c2bc988d42335efa26118b3c85cc7f 0010-ldbl128-config.patch
+cd3ba928121e8578ba9f73215e4d81ee3ebbab33e00b04cdfd62b46d21f9536297ae12dc021aad6e56f3b28d9d544727331bbe6db1e3438d7b9545b2c3250906 0011-m68k.patch
+45d5bc11a89e5af77503ca06eec52d6d84e6fea0be021aaee1bcc39f8dd3c7b4baa4200cfa2b0688faa0f207d005db89c029eff32f362207aa3d2365b2f2363e 0012-static-pie.patch
+625c02e03c2f1db04da12cc6a086ec85790a031a13df36486243fd9569cd17f7c8ebeec91ac16cc1f87c3ec1ffe4c421153e98a9aeb5eea35943a6f015d81f50 002_all_default-relro.patch
+02b725b220e540077efef741e9d457f9e004fe53ae642a138e214875d076a60f7c2f27de0ed9a4225db2030fc9c3d2c5b0414c895b9eec0f5f48fad70e2fb029 005_all_default-as-needed.patch
+622fdbcbbf2feb86bd839af627ec3613c6d2c77b14d37d31165b19f73f45b3663a203efff5d224f194edb15eb62d3d5885e32f85d1b584f071e580fea4e12664 011_all_default-warn-format-security.patch
+03cddde56b2a355f08716c8efcd5616606d42946c87831d77d55570636c46e351e81a04c7dabd3466d9406c40476bead857cfe1eceaf7f0d86dd2757c8cf4a9e 012_all_default-warn-trampolines.patch
d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd 020_all_msgfmt-libstdc++-link.patch
-840070a3c423e6206aaa6e63e1d9a0fcd6efd53626cd1240a193f0b60aa5d84216acc4a2a4fa8bce74549b07e6a316b01d638f20cea13dc62473491a302fb3d6 050_all_libiberty-asprintf.patch
0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca 051_all_libiberty-pic.patch
-e7a2eb1b1870e199d6fd753d065781575656fa12baa264f96c5d179689d88c31b8a3f92a5dae96088c05e96aa2bda138364ad7dbcc79e1819a102f192cbb7bab 053_all_libitm-no-fortify-source.patch
-e87da18aa7ab92b02b06168658c63b42a6c73a08fad2a30f81ef6296100fdbe3c3a91548fd0cb24eaf591e862bb08e4b67249bc4b977b07da33523aee0c686bc 067_all_gcc-poison-system-directories.patch
-4a328d1e1a56c20166307edcfa322068915784d9c08025b7f81cf69714da48fc266b6d34f77b9135c2f10da830d9df408276a1b78d1fd218637c2823506593c2 090_all_pr55930-dependency-tracking.patch
-ef052d0c3c9642fcb5ed570069c5a49c8ef523c47ac8ce3f201a801766f72ae4ff7c3725a70ee66e52c0fb559621e35fe0cf5b88b901d71ceadd381f49653a08 201-cilkrts.patch
-808e206f5e107084156fba333d4e091dcbd62f5d7756142bc292d4b0a52619f8c2aaca3617defc2f5b6552ba0439aebd33f4141329d88eab6ddf2dd637d92c08 203-libgcc_s.patch
-fc0de05b36613b732a0222ea005c90653c6a40d6761b6894af2419272f4e74875f37e26af33a9b9940669ef89269c44c46d17ca5bcd54b5cd1176e5eaf2992c1 204-linux_libc_has_function.patch
98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1 205-nopie.patch
-3287d5b443bea8ec64132bcabe869c738ae98ea8f1a86df1c5d18c927f8816edbfcefeefc47792dbbb2bcacf50319af00e01b3735d34525913b64350770ad453 207-static-pie.patch
d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b libgcc-always-build-gcceh.a.patch
600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d gcc-4.9-musl-fortify.patch
dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4 gcc-6.1-musl-libssp.patch
-bda845a6aa1854d2c883910b115f79ccfa93dfc2b5eac69a3a236d83eb34cadc140731d616ffc24698c7abc8878dd15f231bcc5119f1860e575a120b311706c7 boehm-gc-musl.patch
fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7 gcc-pure64.patch
-2253941f3d19b6d08801d3782f5f5ed56c3b73fbc9d3561a8f01c702963ac4fab91599c686076e7081eb6a80c37ccd33591ae978996d6eee1dc0ce0f1c50259a fix-gcj-stdgnu14-link.patch
-f89ddeb21bc8f97e6a850a6b70b4501a8f3e49a4bc8cc82897488decda5d98ad01cb7f6c8b392d452e9579924a523bc75da6e0648c1c976d42e40af48b10343b fix-gcj-musl.patch
-54d67cc008b735e47771314171930c5d8b8f5f5dc97fcf4214824c105c808f3e75d22d5a4fdf5068ed0457fa0d46c60cfb442e276259a4a5e9b8722a027d18e6 fix-gcj-iconv-musl.patch
-abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1ca7d49fd0b5e351532aa15a3b13362abbf1ca4266f54a687 gcc-4.8-build-args.patch
35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282 fix-cxxflags-passing.patch
-9016b257abd8fa981de44a49512e35db814d1cbb47c1a87cd31c12d4ae20b13e9e149fe41691a7ec3c95bbcfde8a79194a8d2eaf547ceade3a246fad67c47dd8 ada-fixes.patch
3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19 ada-shared.patch
631d4bdef6d8bde34df7978bb53ec28c3c909cf1f87139e5f148138d0f09adc58b41ecf0148bbf50fb4bc916c411e9bf8a2b6c046c75c0e77d754d8c35bcd4d7 ada-musl.patch
-fa44c8158111627aa0e91c43e7cc3aa38642c2041c96532dd4f0932dae4d6f92ea2850b683abcf10e7e120299d42ea6b69adc00002a514c76be8e39e99fa052b ada-aarch64-multiarch.patch
-4b4a0ff306a8ef34ff6e3284fbfca869012164a47ba7cb099085c1dd03e6ca0cdd462f82710e08c9a02895adc7484e4c5eef17b5aa264cf5d978fe8ad78eea93 300-main-gcc-add-musl-s390x-dynamic-linker.patch
-385bc2fa50204f678964e5148c6170f572701dab920fbec8301f505bda34d182cde0adb7da042fee71719e12fb59f59181897f9b1bb4f4716ff59aad46ca1998 310-build-gcj-s390x.patch
f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181 320-libffi-gnulinux.patch
8efd028febb962ae100be32f72f7450c4f77d67ad96a5f47072136cdf47043f9d54835a87c7ab5aaa0fa0108c4c7a97ba2d7732d5aaf2efce70fe1f7e1c39d6e 330-gccgo-link-to-ucontext.patch
24c8708f64b9b7945b3f07e9bbecf17ab8bcde2524f49cbd694ca2f6146ccc3f13bb027db282f326525ea79d50a2868fa3fa2b0d688a914b5ea77bbfd7e5cbe4 331-gccgo-use-real-off_t-type.patch
-cf19fcc6abee70210a9061e5385fe361a5eb59a74f7d34297420a53e351400da23a060164bef5b322daba4be90019481731acf93c45fb5a93430018f1aa7ce35 332-gccgo-remove-ustat.patch
-01c71cd5881fc07ea3b9b980697e89b3ca0fe98502958ceafc3fca18b2604c844e2f457feab711baf8e03f00a5383b0e38aac7eb954034e306f43d4a37f165ed fix-rs6000-pie.patch
+31f9d85faa8648d140834646fc2bc7733eb362bfb87d696c5f375f9c0a3e4c3df41708a9a37c49bc0757513a7704976b9a5e21aa5c2de4b380d47d7e2cbde214 332-gccgo-sysinfo.patch
+ef6ff46d571814ce2f6db549bfb9b9f5cc55d46085b197c36627a72e4f355fcbeb41d04fabd3029f3bc536fc48155fe3feab58a7a6ece9dcd19409ea44c17b0b 333-gccgo-signal-ppc64.patch
+ab7a19d2702d232c9c1242fbdf9bd782e195d94104c0278e3b9ce435060a169094525ca53b615b3a9e62786db77bba836ecd495d58b544df474b13348432c200 334-gccgo-signal-shell.patch
+e755072a3c71ada6cde354dd258fae029919e1116048068368d38411ca28a6ad8856702498d6667b0dcbb1d09fcb3fd66669aa79739a5e574a9cd490bd92ce90 335-gccgo-signal-ppc32.patch
+de0cc0f9356c9ee5ea7b0f954441b59115f4a8f8f63573d0c17b6537e6f37641cf137531b496fc192d38035c2c4ba8175d36cbd7da15cbfcf8dc18c049c0f111 336-gccgo-mmap64.patch
+c2916948b028e1e990e1953875b884561c0f8dd105c1ec03073795df9a47ec2c627cbc95ca0ec98ab9177bf2b7c8458bf3fd09f780fa6c301995846f6317e366 337-gccgo-signal-sig34.patch
1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1 add-classic_table-support.patch
-4e1b421ed72668b66ecbcb0a34afa99d2a34cb2ea9ee51c4aad605fc8a0e94e3bfbabae4ebe236efc5ec86fc01a472cbe93f36fe25cf579714939d8102a9b84a lra-pentium.patch
-67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4 gcc-5.4.0-locale.patch"
+db8c4ab3eae7c01943a61e9e3e20af45d4f6d196184eee5b94068b212900ccdeecaf4fb4145983226954f64e7c989fcd13e0b506176d2b3e781c2e9dc8b5a5a8 disable-multiarch-ppc32.patch
+67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4 gcc-5.4.0-locale.patch
+65a4d8bf9cefcbc79e86015ef4376b2794492d6cae77065359b35bb4ed630dde6256982cd5e43ed837cbbdab366ea376da9f1c83f80ddf6dc53ab017b378c3cd backport-r267157-posix-conformant-snprintf.patch
+23c20f258d1a21d0d706945376df8b93c0277a8dcd5183cc0b15c9f22250ef179833c725f877279f74e89364d772148526af5544ab7758172bfb758618554ad3 backport-r268048-memcpy-bounds.patch"
diff --git a/system/gcc/ada-aarch64-multiarch.patch b/system/gcc/ada-aarch64-multiarch.patch
deleted file mode 100644
index ac60b6f6a..000000000
--- a/system/gcc/ada-aarch64-multiarch.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gcc-6.4.0/gcc/ada/gcc-interface/Makefile.in.orig
-+++ gcc-6.4.0/gcc/ada/gcc-interface/Makefile.in
-@@ -2042,13 +2042,8 @@
- system.ads<system-linux-x86_64.ads
- ## ^^ Note the above is a pretty-close placeholder.
-
-- ifneq (,$(or $(filter aarch64-linux-gnu, $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multiarch)), $(filter ../lib64, $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory))))
- LIBGNAT_TARGET_PAIRS = \
- $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
-- else
-- LIBGNAT_TARGET_PAIRS = \
-- $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
-- endif
-
- TOOLS_TARGET_PAIRS = \
- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
diff --git a/system/gcc/ada-fixes.patch b/system/gcc/ada-fixes.patch
deleted file mode 100644
index ba4ea42b4..000000000
--- a/system/gcc/ada-fixes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gcc-6.1.0.orig/gcc/ada/cal.c
-+++ gcc-6.1.0/gcc/ada/cal.c
-@@ -49,6 +49,7 @@
- #include <time.h>
- #else
- #include <sys/time.h>
-+#include <time.h>
- #endif
-
- #ifdef __MINGW32__
---- gcc-6.1.0.orig/gcc/ada/terminals.c
-+++ gcc-6.1.0/gcc/ada/terminals.c
-@@ -1068,13 +1068,6 @@
- #include <stdio.h>
- #include <stdlib.h>
-
--/* On some system termio is either absent or including it will disable termios
-- (HP-UX) */
--#if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \
-- && !defined (__rtems__)
--# include <termio.h>
--#endif
--
- #include <sys/ioctl.h>
- #include <termios.h>
- #include <fcntl.h>
-@@ -1169,7 +1162,7 @@
- char *slave_name = NULL;
-
- #ifdef USE_GETPT
-- master_fd = getpt ();
-+ master_fd = posix_openpt (O_RDWR);
- #elif defined (USE_OPENPTY)
- status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
- #elif defined (USE_CLONE_DEVICE)
diff --git a/system/gcc/backport-r267157-posix-conformant-snprintf.patch b/system/gcc/backport-r267157-posix-conformant-snprintf.patch
new file mode 100644
index 000000000..adedf0ce9
--- /dev/null
+++ b/system/gcc/backport-r267157-posix-conformant-snprintf.patch
@@ -0,0 +1,80 @@
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87096
+
+GCC's "optimised" snprintf is not POSIX conformant
+
+--- trunk/gcc/gimple-ssa-sprintf.c 2018/12/07 17:02:11 266897
++++ trunk/gcc/gimple-ssa-sprintf.c 2018/12/14 22:38:08 267157
+@@ -3899,6 +3899,7 @@
+ /* True when the destination size is constant as opposed to the lower
+ or upper bound of a range. */
+ bool dstsize_cst_p = true;
++ bool posunder4k = true;
+
+ if (idx_dstsize == HOST_WIDE_INT_M1U)
+ {
+@@ -3931,11 +3932,20 @@
+ "specified bound %wu exceeds maximum object size "
+ "%wu",
+ dstsize, target_size_max () / 2);
++ /* POSIX requires snprintf to fail if DSTSIZE is greater
++ than INT_MAX. Even though not all POSIX implementations
++ conform to the requirement, avoid folding in this case. */
++ posunder4k = false;
+ }
+ else if (dstsize > target_int_max ())
+- warning_at (gimple_location (info.callstmt), info.warnopt (),
+- "specified bound %wu exceeds %<INT_MAX%>",
+- dstsize);
++ {
++ warning_at (gimple_location (info.callstmt), info.warnopt (),
++ "specified bound %wu exceeds %<INT_MAX%>",
++ dstsize);
++ /* POSIX requires snprintf to fail if DSTSIZE is greater
++ than INT_MAX. Avoid folding in that case. */
++ posunder4k = false;
++ }
+ }
+ else if (TREE_CODE (size) == SSA_NAME)
+ {
+@@ -3944,9 +3954,29 @@
+ if (vr->type == VR_RANGE
+ && TREE_CODE (vr->min) == INTEGER_CST
+ && TREE_CODE (vr->max) == INTEGER_CST)
+- dstsize = (warn_level < 2
+- ? TREE_INT_CST_LOW (vr->max)
+- : TREE_INT_CST_LOW (vr->min));
++ {
++ unsigned HOST_WIDE_INT minsize = TREE_INT_CST_LOW (vr->min);
++ unsigned HOST_WIDE_INT maxsize = TREE_INT_CST_LOW (vr->max);
++ dstsize = warn_level < 2 ? maxsize : minsize;
++
++ if (minsize > target_int_max ())
++ warning_at (gimple_location (info.callstmt), info.warnopt (),
++ "specified bound range [%wu, %wu] exceeds "
++ "%<INT_MAX%>",
++ minsize, maxsize);
++
++ /* POSIX requires snprintf to fail if DSTSIZE is greater
++ than INT_MAX. Avoid folding if that's possible. */
++ if (maxsize > target_int_max ())
++ posunder4k = false;
++ }
++ else if (vr->type == VR_VARYING)
++ {
++ /* POSIX requires snprintf to fail if DSTSIZE is greater
++ than INT_MAX. Since SIZE's range is unknown, avoid
++ folding. */
++ posunder4k = false;
++ }
+
+ /* The destination size is not constant. If the function is
+ bounded (e.g., snprintf) a lower bound of zero doesn't
+@@ -4033,7 +4073,7 @@
+ the call. Avoid this optimization when -frounding-math is in effect
+ and the format string contains a floating point directive. */
+ bool call_removed = false;
+- if (success && optimize > 0)
++ if (!posunder4k && success && optimize > 0)
+ {
+ /* Save a copy of the iterator pointing at the call. The iterator
+ may change to point past the call in try_substitute_return_value
diff --git a/system/gcc/backport-r268048-memcpy-bounds.patch b/system/gcc/backport-r268048-memcpy-bounds.patch
new file mode 100644
index 000000000..eebecd832
--- /dev/null
+++ b/system/gcc/backport-r268048-memcpy-bounds.patch
@@ -0,0 +1,21 @@
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88273
+
+GCC 8.2+ fails to build 32-bit PowerPC kernel due to this.
+
+--- trunk/gcc/gimple-ssa-warn-restrict.c 2019/01/17 16:33:55 268037
++++ trunk/gcc/gimple-ssa-warn-restrict.c 2019/01/17 22:52:47 268048
+@@ -319,13 +319,9 @@
+ offrange[0] += offset_int::from (min, SIGNED);
+ offrange[1] += offset_int::from (max, SIGNED);
+ }
+- else if (rng == VR_ANTI_RANGE)
+- {
+- offrange[0] += offset_int::from (max + 1, SIGNED);
+- offrange[1] += offset_int::from (min - 1, SIGNED);
+- }
+ else
+ {
++ /* Handle an anti-range the same as no range at all. */
+ gimple *stmt = SSA_NAME_DEF_STMT (offset);
+ tree type;
+ if (is_gimple_assign (stmt)
diff --git a/system/gcc/boehm-gc-musl.patch b/system/gcc/boehm-gc-musl.patch
deleted file mode 100644
index 2f106cba1..000000000
--- a/system/gcc/boehm-gc-musl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- gcc-4.8.1/boehm-gc/os_dep.c.orig 2013-09-17 07:46:00.969884340 +0000
-+++ gcc-4.8.1/boehm-gc/os_dep.c 2013-09-17 06:53:53.629884946 +0000
-@@ -26,7 +26,7 @@
- # define __KERNEL__
- # include <asm/signal.h>
- # undef __KERNEL__
--# else
-+# elif defined(__GLIBC__)
- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */
- /* prototypes, so we have to include the top-level sigcontext.h to */
---- gcc-4.8.2/boehm-gc/dyn_load.c.orig 2014-02-17 14:13:09.519850231 +0200
-+++ gcc-4.8.2/boehm-gc/dyn_load.c 2014-02-17 14:14:27.906093514 +0200
-@@ -459,9 +459,7 @@
- /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
- /* versions. Thanks to Jakub Jelinek for most of the code. */
-
--# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-+# if (defined(LINUX) || defined (__GLIBC__))
-
- /* We have the header files for a glibc that includes dl_iterate_phdr. */
- /* It may still not be available in the library on the target system. */
---- gcc-4.8.2/boehm-gc/include/private/gcconfig.h.orig 2014-02-17 14:14:36.026049422 +0200
-+++ gcc-4.8.2/boehm-gc/include/private/gcconfig.h 2014-02-17 14:17:11.345207887 +0200
-@@ -684,7 +684,7 @@
- # ifdef __ELF__
- # define DYNAMIC_LOADING
- # include <features.h>
--# if defined(__GLIBC__)&& __GLIBC__>=2
-+# if 1
- # define SEARCH_FOR_DATA_START
- # else /* !GLIBC2 */
- extern char **__environ;
-@@ -1147,7 +1147,7 @@
- # define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
- # endif
- # include <features.h>
--# if defined(__GLIBC__) && __GLIBC__ >= 2
-+# if 1
- # define SEARCH_FOR_DATA_START
- # else
- extern char **__environ;
-@@ -1367,7 +1367,7 @@
- # define HBLKSIZE 4096
- # endif
- # define USE_GENERIC_PUSH_REGS
--# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
-+# if 1
- # define LINUX_STACKBOTTOM
- # else
- # define STACKBOTTOM 0x80000000
-@@ -1858,7 +1858,7 @@
- # ifdef __ELF__
- # define DYNAMIC_LOADING
- # include <features.h>
--# if defined(__GLIBC__) && __GLIBC__ >= 2
-+# if 1
- # define SEARCH_FOR_DATA_START
- # else
- extern char **__environ;
diff --git a/system/gcc/disable-multiarch-ppc32.patch b/system/gcc/disable-multiarch-ppc32.patch
new file mode 100644
index 000000000..5ca9a1d0d
--- /dev/null
+++ b/system/gcc/disable-multiarch-ppc32.patch
@@ -0,0 +1,15 @@
+--- gcc-8.3.0/gcc/config/rs6000/t-linux.old 2019-03-04 07:18:12.770000000 +0000
++++ gcc-8.3.0/gcc/config/rs6000/t-linux 2019-03-05 03:22:15.030000000 +0000
+@@ -5,10 +5,10 @@
+ MULTILIB_OSDIRNAMES := m64=../lib
+ MULTILIB_OSDIRNAMES += m32=../lib32
+ else
+-MULTIARCH_DIRNAME := powerpc-linux-gnu
++MULTIARCH_DIRNAME = $(call if_multiarch,powerpc-linux-gnu)
+ endif
+ ifneq (,$(findstring powerpcle,$(target)))
+-MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
++MULTIARCH_DIRNAME := $(call if_multiarch,$(subst -linux,le-linux,$(MULTIARCH_DIRNAME)))
+ endif
+ ifneq (,$(findstring powerpc64le,$(target)))
+ MULTILIB_OSDIRNAMES := m64=../lib
diff --git a/system/gcc/fix-gcj-iconv-musl.patch b/system/gcc/fix-gcj-iconv-musl.patch
deleted file mode 100644
index b0015751e..000000000
--- a/system/gcc/fix-gcj-iconv-musl.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- gcc-4.8.2/libjava/gnu/gcj/convert/natIconv.cc.orig 2014-02-18 18:46:14.897880526 +0200
-+++ gcc-4.8.2/libjava/gnu/gcj/convert/natIconv.cc 2014-02-18 18:50:08.766613550 +0200
-@@ -24,6 +24,13 @@
-
- #ifdef HAVE_ICONV
- #include <iconv.h>
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define UCS2_CHARSET "UCS-2BE"
-+#else
-+#define UCS2_CHARSET "UCS-2LE"
-+#endif
-
- template<typename T>
- static inline size_t
-@@ -45,7 +52,7 @@
- _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
- buffer[len] = '\0';
-
-- iconv_t h = iconv_open ("UCS-2", buffer);
-+ iconv_t h = iconv_open (UCS2_CHARSET, buffer);
- if (h == (iconv_t) -1)
- throw new ::java::io::UnsupportedEncodingException (encoding);
-
-@@ -99,18 +106,6 @@
- throw new ::java::io::CharConversionException ();
- }
-
-- if (iconv_byte_swap)
-- {
-- size_t max = (old_out - outavail) / sizeof (jchar);
-- for (size_t i = 0; i < max; ++i)
-- {
-- // Byte swap.
-- jchar c = (((out[outpos + i] & 0xff) << 8)
-- | ((out[outpos + i] >> 8) & 0xff));
-- outbuf[i] = c;
-- }
-- }
--
- inpos += old_in - inavail;
- return (old_out - outavail) / sizeof (jchar);
- #else /* HAVE_ICONV */
-@@ -145,7 +140,7 @@
- _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
- buffer[len] = '\0';
-
-- iconv_t h = iconv_open (buffer, "UCS-2");
-+ iconv_t h = iconv_open (buffer, UCS2_CHARSET);
- if (h == (iconv_t) -1)
- throw new ::java::io::UnsupportedEncodingException (encoding);
-
-@@ -187,20 +182,6 @@
- char *inbuf = (char *) &chars[inpos];
- char *outbuf = (char *) &out[count];
-
-- if (iconv_byte_swap)
-- {
-- // Ugly performance penalty -- don't use losing systems!
-- temp_buffer = (jchar *) _Jv_Malloc (inlength * sizeof (jchar));
-- for (int i = 0; i < inlength; ++i)
-- {
-- // Byte swap.
-- jchar c = (((chars[inpos + i] & 0xff) << 8)
-- | ((chars[inpos + i] >> 8) & 0xff));
-- temp_buffer[i] = c;
-- }
-- inbuf = (char *) temp_buffer;
-- }
--
- size_t loop_old_in = old_in;
- while (1)
- {
-@@ -252,44 +233,7 @@
- jboolean
- gnu::gcj::convert::IOConverter::iconv_init (void)
- {
-- // Some versions of iconv() always return their UCS-2 results in
-- // big-endian order, and they also require UCS-2 inputs to be in
-- // big-endian order. For instance, glibc 2.1.3 does this. If the
-- // UTF-8=>UCS-2 iconv converter has this feature, then we assume
-- // that all UCS-2 converters do. (This might not be the best
-- // heuristic, but is is all we've got.)
-- jboolean result = false;
--#ifdef HAVE_ICONV
-- iconv_t handle = iconv_open ("UCS-2", "UTF-8");
-- if (handle != (iconv_t) -1)
-- {
-- jchar c;
-- unsigned char in[4];
-- char *inp, *outp;
-- size_t inc, outc, r;
--
-- // This is the UTF-8 encoding of \ufeff. At least Tru64 UNIX libiconv
-- // needs the trailing NUL byte, otherwise iconv fails with EINVAL.
-- in[0] = 0xef;
-- in[1] = 0xbb;
-- in[2] = 0xbf;
-- in[3] = 0x00;
--
-- inp = (char *) in;
-- inc = 4;
-- outp = (char *) &c;
-- outc = 2;
--
-- r = iconv_adapter (iconv, handle, &inp, &inc, &outp, &outc);
-- // Conversion must be complete for us to use the result.
-- if (r != (size_t) -1 && inc == 0 && outc == 0)
-- result = (c != 0xfeff);
--
-- // Release iconv handle.
-- iconv_close (handle);
-- }
--#endif /* HAVE_ICONV */
-- return result;
-+ return false;
- }
-
- void
diff --git a/system/gcc/fix-gcj-musl.patch b/system/gcc/fix-gcj-musl.patch
deleted file mode 100644
index d26f510c0..000000000
--- a/system/gcc/fix-gcj-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- gcc-4.8.2/libjava/gnu/classpath/natSystemProperties.cc.orig 2014-02-18 10:55:08.617678779 +0200
-+++ gcc-4.8.2/libjava/gnu/classpath/natSystemProperties.cc 2014-02-18 10:56:31.927227453 +0200
-@@ -289,7 +289,7 @@
- // just default to `en_US'.
- setlocale (LC_ALL, "");
- char *locale = setlocale (LC_MESSAGES, "");
-- if (locale && strlen (locale) >= 2)
-+ if (locale && strlen (locale) >= 2 && (locale[2] == '\0' || locale[2] == '_'))
- {
- char buf[3];
- buf[2] = '\0';
---- gcc-4.8.2/libjava/posix-threads.cc.orig 2014-02-18 13:22:01.789933726 +0200
-+++ gcc-4.8.2/libjava/posix-threads.cc 2014-02-18 13:29:50.924058875 +0200
-@@ -657,6 +657,7 @@
- struct sched_param param;
- pthread_attr_t attr;
- struct starter *info;
-+ size_t ss;
-
- if (data->flags & FLAG_START)
- return;
-@@ -675,8 +676,25 @@
- // Set stack size if -Xss option was given.
- if (gcj::stack_size > 0)
- {
-- int e = pthread_attr_setstacksize (&attr, gcj::stack_size);
-+ ss = gcj::stack_size;
-+ }
-+ else
-+ {
-+ int e = pthread_attr_getstacksize (&attr, &ss);
-+ if (e != 0)
-+ JvFail (strerror (e));
-+
-+ // Request at least 1meg of stack
-+ if (ss >= 1024 * 1024)
-+ ss = 0;
-+ else
-+ ss = 1024 * 1024;
-+ }
-+
-+ if (ss)
-+ {
-+ int e = pthread_attr_setstacksize (&attr, ss);
- if (e != 0)
- JvFail (strerror (e));
- }
-
- info = (struct starter *) _Jv_AllocBytes (sizeof (struct starter));
diff --git a/system/gcc/fix-gcj-stdgnu14-link.patch b/system/gcc/fix-gcj-stdgnu14-link.patch
deleted file mode 100644
index 2b2ce0fa5..000000000
--- a/system/gcc/fix-gcj-stdgnu14-link.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gcc-6.1.0/libjava/Makefile.am
-+++ gcc-6.1.0/libjava/Makefile.am
-@@ -488,10 +488,14 @@
- nat_files = $(nat_source_files:.cc=.lo)
- xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
-
-+libgcj_la_CPPFLAGS = \
-+ $(AM_CPPFLAGS) \
-+ $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
-+
- # Include THREADLIBS here to ensure that the correct version of
- # certain linuxthread functions get linked:
- ## The mysterious backslash in the grep pattern is consumed by make.
--libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
-+libgcj_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDFLAGS) -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
- $(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
- -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
---- gcc-6.1.0/libjava/Makefile.in
-+++ gcc-6.1.0/libjava/Makefile.in
-@@ -1103,9 +1103,13 @@
- nat_files = $(nat_source_files:.cc=.lo)
- xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
-
-+libgcj_la_CPPFLAGS = \
-+ $(AM_CPPFLAGS) \
-+ $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
-+
- # Include THREADLIBS here to ensure that the correct version of
- # certain linuxthread functions get linked:
--libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
-+libgcj_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDFLAGS) -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
- $(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
- -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
diff --git a/system/gcc/fix-rs6000-pie.patch b/system/gcc/fix-rs6000-pie.patch
deleted file mode 100644
index 1fbc31a56..000000000
--- a/system/gcc/fix-rs6000-pie.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- gcc-6.3.0.orig/gcc/config/rs6000/sysv4.h
-+++ gcc-6.3.0/gcc/config/rs6000/sysv4.h
-@@ -753,23 +753,42 @@
- #endif
-
- #ifdef HAVE_LD_PIE
--#define STARTFILE_LINUX_SPEC "\
--%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
--%{mnewlib:ecrti.o%s;:crti.o%s} \
--%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
--" CRTOFFLOADBEGIN
-+#define STARTFILE_LINUX_SPEC \
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s;: \
-+ %{" PIE_SPEC ":%{static:rcrt1.o%s;:Scrt1.o%s}} %{" NO_PIE_SPEC ":crt1.o%s}}} \
-+ crti.o%s %{shared:crtbeginS.o%s;: \
-+ %{" PIE_SPEC ":crtbeginS.o%s} \
-+ %{" NO_PIE_SPEC ":%{static:crtbeginT.o%s;:crtbegin.o%s}}} \
-+ %{fvtable-verify=none:%s; \
-+ fvtable-verify=preinit:vtv_start_preinit.o%s; \
-+ fvtable-verify=std:vtv_start.o%s} \
-+ " CRTOFFLOADBEGIN
- #else
--#define STARTFILE_LINUX_SPEC "\
--%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \
--%{mnewlib:ecrti.o%s;:crti.o%s} \
--%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
--" CRTOFFLOADBEGIN
-+#define STARTFILE_LINUX_SPEC \
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \
-+ crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
-+ %{fvtable-verify=none:%s; \
-+ fvtable-verify=preinit:vtv_start_preinit.o%s; \
-+ fvtable-verify=std:vtv_start.o%s} \
-+ " CRTOFFLOADBEGIN
- #endif
-
--#define ENDFILE_LINUX_SPEC "\
--%{shared|pie:crtendS.o%s;:crtend.o%s} \
--%{mnewlib:ecrtn.o%s;:crtn.o%s} \
--" CRTOFFLOADEND
-+#ifdef HAVE_LD_PIE
-+#define ENDFILE_LINUX_SPEC \
-+ "%{fvtable-verify=none:%s; \
-+ fvtable-verify=preinit:vtv_end_preinit.o%s; \
-+ fvtable-verify=std:vtv_end.o%s} \
-+ %{shared:crtendS.o%s;: %{" PIE_SPEC ":crtendS.o%s} \
-+ %{" NO_PIE_SPEC ":crtend.o%s}} crtn.o%s \
-+ " CRTOFFLOADEND
-+#else
-+#define ENDFILE_LINUX_SPEC \
-+ "%{fvtable-verify=none:%s; \
-+ fvtable-verify=preinit:vtv_end_preinit.o%s; \
-+ fvtable-verify=std:vtv_end.o%s} \
-+ %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s \
-+ " CRTOFFLOADEND
-+#endif
-
- #define LINK_START_LINUX_SPEC ""
-
diff --git a/system/gcc/gcc-4.8-build-args.patch b/system/gcc/gcc-4.8-build-args.patch
deleted file mode 100644
index c27e00961..000000000
--- a/system/gcc/gcc-4.8-build-args.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-When cross compiling a target gcc, target flags may be used on the host
-
-Configure identifies a number of warning flags (WARN_CFLAGS and
-WARN_CXXFLAGS) from the $CC value. The cross compiler may be different
-from the host compiler and may not support the same set of flags. This
-leads to problems such as:
-
-cc1plus: error: unrecognized command line option "-Wno-narrowing"
-cc1plus: error: unrecognized command line option "-Wno-overlength-strings"
-
-Work around this problem by removing the warning flags from the
-BUILD_CXXFLAGS value, in a way similar to the BUILD_CFLAGS.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: gcc-4.8.0/gcc/configure
-===================================================================
---- gcc-4.8.0.orig/gcc/configure
-+++ gcc-4.8.0/gcc/configure
-@@ -11720,6 +10581,7 @@ STMP_FIXINC=stmp-fixinc
- if test x$build != x$host || test "x$coverage_flags" != x
- then
- BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-+ BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
- BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
- fi
-
-Index: gcc-4.8.0/gcc/configure.ac
-===================================================================
---- gcc-4.8.0.orig/gcc/configure.ac
-+++ gcc-4.8.0/gcc/configure.ac
-@@ -1901,6 +1901,7 @@ STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_F
- if test x$build != x$host || test "x$coverage_flags" != x
- then
- BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-+ BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
- BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
- fi
-
diff --git a/system/gcc/lra-pentium.patch b/system/gcc/lra-pentium.patch
deleted file mode 100644
index e876bcc39..000000000
--- a/system/gcc/lra-pentium.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- trunk/gcc/lra-assigns.c 2017/03/10 20:53:18 246058
-+++ trunk/gcc/lra-assigns.c 2017/03/10 21:17:13 246059
-@@ -889,6 +889,30 @@
- live_pseudos_reg_renumber[regno] = hard_regno;
- }
-
-+/* Return true iff there is a reason why pseudo SPILL_REGNO should not
-+ be spilled. */
-+static bool
-+must_not_spill_p (unsigned spill_regno)
-+{
-+ if ((pic_offset_table_rtx != NULL
-+ && spill_regno == REGNO (pic_offset_table_rtx))
-+ || ((int) spill_regno >= lra_constraint_new_regno_start
-+ && ! bitmap_bit_p (&lra_inheritance_pseudos, spill_regno)
-+ && ! bitmap_bit_p (&lra_split_regs, spill_regno)
-+ && ! bitmap_bit_p (&lra_subreg_reload_pseudos, spill_regno)
-+ && ! bitmap_bit_p (&lra_optional_reload_pseudos, spill_regno)))
-+ return true;
-+ /* A reload pseudo that requires a singleton register class should
-+ not be spilled.
-+ FIXME: this mitigates the issue on certain i386 patterns, but
-+ does not solve the general case where existing reloads fully
-+ cover a limited register class. */
-+ if (!bitmap_bit_p (&non_reload_pseudos, spill_regno)
-+ && reg_class_size [reg_preferred_class (spill_regno)] == 1)
-+ return true;
-+ return false;
-+}
-+
- /* Array used for sorting reload pseudos for subsequent allocation
- after spilling some pseudo. */
- static int *sorted_reload_pseudos;
-@@ -960,13 +984,7 @@
- /* Spill pseudos. */
- static_p = false;
- EXECUTE_IF_SET_IN_BITMAP (&spill_pseudos_bitmap, 0, spill_regno, bi)
-- if ((pic_offset_table_rtx != NULL
-- && spill_regno == REGNO (pic_offset_table_rtx))
-- || ((int) spill_regno >= lra_constraint_new_regno_start
-- && ! bitmap_bit_p (&lra_inheritance_pseudos, spill_regno)
-- && ! bitmap_bit_p (&lra_split_regs, spill_regno)
-- && ! bitmap_bit_p (&lra_subreg_reload_pseudos, spill_regno)
-- && ! bitmap_bit_p (&lra_optional_reload_pseudos, spill_regno)))
-+ if (must_not_spill_p (spill_regno))
- goto fail;
- else if (non_spilled_static_chain_regno_p (spill_regno))
- static_p = true;
diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD
index c976cd275..31a646011 100644
--- a/system/gettys-openrc/APKBUILD
+++ b/system/gettys-openrc/APKBUILD
@@ -4,7 +4,7 @@ pkgname=gettys-openrc
pkgver=0.0.1.0
pkgrel=3
pkgdesc="Dynamic getty services"
-url="http://adelielinux.org/"
+url="https://adelielinux.org/"
arch="noarch"
options="!check" # No test suite.
license="NCSA"
diff --git a/system/git/APKBUILD b/system/git/APKBUILD
index b642f8137..e931dce98 100644
--- a/system/git/APKBUILD
+++ b/system/git/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=git
-pkgver=2.19.2
+pkgver=2.21.0
pkgrel=0
pkgdesc="A distributed version control system"
url="https://www.git-scm.com/"
@@ -36,9 +36,7 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
git-daemon.initd
git-daemon.confd
"
-
_gitcoredir=/usr/libexec/git-core
-builddir="$srcdir"/$pkgname-$pkgver
prepare() {
default_prepare
@@ -55,17 +53,15 @@ prepare() {
}
build() {
- cd "$builddir"
make prefix=/usr DESTDIR="$pkgdir"
}
check() {
- cd "$builddir"
+ rm t/t9020-remote-svn.sh # Requires /usr/bin/python / python-compat.
make prefix=/usr DESTDIR="$pkgdir" -j1 test
}
package() {
- cd "$builddir"
make -j1 prefix=/usr \
DESTDIR="$pkgdir" \
INSTALLDIRS=vendor \
@@ -168,7 +164,7 @@ subtree_doc() {
gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1
}
-sha512sums="1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 git-2.19.2.tar.xz
-ef6c31ac1474fa128aecf86eda75653fdd0fe7a09d35914c1a03749abf9c92cbc01f8064b2b697ca796fa18bec717b9bcb1aac6d36d02ce8ed4270d4728e72f0 dont-test-other-encodings.patch
+sha512sums="83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 git-2.21.0.tar.xz
+315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"
diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch
index 29c4bdb34..9019d4cab 100644
--- a/system/git/dont-test-other-encodings.patch
+++ b/system/git/dont-test-other-encodings.patch
@@ -191,51 +191,12 @@ We can't support Japanese people using musl
cat >expected <<EOF
author $UTF8_NAME
summary $UTF8_MSG
---- git-2.19.1/t/t0028-working-tree-encoding.sh.old 2018-09-27 20:46:40.000000000 +0000
-+++ git-2.19.1/t/t0028-working-tree-encoding.sh 2018-10-22 20:59:17.530000000 +0000
-@@ -4,246 +4,4 @@
-
- . ./test-lib.sh
+--- git-2.21.0/t/t0028-working-tree-encoding.sh.old 2019-02-24 16:31:46.000000000 +0000
++++ git-2.21.0/t/t0028-working-tree-encoding.sh 2019-03-08 00:49:07.580000000 +0000
+@@ -71,14 +71,6 @@
+ test_cmp_bin test.utf8.raw test.utf16.git
+ '
--GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING
--
--test_expect_success 'setup test files' '
-- git config core.eol lf &&
--
-- text="hallo there!\ncan you read me?" &&
-- echo "*.utf16 text working-tree-encoding=utf-16" >.gitattributes &&
-- printf "$text" >test.utf8.raw &&
-- printf "$text" | iconv -f UTF-8 -t UTF-16 >test.utf16.raw &&
-- printf "$text" | iconv -f UTF-8 -t UTF-32 >test.utf32.raw &&
--
-- # Line ending tests
-- printf "one\ntwo\nthree\n" >lf.utf8.raw &&
-- printf "one\r\ntwo\r\nthree\r\n" >crlf.utf8.raw &&
--
-- # BOM tests
-- printf "\0a\0b\0c" >nobom.utf16be.raw &&
-- printf "a\0b\0c\0" >nobom.utf16le.raw &&
-- printf "\376\777\0a\0b\0c" >bebom.utf16be.raw &&
-- printf "\777\376a\0b\0c\0" >lebom.utf16le.raw &&
-- printf "\0\0\0a\0\0\0b\0\0\0c" >nobom.utf32be.raw &&
-- printf "a\0\0\0b\0\0\0c\0\0\0" >nobom.utf32le.raw &&
-- printf "\0\0\376\777\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw &&
-- printf "\777\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw &&
--
-- # Add only UTF-16 file, we will add the UTF-32 file later
-- cp test.utf16.raw test.utf16 &&
-- cp test.utf32.raw test.utf32 &&
-- git add .gitattributes test.utf16 &&
-- git commit -m initial
--'
--
--test_expect_success 'ensure UTF-8 is stored in Git' '
-- test_when_finished "rm -f test.utf16.git" &&
--
-- git cat-file -p :test.utf16 >test.utf16.git &&
-- test_cmp_bin test.utf8.raw test.utf16.git
--'
--
-test_expect_success 're-encode to UTF-16 on checkout' '
- test_when_finished "rm -f test.utf16.raw" &&
-
@@ -244,71 +205,20 @@ We can't support Japanese people using musl
- test_cmp_bin test.utf16.raw test.utf16
-'
-
--test_expect_success 'check $GIT_DIR/info/attributes support' '
-- test_when_finished "rm -f test.utf32.git" &&
-- test_when_finished "git reset --hard HEAD" &&
--
-- echo "*.utf32 text working-tree-encoding=utf-32" >.git/info/attributes &&
-- git add test.utf32 &&
--
-- git cat-file -p :test.utf32 >test.utf32.git &&
-- test_cmp_bin test.utf8.raw test.utf32.git
--'
--
--for i in 16 32
--do
-- test_expect_success "check prohibited UTF-${i} BOM" '
-- test_when_finished "git reset --hard HEAD" &&
--
-- echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes &&
-- echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes &&
--
-- # Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian)
-- # but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32).
-- # In these cases the BOM is prohibited.
-- cp bebom.utf${i}be.raw bebom.utf${i}be &&
-- test_must_fail git add bebom.utf${i}be 2>err.out &&
-- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
-- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
--
-- cp lebom.utf${i}le.raw lebom.utf${i}be &&
-- test_must_fail git add lebom.utf${i}be 2>err.out &&
-- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
-- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
--
-- cp bebom.utf${i}be.raw bebom.utf${i}le &&
-- test_must_fail git add bebom.utf${i}le 2>err.out &&
-- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
-- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
--
-- cp lebom.utf${i}le.raw lebom.utf${i}le &&
-- test_must_fail git add lebom.utf${i}le 2>err.out &&
-- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
-- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out
-- '
--
-- test_expect_success "check required UTF-${i} BOM" '
-- test_when_finished "git reset --hard HEAD" &&
--
-- echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes &&
--
-- cp nobom.utf${i}be.raw nobom.utf${i} &&
-- test_must_fail git add nobom.utf${i} 2>err.out &&
-- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
-- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out &&
--
-- cp nobom.utf${i}le.raw nobom.utf${i} &&
-- test_must_fail git add nobom.utf${i} 2>err.out &&
-- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
-- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out
-- '
+ test_expect_success 're-encode to UTF-16-LE-BOM on checkout' '
+ rm test.utf16lebom &&
+ git checkout test.utf16lebom &&
+@@ -143,41 +135,6 @@
+ test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
+ test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out
+ '
-
- test_expect_success "eol conversion for UTF-${i} encoded files on checkout" '
- test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
- test_when_finished "git reset --hard HEAD^" &&
-
-- cat lf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >lf.utf${i}.raw &&
-- cat crlf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >crlf.utf${i}.raw &&
+- cat lf.utf8.raw | write_utf${i} >lf.utf${i}.raw &&
+- cat crlf.utf8.raw | write_utf${i} >crlf.utf${i}.raw &&
- cp crlf.utf${i}.raw eol.utf${i} &&
-
- cat >expectIndexLF <<-EOF &&
@@ -337,106 +247,6 @@ We can't support Japanese people using musl
- git ls-files --eol eol.utf${i} >actual &&
- test_cmp expectIndexLF actual
- '
--done
--
--test_expect_success 'check unsupported encodings' '
-- test_when_finished "git reset --hard HEAD" &&
--
-- echo "*.set text working-tree-encoding" >.gitattributes &&
-- printf "set" >t.set &&
-- test_must_fail git add t.set 2>err.out &&
-- test_i18ngrep "true/false are no valid working-tree-encodings" err.out &&
--
-- echo "*.unset text -working-tree-encoding" >.gitattributes &&
-- printf "unset" >t.unset &&
-- git add t.unset &&
--
-- echo "*.empty text working-tree-encoding=" >.gitattributes &&
-- printf "empty" >t.empty &&
-- git add t.empty &&
--
-- echo "*.garbage text working-tree-encoding=garbage" >.gitattributes &&
-- printf "garbage" >t.garbage &&
-- test_must_fail git add t.garbage 2>err.out &&
-- test_i18ngrep "failed to encode" err.out
--'
--
--test_expect_success 'error if encoding round trip is not the same during refresh' '
-- BEFORE_STATE=$(git rev-parse HEAD) &&
-- test_when_finished "git reset --hard $BEFORE_STATE" &&
--
-- # Add and commit a UTF-16 file but skip the "working-tree-encoding"
-- # filter. Consequently, the in-repo representation is UTF-16 and not
-- # UTF-8. This simulates a Git version that has no working tree encoding
-- # support.
-- echo "*.utf16le text working-tree-encoding=utf-16le" >.gitattributes &&
-- echo "hallo" >nonsense.utf16le &&
-- TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) &&
-- git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le &&
-- COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
-- git update-ref refs/heads/master $COMMIT &&
--
-- test_must_fail git checkout HEAD^ 2>err.out &&
-- test_i18ngrep "error: .* overwritten by checkout:" err.out
--'
--
--test_expect_success 'error if encoding garbage is already in Git' '
-- BEFORE_STATE=$(git rev-parse HEAD) &&
-- test_when_finished "git reset --hard $BEFORE_STATE" &&
--
-- # Skip the UTF-16 filter for the added file
-- # This simulates a Git version that has no checkoutEncoding support
-- cp nobom.utf16be.raw nonsense.utf16 &&
-- TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) &&
-- git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 &&
-- COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
-- git update-ref refs/heads/master $COMMIT &&
--
-- git diff 2>err.out &&
-- test_i18ngrep "error: BOM is required" err.out
--'
--
--test_lazy_prereq ICONV_SHIFT_JIS '
-- iconv -f UTF-8 -t SHIFT-JIS </dev/null
--'
--
--test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' '
-- test_when_finished "rm -f roundtrip.shift roundtrip.utf16" &&
-- test_when_finished "git reset --hard HEAD" &&
--
-- text="hallo there!\nroundtrip test here!" &&
-- printf "$text" | iconv -f UTF-8 -t SHIFT-JIS >roundtrip.shift &&
-- printf "$text" | iconv -f UTF-8 -t UTF-16 >roundtrip.utf16 &&
-- echo "*.shift text working-tree-encoding=SHIFT-JIS" >>.gitattributes &&
--
-- # SHIFT-JIS encoded files are round-trip checked by default...
-- GIT_TRACE=1 git add .gitattributes roundtrip.shift 2>&1 |
-- grep "Checking roundtrip encoding for SHIFT-JIS" &&
-- git reset &&
--
-- # ... unless we overwrite the Git config!
-- ! GIT_TRACE=1 git -c core.checkRoundtripEncoding=garbage \
-- add .gitattributes roundtrip.shift 2>&1 |
-- grep "Checking roundtrip encoding for SHIFT-JIS" &&
-- git reset &&
--
-- # UTF-16 encoded files should not be round-trip checked by default...
-- ! GIT_TRACE=1 git add roundtrip.utf16 2>&1 |
-- grep "Checking roundtrip encoding for UTF-16" &&
-- git reset &&
--
-- # ... unless we tell Git to check it!
-- GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-16, UTF-32" \
-- add roundtrip.utf16 2>&1 |
-- grep "Checking roundtrip encoding for utf-16" &&
-- git reset &&
--
-- # ... unless we tell Git to check it!
-- # (here we also check that the casing of the encoding is irrelevant)
-- GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-32, utf-16" \
-- add roundtrip.utf16 2>&1 |
-- grep "Checking roundtrip encoding for utf-16" &&
-- git reset
--'
--
- test_done
+ done
+
+ test_expect_success 'check unsupported encodings' '
diff --git a/system/grep/APKBUILD b/system/grep/APKBUILD
index 442d666a6..962d7d1e1 100644
--- a/system/grep/APKBUILD
+++ b/system/grep/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=grep
-pkgver=3.1
-pkgrel=2
+pkgver=3.3
+pkgrel=0
pkgdesc="Searches input files for lines containing a match to a specified pattern"
url="https://www.gnu.org/software/grep/grep.html"
arch="all"
@@ -11,18 +11,11 @@ license="GPL-3.0+"
makedepends="pcre-dev autoconf automake"
checkdepends="coreutils bash diffutils"
subpackages="$pkgname-doc $pkgname-lang"
-source="http://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
gnulib-tests-dont-require-gpg-passphrase.patch
fix-tests.patch"
-prepare() {
- default_prepare
- sed -i '/test-localename$(EXEEXT)/d' \
- "$builddir"/gnulib-tests/Makefile.in
-}
-
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,17 +28,16 @@ build() {
}
check() {
- make -C "$builddir" check
+ make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26 grep-3.1.tar.xz
+sha512sums="e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db grep-3.3.tar.xz
fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c gnulib-tests-dont-require-gpg-passphrase.patch
9ba6b01c0c74933299afb469dadd2ea0c7e24befa34c691671a576063e32a1f0c735541e5e2bb0073d8afd814790909f7f895827aa8a2fbacdfcae380a7bcb11 fix-tests.patch"
diff --git a/system/groff/APKBUILD b/system/groff/APKBUILD
index ddb83a4b2..1045af000 100644
--- a/system/groff/APKBUILD
+++ b/system/groff/APKBUILD
@@ -1,19 +1,18 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=groff
-pkgver=1.22.3
-pkgrel=2
+pkgver=1.22.4
+pkgrel=0
pkgdesc="GNU troff text-formatting system"
url="https://www.gnu.org/software/groff/groff.html"
arch="all"
license="GPL-3.0+"
-depends=
+depends=""
makedepends="perl texinfo"
subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
build () {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,15 +23,13 @@ build () {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
-sha512sums="c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c groff-1.22.3.tar.gz"
+sha512sums="1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d groff-1.22.4.tar.gz"
diff --git a/system/gzip/APKBUILD b/system/gzip/APKBUILD
index 8e45ed894..698fc2c74 100644
--- a/system/gzip/APKBUILD
+++ b/system/gzip/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=gzip
-pkgver=1.9
-pkgrel=1
+pkgver=1.10
+pkgrel=0
pkgdesc="A popular data compression program"
subpackages="$pkgname-doc"
url="https://www.gnu.org/software/gzip/"
@@ -15,8 +15,6 @@ checkdepends="perl coreutils diffutils less"
source="https://ftp.gnu.org/gnu/gzip/gzip-$pkgver.tar.gz"
build() {
- cd "$builddir"
-
# avoid text relocation
export DEFS="NO_ASM"
./configure \
@@ -29,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR=$pkgdir install
rm -rf "$pkgdir"/usr/lib/charset.alias
@@ -49,4 +45,4 @@ package() {
ln -sf /bin/gunzip "$pkgdir"/usr/bin/uncompress
}
-sha512sums="686cb920701e2e19178143a0714edf46da5456bcdc5f5f99c2c186eb195078bc1039e4552f6e0eb4b870cc9beb1042ca3b8922d0b81e378c27bbbc55ba8f4a2f gzip-1.9.tar.gz"
+sha512sums="7939043e74554ced0c1c05d354ab4eb36cd6dce89ad79d02ccdc5ed6b7ee390759689b2d47c07227b9b44a62851afe7c76c4cae9f92527d999f3f1b4df1cccff gzip-1.10.tar.gz"
diff --git a/system/heirloom-devtools/APKBUILD b/system/heirloom-devtools/APKBUILD
index 974afd1e0..ddd99793c 100644
--- a/system/heirloom-devtools/APKBUILD
+++ b/system/heirloom-devtools/APKBUILD
@@ -11,7 +11,7 @@ license="CDDL-1.0"
depends=""
makedepends=""
subpackages="$pkgname-dev"
-source="https://superb-sea2.dl.sourceforge.net/project/heirloom/heirloom-devtools/$pkgver/heirloom-devtools-$pkgver.tar.bz2
+source="https://downloads.sourceforge.net/heirloom/heirloom-devtools/$pkgver/heirloom-devtools-$pkgver.tar.bz2
configure.patch
deauto.patch
lex-compiler.patch
diff --git a/system/help2man/APKBUILD b/system/help2man/APKBUILD
index b021f7f88..f3c238fc6 100644
--- a/system/help2man/APKBUILD
+++ b/system/help2man/APKBUILD
@@ -10,7 +10,7 @@ license="GPL-3.0+"
depends="perl"
makedepends="gettext-tiny"
subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/help2man/help2man-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/help2man/help2man-$pkgver.tar.xz"
build() {
cd "$builddir"
diff --git a/system/icu/APKBUILD b/system/icu/APKBUILD
index 1c7c7fb34..fa49774df 100644
--- a/system/icu/APKBUILD
+++ b/system/icu/APKBUILD
@@ -8,14 +8,14 @@ _ver=${pkgver//./_}
pkgrel=1
pkgdesc="International Components for Unicode library"
-url="http://www.icu-project.org/"
+url="https://www.icu-project.org/"
arch="all"
license="ICU"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
depends=""
checkdepends="diffutils"
makedepends=""
-source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz
+source="https://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz
icu-60.2-always-use-utf8.patch
checkimpl.patch
"
diff --git a/system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch b/system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch
new file mode 100644
index 000000000..8a51affe5
--- /dev/null
+++ b/system/iproute2/0001-f_flower-fix-build-with-musl-libc.patch
@@ -0,0 +1,28 @@
+From 28747146622a49c3e7b5c5b36dc02c6a64124770 Mon Sep 17 00:00:00 2001
+From: Hans Dedecker <dedeckeh@gmail.com>
+Date: Wed, 23 Jan 2019 22:02:31 +0100
+Subject: [PATCH] f_flower: fix build with musl libc
+
+XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it
+
+Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ tc/f_flower.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tc/f_flower.c b/tc/f_flower.c
+index c5636667..9659e894 100644
+--- a/tc/f_flower.c
++++ b/tc/f_flower.c
+@@ -14,6 +14,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <net/if.h>
++#include <linux/limits.h>
+ #include <linux/if_arp.h>
+ #include <linux/if_ether.h>
+ #include <linux/ip.h>
+--
+2.19.2
+
diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD
index bf0266e65..500a49f18 100644
--- a/system/iproute2/APKBUILD
+++ b/system/iproute2/APKBUILD
@@ -1,24 +1,25 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=iproute2
-pkgver=4.19.0
+pkgver=4.20.0
pkgrel=0
pkgdesc="IP configuration, routing, and traffic control utilities"
url="https://wiki.linuxfoundation.org/networking/iproute2"
arch="all"
+# the testsuite in this package seems to be geared towards kernel developers
+options="!check"
license="GPL-2.0-only"
depends=""
-install="$pkgname.post-install"
makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev"
-# the testsuite in this package seems to be geared towards kernel developers
-options="!check"
+install="$pkgname.post-install"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
- fix-uapi-garbage.patch"
+ fix-uapi-garbage.patch
+ 0001-f_flower-fix-build-with-musl-libc.patch
+ "
prepare() {
default_prepare
- cd "$builddir"
sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h
@@ -27,7 +28,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -39,7 +39,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
@@ -55,5 +54,6 @@ bashcomp() {
rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
}
-sha512sums="47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8 iproute2-4.19.0.tar.xz
-d9b40539f4ac074f20b0bb10381de9c3b64aadf612f0d599814cdb632fe97c76c9b4730406b08a6e53739670ca51ea0f699862156247cf20c3b7f4c78394fa46 fix-uapi-garbage.patch"
+sha512sums="ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b iproute2-4.20.0.tar.xz
+d9b40539f4ac074f20b0bb10381de9c3b64aadf612f0d599814cdb632fe97c76c9b4730406b08a6e53739670ca51ea0f699862156247cf20c3b7f4c78394fa46 fix-uapi-garbage.patch
+b6b5dc65fb4ffff06978c160446bcc79f4f242c94d0ba44890f3b01d86640f56e7cc32efbc0b2bbfce1ae5fd40252ba9ddbb59ff91e54a4de1d4274d48260b2c 0001-f_flower-fix-build-with-musl-libc.patch"
diff --git a/system/iproute2/musl-fixes.patch b/system/iproute2/musl-fixes.patch
deleted file mode 100644
index 0149f6dae..000000000
--- a/system/iproute2/musl-fixes.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- include/linux/if_ether.h 2017-07-06 11:09:53.305214044 -0700
-+++ include/linux/if_ether.h 2017-07-06 16:30:06.651369931 -0700
-@@ -22,6 +22,7 @@
- #define _LINUX_IF_ETHER_H
-
- #include <linux/types.h>
-+#include <linux/libc-compat.h>
-
- /*
- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
-@@ -142,11 +143,13 @@
- * This is an Ethernet frame header.
- */
-
-+#if __UAPI_DEF_ETHHDR
- struct ethhdr {
- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
- unsigned char h_source[ETH_ALEN]; /* source ether addr */
- __be16 h_proto; /* packet type ID field */
- } __attribute__((packed));
-+#endif
-
-
- #endif /* _LINUX_IF_ETHER_H */
---- include/linux/if_tunnel.h 2017-07-06 11:09:53.305214044 -0700
-+++ include/linux/if_tunnel.h 2017-07-06 16:32:23.814172660 -0700
-@@ -2,7 +2,6 @@
- #define _IF_TUNNEL_H_
-
- #include <linux/types.h>
--#include <linux/if.h>
- #include <linux/ip.h>
- #include <linux/in6.h>
- #include <asm/byteorder.h>
---- include/linux/ip6_tunnel.h 2017-07-06 11:09:53.303214021 -0700
-+++ include/linux/ip6_tunnel.h 2017-07-06 16:33:41.630158864 -0700
-@@ -2,7 +2,6 @@
- #define _IP6_TUNNEL_H
-
- #include <linux/types.h>
--#include <linux/if.h> /* For IFNAMSIZ. */
- #include <linux/in6.h> /* For struct in6_addr. */
-
- #define IPV6_TLV_TNL_ENCAP_LIMIT 4
---- include/linux/kernel.h 2017-07-06 11:09:53.303214021 -0700
-+++ include/linux/kernel.h 2017-07-06 16:30:06.650369918 -0700
-@@ -1,7 +1,9 @@
- #ifndef _LINUX_KERNEL_H
- #define _LINUX_KERNEL_H
-
-+#ifdef __GLIBC__
- #include <linux/sysinfo.h>
-+#endif
-
- /*
- * 'kernel.h' contains some often-used function prototypes etc
---- include/linux/libc-compat.h 2017-07-06 11:09:53.302214010 -0700
-+++ include/linux/libc-compat.h 2017-07-06 16:30:06.650369918 -0700
-@@ -48,47 +48,57 @@
- #ifndef _LIBC_COMPAT_H
- #define _LIBC_COMPAT_H
-
--/* We have included glibc headers... */
--#if defined(__GLIBC__)
-+/* We're used from userspace... */
-+#if !defined(__KERNEL__)
-
--/* Coordinate with glibc net/if.h header. */
-+/* Coordinate with libc net/if.h header. */
- #if defined(_NET_IF_H) && defined(__USE_MISC)
-
--/* GLIBC headers included first so don't define anything
-+/* libc headers included first so don't define anything
- * that would already be defined. */
-
- #define __UAPI_DEF_IF_IFCONF 0
- #define __UAPI_DEF_IF_IFMAP 0
- #define __UAPI_DEF_IF_IFNAMSIZ 0
- #define __UAPI_DEF_IF_IFREQ 0
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
--/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+#if !defined(__GLIBC__)
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
-+#else
- #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
- #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
-+#endif /* !defined(__GLIBC__) */
-
- #else /* _NET_IF_H */
-
- /* Linux headers included first, and we must define everything
-- * we need. The expectation is that glibc will check the
-+ * we need. The expectation is that libc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
-
- #define __UAPI_DEF_IF_IFCONF 1
- #define __UAPI_DEF_IF_IFMAP 1
- #define __UAPI_DEF_IF_IFNAMSIZ 1
- #define __UAPI_DEF_IF_IFREQ 1
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
--/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-
- #endif /* _NET_IF_H */
-
--/* Coordinate with glibc netinet/in.h header. */
-+/* Coordinate with libc netinet/if_ether.h */
-+#ifdef _NETINET_IF_ETHER_H
-+#define __UAPI_DEF_ETHHDR 0
-+#else
-+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */
-+#define __UAPI_DEF_ETHHDR 1
-+#endif /* _NETINET_IF_ETHER_H */
-+
-+/* Coordinate with libc netinet/in.h header. */
- #if defined(_NETINET_IN_H)
-
--/* GLIBC headers included first so don't define anything
-+/* libc headers included first so don't define anything
- * that would already be defined. */
- #define __UAPI_DEF_IN_ADDR 0
- #define __UAPI_DEF_IN_IPPROTO 0
-@@ -98,15 +108,7 @@
- #define __UAPI_DEF_IN_CLASS 0
-
- #define __UAPI_DEF_IN6_ADDR 0
--/* The exception is the in6_addr macros which must be defined
-- * if the glibc code didn't define them. This guard matches
-- * the guard in glibc/inet/netinet/in.h which defines the
-- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
--#if defined(__USE_MISC) || defined (__USE_GNU)
- #define __UAPI_DEF_IN6_ADDR_ALT 0
--#else
--#define __UAPI_DEF_IN6_ADDR_ALT 1
--#endif
- #define __UAPI_DEF_SOCKADDR_IN6 0
- #define __UAPI_DEF_IPV6_MREQ 0
- #define __UAPI_DEF_IPPROTO_V6 0
-@@ -117,7 +119,7 @@
- #else
-
- /* Linux headers included first, and we must define everything
-- * we need. The expectation is that glibc will check the
-+ * we need. The expectation is that libc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
- #define __UAPI_DEF_IN_ADDR 1
- #define __UAPI_DEF_IN_IPPROTO 1
-@@ -127,7 +129,7 @@
- #define __UAPI_DEF_IN_CLASS 1
-
- #define __UAPI_DEF_IN6_ADDR 1
--/* We unconditionally define the in6_addr macros and glibc must
-+/* We unconditionally define the in6_addr macros and libc must
- * coordinate. */
- #define __UAPI_DEF_IN6_ADDR_ALT 1
- #define __UAPI_DEF_SOCKADDR_IN6 1
-@@ -168,18 +170,20 @@
- /* If we did not see any headers from any supported C libraries,
- * or we are being included in the kernel, then define everything
- * that we need. */
--#else /* !defined(__GLIBC__) */
-+#else /* defined(__KERNEL__) */
-
- /* Definitions for if.h */
- #define __UAPI_DEF_IF_IFCONF 1
- #define __UAPI_DEF_IF_IFMAP 1
- #define __UAPI_DEF_IF_IFNAMSIZ 1
- #define __UAPI_DEF_IF_IFREQ 1
--/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
--/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-
-+/* Definitions for if/ether.h */
-+#define __UAPI_DEF_ETHHDR 1
-+
- /* Definitions for in.h */
- #define __UAPI_DEF_IN_ADDR 1
- #define __UAPI_DEF_IN_IPPROTO 1
-@@ -208,6 +212,6 @@
- /* Definitions for xattr.h */
- #define __UAPI_DEF_XATTR 1
-
--#endif /* __GLIBC__ */
-+#endif /* defined(__KERNEL__) */
-
- #endif /* _LIBC_COMPAT_H */
---- include/linux/netfilter_ipv4/ip_tables.h 2017-07-06 11:09:53.310214100 -0700
-+++ include/linux/netfilter_ipv4/ip_tables.h 2017-07-06 16:38:57.526211238 -0700
-@@ -17,7 +17,6 @@
-
- #include <linux/types.h>
-
--#include <linux/if.h>
- #include <linux/netfilter_ipv4.h>
-
- #include <linux/netfilter/x_tables.h>
---- tc/f_flower.c 2017-07-06 11:09:53.289213865 -0700
-+++ tc/f_flower.c 2017-07-06 16:36:04.967030780 -0700
-@@ -15,7 +15,7 @@
- #include <syslog.h>
- #include <string.h>
- #include <net/if.h>
--#include <linux/if_arp.h>
-+#include <net/if_arp.h>
- #include <linux/if_ether.h>
- #include <linux/ip.h>
- #include <linux/tc_act/tc_vlan.h>
diff --git a/system/isl/APKBUILD b/system/isl/APKBUILD
index 5d789e087..e0f2785d9 100644
--- a/system/isl/APKBUILD
+++ b/system/isl/APKBUILD
@@ -1,25 +1,22 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
pkgname=isl
-pkgver=0.18
+pkgver=0.20
pkgrel=0
pkgdesc="An Integer Set Library for the Polyhedral Model"
url="http://isl.gforge.inria.fr/"
arch="all"
+options="!dbg strip" # Static libs only
license="MIT"
depends=""
depends_dev="gmp-dev"
makedepends_host="$depends_dev"
makedepends="$makedepends_host"
replaces="cloog"
-install=""
subpackages="$pkgname-dev"
source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
-
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,26 +24,17 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --with-sysroot=${CBUILDROOT}
+ --with-sysroot=${CBUILDROOT} \
+ --disable-shared
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" INSTALL="install -D" install
}
-dev() {
- default_dev
- replaces="cloog-dev"
- mkdir -p "$subpkgdir"/usr/share/gdb/python/auto-load/usr/lib
- mv "$pkgdir"/usr/lib/*-gdb.py \
- "$subpkgdir"/usr/share/gdb/python/auto-load/usr/lib/
-}
-
-sha512sums="85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94 isl-0.18.tar.bz2"
+sha512sums="afe2e159b74646a26449268637403d271f9e3f6410d8cc1c9cffca41370c4357b165dea844db0c2a654591f954e54710dda650c8088abd4711406aa6302da950 isl-0.20.tar.bz2"
diff --git a/system/kmod/APKBUILD b/system/kmod/APKBUILD
index 2499dcdd6..748d26def 100644
--- a/system/kmod/APKBUILD
+++ b/system/kmod/APKBUILD
@@ -1,19 +1,17 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmod
-pkgver=25
+pkgver=26
pkgrel=0
pkgdesc="Linux kernel module management utilities"
-url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
+url="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
arch="all"
options="!check" # https://bugs.gentoo.org/408915#c3
license="GPL-2.0+"
depends=""
-depends_dev=""
makedepends_build="libxslt"
-makedepends_host="$depends_dev zlib-dev xz-dev"
+makedepends_host="zlib-dev xz-dev"
makedepends="$makedepends_build $makedepends_host"
-install=""
triggers="$pkgname.trigger=/lib/modules/*"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc
$pkgname-bash-completion:bashcomp:noarch"
@@ -23,7 +21,6 @@ source="https://kernel.org/pub/linux/utils/kernel/kmod/kmod-$pkgver.tar.xz
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,7 +34,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
local i
mkdir -p "$pkgdir"/sbin
@@ -61,6 +57,6 @@ bashcomp() {
}
-sha512sums="d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 kmod-25.tar.xz
+sha512sums="3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 kmod-26.tar.xz
f2ea3527bfba182c5e15557c224a5bba8c7e2ea3d21cf604e6eb2277226dcf983c3aeb9ac44a322c7f2b4942b35135da999d63a5b946b829d3f3b09c050a0f17 strndupa.patch
7f0f89fe98167f71b7924f341ba701d001158225463c2f5e39f706a0224b1e952ee901b441f28cb15787563e83bb6e54eb752bf8669ae7c0ffbb11984542f354 kmod-static-nodes.initd"
diff --git a/system/kyua/APKBUILD b/system/kyua/APKBUILD
index 6a1be176d..bb83158a1 100644
--- a/system/kyua/APKBUILD
+++ b/system/kyua/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
pkgname=kyua
pkgver=0.13
pkgrel=1
@@ -8,7 +8,6 @@ arch="all"
license="BSD-3-Clause"
depends=""
makedepends="atf-dev lutok-dev sqlite-dev"
-install=""
options="!check" # doesn't pass without sysctl tweaking.
subpackages="$pkgname-doc"
source="https://github.com/jmmv/kyua/releases/download/kyua-$pkgver/kyua-$pkgver.tar.gz"
diff --git a/system/libaio/APKBUILD b/system/libaio/APKBUILD
index b40b031aa..f46e8b582 100644
--- a/system/libaio/APKBUILD
+++ b/system/libaio/APKBUILD
@@ -1,32 +1,33 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname="libaio"
-pkgver=0.3.111
+pkgver=0.3.112
pkgrel=0
pkgdesc="Asynchronous input/output library"
url="http://lse.sourceforge.net/io/aio.html"
arch="all"
license="LGPL-2.1+"
-depends=
+depends=""
makedepends="linux-headers"
-install=
subpackages="$pkgname-dev"
-source="http://ftp.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz"
+source="http://ftp.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.xz
+ improper-strncpy-usage.patch
+ posix-header.patch
+ "
build() {
- cd "$builddir"
- make
+ make LDFLAGS="$LDFLAGS -lssp_nonshared"
}
check() {
- cd "$builddir"
# the full testsuite requires root and attempts to do a loop mount
make partcheck
}
package() {
- cd "$builddir"
make prefix="$pkgdir/usr" install
}
-sha512sums="440f2b62f99ca2e72ffc8c2c04b4779a1a7cf24a8ba2a30b34d18b4ee77630a2078610fe8c435559f81a5c3bfa93049bd53d77464a0da8267833fbde3f40ceeb libaio_0.3.111.orig.tar.gz"
+sha512sums="612f0adeea4926ced914b43ec550bf821bef348e6c787f9e3c1a545e5667121692a9af7ebaab14744aca7132a071083a1120bd01e31726932f3ceb9be51891a7 libaio_0.3.112.orig.tar.xz
+8294a17b60676838375b3f17b84af19f3f3224788bdc944eda6b235305f48b6b292899f9d528be7b4b87305e7beac409afc0f250d052454b2a739bd990104b83 improper-strncpy-usage.patch
+4cc9ad9f1020bc6397c3847cc511bed93fe4c5391ef00094b6704c8ba3f9e295e35e60536ecb3e306713caac9fdb81ecc3d083d8e96cc20db39a105d16b7ab84 posix-header.patch"
diff --git a/system/libaio/improper-strncpy-usage.patch b/system/libaio/improper-strncpy-usage.patch
new file mode 100644
index 000000000..b2f6b86a4
--- /dev/null
+++ b/system/libaio/improper-strncpy-usage.patch
@@ -0,0 +1,26 @@
+It is invalid to use the src size as the strncpy size parameter.
+
+Found by GCC 8.3, fixed by awilfox.
+
+--- libaio-0.3.111/harness/cases/19.t.old 2018-03-06 22:24:47.000000000 +0000
++++ libaio-0.3.111/harness/cases/19.t 2019-02-28 22:20:03.170000000 +0000
+@@ -41,7 +41,7 @@
+ int fd;
+ char template[sizeof(TEMPLATE)];
+
+- strncpy(template, TEMPLATE, sizeof(TEMPLATE));
++ strncpy(template, TEMPLATE, sizeof(template));
+ fd = mkostemp(template, O_DIRECT);
+ if (fd < 0) {
+ perror("mkstemp");
+--- libaio-0.3.111/harness/cases/21.t.old 2018-03-06 22:24:47.000000000 +0000
++++ libaio-0.3.111/harness/cases/21.t 2019-02-28 22:20:13.120000000 +0000
+@@ -43,7 +43,7 @@
+ int fd;
+ char temp_file[sizeof(TEMPLATE)];
+
+- strncpy(temp_file, TEMPLATE, sizeof(TEMPLATE));
++ strncpy(temp_file, TEMPLATE, sizeof(temp_file));
+ fd = mkstemp(temp_file);
+ if (fd < 0) {
+ perror("mkstemp");
diff --git a/system/libaio/posix-header.patch b/system/libaio/posix-header.patch
new file mode 100644
index 000000000..6a11c0e34
--- /dev/null
+++ b/system/libaio/posix-header.patch
@@ -0,0 +1,11 @@
+--- libaio-0.3.112/harness/cases/22.t.old 2018-10-22 18:55:23.000000000 +0000
++++ libaio-0.3.112/harness/cases/22.t 2019-03-08 01:52:02.840000000 +0000
+@@ -11,7 +11,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <stdlib.h>
+
diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD
index c3f3ceef6..02e845f81 100644
--- a/system/libarchive/APKBUILD
+++ b/system/libarchive/APKBUILD
@@ -4,14 +4,14 @@ pkgname=libarchive
pkgver=3.3.3
pkgrel=0
pkgdesc="Library for creating and reading streaming archives"
-url="http://libarchive.org/"
+url="https://libarchive.org/"
arch="all"
options="!check" # needs EUC-JP and KOI8R support in iconv
license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain"
makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev
attr-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://www.libarchive.org/downloads/$pkgname-$pkgver.tar.gz
+source="https://www.libarchive.org/downloads/$pkgname-$pkgver.tar.gz
seek-error.patch"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD
index 7cb3a0db0..5bf8dc29d 100644
--- a/system/libcap-ng/APKBUILD
+++ b/system/libcap-ng/APKBUILD
@@ -3,14 +3,14 @@ pkgname=libcap-ng
pkgver=0.7.9
pkgrel=0
pkgdesc="POSIX capabilities library"
-url="http://people.redhat.com/sgrubb/libcap-ng/index.html"
+url="https://people.redhat.com/sgrubb/libcap-ng/index.html"
arch="all"
license="LGPL-2.1+"
depends_dev="linux-headers"
makedepends="python3 $depends_dev"
makedepends_host="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz
+source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz
fix-includes.patch
"
diff --git a/system/libcap/APKBUILD b/system/libcap/APKBUILD
index 64763b21b..517b30609 100644
--- a/system/libcap/APKBUILD
+++ b/system/libcap/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="POSIX 1003.1e capabilities"
arch="all"
options="!check"
license="BSD-3-Clause OR GPL-2.0-only"
-url="http://www.friedhoff.org/posixfilecaps.html"
+url="https://www.friedhoff.org/posixfilecaps.html"
depends=""
depends_dev="linux-headers"
makedepends_build="linux-headers perl !gperf"
diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD
index bd5362f82..e63964751 100644
--- a/system/libedit/APKBUILD
+++ b/system/libedit/APKBUILD
@@ -1,30 +1,28 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libedit
-pkgver=20180525.3.1
+pkgver=20181209.3.1
_realver=${pkgver/.3.1/-3.1}
pkgrel=0
pkgdesc="Library providing line editing, history, and tokenisation functions"
-url="http://thrysoee.dk/editline/"
+url="https://thrysoee.dk/editline/"
arch="all"
license="BSD-2-Clause"
depends=""
depends_dev="ncurses-dev" # XXX is this always unconditionally needed?
makedepends="$depends_dev autoconf automake"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://thrysoee.dk/editline/libedit-$_realver.tar.gz
+source="https://thrysoee.dk/editline/libedit-$_realver.tar.gz
tinfo.patch
"
builddir="$srcdir/$pkgname-$_realver"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -v -f --install
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -36,14 +34,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="63b4dae3f0a71714ba66c074d6cf9b49dbc82dd795f1290ca978cfe3cb57944dffb6d89d275f9bbb200b4672b5a1101d9e62ebf492a83bb7f795b2e4d9d3d2ea libedit-20180525-3.1.tar.gz
+sha512sums="7673fb5612149a0d3508a103ac6f92041704911b27fffa084624f835fa6ac55b17c43b6e622ff9eac6ca06368e80ede14d93ec75afb5a368651734b8bfe045d2 libedit-20181209-3.1.tar.gz
b9cfb07733d14339cfb053b5c4249b74486268005474f65f377e412e5cccbe29d3ce55663a9795db0b682155084cca5a9424de348c7defdc8698dea042c2a674 tinfo.patch"
diff --git a/system/libelf/APKBUILD b/system/libelf/APKBUILD
index 7ba1a6cc0..5ddc8884a 100644
--- a/system/libelf/APKBUILD
+++ b/system/libelf/APKBUILD
@@ -4,13 +4,13 @@ pkgname=libelf
pkgver=0.8.13
pkgrel=4
pkgdesc="ELF object file access library"
-url="http://www.mr511.de/software/"
+url=" " # Dead upstream: http://www.mr511.de/software/
arch="all"
license="LGPL-2.0+"
-depends=
-makedepends=
+depends=""
+makedepends=""
subpackages="$pkgname-dev"
-source="http://www.mr511.de/software/$pkgname-$pkgver.tar.gz"
+source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz"
prepare() {
cd "$builddir"
@@ -39,4 +39,5 @@ package() {
cd "$builddir"
make install prefix="$pkgdir"/usr
}
+
sha512sums="d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe libelf-0.8.13.tar.gz"
diff --git a/system/libexecinfo/APKBUILD b/system/libexecinfo/APKBUILD
index 351913d6d..e2f261689 100644
--- a/system/libexecinfo/APKBUILD
+++ b/system/libexecinfo/APKBUILD
@@ -12,7 +12,7 @@ depends=
makedepends=
install=
subpackages="${pkgname}-dev"
-source="http://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
+source="https://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
10-execinfo.patch
20-define-gnu-source.patch
30-linux-makefile.patch
diff --git a/system/libffi/APKBUILD b/system/libffi/APKBUILD
index c5ac35baa..b37b6226c 100644
--- a/system/libffi/APKBUILD
+++ b/system/libffi/APKBUILD
@@ -3,7 +3,7 @@ pkgname=libffi
pkgver=3.2.1
pkgrel=4
pkgdesc="A portable, high level programming interface to various calling conventions."
-url="http://sourceware.org/libffi"
+url="https://sourceware.org/libffi"
arch="all"
license="MIT"
depends=
@@ -11,7 +11,7 @@ makedepends="texinfo"
checkdepends="dejagnu"
install=
subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
disable-ppc-ldvariant.patch
fix-testsuite-longdouble.patch
gnu-linux-define.patch
diff --git a/system/libgcrypt/APKBUILD b/system/libgcrypt/APKBUILD
index c1c637f33..13797a615 100644
--- a/system/libgcrypt/APKBUILD
+++ b/system/libgcrypt/APKBUILD
@@ -3,14 +3,14 @@ pkgname=libgcrypt
pkgver=1.8.4
pkgrel=0
pkgdesc="GnuPG cryptography library"
-url="http://www.gnupg.org"
+url="https://www.gnupg.org"
arch="all"
license="LGPL-2.1+"
depends=""
depends_dev="libgpg-error-dev"
makedepends="$depends_dev texinfo"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$pkgname-$pkgver.tar.bz2"
+source="https://www.gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
build() {
cd "$builddir"
diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD
index 803410a29..f962068cf 100644
--- a/system/libgpg-error/APKBUILD
+++ b/system/libgpg-error/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libgpg-error
-pkgver=1.32
+pkgver=1.35
pkgrel=0
pkgdesc="GnuPG runtime library"
url="https://www.gnupg.org"
@@ -10,11 +10,9 @@ license="LGPL-2.1+"
depends=""
makedepends=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-lisp:lisp:noarch"
-source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
- "
+source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
@@ -40,4 +36,4 @@ lisp() {
mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/
}
-sha512sums="0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20 libgpg-error-1.32.tar.bz2"
+sha512sums="9b1983f18f44f51b89a034c15b27415f710c21ead12dd63821aa489fb4c6d4b649a658ce1d5e1f3424cee483d3243be151b8fe32a24642af4531ded508aa4ac7 libgpg-error-1.35.tar.bz2"
diff --git a/system/libidn/APKBUILD b/system/libidn/APKBUILD
index 5edbabdb2..1222c499e 100644
--- a/system/libidn/APKBUILD
+++ b/system/libidn/APKBUILD
@@ -12,7 +12,7 @@ makedepends=
checkdepends="diffutils"
install=
subpackages="$pkgname-doc $pkgname-dev $pkgname-lang"
-source="http://ftp.gnu.org/gnu/libidn/$pkgname-$pkgver.tar.gz
+source="https://ftp.gnu.org/gnu/libidn/$pkgname-$pkgver.tar.gz
localename-test-fix.patch
gnulib-tests-dont-require-gpg-passphrase.patch
"
diff --git a/system/libmnl/APKBUILD b/system/libmnl/APKBUILD
index cb26c05e9..2826275b1 100644
--- a/system/libmnl/APKBUILD
+++ b/system/libmnl/APKBUILD
@@ -4,7 +4,7 @@ pkgname=libmnl
pkgver=1.0.4
pkgrel=0
pkgdesc="Minimalistic library for Netlink operations"
-url="http://www.netfilter.org/projects/libmnl/"
+url="https://www.netfilter.org/projects/libmnl/"
arch="all"
options="!check" # this package doesn't actually run any tests, just builds them
license="LGPL-2.0+"
@@ -14,7 +14,7 @@ makedepends="$depends_dev"
checkdepends="bsd-compat-headers"
install=""
subpackages="$pkgname-dev"
-source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
+source="https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
test-include-sysselect.patch"
build() {
diff --git a/system/libpipeline/APKBUILD b/system/libpipeline/APKBUILD
index 8dd830f0e..ffe0494e2 100644
--- a/system/libpipeline/APKBUILD
+++ b/system/libpipeline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libpipeline
-pkgver=1.5.0
+pkgver=1.5.1
pkgrel=0
pkgdesc="C pipeline manipulation library"
url="http://libpipeline.nongnu.org/"
@@ -9,10 +9,9 @@ arch="all"
license="GPL-3.0+"
checkdepends="check-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://download.savannah.nongnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz"
+source="https://download.savannah.nongnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -23,14 +22,12 @@ build() {
make
}
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
-}
-
check() {
- cd "$builddir"
make check
}
-sha512sums="4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117 libpipeline-1.5.0.tar.gz"
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="9252c114bc59925eaf73ec9e8bb76b5649ccf985766edd2dc665630ec6de04c341298c74f8dc31c56e9ce20ad83da59df33eb3cc367e18a8012fd693cb823de6 libpipeline-1.5.1.tar.gz"
diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD
index d4d562edc..9f5b9c683 100644
--- a/system/libssh2/APKBUILD
+++ b/system/libssh2/APKBUILD
@@ -6,20 +6,17 @@ pkgrel=2
pkgdesc="library for accessing ssh1/ssh2 protocol servers"
url="https://libssh2.org/"
arch="all"
-options="!checkroot"
license="BSD-3-Clause"
makedepends="openssl-dev zlib-dev"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
-source="http://www.libssh2.org/download/libssh2-$pkgver.tar.gz"
+source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
update_config_sub
default_prepare
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/system/libtool/APKBUILD b/system/libtool/APKBUILD
index 23084d371..c4a3348f9 100644
--- a/system/libtool/APKBUILD
+++ b/system/libtool/APKBUILD
@@ -6,14 +6,13 @@ pkgdesc="A generic library support script"
arch="all"
license="GPL-2.0+"
url="http://www.gnu.org/software/libtool"
-source="ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz
- libtool-fix-cross-compile.patch
- "
depends="bash libltdl"
makedepends="m4 help2man"
checkdepends="autoconf automake gzip"
subpackages="libltdl $pkgname-doc"
options="libtool"
+source="https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz
+ libtool-fix-cross-compile.patch"
build() {
cd "$builddir"
diff --git a/system/libtool/libtool.patch b/system/libtool/libtool.patch
deleted file mode 100644
index 4302b7e07..000000000
--- a/system/libtool/libtool.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD
-index de86f2aeb7..3a7d137533 100644
---- a/main/libtool/APKBUILD
-+++ b/main/libtool/APKBUILD
-@@ -4,13 +4,14 @@ pkgver=2.4.6
- pkgrel=1
- pkgdesc="A generic library support script"
- arch="all"
--license='GPL'
-+license="GPL"
- url="http://www.gnu.org/software/libtool"
- source="ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz
- libtool-fix-cross-compile.patch
- "
- depends="bash libltdl"
- makedepends="m4 help2man"
-+checkdepends="mawk autoconf automake gzip"
- subpackages="libltdl $pkgname-doc"
- options="libtool"
-
-@@ -23,7 +24,7 @@ build() {
- --host=$CHOST \
- --prefix=/usr \
- --disable-static \
-- || return 1
-+ lt_cv_shlibpath_overrides_runpath=yes
- make
- }
-
-@@ -32,6 +33,11 @@ package() {
- make DESTDIR="$pkgdir" install
- }
-
-+check() {
-+ cd "$builddir"
-+ make check
-+}
-+
- libltdl() {
- pkgdesc="Runtime libraries for GNU Libtool Dynamic Module Loader"
- depends=
diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD
index f6b020858..f152933a5 100644
--- a/system/libucontext/APKBUILD
+++ b/system/libucontext/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
pkgname=libucontext
pkgver=0.1.3
pkgrel=1
diff --git a/system/libuv/APKBUILD b/system/libuv/APKBUILD
index acbf16d8d..4d043bec1 100644
--- a/system/libuv/APKBUILD
+++ b/system/libuv/APKBUILD
@@ -2,10 +2,10 @@
# Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libuv
-pkgver=1.23.2
+pkgver=1.26.0
pkgrel=0
pkgdesc="Cross-platform asychronous I/O"
-url="http://libuv.org"
+url="https://libuv.org"
arch="all"
license="MIT AND BSD-2-Clause AND BSD-3-Clause AND ISC"
makedepends="automake autoconf libtool linux-headers"
@@ -18,13 +18,10 @@ builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
default_prepare
-
- cd "$builddir"
sh autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -36,17 +33,15 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 LICENSE \
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="8dd9053adad115ae6dd012bf1059aab87cea2adcd8d2f8061607929bf5b0c83b1898f5945325b0f3ace7cdd70b7cdc03f60d4b2f85495c34ca94b9dcf76b42fe libuv-v1.23.2.tar.gz
+sha512sums="ad8d2eb14b98b64b9c81499149cbc3dbed524635be893a9203d0aaaabfe0b623d7e1d26b5cfd16fe5bd63f1656280808faf820d6f4f4aaf93ad89d5615b7952a libuv-v1.26.0.tar.gz
58bc259a0f703fa6b8dda14909f718e14dfb9ddc9039ae13378f7e32e0ff7096774cbfb2964a0abb06f8a64a71cf298cc77b7475927df0fb50ce3f0e414a7787 disable-process-priority.patch
478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch"
diff --git a/system/libxml2/APKBUILD b/system/libxml2/APKBUILD
index ffeaf9772..15e2d87b8 100644
--- a/system/libxml2/APKBUILD
+++ b/system/libxml2/APKBUILD
@@ -1,22 +1,21 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libxml2
-pkgver=2.9.8
-pkgrel=1
+pkgver=2.9.9
+pkgrel=0
pkgdesc="XML parsing library"
url="http://www.xmlsoft.org/"
arch="all"
+options="!check !strip" # Impossible to run on Python 3
license="MIT"
-depends=
+depends=""
depends_dev="zlib-dev icu-dev"
checkdepends="perl tar"
makedepends="$depends_dev python3-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-utils py-libxml2:py"
-options="!check !strip" # Impossible to run on Python 3
source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
python-segfault-fix.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 2.9.4-r1:
@@ -46,7 +45,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
@@ -56,8 +54,6 @@ dev() {
}
py() {
- cd "$builddir"
-
pkgdesc="$pkgname Python bindings"
provides="py3-libxml2=$pkgver-r$pkgrel"
install -d "$subpkgdir"/usr/lib
@@ -71,5 +67,5 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917 libxml2-2.9.8.tar.gz
+sha512sums="cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810 libxml2-2.9.9.tar.gz
384b3d2031cd8f77528190bbb7652faa9ccb22bc604bcf4927e59046d38830dac38010828fe1568b6514976f725981a6d3ac1aa595d31477a36db2afe491452c python-segfault-fix.patch"
diff --git a/system/libxslt/APKBUILD b/system/libxslt/APKBUILD
index 80224d2ff..0ba2dd390 100644
--- a/system/libxslt/APKBUILD
+++ b/system/libxslt/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libxslt
-pkgver=1.1.32
+pkgver=1.1.33
pkgrel=0
pkgdesc="XML stylesheet transformation library"
url="http://xmlsoft.org/XSLT/"
@@ -16,8 +16,6 @@ source="ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz"
# - CVE-2017-5029
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,15 +24,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39 libxslt-1.1.32.tar.gz"
+sha512sums="ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0 libxslt-1.1.33.tar.gz"
diff --git a/system/linenoise/APKBUILD b/system/linenoise/APKBUILD
index 48012cda9..5e95f3927 100644
--- a/system/linenoise/APKBUILD
+++ b/system/linenoise/APKBUILD
@@ -2,16 +2,14 @@
# Maintainer:
pkgname=linenoise
pkgver=1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Minimal replacement for readline"
url="https://github.com/antirez/linenoise"
arch="all"
options="!check" # No test suite.
license="BSD-2-Clause-NetBSD"
depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+makedepends=""
subpackages="$pkgname-dev"
source="linenoise-$pkgver.tar.gz::https://github.com/antirez/linenoise/archive/$pkgver.tar.gz
build-shared-lib.patch
@@ -28,4 +26,4 @@ package() {
}
sha512sums="9e68fade8d64d7ba8d5d681e74d0ca6c4ebd9576249bb0e885b1aa708a9af77a43ea6264307ae46fb74e52219387a2c831b570f9601e331837f35294af9883e3 linenoise-1.0.tar.gz
-e37fe58f414f48a6a6fcab9925881131d2dbca0c54fe2b17a359d0b5c58ce1e29dad92baa8dc7f7d390af1edace2a75091f20bed5aa381ff2599e734616b2418 build-shared-lib.patch"
+4f38ffc191c69e6a60fd064929ad0d442700a2928cd2de04e52c12e3ce67c8f1d49e993782d764fe8c59165eed20fb7725ea9147942a7e0e26ff1a8ebb145e9a build-shared-lib.patch"
diff --git a/system/linenoise/build-shared-lib.patch b/system/linenoise/build-shared-lib.patch
index 2f9542dcf..b94d6ab4c 100644
--- a/system/linenoise/build-shared-lib.patch
+++ b/system/linenoise/build-shared-lib.patch
@@ -1,6 +1,6 @@
--- ./Makefile.orig
+++ ./Makefile
-@@ -1,7 +1,33 @@
+@@ -1,7 +1,34 @@
+MAJOR_VERSION = 0
+EXTRA_VERSION = .0.0
+SONAME = liblinenoise.so.$(MAJOR_VERSION)
@@ -34,4 +34,5 @@
+ install -m 0755 -d $(DESTDIR)$(LIBDIR)
+ install -m 0755 $(LIB) $(DESTDIR)$(LIBDIR)
+ ldconfig -n $(DESTDIR)$(LIBDIR)
-+ ln -s $(LIB) $(DESTDIR)$(LIBDIR)/liblinenoise.so
++ ln -s $(LIB) $(DESTDIR)$(LIBDIR)/$(SONAME)
++ ln -s $(SONAME) $(DESTDIR)$(LIBDIR)/liblinenoise.so
diff --git a/system/linux-pam/APKBUILD b/system/linux-pam/APKBUILD
index 03420b085..431478d7f 100644
--- a/system/linux-pam/APKBUILD
+++ b/system/linux-pam/APKBUILD
@@ -4,12 +4,12 @@ pkgname=linux-pam
pkgver=1.3.1
pkgrel=1
pkgdesc="Pluggable Authentication Modules"
-url="http://www.kernel.org/pub/linux/libs/pam"
+url="https://www.kernel.org/pub/linux/libs/pam"
arch="all"
license="BSD-3-Clause"
depends_dev="gettext-tiny-dev"
makedepends_host="$depends_dev utmps-dev"
-makedepends_build="$depends_dev bison flex-dev autoconf automake libtool"
+makedepends_build="$depends_dev byacc flex-dev autoconf automake libtool"
makedepends="$makedepends_host $makedepends_build"
options="suid"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/system/lutok/APKBUILD b/system/lutok/APKBUILD
index 5e84fd867..103688367 100644
--- a/system/lutok/APKBUILD
+++ b/system/lutok/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
pkgname=lutok
pkgver=0.4
pkgrel=2
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 0b9d4428d..efb73d48f 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lvm2
-pkgver=2.02.181
+pkgver=2.03.02
pkgrel=0
pkgdesc="Logical Volume Manager 2 utilities"
-url="http://sourceware.org/lvm2/"
+url="https://sourceware.org/lvm2/"
arch="all"
options="!check" # Test tries to use real /dev/mapper/control.
license="GPL-2.0+ AND LGPL-2.1-only"
@@ -32,14 +32,11 @@ subpackages="
device-mapper-libs:dm_libs
device-mapper-event-libs:dm_event_libs
$pkgname-libs
- $pkgname-extra::noarch
"
builddir="$srcdir/LVM2.$pkgver"
build () {
- cd "$builddir"
-
# during cross-compilation malloc test goes wrong
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
@@ -54,20 +51,17 @@ build () {
--localstatedir=/var \
--disable-readline \
--enable-pkgconfig \
- --enable-applib \
--with-thin=internal \
--enable-dmeventd \
--enable-cmdlib \
--with-thin-check=/sbin/thin_check \
--with-thin-dump=/sbin/thin_dump \
--with-thin-repair=/sbin/thin_repair \
- --with-dmeventd-path=/sbin/dmeventd \
- CLDFLAGS="$LDFLAGS"
+ --with-dmeventd-path=/sbin/dmeventd
make
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup
install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm
@@ -111,17 +105,7 @@ dm_event_libs() {
mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
}
-extra() {
- pkgdesc="LVM2 extra utilities"
- depends="bash coreutils"
- local util
- for util in sbin/lvmdump sbin/lvmconf sbin/fsadm sbin/blkdeactivate; do
- mkdir -p "$subpkgdir/${util%/*}"
- mv $pkgdir/$util $subpkgdir/$util
- done
-}
-
-sha512sums="599d992823510e27f3ec3ceaf0d2332402b731afc0d2df88096ab55ed98dba8c3bdc5408d51b9f5b0ffbbb9ac3760ee37b878a0f36ab379449dc076c58e59511 LVM2.2.02.181.tgz
+sha512sums="b8ccd96a98bee36272492ed056aa0bd65e074e476f29d6e5562ff4604a18326cbf40a7948f2c37d8d4758a1403c3c98106f2698e1e2ba5e014e4cb91aeb3cf90 LVM2.2.03.02.tgz
6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch
9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch
33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch
diff --git a/system/lz4/APKBUILD b/system/lz4/APKBUILD
index 5d46c4933..b7c8a56b7 100644
--- a/system/lz4/APKBUILD
+++ b/system/lz4/APKBUILD
@@ -1,41 +1,30 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lz4
-pkgver=1.8.2
+pkgver=1.8.3
pkgrel=0
pkgdesc="LZ4: Extremely Fast Compression algorithm"
url="https://github.com/lz4/lz4"
arch="all"
license="BSD-2-Clause GPL-2.0-only"
checkdepends="diffutils"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-tests:tests"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
case "$CARCH" in
armhf) options="!check" ;; # FIXME
esac
build() {
- cd "$builddir"
make PREFIX="/usr"
}
check() {
- cd "$builddir"
make test
}
-tests() {
- cd "$builddir"/tests
- mkdir -p "$subpkgdir"/usr/share/$pkgname
- rm -f *.c COPYING Makefile .gitignore
- cp -rf "$builddir"/tests "$subpkgdir"/usr/share/$pkgname
-}
-
package() {
- cd "$builddir"
make PREFIX="/usr" DESTDIR="$pkgdir" install
}
-sha512sums="5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763 lz4-1.8.2.tar.gz"
+sha512sums="5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f lz4-1.8.3.tar.gz"
diff --git a/system/lzip/APKBUILD b/system/lzip/APKBUILD
index d6f4ccec4..d086f754d 100644
--- a/system/lzip/APKBUILD
+++ b/system/lzip/APKBUILD
@@ -1,18 +1,16 @@
# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lzip
-pkgver=1.20
+pkgver=1.21
pkgrel=0
-pkgdesc="Lzip is a lossless data compressor"
-url="http://www.nongnu.org/lzip/lzip.html"
+pkgdesc="Lossless data compressor"
+url="https://www.nongnu.org/lzip/lzip.html"
arch="all"
license="GPL-2.0+"
subpackages="$pkgname-doc"
-source="http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
CXX="${CXX-g++}" \
@@ -23,13 +21,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR=$pkgdir install
}
-sha512sums="0349b4c6c0b41e601b7ee381c3254d741397beb3ef9354c08162f346f131f4f48f6613ee0a610cdc6d827530df634f884ecfeee35215b10045a40fee76f8e938 lzip-1.20.tar.gz"
+sha512sums="02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362 lzip-1.21.tar.gz"
diff --git a/user/lzo/APKBUILD b/system/lzo/APKBUILD
index 1707525e0..1707525e0 100644
--- a/user/lzo/APKBUILD
+++ b/system/lzo/APKBUILD
diff --git a/user/lzop/APKBUILD b/system/lzop/APKBUILD
index 030364595..030364595 100644
--- a/user/lzop/APKBUILD
+++ b/system/lzop/APKBUILD
diff --git a/system/m4/APKBUILD b/system/m4/APKBUILD
index 9c712662d..861b1671f 100644
--- a/system/m4/APKBUILD
+++ b/system/m4/APKBUILD
@@ -10,7 +10,7 @@ depends=
makedepends="texinfo"
checkdepends="diffutils"
subpackages="m4-doc"
-source="ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
+source="https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
disable-mbrtowc-test.patch
localename-test-fix.patch
gnulib-tests-dont-require-gpg-passphrase.patch
diff --git a/system/mailx/APKBUILD b/system/mailx/APKBUILD
index 062b40286..b2e4af92e 100644
--- a/system/mailx/APKBUILD
+++ b/system/mailx/APKBUILD
@@ -11,7 +11,7 @@ license="BSD-4-Clause AND MIT AND MPL-1.1"
depends=""
makedepends="openssl-dev"
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/heirloom/$pkgname-$pkgver.tar.bz2
+source="https://downloads.sourceforge.net/heirloom/$pkgname-$pkgver.tar.bz2
Mail
mailx-12.4-openssl.patch
mailx-12.4-cve.patch"
diff --git a/system/make/APKBUILD b/system/make/APKBUILD
index 6aee8945d..944f1c8b3 100644
--- a/system/make/APKBUILD
+++ b/system/make/APKBUILD
@@ -5,23 +5,20 @@ pkgrel=2
pkgdesc="GNU make utility to maintain groups of programs"
url="https://www.gnu.org/software/make"
arch="all"
-options="!checkroot"
license="GPL-3.0+"
depends=""
checkdepends="perl"
subpackages="$pkgname-doc $pkgname-lang"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
fix-atexit-exit.patch
"
prepare() {
- cd "$builddir"
update_config_sub
default_prepare
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
[ "$CBUILD" != "$CHOST" ] || (ulimit -n 64 && PERL5LIB=. make check) || return 1
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD
index 0e0aa9724..fd89714e7 100644
--- a/system/man-db/APKBUILD
+++ b/system/man-db/APKBUILD
@@ -1,22 +1,22 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=man-db
-pkgver=2.8.4
-pkgrel=1
+pkgver=2.8.5
+pkgrel=0
pkgdesc="The man command and related utilities for examining on-line help files"
-url="http://www.nongnu.org/man-db/"
+url="https://www.nongnu.org/man-db/"
arch="all"
+options="!check" # requires //IGNORE in iconv
license="GPL-2.0+"
depends="groff gzip less"
makedepends_host="db-dev libpipeline-dev zlib-dev"
subpackages="$pkgname-doc $pkgname-lang"
-options="!check" # requires //IGNORE in iconv
-source="http://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz
- man-db-2.8.3-iconv.patch"
triggers="man-db.trigger=/usr/share/man"
+source="https://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz
+ man-db-2.8.5-iconv.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,15 +32,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -r "${pkgdir}"/usr/lib/tmpfiles.d # systemd
}
-sha512sums="3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66 man-db-2.8.4.tar.xz
-4bc9efaafa30dedb6da9d2a62436cf570bef5603b98494ca3c565c3e338b57a481ed40af2312a20cd9f64f965fc0c45607403d829339700c57f9dc0022d7c6ed man-db-2.8.3-iconv.patch"
+sha512sums="8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69 man-db-2.8.5.tar.xz
+76a5b13d3018627cbc5a72cb51da3c78022245ad574c742699e7c4ab152ec2222ce7f34af5594de74b436dd23008af6c43739ee66973e049b07d82882e4965c6 man-db-2.8.5-iconv.patch"
diff --git a/system/man-db/man-db-2.8.3-iconv.patch b/system/man-db/man-db-2.8.5-iconv.patch
index 98f10cb2a..8c006fd9c 100644
--- a/system/man-db/man-db-2.8.3-iconv.patch
+++ b/system/man-db/man-db-2.8.5-iconv.patch
@@ -1,5 +1,5 @@
---- man-db-2.8.3/src/man.c 2018-06-18 22:44:35.672743065 -0500
-+++ man-db-2.8.3/src/man.c 2018-06-18 22:46:35.032624890 -0500
+--- man-db-2.8.5/src/man.c 2018-06-18 22:44:35.672743065 -0500
++++ man-db-2.8.5/src/man.c 2018-06-18 22:46:35.032624890 -0500
@@ -1569,15 +1569,13 @@
{
debug ("add_output_iconv: source %s, target %s\n", source, target);
@@ -9,7 +9,7 @@
iconv_cmd = pipecmd_new_args
- ("iconv", "-c", "-f", source, "-t", target_translit,
+ ("iconv", "-c", "-f", source, "-t", target,
- NULL);
+ (void *) 0);
pipecmd_pre_exec (iconv_cmd, sandbox_load, sandbox_free,
sandbox);
pipeline_command (p, iconv_cmd);
@@ -17,8 +17,8 @@
}
}
---- man-db-2.8.3/src/manconv.c
-+++ man-db-2.8.3/src/manconv.c
+--- man-db-2.8.5/src/manconv.c
++++ man-db-2.8.5/src/manconv.c
@@ -106,10 +106,9 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
static char *utf8 = NULL, *output = NULL;
size_t utf8left = 0;
@@ -33,32 +33,32 @@
int ret = 0;
debug ("trying encoding %s -> %s\n", try_from_code, try_to_code);
---- man-db-2.8.3/src/manconv_client.c
-+++ man-db-2.8.3/src/manconv_client.c
+--- man-db-2.8.5/src/manconv_client.c
++++ man-db-2.8.5/src/manconv_client.c
@@ -105,7 +105,7 @@ void add_manconv (pipeline *p, const char *source, const char *target)
codes->from[2] = NULL;
- name = appendstr (name, "UTF-8:", source, NULL);
+ name = appendstr (name, "UTF-8:", source, (void *) 0);
}
- codes->to = xasprintf ("%s//IGNORE", target);
+ codes->to = xstrdup (target);
/* informational only; no shell quoting concerns */
- name = appendstr (name, " -t ", codes->to, NULL);
+ name = appendstr (name, " -t ", codes->to, (void *) 0);
if (quiet >= 2)
---- man-db-2.8.3/src/manconv_main.c
-+++ man-db-2.8.3/src/manconv_main.c
-@@ -107,9 +107,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
+--- man-db-2.8.5/src/manconv_main.c
++++ man-db-2.8.5/src/manconv_main.c
+@@ -106,9 +106,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
return 0;
case 't':
to_code = xstrdup (arg);
- if (!strstr (to_code, "//"))
- to_code = appendstr (to_code, "//TRANSLIT",
-- NULL);
+- (void *) 0);
return 0;
case 'd':
debug_level = 1;
---- man-db-2.8.3/src/whatis.c
-+++ man-db-2.8.3/src/whatis.c
-@@ -968,7 +968,7 @@ int main (int argc, char *argv[])
+--- man-db-2.8.5/src/whatis.c
++++ man-db-2.8.5/src/whatis.c
+@@ -974,7 +974,7 @@ int main (int argc, char *argv[])
display_seen = hashtable_create (&null_hashtable_free);
#ifdef HAVE_ICONV
diff --git a/system/man-pages/APKBUILD b/system/man-pages/APKBUILD
index 20d15124c..9cb2a5396 100644
--- a/system/man-pages/APKBUILD
+++ b/system/man-pages/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=man-pages
-pkgver=4.16
+pkgver=5.00
_posixver=2013-a
-pkgrel=1
+pkgrel=0
pkgdesc="Linux man pages"
url="https://www.kernel.org/doc/man-pages/"
arch="noarch"
@@ -16,8 +16,6 @@ source="https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.xz
"
build() {
- cd "$builddir"
-
mkdir man0
for sect in 0 1 3; do
sed -i "/^\.so /s/man${sect}p/man$sect/" \
@@ -28,8 +26,6 @@ build() {
}
package() {
- cd "$builddir"
-
make prefix="$pkgdir"/usr install
find "$pkgdir"/usr/share/man -name "*.[0-9]" | xargs gzip -9
@@ -53,5 +49,5 @@ package() {
rm -f "$pkgdir"/usr/share/man/man1/localedef*
}
-sha512sums="df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c man-pages-4.16.tar.xz
+sha512sums="7ab44d5c8ed06696e7c463ec5118305fada7a6d284fc38d32e0771faa3ff12b74a8b696f9577481a0d1d2c7f1e5e78a21a72d80d2f34bd50955622b226b39fa2 man-pages-5.00.tar.xz
e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 man-pages-posix-2013-a.tar.xz"
diff --git a/system/mpc1/APKBUILD b/system/mpc1/APKBUILD
index 45f98238f..a0c516857 100644
--- a/system/mpc1/APKBUILD
+++ b/system/mpc1/APKBUILD
@@ -11,7 +11,7 @@ makedepends_host="gmp-dev mpfr-dev"
makedepends="$makedepends_host"
install=
subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnu.org/gnu/mpc/mpc-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/mpc/mpc-$pkgver.tar.gz"
builddir="$srcdir"/mpc-$pkgver
diff --git a/system/mpfr3/APKBUILD b/system/mpfr3/APKBUILD
index 851326216..0e490bcd2 100644
--- a/system/mpfr3/APKBUILD
+++ b/system/mpfr3/APKBUILD
@@ -11,7 +11,7 @@ depends_dev="gmp-dev"
makedepends_build="texinfo"
makedepends_host="gmp-dev"
makedepends="$makedepends_build $makedepends_host"
-source="http://www.mpfr.org/mpfr-$pkgver/mpfr-$pkgver.tar.xz"
+source="https://www.mpfr.org/mpfr-$pkgver/mpfr-$pkgver.tar.xz"
subpackages="$pkgname-doc mpfr-dev"
builddir="$srcdir/mpfr-$pkgver"
diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD
index bffa25154..0b6d3a959 100644
--- a/system/musl/APKBUILD
+++ b/system/musl/APKBUILD
@@ -3,7 +3,7 @@ pkgname=musl
pkgver=1.1.21
pkgrel=3
pkgdesc="System library (libc) implementation"
-url="http://www.musl-libc.org/"
+url="https://www.musl-libc.org/"
arch="all"
options="!check"
license="MIT"
@@ -21,7 +21,7 @@ nolibc) ;;
triggers="$pkgname-utils.trigger=/etc/ld.so.conf.d"
;;
esac
-source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
+source="https://www.musl-libc.org/releases/musl-$pkgver.tar.gz
amalgamation.patch
3001-make-real-lastlog-h.patch
handle-aux-at_base.patch
diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD
index bf0c907e8..9700b0491 100644
--- a/system/nspr/APKBUILD
+++ b/system/nspr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nspr
-pkgver=4.20
-pkgrel=1
+pkgver=4.21
+pkgrel=0
pkgdesc="Netscape Portable Runtime"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
arch="all"
@@ -12,13 +12,12 @@ depends=""
depends_dev="nspr"
makedepends="autoconf automake"
subpackages="$pkgname-dev"
-source="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz
+source="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz
fix-getproto.patch
stacksize.patch
"
prepare() {
- cd "$builddir"
mkdir build inst
default_prepare
}
@@ -61,6 +60,6 @@ package() {
"$pkgdir"/usr/include/nspr/md
}
-sha512sums="22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949 nspr-4.20.tar.gz
+sha512sums="4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c nspr-4.21.tar.gz
ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch
1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch"
diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD
index 806441d20..cd3dd5ab2 100644
--- a/system/nss/APKBUILD
+++ b/system/nss/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nss
-pkgver=3.39
+pkgver=3.42.1
_ver=${pkgver//./_}
pkgrel=0
pkgdesc="Mozilla Network Security Services"
@@ -13,14 +13,13 @@ depends=""
depends_dev="nspr-dev"
makedepends="nspr-dev sqlite-dev zlib-dev perl bsd-compat-headers"
subpackages="$pkgname-static $pkgname-dev $pkgname-tools"
-source="http://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${pkgver//./_}_RTM/src/$pkgname-$pkgver.tar.gz
+source="https://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${pkgver//./_}_RTM/src/$pkgname-$pkgver.tar.gz
nss.pc.in
nss-util.pc.in
nss-softokn.pc.in
nss-config.in
add_spi+cacert_ca_certs.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
prepare() {
default_prepare
@@ -31,7 +30,6 @@ prepare() {
}
build() {
- cd "$builddir"
unset CFLAGS
unset CXXFLAGS
export BUILD_OPT=1
@@ -51,10 +49,6 @@ build() {
}
package() {
- replaces="nss-dev libnss"
-
- cd "$builddir"
-
install -m755 -d "$pkgdir"/usr/lib/pkgconfig
install -m755 -d "$pkgdir"/usr/bin
install -m755 -d "$pkgdir"/usr/include/nss/private
@@ -147,7 +141,7 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f nss-3.39.tar.gz
+sha512sums="468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265 nss-3.42.1.tar.gz
75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in
0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in
09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index dac0cec8d..d48ee52f6 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
pkgname=openrc
pkgver=0.24.1
_ver=${pkgver/_git*/}
@@ -6,6 +6,7 @@ pkgrel=6
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="https://github.com/OpenRC/openrc"
arch="all"
+options="!check" # https://bugs.gentoo.org/575958
license="BSD-2-Clause"
depends="psmisc /sbin/init"
makedepends="bsd-compat-headers"
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD
index 145fc5c86..af1bc23f4 100644
--- a/system/openssh/APKBUILD
+++ b/system/openssh/APKBUILD
@@ -6,7 +6,7 @@ pkgver=7.9_p1
_myver=${pkgver%_*}${pkgver#*_}
pkgrel=2
pkgdesc="Port of OpenBSD's free SSH release"
-url="http://www.openssh.org/portable.html"
+url="https://www.openssh.com/portable.html"
arch="all"
license="BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause"
options="suid !check"
@@ -24,7 +24,7 @@ subpackages="$pkgname-doc
$pkgname-openrc
"
-source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
+source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
bsd-compatible-realpath.patch
CVE-2018-20685.patch
disable-forwarding-by-default.patch
diff --git a/system/openssl/0002-busybox-basename.patch b/system/openssl/0002-busybox-basename.patch
deleted file mode 100644
index 9bbc284f3..000000000
--- a/system/openssl/0002-busybox-basename.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c276ddc394dd402327603959271eac63a2e1ec1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 08:40:00 +0200
-Subject: [PATCH] busybox basename
-
----
- Makefile.org | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.org b/Makefile.org
-index b7a3f96..035fa83 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -649,7 +649,7 @@ install_docs:
- filecase=-i; \
- esac; \
- set -e; for i in doc/apps/*.pod; do \
-- fn=`basename $$i .pod`; \
-+ fn=`basename $$i .pod || true`; \
- sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- (cd `$(PERL) util/dirname.pl $$i`; \
-@@ -666,7 +666,7 @@ install_docs:
- done); \
- done; \
- set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
-- fn=`basename $$i .pod`; \
-+ fn=`basename $$i .pod || true`; \
- sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- (cd `$(PERL) util/dirname.pl $$i`; \
---
-2.2.2
-
diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD
index 7aeb36b7b..6763620d7 100644
--- a/system/openssl/APKBUILD
+++ b/system/openssl/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=openssl
-pkgver=1.0.2p
+pkgver=1.0.2r
pkgrel=0
pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
url="https://www.openssl.org/"
@@ -16,8 +16,7 @@ checkdepends="perl"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.0:libcrypto
libssl1.0:libssl"
-source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
- 0002-busybox-basename.patch
+source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
0003-use-termios.patch
0004-fix-default-ca-path-for-apps.patch
0005-fix-parallel-build.patch
@@ -63,6 +62,10 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
# - CVE-2018-0739
# - CVE-2018-0737
# - CVE-2018-0732
+# 1.0.2r-r0:
+# - CVE-2018-0734
+# - CVE-2018-5407
+# - CVE-2019-1559
builddir="$srcdir"/$pkgname-$pkgver
@@ -141,8 +144,7 @@ dev() {
default_dev
}
-sha512sums="958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 openssl-1.0.2p.tar.gz
-2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c 0002-busybox-basename.patch
+sha512sums="6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235 openssl-1.0.2r.tar.gz
58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch
c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch
5d4191482f8bbf62c75fe6bc2d9587388022c3310703c2a913788a983b1d1406e706cf3916a5792604f0b0f220a87432d3b82b442cea9915f2abb6fdd8478fcb 0005-fix-parallel-build.patch
diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD
index d5a18131c..ff9eb6c76 100644
--- a/system/parted/APKBUILD
+++ b/system/parted/APKBUILD
@@ -4,9 +4,8 @@ pkgname=parted
pkgver=3.2
pkgrel=8
pkgdesc="Utility to create, destroy, resize, check and copy partitions"
-url="http://www.gnu.org/software/parted/parted.html"
+url="https://www.gnu.org/software/parted/parted.html"
arch="all"
-options="!checkroot"
license="GPL-3.0+"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends=
@@ -21,13 +20,11 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
"
prepare() {
- cd "$builddir"
default_prepare
autoreconf
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -41,12 +38,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD
index 808152cf2..175bb7a67 100644
--- a/system/patch/APKBUILD
+++ b/system/patch/APKBUILD
@@ -11,7 +11,7 @@ makedepends=""
checkdepends="bash ed"
install=""
subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
CVE-2018-6951.patch
allow-missing.patch
CVE-2018-1000156.patch
diff --git a/system/pax-utils/APKBUILD b/system/pax-utils/APKBUILD
index c239da2bf..e3f4e7601 100644
--- a/system/pax-utils/APKBUILD
+++ b/system/pax-utils/APKBUILD
@@ -12,7 +12,7 @@ depends="scanelf"
makedepends_build=""
makedepends_host="linux-headers libcap-dev"
makedepends="$makedepends_build $makedepends_host"
-source="http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz
+source="https://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz
fix-eitype.patch"
subpackages="$pkgname-doc scanelf:_scanelf"
diff --git a/system/perl-authen-sasl/APKBUILD b/system/perl-authen-sasl/APKBUILD
index ad6f196ca..b894d9dee 100644
--- a/system/perl-authen-sasl/APKBUILD
+++ b/system/perl-authen-sasl/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-digest-hmac"
makedepends="perl-dev perl-module-install"
install=
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Authen-SASL-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Authen-SASL-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
build() {
diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD
index 3792720b6..6caa3779d 100644
--- a/system/perl-cpanel-json-xs/APKBUILD
+++ b/system/perl-cpanel-json-xs/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends="perl-json perl-test-leaktrace"
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD
index 066b7b4b8..4e41bd18f 100644
--- a/system/perl-dbd-sqlite/APKBUILD
+++ b/system/perl-dbd-sqlite/APKBUILD
@@ -10,7 +10,7 @@ arch="all"
license="GPL-2.0-only OR Artistic-1.0-Perl"
depends="perl-dbi"
makedepends="perl perl-dev sqlite-dev"
-source="http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/${_pkgname}-$pkgver.tar.gz
+source="https://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/${_pkgname}-$pkgver.tar.gz
perl-DBD-SQLite-bz543982.patch
"
subpackages="$pkgname-dev $pkgname-doc"
diff --git a/system/perl-dbi/APKBUILD b/system/perl-dbi/APKBUILD
index 0b54d1d49..39f2718f5 100644
--- a/system/perl-dbi/APKBUILD
+++ b/system/perl-dbi/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0-only OR Artistic-1.0-Perl"
depends=
makedepends="perl perl-dev"
subpackages="$pkgname-doc"
-source="http://www.cpan.org/authors/id/T/TI/TIMB/${_realpkgname}-$pkgver.tar.gz"
+source="https://www.cpan.org/authors/id/T/TI/TIMB/${_realpkgname}-$pkgver.tar.gz"
builddir="$srcdir"/${_realpkgname}-$pkgver
build() {
diff --git a/system/perl-digest-hmac/APKBUILD b/system/perl-digest-hmac/APKBUILD
index 3bca43d37..411445654 100644
--- a/system/perl-digest-hmac/APKBUILD
+++ b/system/perl-digest-hmac/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-digest-sha1"
makedepends="perl-dev"
install=
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
builddir="$srcdir"/$_realname-$pkgver
build() {
diff --git a/system/perl-digest-sha1/APKBUILD b/system/perl-digest-sha1/APKBUILD
index a9f19e206..9d4155ce1 100644
--- a/system/perl-digest-sha1/APKBUILD
+++ b/system/perl-digest-sha1/APKBUILD
@@ -12,7 +12,7 @@ depends="perl"
makedepends="perl-dev"
install=
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz
perl-digest-sha1-check-object.patch
"
builddir="$srcdir/$_realname-$pkgver"
diff --git a/system/perl-encode-locale/APKBUILD b/system/perl-encode-locale/APKBUILD
index a4dccf27c..0bcfd0c88 100644
--- a/system/perl-encode-locale/APKBUILD
+++ b/system/perl-encode-locale/APKBUILD
@@ -12,7 +12,7 @@ depends="perl"
makedepends="perl-dev"
install=
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
diff --git a/system/perl-error/APKBUILD b/system/perl-error/APKBUILD
index 935dd46c8..5fe1529d4 100644
--- a/system/perl-error/APKBUILD
+++ b/system/perl-error/APKBUILD
@@ -11,7 +11,7 @@ depends="perl"
makedepends="perl-dev"
install=
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_realname-$pkgver.tar.gz"
builddir="$srcdir"/$_realname-$pkgver
prepare() {
diff --git a/system/perl-extutils-config/APKBUILD b/system/perl-extutils-config/APKBUILD
index 2c42337c2..7c0f1978b 100644
--- a/system/perl-extutils-config/APKBUILD
+++ b/system/perl-extutils-config/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-extutils-helpers/APKBUILD b/system/perl-extutils-helpers/APKBUILD
index 310875cf2..4070b7137 100644
--- a/system/perl-extutils-helpers/APKBUILD
+++ b/system/perl-extutils-helpers/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-extutils-installpaths/APKBUILD b/system/perl-extutils-installpaths/APKBUILD
index 57d3ba2e5..df8d7dcf0 100644
--- a/system/perl-extutils-installpaths/APKBUILD
+++ b/system/perl-extutils-installpaths/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-file-listing/APKBUILD b/system/perl-file-listing/APKBUILD
index 89464b395..db9ea786a 100644
--- a/system/perl-file-listing/APKBUILD
+++ b/system/perl-file-listing/APKBUILD
@@ -12,7 +12,7 @@ makedepends="perl-dev"
install=""
replaces="perl-libwww"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-$pkgver.tar.gz"
builddir="$srcdir"/File-Listing-$pkgver
diff --git a/system/perl-file-remove/APKBUILD b/system/perl-file-remove/APKBUILD
index 6f626bd08..43ea8ff9a 100644
--- a/system/perl-file-remove/APKBUILD
+++ b/system/perl-file-remove/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-html-parser/APKBUILD b/system/perl-html-parser/APKBUILD
index 60aede3a0..227948e5c 100644
--- a/system/perl-html-parser/APKBUILD
+++ b/system/perl-html-parser/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=" "
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-html-tagset/APKBUILD b/system/perl-html-tagset/APKBUILD
index 0427a8a5e..9fe51281f 100644
--- a/system/perl-html-tagset/APKBUILD
+++ b/system/perl-html-tagset/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-http-cookies/APKBUILD b/system/perl-http-cookies/APKBUILD
index f6b751771..5515f1057 100644
--- a/system/perl-http-cookies/APKBUILD
+++ b/system/perl-http-cookies/APKBUILD
@@ -12,7 +12,7 @@ depends="perl perl-http-date perl-http-message"
makedepends="perl-dev"
replaces="perl-libwww"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
diff --git a/system/perl-http-daemon/APKBUILD b/system/perl-http-daemon/APKBUILD
index b85717256..835404dd1 100644
--- a/system/perl-http-daemon/APKBUILD
+++ b/system/perl-http-daemon/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-http-date perl-http-message"
makedepends="perl-dev"
replaces="perl-libwww"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-$pkgver.tar.gz"
builddir="$srcdir"/HTTP-Daemon-$pkgver
build() {
diff --git a/system/perl-http-date/APKBUILD b/system/perl-http-date/APKBUILD
index b4a3f7829..4cfb54549 100644
--- a/system/perl-http-date/APKBUILD
+++ b/system/perl-http-date/APKBUILD
@@ -13,7 +13,7 @@ makedepends="perl-dev"
replaces="perl-libwww"
install=
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD
index 26fae9ff0..0cc720442 100644
--- a/system/perl-http-message/APKBUILD
+++ b/system/perl-http-message/APKBUILD
@@ -15,7 +15,7 @@ depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
checkdepends="perl-try-tiny"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-http-negotiate/APKBUILD b/system/perl-http-negotiate/APKBUILD
index 98ebfb1da..f0cc5d77c 100644
--- a/system/perl-http-negotiate/APKBUILD
+++ b/system/perl-http-negotiate/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-http-message"
makedepends="perl-dev"
install=""
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Negotiate-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Negotiate-$pkgver.tar.gz"
builddir="$srcdir"/HTTP-Negotiate-$pkgver
build() {
diff --git a/system/perl-io-html/APKBUILD b/system/perl-io-html/APKBUILD
index b5e2c6c6e..7d32a8dbd 100644
--- a/system/perl-io-html/APKBUILD
+++ b/system/perl-io-html/APKBUILD
@@ -13,7 +13,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/C/CJ/CJM/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/C/CJ/CJM/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-io-socket-ssl/APKBUILD b/system/perl-io-socket-ssl/APKBUILD
index 939f97174..225ffb38d 100644
--- a/system/perl-io-socket-ssl/APKBUILD
+++ b/system/perl-io-socket-ssl/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0-only OR Artistic-1.0-Perl"
depends="ca-certificates perl-net-libidn perl-net-ssleay"
makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/S/SU/SULLR/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-json-maybexs/APKBUILD b/system/perl-json-maybexs/APKBUILD
index cbea4a6d2..92a37e687 100644
--- a/system/perl-json-maybexs/APKBUILD
+++ b/system/perl-json-maybexs/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends="perl-test-without-module"
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/H/HA/HAARG/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/H/HA/HAARG/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD
index 68819a602..1c5f62674 100644
--- a/system/perl-json/APKBUILD
+++ b/system/perl-json/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
license="GPL-2.0-only OR Artistic-1.0-Perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-lwp-mediatypes/APKBUILD b/system/perl-lwp-mediatypes/APKBUILD
index 51778d258..6b4868091 100644
--- a/system/perl-lwp-mediatypes/APKBUILD
+++ b/system/perl-lwp-mediatypes/APKBUILD
@@ -13,7 +13,7 @@ makedepends="perl-dev"
install=
replaces="perl-libwww"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
build() {
diff --git a/system/perl-module-build-tiny/APKBUILD b/system/perl-module-build-tiny/APKBUILD
index 05d2e73da..765e79051 100644
--- a/system/perl-module-build-tiny/APKBUILD
+++ b/system/perl-module-build-tiny/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD
index ddc802076..6a13e68e3 100644
--- a/system/perl-module-build/APKBUILD
+++ b/system/perl-module-build/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-module-install/APKBUILD b/system/perl-module-install/APKBUILD
index 38b38df74..b610f057c 100644
--- a/system/perl-module-install/APKBUILD
+++ b/system/perl-module-install/APKBUILD
@@ -13,7 +13,7 @@ cpanmakedepends="perl-file-remove perl-module-build perl-module-scandeps perl-ya
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD
index e94e31579..e9940d7cb 100644
--- a/system/perl-module-scandeps/APKBUILD
+++ b/system/perl-module-scandeps/APKBUILD
@@ -12,7 +12,7 @@ license="GPL-2.0-only OR Artistic-1.0-Perl"
cpanmakedepends="perl-test-requires"
makedepends="perl-dev $cpanmakedepends perl-test-pod"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/R/RS/RSCHUPP/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/R/RS/RSCHUPP/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-net-http/APKBUILD b/system/perl-net-http/APKBUILD
index 879c5f966..435372b19 100644
--- a/system/perl-net-http/APKBUILD
+++ b/system/perl-net-http/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-uri"
makedepends="perl-dev"
replaces="perl-libwww"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz"
builddir="$srcdir"/Net-HTTP-$pkgver
build() {
diff --git a/system/perl-net-libidn/APKBUILD b/system/perl-net-libidn/APKBUILD
index d8bac5b15..147252aa3 100644
--- a/system/perl-net-libidn/APKBUILD
+++ b/system/perl-net-libidn/APKBUILD
@@ -5,13 +5,13 @@ _realname=Net-LibIDN
pkgver=0.12
pkgrel=4
pkgdesc="Perl bindings for libidn"
-url="http://www.net-dns.org/"
+url="https://www.net-dns.org/"
arch="all"
license="GPL-2.0-only OR Artistic-1.0-Perl"
depends="perl"
makedepends="libidn-dev perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/T/TH/THOR/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/T/TH/THOR/$_realname-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
build() {
diff --git a/system/perl-net-smtp-ssl/APKBUILD b/system/perl-net-smtp-ssl/APKBUILD
index 05e7f7a05..3be9c4aef 100644
--- a/system/perl-net-smtp-ssl/APKBUILD
+++ b/system/perl-net-smtp-ssl/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD
index f39c464b7..ae01038ca 100644
--- a/system/perl-net-ssleay/APKBUILD
+++ b/system/perl-net-ssleay/APKBUILD
@@ -12,7 +12,7 @@ depends="perl"
makedepends="perl-dev openssl-dev zlib-dev"
checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
build() {
diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD
index 110fdbd99..1874fb094 100644
--- a/system/perl-sgmls/APKBUILD
+++ b/system/perl-sgmls/APKBUILD
@@ -10,7 +10,6 @@ license="GPL-2.0-only"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/R/RA/RAAB/SGMLSpm-$pkgver.tar.gz"
-sha512sums="0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc SGMLSpm-1.1.tar.gz"
builddir="$srcdir/SGMLSpm-$pkgver"
prepare() {
@@ -36,3 +35,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
+sha512sums="0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc SGMLSpm-1.1.tar.gz"
diff --git a/system/perl-sub-uplevel/APKBUILD b/system/perl-sub-uplevel/APKBUILD
index 035f67670..6c3954811 100644
--- a/system/perl-sub-uplevel/APKBUILD
+++ b/system/perl-sub-uplevel/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0-only OR Artistic-1.0-Perl"
depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_realname-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_realname-$pkgver.tar.gz"
builddir="$srcdir/$_realname-$pkgver"
build() {
diff --git a/system/perl-test-exception/APKBUILD b/system/perl-test-exception/APKBUILD
index 4c1acf79c..a02e25ed0 100644
--- a/system/perl-test-exception/APKBUILD
+++ b/system/perl-test-exception/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD
index f9c0bbfd5..f767bfb56 100644
--- a/system/perl-test-fatal/APKBUILD
+++ b/system/perl-test-fatal/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-test-harness/APKBUILD b/system/perl-test-harness/APKBUILD
index 082ee0e68..4bc0b88a5 100644
--- a/system/perl-test-harness/APKBUILD
+++ b/system/perl-test-harness/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc $pkgname-utils"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-test-leaktrace/APKBUILD b/system/perl-test-leaktrace/APKBUILD
index 5ba02bf89..36a7c4294 100644
--- a/system/perl-test-leaktrace/APKBUILD
+++ b/system/perl-test-leaktrace/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/$_pkgreal-$pkgver.tar.gz
+source="https://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/$_pkgreal-$pkgver.tar.gz
"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-test-nowarnings/APKBUILD b/system/perl-test-nowarnings/APKBUILD
index f8ab7e3d2..283bdde62 100644
--- a/system/perl-test-nowarnings/APKBUILD
+++ b/system/perl-test-nowarnings/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-test-simple"
makedepends="perl-dev"
install=""
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-NoWarnings-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-NoWarnings-$pkgver.tar.gz"
builddir="$srcdir"/Test-NoWarnings-$pkgver
build() {
diff --git a/system/perl-test-pod/APKBUILD b/system/perl-test-pod/APKBUILD
index e2c3ae3c3..9385c2c1c 100644
--- a/system/perl-test-pod/APKBUILD
+++ b/system/perl-test-pod/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-test-requires/APKBUILD b/system/perl-test-requires/APKBUILD
index a849fab33..a352f8aed 100644
--- a/system/perl-test-requires/APKBUILD
+++ b/system/perl-test-requires/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-test-requiresinternet/APKBUILD b/system/perl-test-requiresinternet/APKBUILD
index 6a7dea85e..4121966e5 100644
--- a/system/perl-test-requiresinternet/APKBUILD
+++ b/system/perl-test-requiresinternet/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
license="GPL-2.0-only OR Artistic-1.0-Perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/M/MA/MALLEN/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/M/MA/MALLEN/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD
index ac80247c5..dce6203e2 100644
--- a/system/perl-test-simple/APKBUILD
+++ b/system/perl-test-simple/APKBUILD
@@ -13,7 +13,7 @@ provides="perl-test-tester"
depends=""
makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-test-warn/APKBUILD b/system/perl-test-warn/APKBUILD
index 0ae630515..30fab337c 100644
--- a/system/perl-test-warn/APKBUILD
+++ b/system/perl-test-warn/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/B/BI/BIGJ/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/B/BI/BIGJ/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl-test-without-module/APKBUILD b/system/perl-test-without-module/APKBUILD
index ce250cbbe..b39692dc2 100644
--- a/system/perl-test-without-module/APKBUILD
+++ b/system/perl-test-without-module/APKBUILD
@@ -10,7 +10,7 @@ arch="noarch"
license="GPL-2.0-only OR Artistic-1.0-Perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/C/CO/CORION/Test-Without-Module-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/C/CO/CORION/Test-Without-Module-$pkgver.tar.gz"
builddir="$srcdir"/$_pkgreal-$pkgver
build() {
diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD
index 957139162..0ce6d0cfb 100644
--- a/system/perl-try-tiny/APKBUILD
+++ b/system/perl-try-tiny/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends=""
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD
index cea969562..5d7d91ea3 100644
--- a/system/perl-unicode-linebreak/APKBUILD
+++ b/system/perl-unicode-linebreak/APKBUILD
@@ -12,8 +12,8 @@ depends="perl perl-mime-charset"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-$pkgver.tar.gz
- ftp://unicode.org/Public/$_univer/ucd/auxiliary/GraphemeBreakTest.txt
- ftp://unicode.org/Public/$_univer/ucd/auxiliary/LineBreakTest.txt"
+ https://www.unicode.org/Public/$_univer/ucd/auxiliary/GraphemeBreakTest.txt
+ https://www.unicode.org/Public/$_univer/ucd/auxiliary/LineBreakTest.txt"
builddir="$srcdir/Unicode-LineBreak-$pkgver"
prepare() {
diff --git a/system/perl-www-robotrules/APKBUILD b/system/perl-www-robotrules/APKBUILD
index dba5d1b34..9911f3670 100644
--- a/system/perl-www-robotrules/APKBUILD
+++ b/system/perl-www-robotrules/APKBUILD
@@ -11,7 +11,7 @@ depends="perl perl-uri"
makedepends="perl-dev"
replaces="perl-libwww"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz"
builddir="$srcdir"/WWW-RobotRules-$pkgver
build() {
diff --git a/system/perl-yaml-tiny/APKBUILD b/system/perl-yaml-tiny/APKBUILD
index 466fcbe98..4570c5fb0 100644
--- a/system/perl-yaml-tiny/APKBUILD
+++ b/system/perl-yaml-tiny/APKBUILD
@@ -14,7 +14,7 @@ cpanmakedepends="perl-json-maybexs"
depends="$cpandepends"
makedepends="perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index be47ade30..b16bdfa56 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -7,7 +7,7 @@ pkgname=perl
pkgver=5.26.3
pkgrel=0
pkgdesc="Larry Wall's Practical Extraction and Report Language"
-url="http://www.perl.org/"
+url="https://www.perl.org/"
arch="all"
license="Artistic-1.0-Perl GPL-2.0"
# remove !check when tests pass.
@@ -15,7 +15,7 @@ options="!check !fhs"
depends=""
makedepends="bzip2-dev zlib-dev"
subpackages="$pkgname-doc $pkgname-dev"
-source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
+source="https://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
"
# secfixes:
diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD
index 79f4b3819..777af1613 100644
--- a/system/pkgconf/APKBUILD
+++ b/system/pkgconf/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pkgconf
-pkgver=1.5.4
+pkgver=1.6.0
pkgrel=0
-pkgdesc="development framework configuration tools"
+pkgdesc="Toolkit for maintaining development package metadata"
url="https://git.dereferenced.org/pkgconf/pkgconf/"
arch="all"
license="ISC"
@@ -10,10 +10,11 @@ replaces="pkgconfig"
provides="pkgconfig=1"
subpackages="$pkgname-doc $pkgname-dev"
checkdepends="kyua atf"
-source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
+source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz
+ personality.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,13 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
ln -s pkgconf "$pkgdir"/usr/bin/pkg-config
}
@@ -49,4 +47,5 @@ dev() {
mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/
}
-sha512sums="795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93 pkgconf-1.5.4.tar.xz"
+sha512sums="eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda pkgconf-1.6.0.tar.xz
+94d7749fa5d751f9207c9f6168dcce52bbe6108e9440721a640b6bc3492867c3fce5231d779a780a611009f1c1ad65bc9db8e81452c059f7b34b97314b38844a personality.patch"
diff --git a/system/pkgconf/personality.patch b/system/pkgconf/personality.patch
new file mode 100644
index 000000000..e7ff9ad9a
--- /dev/null
+++ b/system/pkgconf/personality.patch
@@ -0,0 +1,55 @@
+From d926e75b345a6948e4e976828d3331cd7f0db660 Mon Sep 17 00:00:00 2001
+From: Emil Renner Berthing <esmil@mailme.dk>
+Date: Wed, 6 Mar 2019 16:03:32 +0100
+Subject: [PATCH] main: fix personalities when argv[0] contains path
+
+---
+ cli/main.c | 31 ++++++++++++++++++++-----------
+ 1 file changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/cli/main.c b/cli/main.c
+index b52cc85..caa2525 100644
+--- a/cli/main.c
++++ b/cli/main.c
+@@ -740,21 +740,30 @@ dump_personality(const pkgconf_cross_personality_t *p)
+ static pkgconf_cross_personality_t *
+ deduce_personality(char *argv[])
+ {
+- char *workbuf = strdup(argv[0]), *i;
+- pkgconf_cross_personality_t *out = pkgconf_cross_personality_default(), *deduced;
++ const char *argv0 = argv[0];
++ char *i, *prefix;
++ pkgconf_cross_personality_t *out;
++
++ i = strrchr(argv0, '/');
++ if (i != NULL)
++ argv0 = i + 1;
++
++#if defined(_WIN32) || defined(_WIN64)
++ i = strrchr(argv0, '\\');
++ if (i != NULL)
++ argv0 = i + 1;
++#endif
+
+- i = strstr(workbuf, "-pkg");
++ i = strstr(argv0, "-pkg");
+ if (i == NULL)
+- goto finish;
+-
+- *i = 0;
++ return pkgconf_cross_personality_default();
+
+- deduced = pkgconf_cross_personality_find(workbuf);
+- if (deduced != NULL)
+- out = deduced;
++ prefix = strndup(argv0, i - argv0);
++ out = pkgconf_cross_personality_find(prefix);
++ free(prefix);
++ if (out == NULL)
++ return pkgconf_cross_personality_default();
+
+-finish:
+- free(workbuf);
+ return out;
+ }
+
diff --git a/system/po4a/APKBUILD b/system/po4a/APKBUILD
index 7ba0d5b11..c3bcce336 100644
--- a/system/po4a/APKBUILD
+++ b/system/po4a/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Christian Kampka <christian@kampka.net>
# Maintainer:
pkgname=po4a
-pkgver=0.54
+pkgver=0.55
pkgrel=0
pkgdesc="Tools for helping translation of documentation"
url="https://po4a.org"
@@ -14,21 +14,18 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://github.com/mquinson/po4a/releases/download/v$pkgver/po4a-$pkgver.tar.gz"
build() {
- cd "$builddir"
perl Build.PL installdirs=vendor create_packlist=0
perl Build
}
check() {
- cd "$builddir"
perl Build test
}
package() {
- cd "$builddir"
perl Build destdir=${pkgdir} install
# remove perllocal.pod and .packlist
find ${pkgdir} -name .packlist -o -name perllocal.pod -delete
}
-sha512sums="5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130 po4a-0.54.tar.gz"
+sha512sums="95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599 po4a-0.55.tar.gz"
diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index db6326d40..abfc78b55 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -5,7 +5,7 @@ pkgver=3.6.5
_basever="${pkgver%.*}"
pkgrel=0
pkgdesc="A high-level scripting language"
-url="http://www.python.org"
+url="https://www.python.org"
arch="all"
license="Python-2.0"
provides="py3-pip"
@@ -37,7 +37,7 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-tests::noarch
# Packages Are Actually Buildable.
makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev xz-dev
sqlite-dev libffi-dev tcl-dev linux-headers !python3"
-source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
+source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
musl-find_library.patch
fix-xattrs-glibc.patch
"
@@ -46,7 +46,6 @@ builddir="$srcdir/Python-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
# force system libs
rm -r Modules/expat \
Modules/zlib \
@@ -55,8 +54,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
# --enable-optimizations is not enabled because it
# is very, very slow as many tests are ran sequentially
# for profile guided optimizations. additionally it
@@ -83,8 +80,6 @@ build() {
}
check() {
- cd "$builddir"
-
# test that we reach recursionlimit before we segfault
cat > test-stacksize.py <<-EOF
import threading
@@ -130,7 +125,6 @@ EOF
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" EXTRA_CFLAGS="$CFLAGS" install maninstall
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
# those are provided by python3-tkinter
@@ -148,7 +142,7 @@ dev() {
}
tests() {
- pkgdesc="The test modules from the main python package"
+ pkgdesc="Test modules from the main Python package"
cd "$pkgdir"/usr/lib/python$_basever
local i; for i in */test */tests; do
diff --git a/system/rhash/APKBUILD b/system/rhash/APKBUILD
index 60f016aae..4f30a7845 100644
--- a/system/rhash/APKBUILD
+++ b/system/rhash/APKBUILD
@@ -1,19 +1,18 @@
# Contributor: Przemyslaw Pawelczyk <przemoc@zoho.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=rhash
-pkgver=1.3.6
+pkgver=1.3.8
pkgrel=0
pkgdesc="Utility for calculation and verification of hash sums and magnet links"
-url="http://rhash.anz.ru/"
+url="http://rhash.sourceforge.net/"
arch="all"
license="MIT"
makedepends="openssl-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-lang $pkgname-libs"
-source="$pkgname-$pkgver.tar.gz::http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.gz"
builddir="$srcdir/RHash-$pkgver"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -24,14 +23,11 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install install-gmo install-lib-so-link install-man
- make DESTDIR="$pkgdir" -C librhash install-headers
+ make DESTDIR="$pkgdir" install install-gmo install-lib-headers install-lib-so-link install-man
}
-sha512sums="54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6 rhash-1.3.6.tar.gz"
+sha512sums="9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1 rhash-1.3.8.tar.gz"
diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD
index c4d57a19c..09b1d6515 100644
--- a/system/rsync/APKBUILD
+++ b/system/rsync/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="A file transfer program to keep remote files in sync"
url="https://rsync.samba.org/"
arch="all"
license="GPL-3.0+"
-options="!checkroot"
makedepends="perl acl-dev attr-dev popt-dev"
subpackages="$pkgname-doc $pkgname-openrc rrsync::noarch"
source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
@@ -16,10 +15,8 @@ source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
rsyncd.conf
rsyncd.logrotate
"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
# Force IPv6 enabled, upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
CFLAGS="$CFLAGS -DINET6" \
./configure \
@@ -35,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m 755 "$srcdir"/rsyncd.initd "$pkgdir"/etc/init.d/rsyncd
@@ -54,8 +49,7 @@ rrsync() {
pkgdesc="Restricted rsync, restricts rsync to a subdir declared in .ssh/authorized_keys"
depends="rsync perl"
- cd "$builddir"
- install -D -m 755 ./support/rrsync "$subpkgdir"/usr/bin/rrsync
+ install -D -m 755 "$builddir"/support/rrsync "$subpkgdir"/usr/bin/rrsync
}
sha512sums="8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 rsync-3.1.3.tar.gz
diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD
index 1ed293793..7f949cc04 100644
--- a/system/ruby/APKBUILD
+++ b/system/ruby/APKBUILD
@@ -24,13 +24,20 @@
# 2.5.3-r0:
# - CVE-2018-16395
# - CVE-2018-16396
+# 2.5.3-r2:
+# - CVE-2019-8320
+# - CVE-2019-8321
+# - CVE-2019-8322
+# - CVE-2019-8323
+# - CVE-2019-8324
+# - CVE-2019-8325
#
pkgname=ruby
pkgver=2.5.3
_abiver="${pkgver%.*}.0"
-pkgrel=1
+pkgrel=2
pkgdesc="An object-oriented language for quick and easy programming"
-url="http://www.ruby-lang.org/"
+url="https://www.ruby-lang.org/"
arch="all"
license="Ruby AND BSD-2-Clause"
depends="ca-certificates"
@@ -61,7 +68,9 @@ subpackages="$pkgname-doc $pkgname-dev
source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.xz
rubygems-avoid-platform-specific-gems.patch
test_insns-lower-recursion-depth.patch
- fix-get_main_stack.patch"
+ fix-get_main_stack.patch
+ ruby-2.5.3-rubygems-v2.patch
+ "
replaces="ruby-gems"
_gemdir="/usr/lib/ruby/gems/$_abiver"
@@ -83,14 +92,10 @@ done
prepare() {
default_prepare
-
- cd "$builddir"
autoconf
}
build() {
- cd "$builddir"
-
# -fomit-frame-pointer makes ruby segfault, see gentoo bug #150413
# In many places aliasing rules are broken; play it safe
# as it's risky with newer compilers to leave it as it is.
@@ -111,7 +116,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --with-sitedir='/usr/local/lib/site_ruby' \
+ --with-sitedir="/usr/local/lib/site_ruby" \
--with-search-path="/usr/lib/site_ruby/\$(ruby_ver)/$_arch-linux" \
--enable-pthread \
--disable-rpath \
@@ -121,13 +126,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
install -m 644 -D COPYING \
@@ -317,4 +319,5 @@ _mvgem() {
sha512sums="6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518 ruby-2.5.3.tar.xz
cfdc5ea3b2e2ea69c51f38e8e2180cb1dc27008ca55cc6301f142ebafdbab31c3379b3b6bba9ff543153876dd98ed2ad194df3255b7ea77a62e931c935f80538 rubygems-avoid-platform-specific-gems.patch
814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch
-8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81 fix-get_main_stack.patch"
+8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81 fix-get_main_stack.patch
+4f374a8bce1f5137e155d79aa06086d25c3be45f90d8dbebc9f4ee2fb71dd5fe4a3bc1f7b922e784cbb9054f575155c1ad921062b762eb372306dabe9ff7951e ruby-2.5.3-rubygems-v2.patch"
diff --git a/system/ruby/ruby-2.5.3-rubygems-v2.patch b/system/ruby/ruby-2.5.3-rubygems-v2.patch
new file mode 100644
index 000000000..cf2b2c7f1
--- /dev/null
+++ b/system/ruby/ruby-2.5.3-rubygems-v2.patch
@@ -0,0 +1,408 @@
+diff --git lib/rubygems.rb lib/rubygems.rb
+index 2762bfcb88..cd7434ca87 100644
+--- a/lib/rubygems.rb
++++ b/lib/rubygems.rb
+@@ -10,7 +10,7 @@
+ require 'thread'
+
+ module Gem
+- VERSION = "2.7.6"
++ VERSION = "2.7.6.1"
+ end
+
+ # Must be first since it unloads the prelude from 1.9.2
+diff --git lib/rubygems/command_manager.rb lib/rubygems/command_manager.rb
+index 887272378e..3bee1c30a4 100644
+--- a/lib/rubygems/command_manager.rb
++++ b/lib/rubygems/command_manager.rb
+@@ -7,6 +7,7 @@
+
+ require 'rubygems/command'
+ require 'rubygems/user_interaction'
++require 'rubygems/text'
+
+ ##
+ # The command manager registers and installs all the individual sub-commands
+@@ -32,6 +33,7 @@
+
+ class Gem::CommandManager
+
++ include Gem::Text
+ include Gem::UserInteraction
+
+ BUILTIN_COMMANDS = [ # :nodoc:
+@@ -140,12 +142,12 @@ def command_names
+ def run(args, build_args=nil)
+ process_args(args, build_args)
+ rescue StandardError, Timeout::Error => ex
+- alert_error "While executing gem ... (#{ex.class})\n #{ex}"
++ alert_error clean_text("While executing gem ... (#{ex.class})\n #{ex}")
+ ui.backtrace ex
+
+ terminate_interaction(1)
+ rescue Interrupt
+- alert_error "Interrupted"
++ alert_error clean_text("Interrupted")
+ terminate_interaction(1)
+ end
+
+@@ -163,7 +165,7 @@ def process_args(args, build_args=nil)
+ say Gem::VERSION
+ terminate_interaction 0
+ when /^-/ then
+- alert_error "Invalid option: #{args.first}. See 'gem --help'."
++ alert_error clean_text("Invalid option: #{args.first}. See 'gem --help'.")
+ terminate_interaction 1
+ else
+ cmd_name = args.shift.downcase
+@@ -212,7 +214,7 @@ def load_and_instantiate(command_name)
+ rescue Exception => e
+ e = load_error if load_error
+
+- alert_error "Loading command: #{command_name} (#{e.class})\n\t#{e}"
++ alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}")
+ ui.backtrace e
+ end
+ end
+diff --git lib/rubygems/commands/owner_command.rb lib/rubygems/commands/owner_command.rb
+index 637b5bdc4d..cac6c5a17d 100644
+--- a/lib/rubygems/commands/owner_command.rb
++++ b/lib/rubygems/commands/owner_command.rb
+@@ -2,8 +2,11 @@
+ require 'rubygems/command'
+ require 'rubygems/local_remote_options'
+ require 'rubygems/gemcutter_utilities'
++require 'rubygems/text'
+
+ class Gem::Commands::OwnerCommand < Gem::Command
++
++ include Gem::Text
+ include Gem::LocalRemoteOptions
+ include Gem::GemcutterUtilities
+
+@@ -64,7 +67,7 @@ def show_owners name
+ end
+
+ with_response response do |resp|
+- owners = Gem::SafeYAML.load resp.body
++ owners = Gem::SafeYAML.load clean_text(resp.body)
+
+ say "Owners for gem: #{name}"
+ owners.each do |owner|
+diff --git lib/rubygems/gemcutter_utilities.rb lib/rubygems/gemcutter_utilities.rb
+index 7c6d6bb364..623d9301b5 100644
+--- a/lib/rubygems/gemcutter_utilities.rb
++++ b/lib/rubygems/gemcutter_utilities.rb
+@@ -1,11 +1,14 @@
+ # frozen_string_literal: true
+ require 'rubygems/remote_fetcher'
++require 'rubygems/text'
+
+ ##
+ # Utility methods for using the RubyGems API.
+
+ module Gem::GemcutterUtilities
+
++ include Gem::Text
++
+ # TODO: move to Gem::Command
+ OptionParser.accept Symbol do |value|
+ value.to_sym
+@@ -145,13 +148,13 @@ def with_response response, error_prefix = nil
+ if block_given? then
+ yield response
+ else
+- say response.body
++ say clean_text(response.body)
+ end
+ else
+ message = response.body
+ message = "#{error_prefix}: #{message}" if error_prefix
+
+- say message
++ say clean_text(message)
+ terminate_interaction 1 # TODO: question this
+ end
+ end
+diff --git lib/rubygems/installer.rb lib/rubygems/installer.rb
+index ee5fedeb64..904d5a0c7c 100644
+--- a/lib/rubygems/installer.rb
++++ b/lib/rubygems/installer.rb
+@@ -707,9 +707,26 @@ def verify_gem_home(unpack = false) # :nodoc:
+ unpack or File.writable?(gem_home)
+ end
+
+- def verify_spec_name
+- return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN
+- raise Gem::InstallError, "#{spec} has an invalid name"
++ def verify_spec
++ unless spec.name =~ Gem::Specification::VALID_NAME_PATTERN
++ raise Gem::InstallError, "#{spec} has an invalid name"
++ end
++
++ if spec.raw_require_paths.any?{|path| path =~ /\r\n|\r|\n/ }
++ raise Gem::InstallError, "#{spec} has an invalid require_paths"
++ end
++
++ if spec.extensions.any?{|ext| ext =~ /\r\n|\r|\n/ }
++ raise Gem::InstallError, "#{spec} has an invalid extensions"
++ end
++
++ unless spec.specification_version.to_s =~ /\A\d+\z/
++ raise Gem::InstallError, "#{spec} has an invalid specification_version"
++ end
++
++ if spec.dependencies.any? {|dep| dep.type =~ /\r\n|\r|\n/ || dep.name =~ /\r\n|\r|\n/ }
++ raise Gem::InstallError, "#{spec} has an invalid dependencies"
++ end
+ end
+
+ ##
+@@ -836,10 +853,12 @@ def dir
+ def pre_install_checks
+ verify_gem_home options[:unpack]
+
++ # The name and require_paths must be verified first, since it could contain
++ # ruby code that would be eval'ed in #ensure_loadable_spec
++ verify_spec
++
+ ensure_loadable_spec
+
+- verify_spec_name
+-
+ if options[:install_as_default]
+ Gem.ensure_default_gem_subdirectories gem_home
+ else
+diff --git lib/rubygems/package.rb lib/rubygems/package.rb
+index b924122827..b472b97a07 100644
+--- a/lib/rubygems/package.rb
++++ b/lib/rubygems/package.rb
+@@ -425,6 +425,16 @@ def install_location filename, destination_dir # :nodoc:
+ raise Gem::Package::PathError.new(destination, destination_dir) unless
+ destination.start_with? destination_dir + '/'
+
++ begin
++ real_destination = File.expand_path(File.realpath(destination))
++ rescue
++ # it's fine if the destination doesn't exist, because rm -rf'ing it can't cause any damage
++ nil
++ else
++ raise Gem::Package::PathError.new(real_destination, destination_dir) unless
++ real_destination.start_with? destination_dir + '/'
++ end
++
+ destination.untaint
+ destination
+ end
+diff --git lib/rubygems/user_interaction.rb lib/rubygems/user_interaction.rb
+index cacd782e08..eff8f9533c 100644
+--- a/lib/rubygems/user_interaction.rb
++++ b/lib/rubygems/user_interaction.rb
+@@ -6,6 +6,7 @@
+ #++
+
+ require 'rubygems/util'
++require 'rubygems/text'
+
+ ##
+ # Module that defines the default UserInteraction. Any class including this
+@@ -13,6 +14,8 @@
+
+ module Gem::DefaultUserInteraction
+
++ include Gem::Text
++
+ ##
+ # The default UI is a class variable of the singleton class for this
+ # module.
+@@ -160,8 +163,8 @@ def terminate_interaction exit_code = 0
+ # Calls +say+ with +msg+ or the results of the block if really_verbose
+ # is true.
+
+- def verbose msg = nil
+- say(msg || yield) if Gem.configuration.really_verbose
++ def verbose(msg = nil)
++ say(clean_text(msg || yield)) if Gem.configuration.really_verbose
+ end
+ end
+
+diff --git test/rubygems/test_gem_installer.rb test/rubygems/test_gem_installer.rb
+index 93b0482407..a47a307049 100644
+--- a/test/rubygems/test_gem_installer.rb
++++ b/test/rubygems/test_gem_installer.rb
+@@ -1474,6 +1474,114 @@ def spec.validate; end
+ end
+ end
+
++ def test_pre_install_checks_malicious_name_before_eval
++ spec = util_spec "malicious\n::Object.const_set(:FROM_EVAL, true)#", '1'
++ def spec.full_name # so the spec is buildable
++ "malicious-1"
++ end
++ def spec.validate(*args); end
++
++ util_build_gem spec
++
++ gem = File.join(@gemhome, 'cache', spec.file_name)
++
++ use_ui @ui do
++ @installer = Gem::Installer.at gem
++ e = assert_raises Gem::InstallError do
++ @installer.pre_install_checks
++ end
++ assert_equal "#<Gem::Specification name=malicious\n::Object.const_set(:FROM_EVAL, true)# version=1> has an invalid name", e.message
++ end
++ refute defined?(::Object::FROM_EVAL)
++ end
++
++ def test_pre_install_checks_malicious_require_paths_before_eval
++ spec = util_spec "malicious", '1'
++ def spec.full_name # so the spec is buildable
++ "malicious-1"
++ end
++ def spec.validate(*args); end
++ spec.require_paths = ["malicious\n``"]
++
++ util_build_gem spec
++
++ gem = File.join(@gemhome, 'cache', spec.file_name)
++
++ use_ui @ui do
++ @installer = Gem::Installer.at gem
++ e = assert_raises Gem::InstallError do
++ @installer.pre_install_checks
++ end
++ assert_equal "#<Gem::Specification name=malicious version=1> has an invalid require_paths", e.message
++ end
++ end
++
++ def test_pre_install_checks_malicious_extensions_before_eval
++ skip "mswin environment disallow to create file contained the carriage return code." if Gem.win_platform?
++
++ spec = util_spec "malicious", '1'
++ def spec.full_name # so the spec is buildable
++ "malicious-1"
++ end
++ def spec.validate(*args); end
++ spec.extensions = ["malicious\n``"]
++
++ util_build_gem spec
++
++ gem = File.join(@gemhome, 'cache', spec.file_name)
++
++ use_ui @ui do
++ @installer = Gem::Installer.at gem
++ e = assert_raises Gem::InstallError do
++ @installer.pre_install_checks
++ end
++ assert_equal "#<Gem::Specification name=malicious version=1> has an invalid extensions", e.message
++ end
++ end
++
++ def test_pre_install_checks_malicious_specification_version_before_eval
++ spec = util_spec "malicious", '1'
++ def spec.full_name # so the spec is buildable
++ "malicious-1"
++ end
++ def spec.validate(*args); end
++ spec.specification_version = "malicious\n``"
++
++ util_build_gem spec
++
++ gem = File.join(@gemhome, 'cache', spec.file_name)
++
++ use_ui @ui do
++ @installer = Gem::Installer.at gem
++ e = assert_raises Gem::InstallError do
++ @installer.pre_install_checks
++ end
++ assert_equal "#<Gem::Specification name=malicious version=1> has an invalid specification_version", e.message
++ end
++ end
++
++ def test_pre_install_checks_malicious_dependencies_before_eval
++ spec = util_spec "malicious", '1'
++ def spec.full_name # so the spec is buildable
++ "malicious-1"
++ end
++ def spec.validate(*args); end
++ spec.add_dependency "b\nfoo", '> 5'
++
++ util_build_gem spec
++
++ gem = File.join(@gemhome, 'cache', spec.file_name)
++
++ use_ui @ui do
++ @installer = Gem::Installer.at gem
++ @installer.ignore_dependencies = true
++ e = assert_raises Gem::InstallError do
++ @installer.pre_install_checks
++ end
++ assert_equal "#<Gem::Specification name=malicious version=1> has an invalid dependencies", e.message
++ end
++ end
++
+ def test_shebang
+ util_make_exec @spec, "#!/usr/bin/ruby"
+
+diff --git test/rubygems/test_gem_package.rb test/rubygems/test_gem_package.rb
+index d1664cf285..0b03ee2e0c 100644
+--- a/test/rubygems/test_gem_package.rb
++++ b/test/rubygems/test_gem_package.rb
+@@ -480,6 +480,42 @@ def test_extract_symlink_parent
+ "#{destination_subdir} is not allowed", e.message)
+ end
+
++ def test_extract_symlink_parent_doesnt_delete_user_dir
++ skip if RUBY_VERSION <= "1.8.7"
++
++ package = Gem::Package.new @gem
++
++ # Extract into a subdirectory of @destination; if this test fails it writes
++ # a file outside destination_subdir, but we want the file to remain inside
++ # @destination so it will be cleaned up.
++ destination_subdir = File.join @destination, 'subdir'
++ FileUtils.mkdir_p destination_subdir
++
++ destination_user_dir = File.join @destination, 'user'
++ destination_user_subdir = File.join destination_user_dir, 'dir'
++ FileUtils.mkdir_p destination_user_subdir
++
++ tgz_io = util_tar_gz do |tar|
++ tar.add_symlink 'link', destination_user_dir, 16877
++ tar.add_symlink 'link/dir', '.', 16877
++ end
++
++ e = assert_raises(Gem::Package::PathError, Errno::EACCES) do
++ package.extract_tar_gz tgz_io, destination_subdir
++ end
++
++ assert_path_exists destination_user_subdir
++
++ if Gem::Package::PathError === e
++ assert_equal("installing into parent path #{destination_user_subdir} of " +
++ "#{destination_subdir} is not allowed", e.message)
++ elsif win_platform?
++ skip "symlink - must be admin with no UAC on Windows"
++ else
++ raise e
++ end
++ end
++
+ def test_extract_tar_gz_directory
+ package = Gem::Package.new @gem
+
+diff --git test/rubygems/test_gem_text.rb test/rubygems/test_gem_text.rb
+index 04f3f605e8..8ce6df94bb 100644
+--- a/test/rubygems/test_gem_text.rb
++++ b/test/rubygems/test_gem_text.rb
+@@ -85,4 +85,9 @@ def test_truncate_text
+ s = "ab" * 500_001
+ assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000)
+ end
++
++ def test_clean_text
++ assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a")
++ end
++
+ end
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 5c7ec31a1..d160e104f 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,17 +1,18 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.7.2.2
+pkgver=2.8.0.0
pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-depends_dev="skalibs-dev execline-dev"
-makedepends="skalibs-dev>=2.7 execline-dev"
+_skalibs_version=2.8
+depends="execline"
+makedepends="skalibs-dev>=$_skalibs_version execline-dev"
install="$pkgname.post-upgrade"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
triggers="$pkgname.trigger=/run/service"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
s6-svscanboot"
@@ -21,6 +22,7 @@ build() {
./configure \
--enable-shared \
--enable-static \
+ --enable-allstatic \
--enable-static-libc \
--libdir=/usr/lib \
--libexecdir="/lib/$pkgname" \
@@ -36,11 +38,38 @@ package() {
chmod 0755 "$pkgdir/lib/s6/s6-svscanboot"
}
+
+libs() {
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
+}
+
+
+dev() {
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr"
+ mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
+}
+
+
+libsdev() {
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
+}
+
+
doc() {
- default_doc
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="ed7b9fbc73e9947e56ad641459c04ff210fb801c8cfdbb5f0a00bdecbe1f5969ae73a6b52b048cd6617c88308f3a7bfd0ed98a48e78b1b5ba90b96e95845d165 s6-2.7.2.2.tar.gz
+sha512sums="e2f2f0fb9481a745fc80b3b8c0aa2de979c0c8dbe066e2402cf7700a08edc32448d7ed3065a19a01a18dc5a12f3abcfd3aba5d2c5fefbbf49fee4a6f8396c106 s6-2.8.0.0.tar.gz
9c29bc9eee6d5ab502a5a86bb043ebd21e085022efc506a330ae5ab0eadf7038d0a3dc8e025d78d9610cf7ec0ca031887f755486c4cb4e571090ea3a9c1806ac s6-svscanboot"
diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade
index 54144895b..0b69f49e7 100644
--- a/system/s6/s6.post-upgrade
+++ b/system/s6/s6.post-upgrade
@@ -1,3 +1,18 @@
#!/bin/sh -e
rm -f /etc/runlevels/default/s6
+
+cat <<EOF
+
+*
+* The s6 package has been upgraded. To complete the upgrade, you need to
+* restart the supervision tree - with the following command, run as root:
+*
+* s6-svscanctl -t /run/service
+*
+* Running this command will instantly log everyone out of all the
+* terminals that are listed in the GETTYS variable in /etc/conf.d/gettys
+* - so please save your work first.
+*
+
+EOF
diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD
index bd20a4f6b..61d644e32 100644
--- a/system/sed/APKBUILD
+++ b/system/sed/APKBUILD
@@ -4,22 +4,18 @@ pkgname=sed
pkgver=4.7
pkgrel=0
pkgdesc="GNU stream editor"
-url="http://www.gnu.org/software/sed"
+url="https://www.gnu.org/software/sed"
arch="all"
-options="!checkroot"
license="GPL-3.0+"
makedepends="perl"
subpackages="$pkgname-doc $pkgname-lang"
install="$pkgname.post-deinstall"
-source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
disable-mbrtowc-test.patch
gnulib-tests-dont-require-gpg-passphrase.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
-
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias || true
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index 2bf84e868..46494176b 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
-pkgver=2.7.0.0
-pkgrel=1
+pkgver=2.8.0.0
+pkgrel=0
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
-url="http://skarnet.org/software/skalibs/"
+url="https://skarnet.org/software/skalibs/"
arch="all"
options="!check" # No test suite.
license="ISC"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -26,17 +26,37 @@ package() {
make DESTDIR="$pkgdir" install
}
+
+libs() {
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends=
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
+}
+
+
dev() {
- default_dev
- mv "$pkgdir/usr/lib/$pkgname"/sysdeps/* \
- "$subpkgdir/usr/lib/$pkgname"/sysdeps/
- rm -rf "$pkgdir"/usr
+ pkgdesc="$pkgdesc (development files)"
+ depends=
+ mkdir -p "$subpkgdir"
+ mv "$pkgdir/usr" "$subpkgdir/"
}
+
+libsdev() {
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
+}
+
+
doc() {
- default_doc
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir/usr/share/doc"
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1 skalibs-2.7.0.0.tar.gz"
+sha512sums="0d8d4a5a68a3f522312c69913a2e998a7cd8562fb99595ed6631531af590701f995b05c2d85defab3cd24d3480787a7456c8326e7bff00cd1a84ff06ca89b463 skalibs-2.8.0.0.tar.gz"
diff --git a/system/sqlite/APKBUILD b/system/sqlite/APKBUILD
index f363490d0..d103b1a5d 100644
--- a/system/sqlite/APKBUILD
+++ b/system/sqlite/APKBUILD
@@ -1,22 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sqlite
-pkgver=3.26.0
-_a=${pkgver%%.*}
-_b=${pkgver#${_a}.}
-_b=${_b%%.*}
-_c=${pkgver#${_a}.${_b}.}
-_c=${_c%%.*}
-case $pkgver in
- *.*.*.*)_d=${pkgver##*.};;
- *.*.*) _d=0;;
-esac
-
-[ $_b -lt 10 ] && _b=0$_b
-[ $_c -lt 10 ] && _c=0$_c
-[ $_d -lt 10 ] && _d=0$_d
-_ver=${_a}${_b}${_c}${_d}
-
+pkgver=3.27.2
pkgrel=0
pkgdesc="C library that implements an SQL database engine"
url="https://sqlite.org/"
@@ -24,11 +9,14 @@ arch="all"
license="Public-Domain"
depends=""
makedepends="libedit-dev"
-source="https://sqlite.org/2018/$pkgname-autoconf-$_ver.tar.gz
+source="https://sqlite.org/2019/$pkgname-autoconf-3270200.tar.gz
license.txt"
subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
-_amalgamation="-DSQLITE_ENABLE_FTS4 \
+builddir="$srcdir/$pkgname-autoconf-3270200"
+
+build() {
+ local _amalgamation="-DSQLITE_ENABLE_FTS4 \
-DSQLITE_ENABLE_FTS3 \
-DSQLITE_ENABLE_FTS3_PARENTHESIS \
-DSQLITE_ENABLE_FTS5 \
@@ -40,10 +28,6 @@ _amalgamation="-DSQLITE_ENABLE_FTS4 \
-DSQLITE_ENABLE_DBSTAT_VTAB \
-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-DSQLITE_ENABLE_JSON1"
-
-builddir="$srcdir/$pkgname-autoconf-$_ver"
-build() {
- cd "$builddir"
export CFLAGS="$CFLAGS $_amalgamation"
./configure \
--build=$CBUILD \
@@ -62,12 +46,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
install -Dm0644 sqlite3.1 \
"$pkgdir"/usr/share/man/man1/sqlite3.1
@@ -76,11 +58,10 @@ package() {
}
libs() {
- replaces="sqlite"
- pkgdesc="Sqlite3 library"
+ pkgdesc="SQLite embeddable library"
mkdir -p "$subpkgdir"/usr
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
}
-sha512sums="8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8 sqlite-autoconf-3260000.tar.gz
+sha512sums="0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972 sqlite-autoconf-3270200.tar.gz
5bde14bec5bf18cc686b8b90a8b2324c8c6600bca1ae56431a795bb34b8b5ae85527143f3b5f0c845c776bce60eaa537624104cefc3a47b3820d43083f40c6e9 license.txt"
diff --git a/system/ssmtp/APKBUILD b/system/ssmtp/APKBUILD
index 944f6505f..7fa905760 100644
--- a/system/ssmtp/APKBUILD
+++ b/system/ssmtp/APKBUILD
@@ -12,7 +12,7 @@ provides=/usr/sbin/sendmail
depends=
makedepends="openssl-dev autoconf"
subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
+source="https://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
generate_config.patch
libcrypto-underlinking.patch
inet6-getaddrinfo.patch
diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD
index 4c0e5bd0f..4cf79f0f7 100644
--- a/system/strace/APKBUILD
+++ b/system/strace/APKBUILD
@@ -1,25 +1,22 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=strace
-pkgver=4.24
+pkgver=4.26
pkgrel=0
pkgdesc="A useful diagnositic, instructional, and debugging tool"
url="https://strace.io/"
arch="all"
options="!check" # test suite requires mpers, which requires multilib
-license="BSD-3-Clause"
+license="LGPL-2.1+"
depends=""
makedepends="linux-headers autoconf automake"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/strace/$pkgname/archive/v$pkgver.tar.gz
+source="https://github.com/strace/strace/releases/download/v4.26/strace-4.26.tar.xz
disable-fortify.patch
fix-ppc-pt-regs-collision.patch
nlattr-fix.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
-
build() {
- cd "$builddir"
case "$CLIBC" in
musl) export CFLAGS="$CFLAGS -Dsigcontext_struct=sigcontext" ;;
esac
@@ -35,8 +32,6 @@ build() {
;;
esac
- ./bootstrap
-
ac_cv_have_long_long_off_t=yes \
./configure \
--build=$CBUILD \
@@ -50,16 +45,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="14d5bb8722a3aeb9d1173e6ee040fbad6fd8a66182fd417f5ec699afcd3fc2f03a636a45a529ed1400881db5e766acdd37fd0f3d07da6e651a15abbc5c394c28 strace-4.24.tar.gz
+sha512sums="cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290 strace-4.26.tar.xz
273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch
b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch
44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch"
diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD
index f9b1fc66d..6b8685d86 100644
--- a/system/sudo/APKBUILD
+++ b/system/sudo/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Horst Burkhardt <horst@adelielinux.org>
pkgname=sudo
-pkgver=1.8.25_p1
+pkgver=1.8.27
if [ "${pkgver%_*}" != "$pkgver" ]; then
_realver=${pkgver%_*}${pkgver#*_}
else
@@ -15,23 +15,23 @@ url="https://www.sudo.ws/sudo/"
arch="all"
options="suid"
license="ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause AND Zlib"
+depends=""
makedepends_host="linux-pam-dev zlib-dev utmps-dev"
makedepends_build="bash"
makedepends="$makedepends_host $makedepends_build"
-depends=
subpackages="$pkgname-doc $pkgname-dev $pkgname-lang"
source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz
fix-cross-compile.patch
musl-fix-headers.patch
+ test-suite.patch
"
+builddir="$srcdir"/$pkgname-$_realver
# secfixes:
# 1.8.20_p2-r0:
# - CVE-2017-1000368
-builddir="$srcdir"/$pkgname-$_realver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -47,12 +47,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
# the sudo's mkinstalldir script miscreates the leading
# path components with bad permissions. fix this.
install -d -m0755 "$pkgdir"/var "$pkgdir"/var/db
@@ -60,6 +58,7 @@ package() {
rm -rf "$pkgdir"/var/run
}
-sha512sums="b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72 sudo-1.8.25p1.tar.gz
+sha512sums="0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac sudo-1.8.27.tar.gz
f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch
-dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch"
+dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch
+3feb9f586fb36cdddaf61523926554533d73b4b03e7bfe5da40b754d68c4cc58c796310cc3a3419dd0d87d30d836d5f9921f5ea3c7c7a0099626f49c161279dc test-suite.patch"
diff --git a/system/sudo/test-suite.patch b/system/sudo/test-suite.patch
new file mode 100644
index 000000000..eb19ff09c
--- /dev/null
+++ b/system/sudo/test-suite.patch
@@ -0,0 +1,407 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1552053510 25200
+# Node ID e82a381f4f3de693f880aab2781fd65c01030ec0
+# Parent 09a915110812b9d6603995aa27be94b71c5df1e7
+Test cvtsudoers stdout and stderr separately.
+Fixes a test failure on systems with musl libc. Bug #873
+
+diff -r 09a915110812 -r e82a381f4f3d MANIFEST
+--- a/MANIFEST Wed Mar 06 20:15:11 2019 -0700
++++ b/MANIFEST Fri Mar 08 06:58:30 2019 -0700
+@@ -450,6 +450,7 @@
+ plugins/sudoers/regress/cvtsudoers/test24.sh
+ plugins/sudoers/regress/cvtsudoers/test25.out.ok
+ plugins/sudoers/regress/cvtsudoers/test25.sh
++plugins/sudoers/regress/cvtsudoers/test26.err.ok
+ plugins/sudoers/regress/cvtsudoers/test26.out.ok
+ plugins/sudoers/regress/cvtsudoers/test26.sh
+ plugins/sudoers/regress/cvtsudoers/test27.out.ok
+@@ -465,6 +466,7 @@
+ plugins/sudoers/regress/cvtsudoers/test31.conf
+ plugins/sudoers/regress/cvtsudoers/test31.out.ok
+ plugins/sudoers/regress/cvtsudoers/test31.sh
++plugins/sudoers/regress/cvtsudoers/test32.err.ok
+ plugins/sudoers/regress/cvtsudoers/test32.out.ok
+ plugins/sudoers/regress/cvtsudoers/test32.sh
+ plugins/sudoers/regress/cvtsudoers/test33.out.ok
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test1.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test1.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test1.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test user and host filters
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test10.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test10.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test10.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test command defaults filtering
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test11.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test11.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test11.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,5 +3,4 @@
+ # Test that Aliases are removed when filtering by defaults type
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test12.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test12.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test12.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,5 +3,4 @@
+ # Test that Aliases are removed when filtering by defaults type
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test13.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test13.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test13.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,5 +3,4 @@
+ # Test that Aliases are removed when filtering by defaults type
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test14.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test14.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test14.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,5 +3,4 @@
+ # Test that Aliases are removed when filtering by defaults type
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test15.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test15.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test15.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test filters and pruning
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF
+ user1, user2, user3, %group1 host1, host2, host3 = ALL
+ EOF
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test16.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test16.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test16.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test filters and pruning
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF
+ user1, user2, user3, %group1 host1, host2, host3 = ALL
+ EOF
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test17.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test17.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test17.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test filters and pruning
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF
+ user1, user2, user3, %group1 host1, host2, host3 = ALL
+ EOF
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test18.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test18.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test18.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test filters and pruning
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF
+ user1, user2, user3, %group1 ALL = ALL
+ EOF
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test19.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test19.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test19.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,5 +3,4 @@
+ # Test filters and pruning; alias contents don't get pruned
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test2.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test2.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test2.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test user and host filters, expanding aliases
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test20.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test20.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test20.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test cvtsudoers.conf
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c $TESTDIR/test20.conf <<EOF
+ Defaults:SOMEUSERS authenticate, timestamp_timeout=0
+ User_Alias SOMEUSERS = user1, user2, user3
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test21.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test21.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test21.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test cvtsudoers.conf
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c $TESTDIR/test21.conf <<EOF
+ Defaults authenticate, timestamp_timeout=0
+ User_Alias FULLTIMERS = user1, user2, user3
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test22.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test22.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test22.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test LDAP base filtering.
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
+ dn: dc=sudo,dc=ws
+ objectClass: dcObject
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test23.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test23.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test23.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,6 +3,5 @@
+ # Test round-tripping of sudoers -> LDIF -> sudoers
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \
+ ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#'
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test24.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test24.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test24.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,6 +3,5 @@
+ # Test round-tripping of LDIF -> sudoers -> LDIF
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \
+ ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws"
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test25.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test25.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test25.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test LDIF base64 attribute parsing
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
+ # defaults, SUDOers, sudo.ws
+ dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.err.ok
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok Fri Mar 08 06:58:30 2019 -0700
+@@ -0,0 +1,3 @@
++cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
++cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
++cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.out.ok
+--- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok Fri Mar 08 06:58:30 2019 -0700
+@@ -1,3 +0,0 @@
+-cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
+-cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
+-cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test26.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test26.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test LDIF invalid base64 attribute parsing
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
+ # defaults, SUDOers, sudo.ws
+ dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test27.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test27.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test27.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test base64 encoding of non-safe strings
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF
+ Defaults badpass_message="Bad password¡"
+
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test28.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test28.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test28.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test LDAP sudoOrder when converting to sudoers.
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
+ dn: dc=sudo,dc=ws
+ objectClass: dcObject
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test29.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test29.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test29.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test LDAP sudoOrder when converting to sudoers.
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
+ dn: dc=sudo,dc=ws
+ objectClass: dcObject
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test3.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test3.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test3.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test group and host filters
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test30.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test30.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test30.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -4,7 +4,6 @@
+ # See https://bugzilla.sudo.ws/show_bug.cgi?id=853
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -e -f json <<EOF
+ Cmnd_Alias CMDA=/path/to/cmda
+ Cmnd_Alias CMDB=/path/to/cmdb
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test31.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test31.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test31.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test cvtsudoers.conf with padding
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c $TESTDIR/test31.conf <<EOF
+ Defaults authenticate, timestamp_timeout=0
+ User_Alias FULLTIMERS = user1, user2, user3
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.err.ok
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok Fri Mar 08 06:58:30 2019 -0700
+@@ -0,0 +1,1 @@
++cvtsudoers: too many sudoers entries, maximum 10
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.out.ok
+--- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok Fri Mar 08 06:58:30 2019 -0700
+@@ -1,4 +1,3 @@
+-cvtsudoers: too many sudoers entries, maximum 10
+ dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com
+ objectClass: top
+ objectClass: sudoRole
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test32.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test32.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test cvtsudoers.conf with invalid padding
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF
+ user0 ALL = (ALL:ALL) ALL
+ user1 ALL = (ALL:ALL) ALL
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test33.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test33.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test33.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers.
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
+ dn: dc=sudo,dc=ws
+ objectClass: dcObject
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test4.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test4.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test4.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test group and host filters, expanding aliases
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test5.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test5.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test5.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test defaults type filtering
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test6.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test6.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test6.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test global defaults filtering
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test7.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test7.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test7.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test user defaults filtering
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test8.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test8.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test8.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test runas defaults filtering
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers
+
+ exit 0
+diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test9.sh
+--- a/plugins/sudoers/regress/cvtsudoers/test9.sh Wed Mar 06 20:15:11 2019 -0700
++++ b/plugins/sudoers/regress/cvtsudoers/test9.sh Fri Mar 08 06:58:30 2019 -0700
+@@ -3,7 +3,6 @@
+ # Test host defaults filtering
+ #
+
+-exec 2>&1
+ ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers
+
+ exit 0
+
diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD
index 7b0b0cee5..d282e1e01 100644
--- a/system/sysvinit/APKBUILD
+++ b/system/sysvinit/APKBUILD
@@ -13,7 +13,7 @@ install="sysvinit.post-upgrade"
options="!check"
provides="/sbin/init"
subpackages="$pkgname-doc"
-source="http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2
+source="https://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2
inittab-2.88
sysvinit-2.88-posix-header.patch
utmpx.patch
diff --git a/system/tcl/APKBUILD b/system/tcl/APKBUILD
index 854222be1..d3a124ae5 100644
--- a/system/tcl/APKBUILD
+++ b/system/tcl/APKBUILD
@@ -4,14 +4,14 @@ pkgname=tcl
pkgver=8.6.9
pkgrel=0
pkgdesc="The Tcl scripting language"
-url="http://tcl.sourceforge.net/"
+url="https://tcl.sourceforge.net/"
arch="all"
license="TCL"
depends=""
depends_dev="tcl"
makedepends="zlib-dev sqlite-dev"
subpackages="$pkgname-doc $pkgname-dev"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname$pkgver-src.tar.gz
+source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname$pkgver-src.tar.gz
tcl-stat64.patch
"
diff --git a/system/texinfo/APKBUILD b/system/texinfo/APKBUILD
index c701bae60..329bdfcdc 100644
--- a/system/texinfo/APKBUILD
+++ b/system/texinfo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=texinfo
-pkgver=6.5
-pkgrel=2
+pkgver=6.6
+pkgrel=0
pkgdesc="Utilities to manage on-line documentation"
url="https://www.gnu.org/software/texinfo/"
arch="all"
@@ -9,10 +9,9 @@ license="GPL-3.0+"
depends="perl"
makedepends="ncurses-dev perl-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -21,16 +20,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir"/ install
rm -f "$pkgdir"/usr/share/info/dir
gzip "$pkgdir"/usr/share/info/*
}
-sha512sums="06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc texinfo-6.5.tar.xz"
+sha512sums="96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 texinfo-6.6.tar.xz"
diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD
index 99b416c59..cd09dac9c 100644
--- a/system/tzdata/APKBUILD
+++ b/system/tzdata/APKBUILD
@@ -2,21 +2,22 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=tzdata
-pkgver=2018g
-_tzcodever=2018g
+pkgver=2018i
+_tzcodever=2018i
_ptzver=0.5
pkgrel=0
pkgdesc="Time zone data"
url="https://www.iana.org/time-zones"
arch="all"
+options="!check" # Until we have sgml-common.
license="Public-Domain"
depends=""
makedepends=""
-checkdepends="sp"
+checkdepends="sgml-common sp"
subpackages="$pkgname-doc"
-source="http://www.iana.org/time-zones/repository/releases/tzcode$_tzcodever.tar.gz
- http://www.iana.org/time-zones/repository/releases/tzdata$pkgver.tar.gz
- http://dev.alpinelinux.org/archive/posixtz/posixtz-$_ptzver.tar.xz
+source="https://www.iana.org/time-zones/repository/releases/tzcode$_tzcodever.tar.gz
+ https://www.iana.org/time-zones/repository/releases/tzdata$pkgver.tar.gz
+ https://dev.alpinelinux.org/archive/posixtz/posixtz-$_ptzver.tar.xz
0001-posixtz-fix-up-lseek.patch"
builddir="$srcdir"
@@ -24,22 +25,17 @@ _timezones="africa antarctica asia australasia europe northamerica \
southamerica pacificnew etcetera backward systemv factory"
build() {
- cd "$builddir"
make cc="${CC:-gcc}" CFLAGS="$CFLAGS -DHAVE_STDINT_H=1"
TZDIR="/usr/share/zoneinfo"
- cd "$builddir"/posixtz-$_ptzver
- make posixtz
+ make -C posixtz-$_ptzver posixtz
}
check() {
- cd "$builddir"
make -j1 check
}
package() {
- cd "$builddir"
-
./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo ${_timezones}
./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo/right -L leapseconds ${_timezones}
#./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo/posix ${_timezones}
@@ -58,7 +54,7 @@ package() {
"$pkgdir"/usr/bin/posixtz
}
-sha512sums="58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484 tzcode2018g.tar.gz
-92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa tzdata2018g.tar.gz
+sha512sums="1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d tzcode2018i.tar.gz
+6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a tzdata2018i.tar.gz
68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd posixtz-0.5.tar.xz
f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467 0001-posixtz-fix-up-lseek.patch"
diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD
index 138d6f402..182e27176 100644
--- a/system/util-linux/APKBUILD
+++ b/system/util-linux/APKBUILD
@@ -2,16 +2,16 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=util-linux
-pkgver=2.32.1
+pkgver=2.33.1
case $pkgver in
*.*.*) _v=${pkgver%.*};;
*.*) _v=$pkgver;;
esac
-pkgrel=1
+pkgrel=0
pkgdesc="Official Linux system management utilities"
-url="http://git.kernel.org/cgit/utils/util-linux/util-linux.git"
+url="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
arch="all"
options="!check suid" # multibyte input fails because of musl locale stuff
license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1+ AND Public-Domain"
@@ -26,23 +26,19 @@ replaces="e2fsprogs util-linux-ng sfdisk cfdisk findmnt mcookie blkid setpriv
provides="sfdisk=$pkgver-$pkgrel cfdisk=$pkgver-$pkgrel findmnt=$pkgver-$pkgrel
mcookie=$pkgver-$pkgrel blkid=$pkgver-$pkgrel libblkid=$pkgver-$pkgrel
libmount=$pkgver-$pkgrel libsmartcols=$pkgver-$pkgrel"
-source="http://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.tar.xz
+source="https://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.tar.xz
ttydefaults.h
"
-builddir="$srcdir/$pkgname-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
cp "$srcdir"/ttydefaults.h include/
libtoolize --force && aclocal -I m4 && autoconf \
&& automake --add-missing
}
build() {
- cd "$builddir"
-
# login utils are provided by shadow
LIBS="-lutmps -lskarnet" ./configure \
--build=$CBUILD \
@@ -56,14 +52,13 @@ build() {
--disable-login \
--disable-sulogin \
--disable-su \
+ --disable-chfn-chsh \
--without-python
make
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
- # use pkg-config
}
dev() {
@@ -105,5 +100,5 @@ libfdisk() {
mv "$pkgdir"/lib/libfdisk.so.* "$subpkgdir"/lib/
}
-sha512sums="267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698 util-linux-2.32.1.tar.xz
+sha512sums="94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2 util-linux-2.33.1.tar.xz
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h"
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index 91bb18b19..9ce4c0dda 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -1,17 +1,17 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=utmps
-pkgver=0.0.2.0
-pkgrel=2
+pkgver=0.0.2.1
+pkgrel=0
pkgdesc="A secure utmp/wtmp implementation"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite
license="ISC"
depends="execline s6"
-depends_dev="skalibs-dev"
-makedepends="skalibs-dev>=2.7"
-subpackages="$pkgname-dev $pkgname-doc"
+_skalibs_version=2.8
+makedepends="skalibs-dev>=$_skalibs_version"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
install="$pkgname.post-upgrade"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
utmpd.run
@@ -22,7 +22,8 @@ build() {
./configure \
--enable-shared \
--enable-static \
- --disable-allstatic \
+ --enable-allstatic \
+ --enable-static-libc \
--libdir=/usr/lib \
--libexecdir="/lib/$pkgname" \
--with-dynlib=/lib
@@ -40,12 +41,39 @@ package() {
chmod 0755 "$pkgdir/etc/s6/early-services/utmpd/run" "$pkgdir/etc/s6/early-services/wtmpd/run"
}
+
+libs() {
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
+}
+
+
+dev() {
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr"
+ mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
+}
+
+
+libsdev() {
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/lib"
+ mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
+}
+
+
doc() {
- default_doc
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="5fffb86f68475f3eadf8da53e3ae40284040cceb644f453218a5fd9e1be081920b5c787283e2578a60922e2feb75c94a7430034a658f7399645fc3bcc9afa28f utmps-0.0.2.0.tar.gz
+sha512sums="e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa utmps-0.0.2.1.tar.gz
525d43e3eced30c564e5390fc715b6caa1ae2b6515a9e3bf01263ff3fb9379bd6908ed302d0d50b6568ac36ed44d272dcc44a683f9ae34d586d8ad17023ed6b1 utmpd.run
93e4fae527ada9381e0b0a7ad5de9079e8d88959abd74fa5c0710c30c6153832abb010b57ddf83055ca34c032e7e5c9c1eedceb2f122a11ab20837ab66dcf5e2 wtmpd.run"
diff --git a/system/uucp/APKBUILD b/system/uucp/APKBUILD
index cb21a3360..3106cb083 100644
--- a/system/uucp/APKBUILD
+++ b/system/uucp/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0+ AND GPL-2.0-only AND LGPL-2.0+ AND Public-Domain"
depends=""
makedepends=""
subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/pub/gnu/uucp/uucp-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/uucp/uucp-$pkgver.tar.gz"
build() {
cd "$builddir"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 9c75b2621..bf29cc167 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -7,7 +7,7 @@ pkgname=vim
pkgver=8.1.0952
pkgrel=0
pkgdesc="advanced text editor"
-url="http://www.vim.org"
+url="https://www.vim.org"
arch="all"
options="!check" # requires controlling TTY, and fails with musl locales
license="Vim"
diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD
index 13c0448d2..ee0544895 100644
--- a/system/xfsprogs/APKBUILD
+++ b/system/xfsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xfsprogs
-pkgver=4.18.0
+pkgver=4.20.0
pkgrel=0
pkgdesc="XFS filesystem utilities"
url="http://xfs.org/index.php/Main_Page"
@@ -16,7 +16,6 @@ source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.
"
build() {
- cd "$builddir"
export DEBUG=-DNDEBUG
export OPTIMIZER="$CFLAGS"
./configure \
@@ -30,16 +29,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DIST_ROOT="$pkgdir" install install-dev
find "$pkgdir" -name *.la -delete
}
-sha512sums="c3eac30155b9790e0ca064fb59b33a588c3909eb1a10966d0a9f4554354b8d09582a2874223c4d16bb782b40eecd32468cbfe66762d1d7257e79ddc27add40a8 xfsprogs-4.18.0.tar.gz
+sha512sums="e0c3fb7fee50914ca372ed9a436bb2291196b48b709cf1ec1284728634ec08f678fabe369c6e489db10b04fec530675c7f7759d5ed92138aadef88096e621191 xfsprogs-4.20.0.tar.gz
c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch
272bd64cf6aa3311edfea94c15167313a805bab3a659c231142a02cb7fd87b97c811ba68b1ef77bb5737b2e37defe6a41b234143b0951b13c251abab7186645b no-utmp-header.patch"
diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD
index 4dfac01b3..f6e0dfd63 100644
--- a/system/yaml/APKBUILD
+++ b/system/yaml/APKBUILD
@@ -10,7 +10,7 @@ license="MIT"
depends=""
makedepends=""
subpackages="$pkgname-dev"
-source="http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz
+source="https://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz
fix-emitter-$pkgver.patch
skip-trailing-doc-term-$pkgver.patch"
diff --git a/system/zlib/APKBUILD b/system/zlib/APKBUILD
index aeb0582d2..72d63357d 100644
--- a/system/zlib/APKBUILD
+++ b/system/zlib/APKBUILD
@@ -5,10 +5,10 @@ pkgrel=1
pkgdesc="A compression/decompression Library"
arch="all"
license="Zlib"
-url="http://zlib.net"
+url="https://zlib.net"
depends=""
subpackages="$pkgname-dev $pkgname-doc"
-source="http://zlib.net/$pkgname-$pkgver.tar.gz"
+source="https://zlib.net/$pkgname-$pkgver.tar.gz"
build() {
cd "$builddir"
diff --git a/system/zsh/APKBUILD b/system/zsh/APKBUILD
index 32c86b7df..5c80e950b 100644
--- a/system/zsh/APKBUILD
+++ b/system/zsh/APKBUILD
@@ -3,16 +3,17 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=zsh
-pkgver=5.6.2
-pkgrel=1
+pkgver=5.7.1
+pkgrel=0
pkgdesc="A very advanced and programmable command interpreter (shell)"
-url="http://www.zsh.org/"
+url="https://www.zsh.org/"
arch="all"
license="Zsh AND BSD-3-Clause AND GPL-2.0+ AND GPL-2.0-only AND Artistic-1.0-Perl AND MIT AND GPL-1.0+"
depends="debianutils" # add-shell
makedepends_host="ncurses-dev pcre-dev utmps-dev"
install="zsh.post-install zsh.post-upgrade zsh.pre-deinstall"
-source="http://www.zsh.org/pub/$pkgname-$pkgver.tar.xz
+# Note the custom fetch() function
+source="https://www.zsh.org/pub/$pkgname-$pkgver.tar.xz
zprofile
zshrc
"
@@ -21,7 +22,6 @@ subpackages="$pkgname-doc
$pkgname-vcs::noarch
$pkgname-tcp::noarch"
[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-zftp"
-builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 5.6.2-r0:
@@ -52,9 +52,12 @@ for _i in $_comps; do
subpackages="$subpackages ${_i%%:*}-zsh-completion:_completion:noarch"
done
-prepare() {
- cd "$builddir"
+fetch() {
+ uri_fetch_mirror "https://www.zsh.org/pub/old/$pkgname-$pkgver.tar.xz" || true
+ default_fetch
+}
+prepare() {
default_prepare
# Remove completions for other systems.
@@ -81,8 +84,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
LIBS="-lutmps -lskarnet" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -102,7 +103,6 @@ build() {
}
check() {
- cd "$builddir"
# Does not work with musl due to UTF-8
rm "$builddir"/Test/A03quoting.ztst
# Does not work with musl due to locale
@@ -115,8 +115,6 @@ check() {
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/zprofile "$pkgdir"/etc/zsh/zprofile
install -Dm644 "$srcdir"/zshrc "$pkgdir"/etc/zsh/zshrc
@@ -177,6 +175,6 @@ _submv() {
mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
}
-sha512sums="f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2 zsh-5.6.2.tar.xz
+sha512sums="a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0 zsh-5.7.1.tar.xz
e90723eb790581419498f3ab86fb5d6cab4aaede8c87eb79ead7047d259b643cfb47f4d1beb06d03e038cfda3a20ef9dd4c1b417270ab55c688e166fe30ef4f6 zprofile
1675e016f97333cad89b587f4292d81b6bc10e27b75482e3e0c3808539c95bd49b907b6579fb98d817f77f2f2384c0df5afa3e2b6f43b6ae9b466925cd9ccffc zshrc"
diff --git a/user/fastjar/APKBUILD b/user/fastjar/APKBUILD
new file mode 100644
index 000000000..b821b2419
--- /dev/null
+++ b/user/fastjar/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=fastjar
+pkgver=0.98
+pkgrel=0
+pkgdesc="Java archiver tool, tuned for performance"
+url="https://savannah.nongnu.org/projects/fastjar/"
+arch="all"
+license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
+makedepends="zlib-dev"
+subpackages="$pkgname-doc"
+source="https://download.savannah.nongnu.org/releases/fastjar/fastjar-$pkgver.tar.gz
+ null-terminate.patch
+ write-return.patch
+ efficiency.patch
+ "
+
+prepare() {
+ cd "$builddir"
+ default_prepare
+ update_config_sub
+}
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+ rm -f "$pkgdir"/usr/lib/charset.alias
+}
+
+sha512sums="c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903 fastjar-0.98.tar.gz
+073c4fcc780588f146f2970f8718dbd70597ce46be8429b86d989056811bd331e209edf90e49d9ed8507e518fd7d7f57a76749f36eb308c12f9a74c7ab10beca null-terminate.patch
+061c9ca0a13136b5eacef453822f71b8dc27f7501e2bbf5243785c147800f5793cffa6d1998dce0c12ce12fd892f3f0f03c06350e50621b5782dfb9a16c375ae write-return.patch
+16584ebe2bc104c2489ee8ff0f0aca471dc0d95c79b199fc463d6bdd6fe99425d583948ebb7e9aab775dffbffdea3babbd824df5debdbd445f559e1334815583 efficiency.patch"
diff --git a/user/fastjar/efficiency.patch b/user/fastjar/efficiency.patch
new file mode 100644
index 000000000..54c471e25
--- /dev/null
+++ b/user/fastjar/efficiency.patch
@@ -0,0 +1,104 @@
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Thu, 10 Jun 2010 11:32:48 +0000
+Subject: [PATCH] jartool.c (extract_jar)
+
+Fix up checks for traversal to parent directories, disallow absolute
+paths, make the code slightly more efficient.
+
+Author: Dan Rosenberg <dan.j.rosenberg@gmail.com>
+
+--- a/jartool.c 2010/06/10 08:46:10 1.61
++++ b/jartool.c 2010/06/10 11:32:48 1.62
+@@ -1731,7 +1731,17 @@
+ struct stat sbuf;
+ int depth = 0;
+
+- tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
++ if(*filename == '/'){
++ fprintf(stderr, "Absolute path names are not allowed.\n");
++ exit(EXIT_FAILURE);
++ }
++
++ tmp_buff = malloc(strlen((const char *)filename));
++
++ if(tmp_buff == NULL) {
++ fprintf(stderr, "Out of memory.\n");
++ exit(EXIT_FAILURE);
++ }
+
+ for(;;){
+ const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
+@@ -1739,25 +1749,28 @@
+ if(idx == NULL)
+ break;
+ else if(idx == start){
++ tmp_buff[idx - filename] = '/';
+ start++;
+ continue;
+ }
+- start = idx + 1;
+
+- strncpy(tmp_buff, (const char *)filename, (idx - filename));
+- tmp_buff[(idx - filename)] = '\0';
++ memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
++ tmp_buff[idx - filename] = '\0';
+
+ #ifdef DEBUG
+ printf("checking the existance of %s\n", tmp_buff);
+ #endif
+- if(strcmp(tmp_buff, "..") == 0){
++ if(idx - start == 2 && memcmp(start, "..", 2) == 0){
+ --depth;
+ if (depth < 0){
+ fprintf(stderr, "Traversal to parent directories during unpacking!\n");
+ exit(EXIT_FAILURE);
+ }
+- } else if (strcmp(tmp_buff, ".") != 0)
++ } else if (idx - start != 1 || *start != '.')
+ ++depth;
++
++ start = idx + 1;
++
+ if(stat(tmp_buff, &sbuf) < 0){
+ if(errno != ENOENT)
+ exit_on_error("stat");
+@@ -1766,6 +1779,7 @@
+ #ifdef DEBUG
+ printf("Directory exists\n");
+ #endif
++ tmp_buff[idx - filename] = '/';
+ continue;
+ }else {
+ fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
+@@ -1782,10 +1796,11 @@
+ if(verbose && handle)
+ printf("%10s: %s/\n", "created", tmp_buff);
+
++ tmp_buff[idx - filename] = '/';
+ }
+
+ /* only a directory */
+- if(strlen((const char *)start) == 0)
++ if(*start == '\0')
+ dir = TRUE;
+
+ #ifdef DEBUG
+@@ -1793,7 +1808,7 @@
+ #endif
+
+ /* If the entry was just a directory, don't write to file, etc */
+- if(strlen((const char *)start) == 0)
++ if(*start == '\0')
+ f_fd = -1;
+
+ free(tmp_buff);
+@@ -1877,7 +1892,8 @@
+ exit(EXIT_FAILURE);
+ }
+
+- close(f_fd);
++ if (f_fd != -1)
++ close(f_fd);
+
+ if(verbose && dir == FALSE && handle)
+ printf("%10s: %s\n",
diff --git a/user/fastjar/null-terminate.patch b/user/fastjar/null-terminate.patch
new file mode 100644
index 000000000..d9aad6ca2
--- /dev/null
+++ b/user/fastjar/null-terminate.patch
@@ -0,0 +1,14 @@
+From: Richard Guenther <rguenther@suse.de>
+Date: Mon, 01 Mar 2010 15:38:43 +0000
+Subject: [PATCH] jartool.c (read_entries): Properly zero-terminate filename.
+
+--- a/jartool.c 2009/09/06 22:16:00 1.59
++++ b/jartool.c 2010/03/01 15:38:43 1.60
+@@ -790,6 +790,7 @@
+ progname, jarfile);
+ return 1;
+ }
++ ze->filename[len] = '\0';
+ len = UNPACK_UB4(header, CEN_EFLEN);
+ len += UNPACK_UB4(header, CEN_COMLEN);
+ if (lseek (fd, len, SEEK_CUR) == -1)
diff --git a/user/fastjar/write-return.patch b/user/fastjar/write-return.patch
new file mode 100644
index 000000000..795179fcd
--- /dev/null
+++ b/user/fastjar/write-return.patch
@@ -0,0 +1,15 @@
+From: Chris Ball <cjb@laptop.org>
+Date: Thu, 10 Jun 2010 08:46:10 +0000
+Subject: [PATCH] jartool.c (add_file_to_jar): Fix write return value check.
+
+--- a/jartool.c 2010/03/01 15:38:43 1.60
++++ b/jartool.c 2010/06/10 08:46:10 1.61
+@@ -1258,7 +1258,7 @@
+ exit_on_error("write");
+
+ /* write the file name to the zip file */
+- if (1 == write(jfd, fname, file_name_length))
++ if (-1 == write(jfd, fname, file_name_length))
+ exit_on_error("write");
+
+ if(verbose){
diff --git a/user/gpgme/1.12.0-fix-t-tofuinfo.patch b/user/gpgme/1.12.0-fix-t-tofuinfo.patch
new file mode 100644
index 000000000..74ba11050
--- /dev/null
+++ b/user/gpgme/1.12.0-fix-t-tofuinfo.patch
@@ -0,0 +1,100 @@
+From 66376f3e206a1aa791d712fb8577bb3490268f60 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke@gnupg.org>
+Date: Wed, 9 Jan 2019 08:25:21 +0100
+Subject: [PATCH] qt: Use tofu conflict test keys without expiry
+
+* lang/qt/tests/t-tofuinfo.cpp: Use new test keys without
+expiry.
+
+--
+The old keys expired on 2019-01-06.
+
+GnuPG-Bug-Id: T3815
+---
+ lang/qt/tests/t-tofuinfo.cpp | 58 +++++++++++++++++++-----------------
+ 1 file changed, 30 insertions(+), 28 deletions(-)
+
+diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
+index b7161028..2d881069 100644
+--- a/lang/qt/tests/t-tofuinfo.cpp
++++ b/lang/qt/tests/t-tofuinfo.cpp
+@@ -69,46 +69,48 @@ static const char testMsg1[] =
+
+ static const char conflictKey1[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+ "\n"
+-"mDMEWG+w/hYJKwYBBAHaRw8BAQdAiq1oStvDYg8ZfFs5DgisYJo8dJxD+C/AA21O\n"
+-"K/aif0O0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBHoJBLaV\n"
+-"DamYAgoa1L5BwMOl/x88BQJYb7D+AhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n"
+-"Ah4BAheAAAoJEL5BwMOl/x88GvwA/0SxkbLyAcshGm2PRrPsFQsSVAfwaSYFVmS2\n"
+-"cMVIw1PfAQDclRH1Z4MpufK07ju4qI33o4s0UFpVRBuSxt7A4P2ZD7g4BFhvsP4S\n"
+-"CisGAQQBl1UBBQEBB0AmVrgaDNJ7K2BSalsRo2EkRJjHGqnp5bBB0tapnF81CQMB\n"
+-"CAeIeAQYFggAIBYhBHoJBLaVDamYAgoa1L5BwMOl/x88BQJYb7D+AhsMAAoJEL5B\n"
+-"wMOl/x88OR0BAMq4/vmJUORRTmzjHcv/DDrQB030DSq666rlckGIKTShAPoDXM9N\n"
+-"0gZK+YzvrinSKZXHmn0aSwmC1/hyPybJPEljBw==\n"
+-"=p2Oj\n"
++"mDMEXDWgpxYJKwYBBAHaRw8BAQdAguVu4qkx8iw4eU+TQ4vvcKG7IdcZvbMhw3Zc\n"
++"npGf0+u0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBO6ovNDG\n"
++"nLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n"
++"AAoJEJYJ0fjlWbUrLaMBALegwkv2+sEcmKZqxt8JscYvFiEuycv2+rKHaZA0eDoN\n"
++"AP97W4XrJb5x49J5jDDdeko8k00uGqiiuAXJo27/i/phA7g4BFw1oKcSCisGAQQB\n"
++"l1UBBQEBB0Crhw24E2lPBhd/y+ZFotQ/2TrYqkUQqGPmff8ofLziNgMBCAeIeAQY\n"
++"FggAIBYhBO6ovNDGnLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsMAAoJEJYJ0fjlWbUr\n"
++"/K8BAJWsa+tOZsJw7w5fz6O0We6Xx4Rt17jHf563G6wMcz9+AQDRsedJ7w4zYzS9\n"
++"MFiJQ5aN0NDHMRtDFWAgCunVnJ3OBw==\n"
++"=fZa5\n"
+ "-----END PGP PUBLIC KEY BLOCK-----\n";
+
+ static const char conflictKey2[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+ "\n"
+-"mDMEWG+xShYJKwYBBAHaRw8BAQdA567gPEPJRpqKnZjlFJMRNUqruRviYMyygfF6\n"
+-"6Ok+ygu0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBJ5kRh7E\n"
+-"I98w8kgUcmkAfYFvqqHsBQJYb7FKAhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n"
+-"Ah4BAheAAAoJEGkAfYFvqqHsYR0BAOz8JjYB4VvGkt6noLS3F5TLfsedGwQkBCw5\n"
+-"znw/vGZsAQD9DSX+ekwdrN56mNO8ISt5uVS7B1ZQtouNBF+nzcwbDbg4BFhvsUoS\n"
+-"CisGAQQBl1UBBQEBB0BFupW8+Xc1ikab8TJqANjQhvFVh6uLsgcK4g9lZgbGXAMB\n"
+-"CAeIeAQYFggAIBYhBJ5kRh7EI98w8kgUcmkAfYFvqqHsBQJYb7FKAhsMAAoJEGkA\n"
+-"fYFvqqHs15ABALdN3uiV/07cJ3RkNb3WPcijGsto+lECDS11dKEwTMFeAQDx+V36\n"
+-"ocbYC/xEuwi3w45oNqGieazzcD/GBbt8OBk3BA==\n"
+-"=45IR\n"
++"mDMEXDWgixYJKwYBBAHaRw8BAQdAMWOhumYspcvEOTuesOSN4rvnJVOj/6qOWFTu\n"
++"x+wPRra0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBA64G88Q\n"
++"NPXztj8ID/FhC7tiGbeRBQJcNaCLAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n"
++"AAoJEPFhC7tiGbeRUt4A/2hf4Zgz+TYyfeH/4/ZtyL1JuZggqR1s5UopEx2Aiw10\n"
++"AP405KiTd31TJQN8Ru+7bskPu0/mzLZMNkRvBNEdc5kbDLg4BFw1oIsSCisGAQQB\n"
++"l1UBBQEBB0B5NtSrx7wDDKgwUe5Rxz0vRkaWLtyE0KbfE77oPy5DGAMBCAeIeAQY\n"
++"FggAIBYhBA64G88QNPXztj8ID/FhC7tiGbeRBQJcNaCLAhsMAAoJEPFhC7tiGbeR\n"
++"km0BAP8TQwraipqb1pJlLsEgDXeM5Jocz4fuePD78BsOBtORAP9gpCyKXdyJYGlA\n"
++"qjmG356yG6pCK9aPckTZ9IViPiHWCw==\n"
++"=tn3Q\n"
+ "-----END PGP PUBLIC KEY BLOCK-----\n";
+
+ static const char conflictMsg1[] = "-----BEGIN PGP MESSAGE-----\n"
+ "\n"
+-"owGbwMvMwCG2z/HA4aX/5W0YT3MlMUTkb2xPSizi6ihlYRDjYJAVU2Sp4mTZNpV3\n"
+-"5QwmLqkrMLWsTCCFDFycAjCR1vcMf4U0Qrs6qzqfHJ9puGOFduLN2nVmhsumxjBE\n"
+-"mdw4lr1ehIWR4QdLuNBpe86PGx1PtNXfVAzm/hu+vfjCp5BVNjPTM9L0eAA=\n"
+-"=MfBD\n"
++"owGbwMvMwCE2jfPij6eRW7UZTwsnMcSYLnT0Ki0uUXD3C1XILFHk6ihlYRDjYJAV\n"
++"U2R5t2LPhWNz9tx2D3lqANPEygTSwcDFKQAT+RjG8M9of873hQrMpinBVwKYv+rq\n"
++"XGmYW+ZcZJ+133KDq+itzlxGhg3L2X/6Khj+2Hd+He+KnXtunF2wNWxl7849e/Sy\n"
++"v6tc+8MBAA==\n"
++"=fZLe\n"
+ "-----END PGP MESSAGE-----\n";
+
+ static const char conflictMsg2[] = "-----BEGIN PGP MESSAGE-----\n"
+ "\n"
+-"owGbwMvMwCGWyVDbmL9q4RvG01xJDBH5GyvS8vO5OkpZGMQ4GGTFFFnmpbjJHVG+\n"
+-"b/DJQ6QIppaVCaSQgYtTACaySZHhr/SOPrdFJ89KrcwKY5i1XnflXYf2PK76SafK\n"
+-"tkxXuXzvJAvDX4kCybuqFk3HXCexz2+IrnZ+5X5EqOnuo3ens2cte+uzlhMA\n"
+-"=BIAi\n"
++"owGbwMvMwCH2MZF7d5Lk9omMp4WTGGJMFwZ4lRaXKLj7hSpklihydZSyMIhxMMiK\n"
++"KbLw7ZA+L2Dy9fM2ew5+mCZWJpAOBi5OAZhIUhIjw7bV+xS+cR0quqhmcY2Dl3WW\n"
++"8Ufr+rRNufOPyIdoO6nEXGH47/B+E1+oxS6e5f5n7MJ3aHBO+s345sipGV/4f665\n"
++"9mmiGjsA\n"
++"=8oJA\n"
+ "-----END PGP MESSAGE-----\n";
+
+ class TofuInfoTest: public QGpgMETest
+--
+2.19.2
+
diff --git a/user/gpgme/APKBUILD b/user/gpgme/APKBUILD
index 21b537848..bb97598e4 100644
--- a/user/gpgme/APKBUILD
+++ b/user/gpgme/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gpgme
pkgver=1.12.0
-pkgrel=0
+pkgrel=1
pkgdesc="GnuPG Made Easy"
url="https://www.gnupg.org/related_software/gpgme/"
arch="all"
@@ -10,9 +10,10 @@ arch="all"
license="(LGPL-3.0+ OR GPL-2.0+) AND LGPL-2.1+ AND MIT AND GPL-3.0+"
depends="gnupg"
depends_dev="libgpg-error-dev libassuan-dev qt5-qtbase-dev"
-makedepends="$depends_dev doxygen"
-subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme"
-source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
+makedepends="$depends_dev doxygen python3-dev swig cmd:which"
+subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme py3-gpg:_py"
+source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
+ 1.12.0-fix-t-tofuinfo.patch"
build() {
cd "$builddir"
@@ -23,7 +24,8 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var
+ --localstatedir=/var \
+ --enable-languages=cl,cpp,python3,qt
make
}
@@ -43,16 +45,19 @@ qgpgme() {
mv "$pkgdir"/usr/lib/libqgpgme.so* "$subpkgdir"/usr/lib/
}
-check() {
- cd "$builddir"
- make check
-}
-
gpgmepp() {
pkgdesc="C++ bindings for GPGME"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libgpgmepp.so.* "$subpkgdir"/usr/lib/
}
+_py() {
+ pkgdesc="$pkgdesc (Python bindings)"
+ depends="$pkgname=$pkgver-r$pkgrel python3"
+
+ mkdir -p "$subpkgdir/usr/lib/"
+ mv "$pkgdir/usr/lib/python"* "$subpkgdir/usr/lib/"
+}
-sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014 gpgme-1.12.0.tar.bz2"
+sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014 gpgme-1.12.0.tar.bz2
+c8748651021a6ea670329cffb9565b905272b092315e77dc6fa9fa23890f8a55c2159edbfa026e8af961f2ff0c0d524dc8332a2e9a24fce2b37ac7cc4bb88cb3 1.12.0-fix-t-tofuinfo.patch"
diff --git a/user/java-cacerts/APKBUILD b/user/java-cacerts/APKBUILD
new file mode 100644
index 000000000..b096f7795
--- /dev/null
+++ b/user/java-cacerts/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=java-cacerts
+pkgver=1.0
+pkgrel=0
+pkgdesc="Script to update Java security certificates"
+url=" "
+arch="noarch"
+options="!check" # Simple script, no tests
+license="MIT"
+depends="p11-kit p11-kit-trust ca-certificates"
+makedepends=""
+subpackages=""
+source="java-cacerts"
+
+builddir="$srcdir"
+
+package() {
+ cd "$builddir"
+ install -D -m755 "$srcdir"/java-cacerts \
+ "$pkgdir"/etc/ca-certificates/update.d/java-cacerts
+ mkdir -p "$pkgdir"/etc/ssl/certs/java
+}
+
+sha512sums="4cc444bcd15312fad08eb23ec605311ef2c525e8ae5b03bd5dfbcbf63632a0f8c5c475f0f5adecebb0c368aa6543a56f3355cf1b98ff9742e3f30a9cc55d02e8 java-cacerts"
diff --git a/user/java-cacerts/java-cacerts b/user/java-cacerts/java-cacerts
new file mode 100644
index 000000000..bfbe473ba
--- /dev/null
+++ b/user/java-cacerts/java-cacerts
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors \
+ --purpose server-auth /etc/ssl/certs/java/cacerts
diff --git a/user/java-common/APKBUILD b/user/java-common/APKBUILD
new file mode 100644
index 000000000..12259b209
--- /dev/null
+++ b/user/java-common/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=java-common
+pkgver=6
+pkgrel=0
+pkgdesc="Default Java runtime binary symlinks"
+url=" "
+arch="noarch"
+options="!check" # Symlinks only.
+license="Public-Domain"
+depends=""
+makedepends=""
+subpackages=""
+source=""
+triggers="java-common.trigger=/usr/lib/jvm"
+
+package() {
+ mkdir -p "$pkgdir"/usr/bin
+ ln -sf ../lib/jvm/default-jvm/jre/bin/java "$pkgdir"/usr/bin
+ ln -sf ../lib/jvm/default-jvm/jre/bin/rmiregistry "$pkgdir"/usr/bin
+ ln -sf ../lib/jvm/default-jvm/jre/bin/keytool "$pkgdir"/usr/bin
+ ln -sf ../lib/jvm/default-jvm/bin/appletviewer "$pkgdir"/usr/bin
+}
diff --git a/user/java-common/java-common.trigger b/user/java-common/java-common.trigger
new file mode 100644
index 000000000..6d0613d48
--- /dev/null
+++ b/user/java-common/java-common.trigger
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -x /usr/lib/jvm/forced-jvm ]; then
+ ln -sfn forced-jvm default-jvm
+ exit 0
+fi
+
+cd /usr/lib/jvm
+LATEST=`ls -d java-* | sort -r | head -1`
+if [ "$LATEST" ]; then
+ ln -sfn $LATEST default-jvm
+fi
+
diff --git a/user/java-gcj-compat/APKBUILD b/user/java-gcj-compat/APKBUILD
new file mode 100644
index 000000000..a75f1e6b1
--- /dev/null
+++ b/user/java-gcj-compat/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+gccver=6.4.0
+gccpkgrel=10
+
+pkgname=java-gcj-compat
+pkgver=$gccver
+pkgrel=$gccpkgrel
+pkgdesc="Java runtime environment using GCC Java"
+url="https://gcc.gnu.org/"
+arch="all"
+license="GPL-3.0+ AND LGPL-2.1+"
+depends="fastjar gcc-java=$gccver-r$gccpkgrel java-common"
+makedepends="gcc-java=$gccver-r$gccpkgrel zlib-dev"
+subpackages=""
+source=""
+
+build() {
+ mkdir -p $builddir
+ cd $builddir
+ msg "Building ecj..."
+ gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main \
+ /usr/share/java/ecj.jar -lgcj
+}
+
+check() {
+ $builddir/ecj > /dev/null
+}
+
+package() {
+ JVM_DIR=$pkgdir/usr/lib/jvm
+ JDK_DIR=$JVM_DIR/java-1.5-gcj
+ JDK_BIN_DIR=$JDK_DIR/bin
+ JRE_DIR=$JDK_DIR/jre
+ JRE_BIN_DIR=$JRE_DIR/bin
+ JRE_LIB_DIR=$JRE_DIR/lib
+
+ CPU=$(uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g')
+
+ mkdir -p $JDK_BIN_DIR
+ ln -sf ../../../../bin/gij $JDK_BIN_DIR/java
+ ln -sf ../../../../bin/fastjar $JDK_BIN_DIR/fastjar
+ ln -sf ../../../../bin/sinjdoc $JDK_BIN_DIR/javadoc
+ ln -sf ../../../../bin/grmic $JDK_BIN_DIR/rmic
+ ln -sf ../../../../bin/gjavah $JDK_BIN_DIR/javah
+ install -s $builddir/ecj $JDK_BIN_DIR/javac
+ ln -sf ../../../../bin/gappletviewer $JDK_BIN_DIR/appletviewer
+ ln -sf ../../../../bin/gjarsigner $JDK_BIN_DIR/jarsigner
+ ln -sf ../../../../bin/grmiregistry $JDK_BIN_DIR/rmiregistry
+ ln -sf ../../../../bin/gkeytool $JDK_BIN_DIR/keytool
+
+ gcjrel=`ls -d /usr/lib/gcj-$gccver-* | cut -d '-' -f 3`
+
+ mkdir -p $JRE_BIN_DIR $JRE_LIB_DIR/$CPU
+ ln -sf ../../../../../bin/gij $JRE_BIN_DIR/java
+ ln -sf ../../../../../bin/grmiregistry $JRE_BIN_DIR/rmiregistry
+ ln -sf ../../../../../bin/gkeytool $JRE_BIN_DIR/keytool
+ ln -sf ../../../../../share/java/libgcj-$gccver.jar $JRE_LIB_DIR/rt.jar
+ ln -sf ../../../../../share/java/libgcj-tools-$gccver.jar $JRE_LIB_DIR/tools.jar
+ ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/libjvm.so $JRE_LIB_DIR/$CPU
+ ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/libjavamath.so $JRE_LIB_DIR/$CPU
+ ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/classmap.db $JRE_LIB_DIR/$CPU
+}
+
diff --git a/user/libxp/APKBUILD b/user/libxp/APKBUILD
new file mode 100644
index 000000000..45cfad2bb
--- /dev/null
+++ b/user/libxp/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libxp
+pkgver=1.0.3
+pkgrel=0
+pkgdesc="X11 print client library"
+url="https://www.X.Org/"
+arch="all"
+license="X11"
+depends=""
+makedepends="libx11-dev libxau-dev libxext-dev xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://www.x.org/releases/individual/lib/libXp-$pkgver.tar.bz2"
+builddir="$srcdir/libXp-$pkgver"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="502a2500ec0f519dae69ac035bf93c65c47e3bc301604aacb350e90043455f3485626194db45208e5521300b282843825e08b7f7c412a7497ffa02f5f1560c8d libXp-1.0.3.tar.bz2"
diff --git a/user/lksctp-tools/APKBUILD b/user/lksctp-tools/APKBUILD
new file mode 100644
index 000000000..adeeec587
--- /dev/null
+++ b/user/lksctp-tools/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=lksctp-tools
+pkgver=1.0.17
+pkgrel=0
+pkgdesc="Tools for using SCTP on Linux"
+url="http://lksctp.sourceforge.net/"
+arch="all"
+license="GPL-2.0-only AND LGPL-2.1-only"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://downloads.sourceforge.net/lksctp/lksctp-tools-$pkgver.tar.gz"
+builddir="$srcdir/lksctp-tools-$pkgver"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 lksctp-tools-1.0.17.tar.gz"
diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index e6aa892ac..b5b50d6ad 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=netqmail
pkgver=1.06
-pkgrel=2
+pkgrel=4
pkgdesc="The qmail mail transfer agent (community version)"
url="http://www.qmail.org/$pkgname/"
arch="all"
-license="ISC"
+license="Public-Domain"
provides=sendmail
options="suid !check" # suid programs (qmail-queue); no test suite
depends="execline s6 s6-networking"
diff --git a/user/openjdk7/APKBUILD b/user/openjdk7/APKBUILD
new file mode 100644
index 000000000..13ffdf60f
--- /dev/null
+++ b/user/openjdk7/APKBUILD
@@ -0,0 +1,286 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Timo Teras <timo.teras@iki.fi>
+pkgname=openjdk7
+_icedteaver=2.6.16
+# pkgver is <JDK version>.<JDK update>
+# check icedtea JDK when updating
+pkgver=7.201.$_icedteaver
+pkgrel=0
+pkgdesc="OpenJDK 7 via IcedTea"
+url="https://icedtea.classpath.org/"
+arch="all"
+license="GPL-2.0-only WITH Classpath-exception-2.0"
+depends="$pkgname-jre java-cacerts"
+options="sover-namecheck"
+makedepends="bash findutils zip file mawk util-linux libxslt
+ autoconf automake linux-headers coreutils cmd:which
+ ca-certificates
+ nss-dev cups-dev libjpeg-turbo-dev giflib-dev libpng-dev libxt-dev
+ lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev
+ libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev
+ gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev
+ libxcomposite-dev nss-static"
+install=""
+
+# upstream binary versions
+RHINO_VER=1.7.7.2
+ANT_VER=1.9.11
+
+case $CARCH in
+x86) _jarch=i386;;
+x86_64) _jarch=amd64;;
+aarch64) _jarch=aarch64;;
+arm*) _jarch=arm
+ # openjdk has quite a bit of arm assembly producing textrels
+ # and it's non trivial to fix. allow it for now.
+ options="$options textrels";;
+s390x) _jarch=s390x;;
+ppc64le) _jarch=ppc64le;;
+ppc64) _jarch=ppc64
+ export CFLAGS="$CFLAGS -DABI_ELFv2";;
+ppc) _jarch=ppc;;
+esac
+
+INSTALL_BASE=/usr/lib/jvm/java-1.7-openjdk
+_jrelib="$INSTALL_BASE/jre/lib/$_jarch"
+
+# exclude xawt from ldpath to avoid duplicate provides for libmawt.so
+# (also in headless). in future this should be a virtual provides.
+ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
+sonameprefix="$pkgname:"
+
+subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase
+ $pkgname-doc:doc"
+
+if [ "$BOOTSTRAP" != "no" ]; then
+ makedepends="$makedepends java-gcj-compat"
+ BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
+else
+ makedepends="$makedepends $pkgname"
+ BOOTSTRAP_JAVA_HOME="$INSTALL_BASE"
+fi
+
+_dropsver=$_icedteaver
+_dropsurl=https://icedtea.classpath.org/download/drops/icedtea7/$_dropsver
+
+source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
+ openjdk-$_dropsver.tar.bz2::$_dropsurl/openjdk.tar.bz2
+ corba-$_dropsver.tar.bz2::$_dropsurl/corba.tar.bz2
+ jaxp-$_dropsver.tar.bz2::$_dropsurl/jaxp.tar.bz2
+ jaxws-$_dropsver.tar.bz2::$_dropsurl/jaxws.tar.bz2
+ jdk-$_dropsver.tar.bz2::$_dropsurl/jdk.tar.bz2
+ langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2
+ hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2
+ https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
+ https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_Release/rhino-$RHINO_VER.zip
+
+ icedtea-hotspot-musl.patch
+ icedtea-hotspot-musl-ppc.patch
+ icedtea-hotspot-noagent-musl.patch
+ icedtea-hotspot-uclibc-fixes.patch
+ icedtea-jdk-fix-build.patch
+ icedtea-jdk-execinfo.patch
+ icedtea-jdk-fix-ipv6-init.patch
+ icedtea-jdk-musl.patch
+ icedtea-jdk-no-soname.patch
+ icedtea-cpio.patch
+ icedtea-tar.patch
+ icedtea-remove-gawk.patch
+ icedtea-xattr.patch
+ remove-gawk.patch
+ xattr.patch
+ "
+
+# secfixes:
+# 7.201.2.6.16-r0:
+# - CVE-2018-3136
+# - CVE-2018-3139
+# - CVE-2018-3149
+# - CVE-2018-3169
+# - CVE-2018-3180
+# - CVE-2018-3214
+# - CVE-2018-13785
+
+builddir="$srcdir/icedtea-$_icedteaver"
+
+unpack() {
+ if [ -z "$force" ]; then
+ verify
+ initdcheck
+ fi
+ mkdir -p "$srcdir"
+ msg "Unpacking sources..."
+ tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz
+ tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz
+ unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir"
+}
+
+prepare() {
+ cd "$builddir"
+
+ # Busybox sha256 does not support longopts
+ sed -e "s/--check/-c/g" -i Makefile.am
+
+ for patch in $source; do
+ case $patch in
+ icedtea-*.patch)
+ cp ../$patch patches
+ ;;
+ *.patch)
+ msg "Applying patch $patch"
+ patch -p1 -i "$srcdir"/$patch
+ ;;
+ esac
+ done
+
+ ./autogen.sh
+}
+
+build() {
+ [ -z "$JOBS" ] && export JOBS=$(echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p')
+ export ALT_PARALLEL_COMPILE_JOBS="${JOBS:-2}"
+ export HOTSPOT_BUILD_JOBS="${JOBS:-2}"
+
+ export JAVA_HOME=$BOOTSTRAP_JAVA_HOME
+ export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH
+ export DISTRIBUTION_PATCHES=""
+
+ # Explicitly set the C++ standard as the default has changed on GCC 6+
+ # and disable optimizations that lead to a broken JVM. These options
+ # has been adopted from the Fedora package.
+ export EXTRA_CPP_FLAGS="$CXXFLAGS -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+ # CXXFLAGS doesn't make it to all calls, so we set the C++ standard
+ # version for C too.
+ export EXTRA_CFLAGS="$CFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+
+ local patch
+ for patch in $source; do
+ case $patch in
+ icedtea-*.patch)
+ export DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch"
+ ;;
+ esac
+ done
+ echo "icedtea patches: $DISTRIBUTION_PATCHES"
+
+ # --disable-arm32-jit: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2942
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=$INSTALL_BASE \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --localstatedir=/var \
+ --with-parallel-jobs=${JOBS:-2} \
+ --disable-dependency-tracking \
+ --disable-downloading \
+ --disable-arm32-jit \
+ --with-rhino=$srcdir/rhino$RHINO_VER/lib/rhino-$RHINO_VER.jar \
+ --with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \
+ --with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \
+ --with-corba-src-zip=$srcdir/corba-$_dropsver.tar.bz2 \
+ --with-jaxp-src-zip=$srcdir/jaxp-$_dropsver.tar.bz2 \
+ --with-jaxws-src-zip=$srcdir/jaxws-$_dropsver.tar.bz2 \
+ --with-jdk-src-zip=$srcdir/jdk-$_dropsver.tar.bz2 \
+ --with-langtools-src-zip=$srcdir/langtools-$_dropsver.tar.bz2 \
+ --with-jdk-home=$BOOTSTRAP_JAVA_HOME \
+ --with-pkgversion="Adelie ${pkgver}-r${pkgrel}"
+
+ msg "Icedtea boot"
+ make -j1 icedtea-boot SHELL=/bin/bash
+ msg "Icedtea boot done"
+ make
+}
+
+package() {
+ mkdir -p "$pkgdir"/$INSTALL_BASE
+ cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE
+ rm "$pkgdir"/$INSTALL_BASE/src.zip
+
+ # symlink to shared java cacerts store
+ rm -f "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts
+ ln -sf /etc/ssl/certs/java/cacerts \
+ "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts
+}
+
+jrelib() {
+ pkgdesc="OpenJDK 7 Java Runtime (class libraries)"
+ depends=""
+
+ local A; for A in jre/lib/zi jre/lib/images jre/lib/*.jar \
+ jre/lib/security jre/lib/ext/*.jar jre/lib/cmm \
+ jre/ASSEMBLY_EXCEPTION jre/THIRD_PARTY_README jre/LICENSE; do
+
+ local dirname=${A%/*}
+ mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
+ mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
+ done
+}
+
+jrebase() {
+ pkgdesc="OpenJDK 7 Java Runtime (no GUI support)"
+ depends="$pkgname-jre-lib java-common java-cacerts"
+
+ mkdir -p "$subpkgdir"/$INSTALL_BASE/bin
+
+ local A; for A in java orbd rmid servertool unpack200 keytool \
+ pack200 rmiregistry tnameserv; do
+ mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin
+ done
+
+ # rest of the jre subdir (which were not taken by -jre subpkg)
+ mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE
+}
+
+jre() {
+ pkgdesc="OpenJDK 7 Java Runtime"
+ # manually depend to avoid clash with libgcj's libjvm.so
+ depends="so:openjdk7:libjvm.so=0"
+
+ mkdir -p "$subpkgdir"
+ local A; for A in jre/bin/policytool \
+ bin/appletviewer \
+ bin/policytool \
+ jre/lib/$_jarch/xawt \
+ jre/lib/$_jarch/libsplashscreen.so; do
+
+ local dirname=${A%/*}
+ mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
+ mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
+ done
+}
+
+doc() {
+ default_doc
+ mkdir -p "$subpkgdir"/$INSTALL_BASE/
+ mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
+}
+
+sha512sums="cc782e1c5b1ce158be315cff5be61676373870c2062eb34688583a875ab68413bbabd909ce83e79a9c46c3d0c8ec10aad3c015276ddf782ce2079cb5a7098f82 icedtea-2.6.16.tar.gz
+ee2443da63ab6b1a525d0633a577f28d28d3916cb47b312d61d71b4795ae3bde4a70478017b7639133fb65cfb63aa0fcbc397afbde18f20d605a50286163e4a2 openjdk-2.6.16.tar.bz2
+3926a1c889d0ff5386dd78e8fb1ff71b553744fe574ab9655d9e1677da9aea3306d65e631866afcbb533b8e0fefbb34ae655400c9bc7c2058aaa34f8fb0a04d8 corba-2.6.16.tar.bz2
+2b37ba6f235b684682d9590c292b6af5fb6f41d4001f92dcf4945570e13fe760f91bbc7068d071e3e935829c9719936ae96940874ee211fd32cba187e05f0255 jaxp-2.6.16.tar.bz2
+41dc2b7a610cd5f4c9155c14670bb97f1c57924af2737faf6beb7b284c0ad7c0f0b33f4276cde5674a57db3f88ba4503f94f2dff7a52db3273ee53ed0b14be64 jaxws-2.6.16.tar.bz2
+2703b7bf7455aa3997426f2ce3d4c2285ee44640a940d15c1c3434414c295d87b44e749fece5a7b966661910c8768a79774fb03b43ab5605df9dc8965b600fd7 jdk-2.6.16.tar.bz2
+192dd5fac399c52bcb547617832428b40af493089b4bb63159cd9363c78af76c7acdc051d461eb4e4692b2090e05ed769b9fec460a328973b36b57bbb28cee39 langtools-2.6.16.tar.bz2
+73b0338ec293d0d87cc7251f63ef453ec10c7de978c56d8ff455b16ee0506175aed681a9a95fbdcc8b747ba00ef6cf914f63d0c5d22268b40620d4dbc7390a98 hotspot-2.6.16.tar.bz2
+0da12cb0f761b8cb76e042449e7d93f43236e7bc948e337215470a70031f0a2dda6d1b508f9397b283808d84c4ebddb31558fe1cd8e6e6469c1dd390d69ec6e7 apache-ant-1.9.11-bin.tar.gz
+1b9e8721749e81c5420a00af1e00ee0e4f48624ccb4e9aa969032114116ad50f59b254d4d16d74feff74de64157cc8b0a2ead9b555907c84b7055b796fba9a75 rhino-1.7.7.2.zip
+f62b942f0bacda8e37d0f1876d8ba14ddb4fc55a7d5fd1019463744927f40f422a85e9ee051948d566242f5a785aa28f275eb58768611283cba89af91235f43c icedtea-hotspot-musl.patch
+e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef icedtea-hotspot-musl-ppc.patch
+e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc icedtea-hotspot-noagent-musl.patch
+822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a icedtea-hotspot-uclibc-fixes.patch
+213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458 icedtea-jdk-fix-build.patch
+0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb icedtea-jdk-execinfo.patch
+48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch
+44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch
+bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch
+a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch
+dc5f59068395e9501b17308c91ec80670c195117e22cb7bef78d551d118f180a11d7f0b5d47f4c7106909d9a9a8c060ddd60b78f251fd35afa6c72a1515af53e icedtea-tar.patch
+049061b97d6e744b7ad9bad4a3dbfa1d236400003175e49740830dcb78a1f164b5c67b066e76c970eb27e09707f948cac0f5b7073abe0f49bcecfdd747f0107d icedtea-remove-gawk.patch
+b9950ddf9c5ebb53d1e029a1fe8ef843860128ceb05872313b33fd2696a4acadbc8291110ca6513ce7531e0f943e42b167068e603f7ecd0e36f5b16d6bb827ab icedtea-xattr.patch
+fda1ba46276475cced16c4f380dbc0a0ac07ae2d66a8da10e88455a299bd40ff04a63dae1c5f3d3de6adbb3c6c240db5d37df0be2fc3391764cb21c9ad83eb8b remove-gawk.patch
+3dd758e04e3b852398d81356c02a89afce0c664938d3f0179ee32e358d7057f5f969379329dd1ebcbf4bc3d37bd5e0d94102cd3f023326db5175968cfbbc9c35 xattr.patch"
diff --git a/user/openjdk7/icedtea-cpio.patch b/user/openjdk7/icedtea-cpio.patch
new file mode 100644
index 000000000..c66c1ca60
--- /dev/null
+++ b/user/openjdk7/icedtea-cpio.patch
@@ -0,0 +1,11 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk
+@@ -104,7 +104,7 @@
+ COMM = $(UTILS_USR_BIN_PATH)comm
+ COMPRESS = $(UTILS_USR_BIN_PATH)compress
+ CP = $(UTILS_COMMAND_PATH)cp
+-CPIO = $(UTILS_COMMAND_PATH)cpio
++CPIO = $(UTILS_USR_BIN_PATH)cpio
+ CUT = $(UTILS_USR_BIN_PATH)cut
+ DATE = $(UTILS_COMMAND_PATH)date
+ DF = $(UTILS_COMMAND_PATH)df
diff --git a/user/openjdk7/icedtea-hotspot-musl-ppc.patch b/user/openjdk7/icedtea-hotspot-musl-ppc.patch
new file mode 100644
index 000000000..eca684884
--- /dev/null
+++ b/user/openjdk7/icedtea-hotspot-musl-ppc.patch
@@ -0,0 +1,169 @@
+--- openjdk.orig/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
++++ openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+@@ -110,11 +110,19 @@
+ // it because the volatile registers are not needed to make setcontext() work.
+ // Hopefully it was zero'd out beforehand.
+ guarantee(uc->uc_mcontext.regs != NULL, "only use ucontext_get_pc in sigaction context");
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ return (address)uc->uc_mcontext.regs->nip;
++#else // Musl
++ return (address)uc->uc_mcontext.gp_regs[32];
++#endif
+ }
+
+ intptr_t* os::Linux::ucontext_get_sp(ucontext_t * uc) {
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ return (intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/];
++#else // Musl
++ return (intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/];
++#endif
+ }
+
+ intptr_t* os::Linux::ucontext_get_fp(ucontext_t * uc) {
+@@ -213,7 +221,11 @@
+ if (uc) {
+ address const pc = os::Linux::ucontext_get_pc(uc);
+ if (pc && StubRoutines::is_safefetch_fault(pc)) {
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ uc->uc_mcontext.regs->nip = (unsigned long)StubRoutines::continuation_for_safefetch_fault(pc);
++#else // Musl
++ uc->uc_mcontext.gp_regs[32] = (unsigned long)StubRoutines::continuation_for_safefetch_fault(pc);
++#endif
+ return true;
+ }
+ }
+@@ -364,7 +376,11 @@
+ // continue at the next instruction after the faulting read. Returning
+ // garbage from this read is ok.
+ thread->set_pending_unsafe_access_error();
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ uc->uc_mcontext.regs->nip = ((unsigned long)pc) + 4;
++#else // Musl
++ uc->uc_mcontext.gp_regs[32] = ((unsigned long)pc) + 4;
++#endif
+ return true;
+ }
+ }
+@@ -383,7 +399,11 @@
+ // continue at the next instruction after the faulting read. Returning
+ // garbage from this read is ok.
+ thread->set_pending_unsafe_access_error();
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ uc->uc_mcontext.regs->nip = ((unsigned long)pc) + 4;
++#else // Musl
++ uc->uc_mcontext.gp_regs[32] = ((unsigned long)pc) + 4;
++#endif
+ return true;
+ }
+ }
+@@ -406,7 +426,11 @@
+ if (stub != NULL) {
+ // Save all thread context in case we need to restore it.
+ if (thread != NULL) thread->set_saved_exception_pc(pc);
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ uc->uc_mcontext.regs->nip = (unsigned long)stub;
++#else
++ uc->uc_mcontext.gp_regs[32] = (unsigned long)stub;
++#endif
+ return true;
+ }
+
+@@ -564,6 +588,7 @@
+ ucontext_t* uc = (ucontext_t*)context;
+
+ st->print_cr("Registers:");
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->nip);
+ st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->link);
+ st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.regs->ctr);
+@@ -572,8 +597,18 @@
+ st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.regs->gpr[i]);
+ if (i % 3 == 2) st->cr();
+ }
++#else // Musl
++ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[32]);
++ st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[36]);
++ st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[35]);
+ st->cr();
++ for (int i = 0; i < 32; i++) {
++ st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.gp_regs[i]);
++ if (i % 3 == 2) st->cr();
++ }
++#endif
+ st->cr();
++ st->cr();
+
+ intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
+ st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp));
+@@ -600,7 +635,11 @@
+ // this is only for the "general purpose" registers
+ for (int i = 0; i < 32; i++) {
+ st->print("r%-2d=", i);
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ print_location(st, uc->uc_mcontext.regs->gpr[i]);
++#else // Musl
++ print_location(st, uc->uc_mcontext.gp_regs[i]);
++#endif
+ }
+ st->cr();
+ }
+--- openjdk.orig/hotspot.orig/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -1242,7 +1242,11 @@
+ // the safepoing polling page.
+ ucontext_t* uc = (ucontext_t*) ucontext;
+ // Set polling address.
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ address addr = (address)uc->uc_mcontext.regs->gpr[ra] + (ssize_t)ds;
++#else // Musl
++ address addr = (address)uc->uc_mcontext.gp_regs[ra] + (ssize_t)ds;
++#endif
+ if (polling_address_ptr != NULL) {
+ *polling_address_ptr = addr;
+ }
+@@ -1263,15 +1267,24 @@
+ int rb = inv_rb_field(instruction);
+
+ // look up content of ra and rb in ucontext
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ address ra_val=(address)uc->uc_mcontext.regs->gpr[ra];
+ long rb_val=(long)uc->uc_mcontext.regs->gpr[rb];
++#else // Musl
++ address ra_val=(address)uc->uc_mcontext.gp_regs[ra];
++ long rb_val=(long)uc->uc_mcontext.gp_regs[rb];
++#endif
+ return os::is_memory_serialize_page(thread, ra_val+rb_val);
+ } else if (is_stw(instruction) || is_stwu(instruction)) {
+ int ra = inv_ra_field(instruction);
+ int d1 = inv_d1_field(instruction);
+
+ // look up content of ra in ucontext
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ address ra_val=(address)uc->uc_mcontext.regs->gpr[ra];
++#else // Musl
++ address ra_val=(address)uc->uc_mcontext.gp_regs[ra];
++#endif
+ return os::is_memory_serialize_page(thread, ra_val+d1);
+ } else {
+ return false;
+@@ -1334,11 +1347,20 @@
+ || (is_stdu(instruction) && rs == 1)) {
+ int ds = inv_ds_field(instruction);
+ // return banged address
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ return ds+(address)uc->uc_mcontext.regs->gpr[ra];
++#else // Musl
++ return ds+(address)uc->uc_mcontext.gp_regs[ra];
++#endif
+ } else if (is_stdux(instruction) && rs == 1) {
+ int rb = inv_rb_field(instruction);
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ address sp = (address)uc->uc_mcontext.regs->gpr[1];
+ long rb_val = (long)uc->uc_mcontext.regs->gpr[rb];
++#else // Musl
++ address sp = (address)uc->uc_mcontext.gp_regs[1];
++ long rb_val = (long)uc->uc_mcontext.gp_regs[rb];
++#endif
+ return ra != 1 || rb_val >= 0 ? NULL // not a stack bang
+ : sp + rb_val; // banged address
+ }
diff --git a/user/openjdk7/icedtea-hotspot-musl.patch b/user/openjdk7/icedtea-hotspot-musl.patch
new file mode 100644
index 000000000..1da903148
--- /dev/null
+++ b/user/openjdk7/icedtea-hotspot-musl.patch
@@ -0,0 +1,79 @@
+--- openjdk.orig/hotspot/src/os/linux/vm/jvm_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp
+@@ -154,7 +154,9 @@
+ #ifdef SIGSTKFLT
+ "STKFLT", SIGSTKFLT, /* Stack fault. */
+ #endif
++#ifdef SIGCLD
+ "CLD", SIGCLD, /* Same as SIGCHLD (System V). */
++#endif
+ "CHLD", SIGCHLD, /* Child status has changed (POSIX). */
+ "CONT", SIGCONT, /* Continue (POSIX). */
+ "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.inline.hpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.inline.hpp
+@@ -52,7 +52,7 @@
+
+ #include <unistd.h>
+ #include <sys/socket.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <netdb.h>
+
+ inline void* os::thread_local_storage_at(int index) {
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -73,7 +73,6 @@
+ # include <pwd.h>
+ # include <poll.h>
+ # include <ucontext.h>
+-# include <fpu_control.h>
+
+ #ifdef AMD64
+ #define REG_SP REG_RSP
+@@ -533,6 +532,9 @@
+ ShouldNotReachHere();
+ return true; // Mute compiler
+ }
++
++#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw))
++#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw))
+
+ void os::Linux::init_thread_fpu_state(void) {
+ #ifndef AMD64
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
+@@ -32,7 +32,9 @@
+ // map stack pointer to thread pointer - see notes in threadLS_linux_x86.cpp
+ #define SP_BITLENGTH 32
+ #define PAGE_SHIFT 12
++ #ifndef PAGE_SIZE
+ #define PAGE_SIZE (1UL << PAGE_SHIFT)
++ #endif
+ static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
+
+ public:
+--- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp.orig
++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+@@ -76,7 +76,7 @@
+ # include <pwd.h>
+ # include <poll.h>
+ # include <ucontext.h>
+-# include <fpu_control.h>
++# include <linux/types.h>
+
+ #ifdef BUILTIN_SIM
+ #define REG_SP REG_RSP
+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp.orig
++++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+@@ -194,10 +194,6 @@
+ return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
+ }
+
+-template <class T> static const T& min (const T& a, const T& b) {
+- return (a > b) ? b : a;
+-}
+-
+ // ---------------------------------------------------------------------------
+ // Read the array of BasicTypes from a signature, and compute where the
+ // arguments should go. Values in the VMRegPair regs array refer to 4-byte
diff --git a/user/openjdk7/icedtea-hotspot-noagent-musl.patch b/user/openjdk7/icedtea-hotspot-noagent-musl.patch
new file mode 100644
index 000000000..37604acca
--- /dev/null
+++ b/user/openjdk7/icedtea-hotspot-noagent-musl.patch
@@ -0,0 +1,54 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make
++++ openjdk/hotspot/make/linux/makefiles/defs.make
+@@ -327,6 +327,9 @@
+
+ # Serviceability Binaries
+ # No SA Support for PPC, IA64, ARM or zero
++# or if thread_db.h missing (musl)
++
++ifneq ($(wildcard /usr/include/thread_db.h),)
+ ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+@@ -343,6 +346,10 @@
+ endif
+ endif
+ endif
++endif
++else
++ADD_SA_BINARIES/x86 =
++ADD_SA_BINARIES/sparc =
+ endif
+ ADD_SA_BINARIES/ppc =
+ ADD_SA_BINARIES/ppc64 =
+--- openjdk.orig/hotspot/make/linux/makefiles/sa.make
++++ openjdk/hotspot/make/linux/makefiles/sa.make
+@@ -59,9 +59,11 @@
+
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
++# check for thread_db.h too (musl does not have it).
+
+ all:
+- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
++ if [ -d $(AGENT_DIR) -a -f /usr/include/thread_db.h \
++ -a "$(SRCARCH)" != "ia64" \
+ -a "$(SRCARCH)" != "zero" \
+ -a "$(SRCARCH)" != "aarch64" ] ; then \
+ $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -65,10 +65,13 @@
+
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
++# check for thread_db.h too (musl does not have it).
+
++ifneq ($(wildcard /usr/include/thread_db.h),)
+ ifneq ($(wildcard $(AGENT_DIR)),)
+ ifneq ($(filter-out ia64 zero aarch64,$(SRCARCH)),)
+ BUILDLIBSAPROC = $(LIBSAPROC)
++endif
+ endif
+ endif
+
diff --git a/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch b/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch
new file mode 100644
index 000000000..1c1d82276
--- /dev/null
+++ b/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch
@@ -0,0 +1,93 @@
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -112,7 +112,6 @@
+ # include <string.h>
+ # include <syscall.h>
+ # include <sys/sysinfo.h>
+-# include <gnu/libc-version.h>
+ # include <sys/ipc.h>
+ # include <sys/shm.h>
+ # include <link.h>
+@@ -632,6 +631,13 @@
+ // detecting pthread library
+
+ void os::Linux::libpthread_init() {
++#if 1
++ // Hard code Alpine Linux supported uclibc/musl compatible settings
++ os::Linux::set_glibc_version("glibc 2.9");
++ os::Linux::set_libpthread_version("NPTL");
++ os::Linux::set_is_NPTL();
++ os::Linux::set_is_floating_stack();
++#else
+ // Save glibc and pthread version strings. Note that _CS_GNU_LIBC_VERSION
+ // and _CS_GNU_LIBPTHREAD_VERSION are supported in glibc >= 2.3.2. Use a
+ // generic name for earlier versions.
+@@ -690,6 +696,7 @@
+ if (os::Linux::is_NPTL() || os::Linux::supports_variable_stack_size()) {
+ os::Linux::set_is_floating_stack();
+ }
++#endif
+ }
+
+ /////////////////////////////////////////////////////////////////////////////
+@@ -2951,11 +2958,7 @@
+ // If we are running with earlier version, which did not have symbol versions,
+ // we should use the base version.
+ void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
+- void *f = dlvsym(handle, name, "libnuma_1.1");
+- if (f == NULL) {
+- f = dlsym(handle, name);
+- }
+- return f;
++ return dlsym(handle, name);
+ }
+
+ bool os::Linux::libnuma_init() {
+@@ -5312,7 +5315,25 @@
+ // Linux doesn't yet have a (official) notion of processor sets,
+ // so just return the system wide load average.
+ int os::loadavg(double loadavg[], int nelem) {
++#ifdef __UCLIBC__
++ FILE *LOADAVG;
++ double avg[3] = { 0.0, 0.0, 0.0 };
++ int i, res = -1;;
++
++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
++ res = 0;
++ fclose(LOADAVG);
++ }
++
++ for (i = 0; (i < nelem) && (i < 3); i++) {
++ loadavg[i] = avg[i];
++ }
++
++ return res;
++#else
+ return ::getloadavg(loadavg, nelem);
++#endif
+ }
+
+ void os::pause() {
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -253,7 +253,7 @@
+ #elif defined(__APPLE__)
+ inline int g_isnan(double f) { return isnan(f); }
+ #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
+-inline int g_isnan(float f) { return isnanf(f); }
++inline int g_isnan(float f) { return isnan(f); }
+ inline int g_isnan(double f) { return isnan(f); }
+ #else
+ #error "missing platform-specific definition here"
+@@ -267,8 +267,8 @@
+
+ // Checking for finiteness
+
+-inline int g_isfinite(jfloat f) { return finite(f); }
+-inline int g_isfinite(jdouble f) { return finite(f); }
++inline int g_isfinite(jfloat f) { return isfinite(f); }
++inline int g_isfinite(jdouble f) { return isfinite(f); }
+
+
+ // Wide characters
diff --git a/user/openjdk7/icedtea-jdk-execinfo.patch b/user/openjdk7/icedtea-jdk-execinfo.patch
new file mode 100644
index 000000000..a6499dcb0
--- /dev/null
+++ b/user/openjdk7/icedtea-jdk-execinfo.patch
@@ -0,0 +1,40 @@
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_xembed_server.c
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c
+@@ -35,7 +35,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ #include <Xm/MwmUtil.h>
+-#ifdef __linux__
++#if defined(__linux__) && defined(__GLIBC__) && ! defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
+ #include <stdio.h>
+@@ -835,7 +835,7 @@
+ AWT_UNLOCK();
+ }
+
+-#ifdef __linux__
++#if defined(__linux__) && defined(__GLIBC__) && ! defined(__UCLIBC__)
+ void
+ print_stack (void)
+ {
+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c
++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
+@@ -27,7 +27,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xos.h>
+ #include <X11/Xatom.h>
+-#ifdef __linux__
++#if defined(__linux__) && defined(__GLIBC__) && ! defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
+
+@@ -689,7 +689,7 @@
+ return ret;
+ }
+
+-#ifdef __linux__
++#if defined(__linux__) && defined(__GLIBC__) && ! defined(__UCLIBC__)
+ void print_stack(void)
+ {
+ void *array[10];
diff --git a/user/openjdk7/icedtea-jdk-fix-build.patch b/user/openjdk7/icedtea-jdk-fix-build.patch
new file mode 100644
index 000000000..9fae895b6
--- /dev/null
+++ b/user/openjdk7/icedtea-jdk-fix-build.patch
@@ -0,0 +1,56 @@
+Fixes three issues:
+ - so's should not be linked to -ljvm as dlopen(/abs/name) is
+ used by the launcher to load libjvm.so; it is thus not available
+ (musl/uclibc) ld.so to satisfy NEEDED dependency inserted by
+ -ljvm. Fix to not link against -ljvm, and disable -z defs so
+ undefined symbols are allowed in sos
+ - the previous makes ldd generate errors on unresolved symbols (musl)
+ remove it altogether as it's used for informative purposes only
+ (display things - not check anything useful)
+ - Don't delete the generated directory $(GENCSEXT), this can
+ confuse make in highly parallel builds with:
+ make[6]: *** INTERNAL: readdir: No such file or directory. Stop.
+ make[6]: Leaving directory '.../openjdk-boot/jdk/make/sun/nio/cs'
+
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk
++++ openjdk/jdk/make/common/Defs-linux.gmk
+@@ -350,7 +350,7 @@
+
+ EXTRA_LIBS += -lc
+
+-LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
++LDFLAGS_DEFS_OPTION =
+ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
+
+ #
+@@ -407,7 +407,7 @@
+ # the library itself should not.
+ #
+ VM_NAME = server
+-JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
++JVMLIB =
+ JAVALIB = -ljava $(JVMLIB)
+
+ #
+--- openjdk.orig/jdk/make/sun/nio/cs/Makefile
++++ openjdk/jdk/make/sun/nio/cs/Makefile
+@@ -107,7 +107,7 @@
+ $(GENCSDATASRC)/DoubleByte-X.java.template \
+ $(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
+ @$(prep-target)
+- $(RM) -r $(GENCSEXT)
++ $(RM) -f "$(GENCSEXT)"/*
+ $(MKDIR) -p $(GENCSEXT)
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) extsbcs
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) euctw \
+--- openjdk.orig/jdk/make/common/shared/Defs-linux.gmk
++++ openjdk/jdk/make/common/shared/Defs-linux.gmk
+@@ -207,8 +207,6 @@
+ if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
+ $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
+ fi && \
+- $(ECHO) "Library loads for: $1" && \
+- $(LDD) $1 && \
+ $(ECHO) "RUNPATH for: $1" && \
+ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
+ )
diff --git a/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch b/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch
new file mode 100644
index 000000000..11f3bf6dd
--- /dev/null
+++ b/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch
@@ -0,0 +1,42 @@
+--- openjdk/jdk/src/solaris/native/java/net/net_util_md.c.orig
++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c
+@@ -561,7 +561,7 @@
+
+ static struct localinterface *localifs = 0;
+ static int localifsSize = 0; /* size of array */
+-static int nifs = 0; /* number of entries used in array */
++static int nifs = -1; /* number of entries used in array */
+
+ /* not thread safe: make sure called once from one thread */
+
+@@ -573,6 +573,10 @@
+ int index, x1, x2, x3;
+ unsigned int u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,ua,ub,uc,ud,ue,uf;
+
++ if (nifs >= 0)
++ return ;
++ nifs = 0;
++
+ if ((f = fopen("/proc/net/if_inet6", "r")) == NULL) {
+ return ;
+ }
+@@ -601,7 +605,7 @@
+ localifs = (struct localinterface *) realloc (
+ localifs, sizeof (struct localinterface)* (localifsSize+5));
+ if (localifs == 0) {
+- nifs = 0;
++ nifs = -1;
+ fclose (f);
+ return;
+ }
+@@ -624,9 +628,7 @@
+ static int getLocalScopeID (char *addr) {
+ struct localinterface *lif;
+ int i;
+- if (localifs == 0) {
+- initLocalIfs();
+- }
++ initLocalIfs();
+ for (i=0, lif=localifs; i<nifs; i++, lif++) {
+ if (memcmp (addr, lif->localaddr, 16) == 0) {
+ return lif->index;
diff --git a/user/openjdk7/icedtea-jdk-musl.patch b/user/openjdk7/icedtea-jdk-musl.patch
new file mode 100644
index 000000000..49c16d73a
--- /dev/null
+++ b/user/openjdk7/icedtea-jdk-musl.patch
@@ -0,0 +1,116 @@
+diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-07-15 07:19:52.186682096 +0000
+@@ -46,6 +46,8 @@
+
+ #include "zip.h"
+
++#define uchar unsigned char
++
+ #ifdef NO_ZLIB
+
+ inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
+diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h 2014-07-15 07:19:52.186682096 +0000
+@@ -23,9 +23,7 @@
+ * questions.
+ */
+
+-#define ushort unsigned short
+-#define uint unsigned int
+-#define uchar unsigned char
++#include <sys/types.h>
+
+ struct unpacker;
+
+diff -ru openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
+--- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-07-15 07:19:52.186682096 +0000
+@@ -27,6 +27,7 @@
+ #ifndef MLIB_TYPES_H
+ #define MLIB_TYPES_H
+
++#include <stddef.h> /* for NULL */
+ #include <limits.h>
+ #if defined(_MSC_VER)
+ #include <float.h> /* for FLT_MAX and DBL_MAX */
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2014-07-15 07:19:52.186682096 +0000
+@@ -47,7 +47,7 @@
+
+ #include "java_net_Inet4AddressImpl.h"
+
+-#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
++#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
+ #define HAS_GLIBC_GETHOSTBY_R 1
+ #endif
+
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c 2014-07-15 07:19:52.186682096 +0000
+@@ -47,7 +47,6 @@
+
+ #ifdef __linux__
+ #include <sys/ioctl.h>
+-#include <bits/ioctls.h>
+ #include <sys/utsname.h>
+ #include <stdio.h>
+ #endif
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-07-15 07:19:52.190015524 +0000
+@@ -35,7 +35,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-07-15 07:19:52.190015524 +0000
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+
+ #include "jvm.h"
+diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2014-07-15 07:22:17.609355950 +0000
+@@ -75,7 +75,7 @@
+ #ifdef _AIX
+ static int sigWakeup = (SIGRTMAX - 1);
+ #else
+-static int sigWakeup = (__SIGRTMAX - 2);
++static int sigWakeup;
+ #endif
+
+ /*
+@@ -148,6 +148,9 @@
+ /*
+ * Setup the signal handler
+ */
++#ifndef __AIX
++ sigWakeup = SIGRTMAX - 2;
++#endif
+ sa.sa_handler = sig_wakeup;
+ sa.sa_flags = 0;
+ sigemptyset(&sa.sa_mask);
+diff -ru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-06-12 20:14:44.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-07-15 07:19:52.190015524 +0000
+@@ -38,7 +38,7 @@
+ #include <sys/signal.h>
+
+ /* Also defined in src/solaris/native/java/net/linux_close.c */
+-#define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
++#define INTERRUPT_SIGNAL (SIGRTMAX - 2)
+
+ static void
+ nullHandler(int sig)
diff --git a/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch b/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
new file mode 100644
index 000000000..26f89bb54
--- /dev/null
+++ b/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
@@ -0,0 +1,84 @@
+--- openjdk.orig/hotspot/agent/src/os/solaris/dbx/Makefile
++++ openjdk/hotspot/agent/src/os/solaris/dbx/Makefile
+@@ -50,7 +50,7 @@
+ CFLAGS_32bit := -xarch=v8
+ CFLAGS_64bit := -xarch=v9
+ CFLAGS := -PIC -xO3 $(INCLUDES)
+-LIBS := -lsocket -lnsl -lrtld_db
++LIBS := -lsocket -lrtld_db
+ LDFLAGS := -G
+
+ ifneq "$(ARCH)" "i486"
+--- openjdk.orig/jdk/make/java/hpi/hpi_common.gmk
++++ openjdk/jdk/make/java/hpi/hpi_common.gmk
+@@ -86,5 +86,5 @@
+ # Things that must be linked in.
+ #
+ ifneq ($(PLATFORM), windows)
+-OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
++OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
+ endif
+--- openjdk.orig/jdk/make/java/java/Makefile
++++ openjdk/jdk/make/java/java/Makefile
+@@ -205,7 +205,7 @@
+ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
+ -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+ else
+-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
+ -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+ endif
+
+--- openjdk.orig/jdk/make/java/java_hprof_demo/Makefile
++++ openjdk/jdk/make/java/java_hprof_demo/Makefile
+@@ -83,7 +83,7 @@
+ ifeq ($(PLATFORM), windows)
+ OTHER_LDLIBS += wsock32.lib winmm.lib
+ else
+- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
++ OTHER_LDLIBS += $(LIBSOCKET) -ldl
+ endif
+
+ #
+--- openjdk.orig/jdk/make/java/net/Makefile
++++ openjdk/jdk/make/java/net/Makefile
+@@ -97,7 +97,7 @@
+ # Will not compile at warning level 3 if warnings are fatal
+ COMPILER_WARNINGS_FATAL=false
+ else
+- OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
++ OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
+ endif
+ ifeq ($(PLATFORM), linux)
+ OTHER_LDLIBS += -lpthread
+--- openjdk.orig/jdk/make/jpda/transport/socket/Makefile
++++ openjdk/jdk/make/jpda/transport/socket/Makefile
+@@ -42,11 +42,11 @@
+ endif
+
+ ifeq ($(PLATFORM), linux)
+- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
++ OTHER_LDLIBS += $(LIBSOCKET) -lpthread
+ endif
+
+ ifeq ($(PLATFORM), solaris)
+- OTHER_LDLIBS += -lnsl $(LIBSOCKET)
++ OTHER_LDLIBS += $(LIBSOCKET)
+ endif
+
+ ifeq ($(PLATFORM), windows)
+--- openjdk.orig/jdk/make/mkdemo/jvmti/hprof/Makefile
++++ openjdk/jdk/make/mkdemo/jvmti/hprof/Makefile
+@@ -39,10 +39,10 @@
+ EXTRA_LIBS += wsock32.lib winmm.lib
+ endif
+ ifeq ($(PLATFORM), solaris)
+- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
++ OTHER_LDLIBS += $(LIBSOCKET) -ldl
+ endif
+ ifeq ($(PLATFORM), linux)
+- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
++ OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
+ endif
+
+ #
diff --git a/user/openjdk7/icedtea-jdk-no-soname.patch b/user/openjdk7/icedtea-jdk-no-soname.patch
new file mode 100644
index 000000000..fe6bbb732
--- /dev/null
+++ b/user/openjdk7/icedtea-jdk-no-soname.patch
@@ -0,0 +1,12 @@
+--- ./openjdk/jdk/make/common/Defs-linux.gmk.orig
++++ ./openjdk/jdk/make/common/Defs-linux.gmk
+@@ -248,7 +248,9 @@
+ #
+ LDFLAGS_OPT = -Xlinker -O1
+ LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
++ifdef LIBRARY
+ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
++endif
+
+ #
+ # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
diff --git a/user/openjdk7/icedtea-remove-gawk.patch b/user/openjdk7/icedtea-remove-gawk.patch
new file mode 100644
index 000000000..98e9878b7
--- /dev/null
+++ b/user/openjdk7/icedtea-remove-gawk.patch
@@ -0,0 +1,22 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2018-10-22 05:22:47.000000000 +0000
++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2019-02-27 00:44:26.900000000 +0000
+@@ -182,7 +182,7 @@
+ # others have it in /usr/bin.
+ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
+ $(wildcard $(UTILS_USR_BIN_PATH)sort))
+- NAWK = $(USRBIN_PATH)gawk
++ NAWK = $(USRBIN_PATH)mawk
+ # Intrinsic unix command, with backslash-escaped character interpretation
+ ECHO = /bin/echo -e
+ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2019-02-27 00:40:12.430000000 +0000
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2019-02-27 00:43:49.520000000 +0000
+@@ -207,7 +207,7 @@
+ # others have it in /usr/bin.
+ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
+ $(wildcard $(UTILS_USR_BIN_PATH)sort))
+- NAWK = $(USRBIN_PATH)gawk
++ NAWK = $(USRBIN_PATH)mawk
+ # Intrinsic unix command, with backslash-escaped character interpretation
+ ECHO = /bin/echo -e
+ # These are really in UTILS_USR_BIN_PATH on Linux
diff --git a/user/openjdk7/icedtea-tar.patch b/user/openjdk7/icedtea-tar.patch
new file mode 100644
index 000000000..98c280184
--- /dev/null
+++ b/user/openjdk7/icedtea-tar.patch
@@ -0,0 +1,22 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2019-02-27 01:45:10.950000000 +0000
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2019-02-27 02:26:55.870000000 +0000
+@@ -150,7 +150,7 @@
+ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
+ SORT = $(UTILS_COMMAND_PATH)sort
+ TAIL = $(UTILS_USR_BIN_PATH)tail
+-TAR = $(UTILS_COMMAND_PATH)tar
++TAR = $(UTILS_USR_BIN_PATH)tar
+ TEST = $(UTILS_USR_BIN_PATH)test
+ TOUCH = $(UTILS_COMMAND_PATH)touch
+ TR = $(UTILS_USR_BIN_PATH)tr
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2019-02-27 02:27:38.910000000 +0000
++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2019-02-27 02:28:00.210000000 +0000
+@@ -129,7 +129,7 @@
+ SORT = $(UTILS_COMMAND_PATH)sort
+ STRIP = $(UTILS_CCS_BIN_PATH)strip
+ TAIL = $(UTILS_USR_BIN_PATH)tail
+-TAR = $(UTILS_COMMAND_PATH)tar
++TAR = $(UTILS_USR_BIN_PATH)tar
+ TEST = $(UTILS_USR_BIN_PATH)test
+ TOUCH = $(UTILS_COMMAND_PATH)touch
+ TR = $(UTILS_USR_BIN_PATH)tr
diff --git a/user/openjdk7/icedtea-xattr.patch b/user/openjdk7/icedtea-xattr.patch
new file mode 100644
index 000000000..51aee48c4
--- /dev/null
+++ b/user/openjdk7/icedtea-xattr.patch
@@ -0,0 +1,11 @@
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c.old 2018-10-22 05:32:13.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2019-02-27 01:37:00.950000000 +0000
+@@ -38,7 +38,7 @@
+
+ #ifdef COMPILE_AGAINST_SYSCALLS
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #else
+ #include <syscalls_fp.h>
+ #endif
diff --git a/user/openjdk7/remove-gawk.patch b/user/openjdk7/remove-gawk.patch
new file mode 100644
index 000000000..dccddbab9
--- /dev/null
+++ b/user/openjdk7/remove-gawk.patch
@@ -0,0 +1,125 @@
+--- icedtea-2.6.16/configure.old 2019-01-01 20:11:07.846602426 +0000
++++ icedtea-2.6.16/configure 2019-02-27 00:23:41.230000000 +0000
+@@ -6881,108 +6881,7 @@
+ LDD="$ac_cv_prog_LDD"
+ fi
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}gawk", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gawk; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GAWK+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $GAWK in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_GAWK="$GAWK" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_GAWK="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
+-fi
+-GAWK=$ac_cv_path_GAWK
+-if test -n "$GAWK"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAWK" >&5
+-$as_echo "$GAWK" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_GAWK"; then
+- ac_pt_GAWK=$GAWK
+- # Extract the first word of "gawk", so it can be a program name with args.
+-set dummy gawk; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_GAWK+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $ac_pt_GAWK in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_ac_pt_GAWK="$ac_pt_GAWK" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_ac_pt_GAWK="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
+-fi
+-ac_pt_GAWK=$ac_cv_path_ac_pt_GAWK
+-if test -n "$ac_pt_GAWK"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GAWK" >&5
+-$as_echo "$ac_pt_GAWK" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+- if test "x$ac_pt_GAWK" = x; then
+- GAWK=""
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- GAWK=$ac_pt_GAWK
+- fi
+-else
+- GAWK="$ac_cv_path_GAWK"
+-fi
+-
+- if test x"$GAWK" = x ; then
+- as_fn_error $? "The following program was not found on the PATH: gawk" "$LINENO" 5
+- fi
+-
++GAWK="$AWK"
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}perl", so it can be a program name with args.
+--- icedtea-2.6.16/configure.ac.old 2019-01-01 20:09:39.139994680 +0000
++++ icedtea-2.6.16/configure.ac 2019-02-27 00:25:01.960000000 +0000
+@@ -39,9 +39,7 @@
+ IT_FIND_TOOLS([FASTJAR], [fastjar jar])
+ IT_FIND_TOOLS([SED],[gsed sed])
+ AC_CHECK_TOOL([LDD], [ldd])
+-dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
+-dnl check for it explicitly rather than using AC_PROG_AWK.
+-IT_FIND_TOOL([GAWK], [gawk])
++IT_FIND_TOOL([GAWK], [awk])
+ IT_FIND_TOOL([PERL], [perl])
+ IT_CHECK_FOR_MERCURIAL
+ IT_OBTAIN_HG_REVISIONS
diff --git a/user/openjdk7/xattr.patch b/user/openjdk7/xattr.patch
new file mode 100644
index 000000000..258f9f12d
--- /dev/null
+++ b/user/openjdk7/xattr.patch
@@ -0,0 +1,11 @@
+--- icedtea-2.6.16/acinclude.m4.old 2019-01-01 20:09:39.127994868 +0000
++++ icedtea-2.6.16/acinclude.m4 2019-02-27 00:35:33.320000000 +0000
+@@ -2271,7 +2271,7 @@
+ dnl Check for syscalls
+ AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],,
+ [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
+- AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h],
++ AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h],
+ , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])])
+ ENABLE_SYSCALL_COMPILATION=true
+ fi
diff --git a/user/perl-test-differences/APKBUILD b/user/perl-test-differences/APKBUILD
index 64a93147b..56d34bce8 100644
--- a/user/perl-test-differences/APKBUILD
+++ b/user/perl-test-differences/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Dan Theisen <djt@hxx.in>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-differences
-pkgver=0.64
+pkgver=0.65
pkgrel=0
pkgdesc="Test strings and data structures and show differences if not ok"
url="https://metacpan.org/pod/Test::Differences"
@@ -31,4 +31,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="118a4b8e3f61f64d6676c82913bb605a843a408f3fc5d960b40cc86f10423380a203b2a5604e15ba8d4e0cff96af88b551fba1c7aa2ada3c0ef408a27ee5f069 Test-Differences-0.64.tar.gz"
+sha512sums="298058b0ca94b865ac84bbed86275e1d2c3f9eadafc70c017d471d39a78a1370112aa63c09ff072621b12b1e6a84e9b456fe05e17d0d2893e2f5fc9946f81b87 Test-Differences-0.65.tar.gz"
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index a0fa13696..aa1473ba5 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -1,16 +1,17 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-dns
-pkgver=2.3.0.1
+pkgver=2.3.0.2
pkgrel=0
pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
url="https://skarnet.org/software/s6-dns/"
arch="all"
-license="ISC"
-makedepends="skalibs-dev"
options="!check"
-makedepends="skalibs-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+license="ISC"
+_skalibs_version=2.8
+depends=
+makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -20,6 +21,7 @@ build() {
--enable-static \
--disable-allstatic \
--prefix=/usr \
+ --libdir=/usr/lib \
--libexecdir="/usr/lib/$package" \
--with-dynlib=/lib
make
@@ -30,10 +32,38 @@ package() {
make DESTDIR="$pkgdir" install
}
+
+libs() {
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
+}
+
+
+dev() {
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
+ mv "$pkgdir/usr/include" "$subpkgdir/usr/"
+ mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
+}
+
+
+libsdev() {
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
+}
+
+
doc() {
- default_doc
- mkdir -p "$subpkgdir"/usr/share/doc
- cp -a "$builddir"/doc "$subpkgdir"/usr/share/doc/$pkgname
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157 s6-dns-2.3.0.1.tar.gz"
+sha512sums="fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33 s6-dns-2.3.0.2.tar.gz"
diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index 39b08026f..09ba89702 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -1,16 +1,17 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-networking
-pkgver=2.3.0.3
+pkgver=2.3.0.4
pkgrel=0
-pkgdesc="skarnet.org's UCSPI Unix and TCP tools, access control tools, and network time management utilities."
+pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities."
url="https://skarnet.org/software/$pkgname/"
arch="all"
-license="ISC"
options="!check" # No test suite.
-depends_dev="skalibs-dev bearssl-dev"
-makedepends="skalibs-dev execline-dev s6-dev s6-dns-dev bearssl-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+license="ISC"
+_skalibs_version=2.8
+depends="execline"
+makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -20,6 +21,7 @@ build() {
--enable-static \
--disable-allstatic \
--prefix=/usr \
+ --libdir=/usr/lib \
--libexecdir="/usr/lib/$pkgname" \
--with-dynlib=/lib \
--enable-ssl=bearssl
@@ -31,10 +33,38 @@ package() {
make DESTDIR="$pkgdir" install
}
+
+libs() {
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
+}
+
+
+dev() {
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
+ mv "$pkgdir/usr/include" "$subpkgdir/usr/"
+ mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
+}
+
+
+libsdev() {
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
+}
+
+
doc() {
- default_doc
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir/usr/share/doc"
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762 s6-networking-2.3.0.3.tar.gz"
+sha512sums="e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3 s6-networking-2.3.0.4.tar.gz"
diff --git a/user/xorgproto/APKBUILD b/user/xorgproto/APKBUILD
index 0cbde9cbc..f1f802e13 100644
--- a/user/xorgproto/APKBUILD
+++ b/user/xorgproto/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xorgproto
pkgver=2018.4
-pkgrel=0
+pkgrel=1
pkgdesc="X11 protocol headers (combination)"
url="https://www.X.Org/"
arch="noarch"
@@ -49,7 +49,9 @@ replaces="bigreqsproto compositeproto damageproto dri2proto dri3proto
randrproto recordproto renderproto resourceproto scrnsaverproto
videoproto xcmiscproto xextproto xf86bigfontproto xf86dgaproto
xf86driproto xf86miscproto xf86vidmodeproto xineramaproto xproto"
-source="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$pkgver.tar.bz2"
+source="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$pkgver.tar.bz2
+ xprint.patch
+ "
build() {
cd "$builddir"
@@ -60,7 +62,8 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- --datadir=/usr/lib
+ --datadir=/usr/lib \
+ --enable-legacy
make
}
@@ -74,4 +77,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c xorgproto-2018.4.tar.bz2"
+sha512sums="2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c xorgproto-2018.4.tar.bz2
+18fc5228bb53eb15cfa0018f718e06faba0384a41e3aa0006fbf63e2a98779fdab527ea9eb8e22bb6a6f1ca02340ad8dad1260ee16e75f0416461ccefaa6df73 xprint.patch"
diff --git a/user/xorgproto/xprint.patch b/user/xorgproto/xprint.patch
new file mode 100644
index 000000000..5b713de0a
--- /dev/null
+++ b/user/xorgproto/xprint.patch
@@ -0,0 +1,424 @@
+--- a/man/Xprint.man.orig 2018-07-24 10:46:56 UTC
++++ b/man/Xprint.man
+@@ -0,0 +1,421 @@
++.\" -*- coding: us-ascii -*-
++.TH Xprint __miscmansuffix__ "8 October 2004"
++.SH NAME
++Xprint \- The "X print service" - a portable, network-transparent printing system based on the X11 protocol
++.SH SYNOPSIS
++Xprint is a very flexible, extensible, scaleable, client/server
++print system based on ISO 10175 (and some other specs) and the X11
++rendering protocol.
++Using Xprint an application can search, query and use devices like
++printers, FAX machines or create documents in formats like PDF.
++In particular, an application can seek a printer, query supported
++attributes (like paper size, trays, fonts etc.), configure the printer
++device to match it\(cqs needs and print on it like on any other X device
++reusing parts of the code which is used for the video card Xserver.
++.SH OVERVIEW
++The "X Print Service" technology allows X rendering to devices such as
++printers and fax. Most of the service is available in the X11
++technology stack as Xp, with the remainder in single toolkit stacks (e.g. DtPrint for CDE).
++Modifications have also been made to the LessTif/Motif/Qt technology
++stacks to support Xprint.
++.PP
++The Xp portion consists of:
++.TP 0.2i
++\(bu
++Xp Extension for the X-Server (included in the X-Server Xprt)
++.TP 0.2i
++\(bu
++Xp Extension API for the client side (libXp/libXprintUtils)
++.TP 0.2i
++\(bu
++PCL ddx driver that converts core X to native PCL
++.TP 0.2i
++\(bu
++PDF ddx driver that converts core X to native PDF
++.TP 0.2i
++\(bu
++PostScript ddx driver that converts core X to native PostScript
++.TP 0.2i
++\(bu
++Raster ddx driver that generates xwd rasters which can be converted to PCL, PDF or PostScript rasters
++.PP
++.PP
++From an X clients perspective, it can attach to one of two nearly
++identical X-Servers, a "Video" X-Server, and a "Print" X-Server
++which has the additional Xp capability but otherwise looks and
++behaves the same.
++.SH "HOW THE X PRINT SERVICE WORKS"
++The X Print Service expands on the traditional X-Server and Xlib world
++in four ways.
++.TP 0.4i
++1.
++Most obvious is the use of "print ddx drivers" instead of
++"video ddx drivers". While a video ddx driver modifies pixels
++in a video frame buffer, a print ddx driver generates "page
++description language (PDL)" output (such as PCL, PDF or PostScript)
++or sends the print rendering instructions to a platform-specific
++print API (like Win32/GDI).
++
++Once a print ddx driver generates PDL output, it can be sent to
++a spooler such as \fBlp\fR(1)
++or retrieved by the client (to implement functionality like "print-to-file").
++
++Though not currently done, a single X-Server can support both
++print and video ddx drivers.
++.TP 0.4i
++2.
++Since printers support "paged" output, unlike video, a portion
++of the Xp Extension supports APIs to delineate printed output.
++For example, XpStartPage and XpEndPage tell the X-Server where
++a physical page starts and ends in an otherwise continuous
++stream of X rendering primitives. Likewise, XpStartJob and
++XpEndJob determine when a collection of pages starts and ends.
++XpEndJob typically causes the generated PDL to be submitted to
++a spooler, such as \fBlp\fR(1).
++.TP 0.4i
++3.
++Since printers have extensive capabilities, another portion of
++the Xp Extension supports APIs to manipulate "print contexts".
++
++Once a printer is selected using the Xp Extension API, a print
++context to represent it can be created. A print context
++embodies the printer selected - it contains the printer's
++default capabilities, selectable range of capabilities,
++printer state, and generated output. Some "attributes" within
++the print context can be modified by the user, and the
++X-Server and print ddx driver will react accordingly. For
++example, the attribute "content-orientation" can be set to
++"landscape" or "portrait" (if the printer supports these
++values - which can be queried using the Xprint API as well).
++.TP 0.4i
++4.
++Since printers can have "built in" fonts, the Xp Extension in
++the X-Server works with the print ddx drivers to make
++available (for printing only) additional fonts on a per print
++context basis.
++
++When a print context is created and set for a given printer,
++the X font calls may be able to access additional printer
++fonts. To do this (typically), the X-Server must have access
++to "printer metric files" (.pmf) that describe at minimum the
++metrics of the built in fonts.
++.PP
++.SH USAGE
++There are three tasks to start the X Print Service:
++.TP 0.4i
++1.
++configuring the X Print Server,
++.TP 0.4i
++2.
++starting the X Print Service
++.TP 0.4i
++3.
++configuring the user session so that clients can find the running X Print Service
++.PP
++.PP
++The tasks are described in detail below.
++.SH "SERVER CONFIGURATION"
++The X Print Server (Xprt) can read a number of configuration files which
++control its behavior and support for printers. Each vendor platform has
++a default location for this information. Xprt can also read the
++environment variable \fBXPCONFIGDIR\fR to locate alternate configuration
++directories. Common settings include:
++
++export XPCONFIGDIR=/X11/lib/X11/XpConfig/
++.PP
++export XPCONFIGDIR=/proj/x11/xc/programs/Xserver/XpConfig/
++
++.PP
++Xprt has many built-in defaults, and lacking any configuration files,
++will immediately try to support all printers visible via \fBlpstat\fR(1).
++.PP
++In order of importance for configuration by a system administrator, the
++configuration files for a "C" locale are as follows (see \fBXprt\fR(__appmansuffix__) for more
++details (including support for non-"C" locales)):
++.TP
++\fB${XPCONFIGDIR}/C/print/Xprinters\fR
++\&'Xprinters' is the top most configuration file. It tells
++Xprt which specific printer names (e.g. mylaser) should
++be supported, and whether \fBlpstat\fR(1) or other commands
++should be used to automatically supplement the list of
++printers.
++.TP
++\fB${XPCONFIGDIR}/C/print/attributes/printer\fR
++The 'printer' file maps printer names to model
++configurations (see 'model-config' below). For example,
++"mylaser" could be mapped to a "HPDJ1600C", and all other
++arbitrary printers could be mapped to a default, such as
++"HPLJ4SI". When depending on \fBlpstat\fR(1) in the Xprinters
++file, setting up defaults in 'printer' becomes all the
++more important.
++.TP
++\fB${XPCONFIGDIR}/C/print/attributes/document\fR
++The 'document' file specifies the initial document values
++for any print jobs. For example, which paper tray to
++use, what default resolution, etc.
++.TP
++\fB${XPCONFIGDIR}/C/print/attributes/job\fR
++The 'job' file specifies the initial job values for any
++print jobs. For example, "notification-profile" can be
++set so that when a print job is successfully sent to a
++printer, e-mail is sent to the user.
++.TP
++\fB${XPCONFIGDIR}/C/print/models/PSdefault/model\-config\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/fonts.dir\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00051.pmf\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00093.pmf\fR
++The 'model-config' file has attributes that describe the
++printer model\(cqs capabilities and default settings.
++Printer model fonts may also be present. The model-config
++file also identifies the print ddx driver to be used.
++For each printer model supported, a complete hierarchy of
++files should exist. In most cases, these files do not
++need to be modified.
++.TP
++\fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pcl\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pdf\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/postscript\fR
++The print ddx drivers can have highly specific
++configuration files to control their behavior. In most
++cases, these files do not need to be modified.
++.PP
++More information in how to configure and customize the X print server can be found in the
++\fBXprt\fR(__appmansuffix__)
++manual page.
++.SH "STARTING UP"
++The summary checklist for starting the X Print Service is as follows:
++.TP 0.4i
++1.
++Choose an execution model for the X Print Service. The X
++Print Service can be run on a per-user session basis, per
++machine basis, or can be run on a few machines globally
++available to a number of users.
++.TP 0.4i
++2.
++If print jobs are to be submitted to a spooler (almost always
++the case), make sure all needed printers are available to the
++spooler subsystem (most often \fBlp\fR(1))
++on the same machine running the X Print Service.
++.TP 0.4i
++3.
++Configure the X Print Server. See ``X Print Server
++Configuration''.
++.TP 0.4i
++4.
++Depending on #1, start the X Print Server process "Xprt", and
++then the toolkit-specific Print Dialog Manager Daemon process
++(such as CDEnext's "dtpdmd") at the appropriate times.
++Note that libXprintUtils-based applications/toolkits do not need
++a Print Dialog Manager Daemon process to use Xprint.
++.PP
++The details are described below.
++.PP
++Because the X Print Service is based on X, it can be easily distributed.
++The most significant factors in which execution model to choose will be
++driven by:
++.TP 0.2i
++\(bu
++how many printers will be accessable through the printer
++subsystem on any given machine. A system administrator may
++choose to cluster printers on a few given machines, or
++scatter them across an organization and possibly make
++extensive use of remote spoolers to make them globally
++available.
++.TP 0.2i
++\(bu
++how many machines will need a copy of the X Print Server
++configuration files. The files have been architected so
++that one super-set version of them can be maintained and
++distributed (e.g. via NFS), and a per-machine or per-user
++version of the `Xprinters' is all that is needed to have the
++appropriate information in them utilized or ignored.
++.TP 0.2i
++\(bu
++how many users can demand services from a given X Print
++Service.
++.PP
++With the above in mind, some obvious execution models include:
++.TP 0.2i
++\(bu
++Global - in this model, the system administrator is choosing
++to run the X Print Service on a *few* select machines with
++appropriate printers configured, and allow clients access to
++the global resource. This can centralize the administration
++of printers and configuration files, but may have to be
++monitored for performance loading.
++
++Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR).
++.TP 0.2i
++\(bu
++Per-machine - every machine with potential X Print Service
++users would run the service. Printer and configuration file
++administration is decentralized, and usage would be limited
++to the users on the machine.
++
++Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR).
++.TP 0.2i
++\(bu
++Per-user session - every user would run an entire X Print
++Service for themselves. In the future, the Video X Server
++normally started may contain Print X Server capability, so
++this model becomes very natural.
++
++Startup would likely be done at session login or by
++launching actions or processes manually once the user
++logs in. Note: Deamons like "dtpdmd" must be started after Xprt.
++.PP
++.PP
++Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage):
++.TP 0.4i
++1.
++
++.nf
++[machineA] % Xprt [\-XpFile <Xprinters file>] [:dispNum] &
++.fi
++
++
++Note that Xprt will look for configuration files in either
++a default location or where \fBXPCONFIGDIR\fR points.
++
++\fB\-XpFile\fR specifies an alternate `Xprinters' file, rather
++than the default one or `\fB${XPCONFIGDIR}/C/print/Xprinters\fR'.
++.TP 0.4i
++2.
++
++.nf
++[machineA] % dtpdmd \-d machineA[:dispNum] [\-l /tmp/dtpdmd.log] &
++.fi
++
++
++The dtpdmd will maintain an X-Selection on the X-Server,
++and will start dtpdm's as required to service requests.
++.PP
++.PP
++In all but the per-user session model, the machine running the dtpdmd
++(thus dtpdm's) will need display authorization to the users video
++display.
++.SH "CLIENT CONFIGURATION"
++Once a X Print Server and dtpdmd have been started -- many of them
++in some cases -- clients will need to find and use them. There are
++two mechanisms that allow clients to discover X Print Servers and
++printers.
++.TP 0.2i
++\(bu
++"X Print Specifier" - assuming usage of the DtPrint/XprintUtils-based print
++applications, the following notation is understood:
++
++
++.nf
++printer_name@machine[:dispNum]
++.fi
++
++
++For example:
++
++
++.nf
++colorlj7@printhub:2
++.fi
++
++
++In the above example, the X Print Server running at `printhub:2'
++is assumed to support the printer named `colorlj7'.
++.TP 0.2i
++\(bu
++\fB${XPSERVERLIST}\fR - assuming usage of the DtPrint print dialogs,
++the environment variable \fB${XPSERVERLIST}\fR can contain a list
++of X Print Servers. For example:
++
++
++.nf
++XPSERVERLIST="printhub:2 printhub:3 otherdept:0"
++.fi
++
++
++Then in the dialogs, only a printer name needs to be entered.
++The dialog will then search the X Print Servers in \fB${XPSERVERLIST}\fR
++for a server than supports the printer, and then establish
++contact.
++.PP
++.SH "END-USER SEQUENCE"
++From most CDEnext applications, printing is accomplished by bringing
++down the <File> menu and selecting <Print...>. This will result in
++the DtPrintSetupBox dialog, which will request the name of a printer,
++and offer limited capability to configure print options (e.g. number
++of copies). If the user wishes, they can select <Setup...>, which
++will start a dtpdm capable of modifying additional print options.
++Finally, the user should select <Print>.
++.SH ENVIRONMENT
++.TP
++\fB${XPCONFIGDIR}\fR
++This environment variable points to the root
++of the Xprint server configuration directory hierarchy.
++If the variable is not defined, the default
++path is be assumed. The default path may be
++\fB/usr/X11R6/lib/X11/xserver/\fR,
++\fB/usr/lib/X11/xserver/\fR,
++\fB/usr/share/Xprint/xserver/\fR or
++\fB/usr/openwin/server/etc/XpConfig\fR, depending on the
++system, and may be configured in \fB/etc/init.d/xprint\fR.
++.TP
++\fB${LANG}\fR
++This environment variable selects the locale settings used by the Xprint server.
++Xprt allows language-specific settings (stored in \fB${XPCONFIGDIR}/${LANG}/print/\fR)
++which will override the default settings (stored in \fB${XPCONFIGDIR}/C/print/\fR).
++If \fB${LANG}\fR is not set "C" is assumed.
++.TP
++\fB${XPSERVERLIST}\fR
++The environment variable \fB${XPSERVERLIST}\fR contains a list
++of display identifiers (separated by whitespace) which tell an
++application where it can find the Xprint servers. Usually
++\fB${XPSERVERLIST}\fR is set by the profile startup scripts (e.g.
++\fB/etc/profile\fR or \fB/etc/profile.d/xprint.sh\fR) using the output of
++\fB/etc/init.d/xprint get_xpserverlist\fR.
++
++Example:
++
++.nf
++
++ export XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`"
++.fi
++
++
++Alternatively \fB${XPSERVERLIST}\fR can be set
++manually. Example:
++
++.nf
++
++ export XPSERVERLIST="littlecat:80 bitdog:72"
++.fi
++
++instructs an application to find an Xprint server at display
++80 on the machine "littlecat" and at display 72 on the
++machine bigdog.
++.TP
++\fB${XPRINTER}\fR
++The environment variable \fB${XPRINTER}\fR
++defines the default printer used by print
++applications. The syntax is either
++\fIprintername\fR or
++\fIprintername\fR@\fIdisplay\fR.
++
++Examples:
++.RS
++.TP
++\fBXPRINTER=ps003\fR
++tells an application to look for the
++first printer named "ps003" on all Xprint
++servers.
++.TP
++\fBXPRINTER=hplaser19@littlecat:80\fR
++tells an application to use the printer "hplaser19"
++on the Xprint server at display
++"littlecat:80".
++.RE
++
++
++If \fB${XPRINTER}\fR is not set the applications
++will examine the values of the \fB${PDPRINTER}\fR,
++\fB${LPDEST}\fR, and
++\fB${PRINTER}\fR environment variables (in that order).
++.SH "SEE ALSO"
++\fBX11\fR(__miscmansuffix__), \fBxplsprinters\fR(__appmansuffix__), \fBxprehashprinterlist\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpxmhelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBXserver\fR(__appmansuffix__), \fBXprt\fR(__appmansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html), Xprint main site (http://xprint.mozdev.org/)
++.SH AUTHORS
++This manual page was written by
++Roland Mainz <roland.mainz@nrubsig.org> based on the original X11R6.6
++\fBxc/programs/Xserver/XpConfig/README\fR.