From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sys-apps/Manifest.gz | Bin 48858 -> 48720 bytes sys-apps/acl/Manifest | 2 +- sys-apps/acl/acl-2.2.53-r1.ebuild | 2 +- sys-apps/agedu/Manifest | 4 +- sys-apps/agedu/agedu-20200617.ebuild | 4 +- sys-apps/agedu/agedu-20200705.ebuild | 4 +- sys-apps/apmd/Manifest | 2 +- sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild | 4 +- sys-apps/attr/Manifest | 2 +- sys-apps/attr/attr-2.4.48-r4.ebuild | 4 +- sys-apps/baobab/Manifest | 6 +- sys-apps/baobab/baobab-3.34.1.ebuild | 40 -- sys-apps/baobab/baobab-3.38.0.ebuild | 2 +- sys-apps/baobab/baobab-40.0.ebuild | 42 ++ sys-apps/baselayout/Manifest | 9 +- sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 248 ---------- sys-apps/baselayout/baselayout-2.6-r1.ebuild | 297 ----------- sys-apps/baselayout/baselayout-2.7-r2.ebuild | 318 ++++++++++++ sys-apps/baselayout/baselayout-2.7.ebuild | 4 +- sys-apps/baselayout/baselayout-9999.ebuild | 74 +-- sys-apps/biosdisk/Manifest | 2 +- sys-apps/biosdisk/biosdisk-1.01.ebuild | 4 +- sys-apps/bolt/Manifest | 2 +- sys-apps/bolt/bolt-0.9-r3.ebuild | 2 +- sys-apps/busybox/Manifest | 8 +- sys-apps/busybox/busybox-1.32.0-r1.ebuild | 337 ------------- sys-apps/busybox/busybox-1.32.1.ebuild | 4 +- sys-apps/busybox/busybox-1.33.0.ebuild | 2 + sys-apps/busybox/busybox-9999.ebuild | 5 +- sys-apps/checkpolicy/Manifest | 4 +- sys-apps/checkpolicy/checkpolicy-3.2.ebuild | 50 ++ sys-apps/checkpolicy/checkpolicy-9999.ebuild | 15 +- sys-apps/coreutils/Manifest | 4 +- sys-apps/coreutils/coreutils-8.31-r1.ebuild | 4 +- sys-apps/coreutils/coreutils-8.32-r1.ebuild | 4 +- sys-apps/cpint/Manifest | 2 +- sys-apps/cpint/cpint-2.5.3.ebuild | 4 +- sys-apps/cracklib-words/Manifest | 2 +- .../cracklib-words/cracklib-words-2.9.6.ebuild | 4 +- sys-apps/daisydog/Manifest | 2 +- sys-apps/daisydog/daisydog-2014.05.30.ebuild | 4 +- sys-apps/darwin-miscutils/Manifest | 8 +- .../darwin-miscutils/darwin-miscutils-10.ebuild | 6 +- .../darwin-miscutils/darwin-miscutils-6-r1.ebuild | 6 +- .../darwin-miscutils/darwin-miscutils-8.ebuild | 6 +- .../darwin-miscutils/darwin-miscutils-9.ebuild | 6 +- sys-apps/debianutils/Manifest | 4 +- sys-apps/debianutils/debianutils-4.11.1.ebuild | 4 +- sys-apps/debianutils/debianutils-4.11.2.ebuild | 2 +- sys-apps/diffutils/Manifest | 2 +- sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +- sys-apps/dmapi/Manifest | 2 +- sys-apps/dmapi/dmapi-2.2.12-r1.ebuild | 6 +- sys-apps/dtc/Manifest | 8 +- sys-apps/dtc/dtc-1.5.0-r2.ebuild | 4 +- sys-apps/dtc/dtc-1.5.0.ebuild | 5 +- sys-apps/dtc/dtc-1.6.0.ebuild | 4 +- sys-apps/dtc/dtc-9999.ebuild | 4 +- sys-apps/earlyoom/Manifest | 6 +- sys-apps/earlyoom/earlyoom-1.3.ebuild | 4 +- sys-apps/earlyoom/earlyoom-1.6.2.ebuild | 2 +- sys-apps/earlyoom/earlyoom-9999.ebuild | 4 +- sys-apps/ed/Manifest | 2 +- sys-apps/ed/ed-1.16.ebuild | 2 +- sys-apps/edac-utils/Manifest | 2 +- sys-apps/edac-utils/edac-utils-0.18.ebuild | 6 +- sys-apps/epoch/Manifest | 8 +- sys-apps/epoch/epoch-1.2.1.ebuild | 4 +- sys-apps/epoch/epoch-1.2.2.ebuild | 4 +- sys-apps/epoch/epoch-1.3.0.ebuild | 4 +- sys-apps/epoch/epoch-9999.ebuild | 4 +- sys-apps/ethq/Manifest | 6 +- sys-apps/ethq/ethq-0.5.0.ebuild | 5 +- sys-apps/ethq/ethq-0.6.1.ebuild | 5 +- sys-apps/ethq/ethq-9999.ebuild | 3 +- sys-apps/ethtool/Manifest | 8 +- sys-apps/ethtool/ethtool-5.10.ebuild | 5 +- sys-apps/ethtool/ethtool-5.4.ebuild | 4 +- sys-apps/ethtool/ethtool-5.8-r1.ebuild | 5 +- sys-apps/ethtool/ethtool-5.9.ebuild | 5 +- sys-apps/fakechroot/Manifest | 3 +- sys-apps/fakechroot/fakechroot-2.20.1.ebuild | 4 + .../files/fakechroot-2.20.1-glibc-2.33.patch | 469 ++++++++++++++++++ sys-apps/fakeroot/Manifest | 13 +- sys-apps/fakeroot/fakeroot-1.22.ebuild | 9 +- sys-apps/fakeroot/fakeroot-1.23.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.24.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.25.1.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.25.2.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild | 56 +++ sys-apps/fakeroot/fakeroot-1.25.3.ebuild | 51 -- .../files/fakeroot-1.25.3-glibc-2.33.patch | 413 ++++++++++++++++ sys-apps/fbset/Manifest | 2 +- sys-apps/fbset/fbset-2.1.ebuild | 2 +- sys-apps/file/Manifest | 21 +- sys-apps/file/file-5.37-r1.ebuild | 128 ----- sys-apps/file/file-5.38-r1.ebuild | 142 ------ sys-apps/file/file-5.39-r3.ebuild | 146 ------ sys-apps/file/file-5.39-r4.ebuild | 147 ------ sys-apps/file/file-5.40-r2.ebuild | 146 ++++++ sys-apps/file/file-9999.ebuild | 9 +- sys-apps/file/files/file-5.37-CVE-2019-18218.patch | 36 -- ...3-iaeiaeiaeiae-Do-as-the-comment-says-and.patch | 40 -- ...ble-bit-is-only-set-when-DF_1_PIE-bit-is-.patch | 29 -- ...le-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch | 27 - .../file/files/file-5.39-add-missing-termios.patch | 30 -- .../file/files/file-5.39-allow-futex-seccomp.patch | 18 - sys-apps/file/files/file-5.39-seccomp-musl.patch | 37 -- .../file/files/file-5.40-seccomp-faccessat.patch | 34 ++ .../file/files/file-5.40-seccomp-fstatat64.patch | 29 ++ sys-apps/file/files/file-5.40-xz_magic.patch | 37 ++ sys-apps/findutils/Manifest | 2 +- sys-apps/findutils/findutils-4.7.0.ebuild | 2 +- sys-apps/flashrom/Manifest | 2 +- sys-apps/flashrom/flashrom-9999.ebuild | 1 + sys-apps/fwupd/Manifest | 14 +- sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch | 44 -- sys-apps/fwupd/files/fwupd-r1 | 13 - sys-apps/fwupd/fwupd-1.4.6.ebuild | 164 ------ sys-apps/fwupd/fwupd-1.4.7.ebuild | 9 +- sys-apps/fwupd/fwupd-1.4.8.ebuild | 164 ++++++ sys-apps/fwupd/fwupd-1.5.6.ebuild | 170 ------- sys-apps/fwupd/fwupd-1.5.7-r1.ebuild | 170 ------- sys-apps/fwupd/fwupd-1.5.9.ebuild | 170 +++++++ sys-apps/fxload/Manifest | 2 +- sys-apps/fxload/fxload-20081013-r1.ebuild | 4 +- sys-apps/gawk/Manifest | 6 +- sys-apps/gawk/gawk-4.2.1-r1.ebuild | 2 +- sys-apps/gawk/gawk-5.0.1.ebuild | 2 +- sys-apps/gawk/gawk-5.1.0.ebuild | 2 +- sys-apps/gentoo-functions/Manifest | 2 +- .../gentoo-functions/gentoo-functions-0.13.ebuild | 2 +- sys-apps/gnome-disk-utility/Manifest | 6 +- .../gnome-disk-utility-3.36.3.ebuild | 62 --- .../gnome-disk-utility-3.38.2.ebuild | 2 +- .../gnome-disk-utility-40.0.ebuild | 63 +++ sys-apps/grep/Manifest | 2 +- sys-apps/grep/grep-3.4.ebuild | 2 +- sys-apps/groff/Manifest | 2 +- sys-apps/groff/groff-1.22.4.ebuild | 2 +- sys-apps/hdparm/Manifest | 2 + sys-apps/hdparm/hdparm-9.61.ebuild | 43 ++ sys-apps/help2man/Manifest | 6 +- sys-apps/help2man/help2man-1.47.17.ebuild | 2 +- sys-apps/help2man/help2man-1.48.1.ebuild | 41 -- sys-apps/help2man/help2man-1.48.3.ebuild | 41 ++ sys-apps/highway/Manifest | 2 +- sys-apps/highway/highway-1.1.0.ebuild | 5 +- sys-apps/hwids/Manifest | 4 +- sys-apps/hwids/hwids-20200813.1.ebuild | 4 +- sys-apps/hwids/hwids-20201207.ebuild | 2 +- sys-apps/hwinfo/Manifest | 2 +- sys-apps/hwinfo/hwinfo-21.72.ebuild | 2 +- sys-apps/ifd-gempc/Manifest | 2 +- sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild | 4 +- sys-apps/init-system-helpers/Manifest | 2 +- .../init-system-helpers-1.60.ebuild | 2 +- sys-apps/input-utils/Manifest | 4 +- sys-apps/input-utils/input-utils-1.2.ebuild | 9 +- sys-apps/input-utils/input-utils-1.3.ebuild | 6 +- sys-apps/install-xattr/Manifest | 4 +- sys-apps/install-xattr/install-xattr-0.5.ebuild | 4 +- sys-apps/install-xattr/install-xattr-0.8.ebuild | 4 +- .../intel-performance-counter-monitor/Manifest | 2 +- .../intel-performance-counter-monitor-2.10.ebuild | 4 +- sys-apps/ipmitool/Manifest | 6 +- .../ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild | 11 +- .../ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild | 13 +- .../ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild | 13 +- sys-apps/iproute2/Manifest | 10 +- .../files/iproute2-5.12.0-configure-nomagic.patch | 245 +++++++++ sys-apps/iproute2/iproute2-5.10.0-r1.ebuild | 2 +- sys-apps/iproute2/iproute2-5.10.0.ebuild | 167 ------- sys-apps/iproute2/iproute2-5.12.0.ebuild | 170 +++++++ sys-apps/iproute2/iproute2-5.7.0.ebuild | 4 +- sys-apps/iproute2/iproute2-9999.ebuild | 2 +- sys-apps/irqbalance/Manifest | 4 +- sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild | 62 --- sys-apps/irqbalance/irqbalance-1.8.0.ebuild | 62 +++ sys-apps/keyutils/Manifest | 2 +- sys-apps/keyutils/keyutils-1.6.1.ebuild | 4 +- sys-apps/kmod/Manifest | 6 +- sys-apps/kmod/kmod-27-r2.ebuild | 6 +- sys-apps/kmod/kmod-28.ebuild | 4 +- sys-apps/kmod/kmod-9999.ebuild | 2 +- sys-apps/kmscon/Manifest | 5 - sys-apps/kmscon/files/kmscon-SIGUNUSED.patch | 14 - sys-apps/kmscon/files/kmscon-sysmacros-fix.patch | 11 - sys-apps/kmscon/kmscon-8-r1.ebuild | 145 ------ sys-apps/kmscon/kmscon-8_p20180906.ebuild | 143 ------ sys-apps/less/Manifest | 6 +- sys-apps/less/less-563-r1.ebuild | 2 +- sys-apps/less/less-580.ebuild | 44 -- sys-apps/less/less-581.2.ebuild | 44 ++ sys-apps/linux-misc-apps/Manifest | 2 +- .../linux-misc-apps/linux-misc-apps-5.8.ebuild | 6 +- sys-apps/lmctfy/Manifest | 2 +- sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild | 4 +- sys-apps/lnxhc/Manifest | 2 +- sys-apps/lnxhc/lnxhc-1.2-r1.ebuild | 4 +- sys-apps/lsb-release/Manifest | 2 +- sys-apps/lsb-release/lsb-release-1.4-r3.ebuild | 6 +- sys-apps/lsd/Manifest | 12 + sys-apps/lsd/lsd-0.20.1.ebuild | 142 ++++++ sys-apps/lshw/Manifest | 10 +- sys-apps/lshw/files/lshw-02.18b-gentoo.patch | 20 +- sys-apps/lshw/lshw-02.18b-r1.ebuild | 4 +- sys-apps/lshw/lshw-02.18b.ebuild | 6 +- sys-apps/lshw/lshw-02.19.2b.ebuild | 1 - sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 5 +- sys-apps/lsvpd/Manifest | 2 +- sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild | 34 ++ sys-apps/lsvpd/lsvpd-1.7.11.ebuild | 34 -- sys-apps/makedev/Manifest | 2 +- sys-apps/makedev/makedev-3.23.1-r1.ebuild | 6 +- sys-apps/man-db/Manifest | 2 +- sys-apps/man-db/man-db-2.9.3-r1.ebuild | 2 +- sys-apps/man-pages-posix/Manifest | 4 +- .../man-pages-posix/man-pages-posix-2013a.ebuild | 4 +- .../man-pages-posix/man-pages-posix-2017a.ebuild | 2 +- sys-apps/man-pages/Manifest | 2 +- sys-apps/man-pages/man-pages-5.09.ebuild | 4 +- sys-apps/man2html/Manifest | 2 +- sys-apps/man2html/man2html-1.6g.ebuild | 4 +- sys-apps/mcstrans/Manifest | 4 +- sys-apps/mcstrans/mcstrans-3.2.ebuild | 49 ++ sys-apps/mcstrans/mcstrans-9999.ebuild | 10 +- sys-apps/memtest86+/Manifest | 4 +- sys-apps/memtest86+/memtest86+-5.01-r4.ebuild | 4 +- sys-apps/memtest86+/memtest86+-5.01-r5.ebuild | 4 +- sys-apps/memtest86/Manifest | 2 +- sys-apps/memtest86/memtest86-4.3.7-r2.ebuild | 4 +- sys-apps/miller/Manifest | 2 + sys-apps/miller/miller-5.10.2.ebuild | 48 ++ sys-apps/minijail/Manifest | 2 +- sys-apps/minijail/minijail-9.ebuild | 6 +- sys-apps/mlocate/Manifest | 4 +- sys-apps/mlocate/mlocate-0.26-r2.ebuild | 4 +- sys-apps/mlocate/mlocate-0.26-r3.ebuild | 6 +- sys-apps/most/Manifest | 5 +- .../files/most-5.0.0a-no-explicit-termcap.patch | 216 -------- sys-apps/most/most-5.0.0a-r1.ebuild | 35 -- sys-apps/most/most-5.1.0.ebuild | 2 +- sys-apps/mount-gtk/Manifest | 2 +- sys-apps/mount-gtk/metadata.xml | 6 +- sys-apps/msr-tools/Manifest | 2 +- sys-apps/msr-tools/msr-tools-1.3.ebuild | 4 +- sys-apps/net-tools/Manifest | 2 +- .../net-tools-1.60_p20180626073013.ebuild | 2 +- sys-apps/netloc/Manifest | 3 - sys-apps/netloc/metadata.xml | 11 - sys-apps/netloc/netloc-0.5.ebuild | 28 -- sys-apps/netplug/Manifest | 2 +- sys-apps/netplug/netplug-1.2.9.2-r2.ebuild | 4 +- sys-apps/newrelic-sysmond/Manifest | 4 - .../newrelic-sysmond/files/newrelic-sysmond.rc | 23 - sys-apps/newrelic-sysmond/metadata.xml | 5 - .../newrelic-sysmond-1.1.2.124-r1.ebuild | 56 --- sys-apps/opal-utils/Manifest | 2 +- sys-apps/opal-utils/opal-utils-6.7.ebuild | 4 +- sys-apps/openrc/Manifest | 8 +- sys-apps/openrc/openrc-0.42.1-r1.ebuild | 2 +- sys-apps/openrc/openrc-0.43.1.ebuild | 187 +++++++ sys-apps/openrc/openrc-0.43.2.ebuild | 187 +++++++ sys-apps/openrc/openrc-0.43.3.ebuild | 187 +++++++ sys-apps/opentmpfiles/Manifest | 8 +- sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild | 4 +- sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild | 4 +- sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild | 4 +- sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild | 2 +- sys-apps/osinfo-db-tools/Manifest | 4 +- .../osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild | 52 -- .../osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild | 2 +- sys-apps/osinfo-db/Manifest | 8 +- sys-apps/osinfo-db/osinfo-db-20200529.ebuild | 27 - sys-apps/osinfo-db/osinfo-db-20201015.ebuild | 25 - sys-apps/osinfo-db/osinfo-db-20210312.ebuild | 2 +- sys-apps/osinfo-db/osinfo-db-20210426.ebuild | 25 + sys-apps/paxctl/Manifest | 2 +- sys-apps/paxctl/paxctl-0.9.ebuild | 6 +- sys-apps/pciutils/Manifest | 6 +- sys-apps/pciutils/pciutils-3.5.6-r1.ebuild | 4 +- sys-apps/pciutils/pciutils-3.6.4.ebuild | 4 +- sys-apps/pciutils/pciutils-3.7.0.ebuild | 4 +- sys-apps/pcsc-slb-rf72-drv/Manifest | 4 +- .../files/pcsc-slb-rf72-drv-1.1.0-openct.patch | 13 +- .../pcsc-slb-rf72-drv-1.1.0-r2.ebuild | 5 +- sys-apps/pick/Manifest | 2 +- sys-apps/pick/pick-4.0.0.ebuild | 9 +- sys-apps/pkgcore/Manifest | 18 +- .../files/pkgcore-0.10.13-metadata-xsd.patch | 24 - .../pkgcore/files/pkgcore-0.10.18-sighdlr.patch | 47 ++ sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild | 54 -- sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild | 53 -- sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild | 48 -- sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild | 53 -- sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild | 53 -- sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild | 54 ++ sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild | 51 ++ sys-apps/pkgcore/pkgcore-0.11.6.ebuild | 47 -- sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild | 51 ++ sys-apps/pkgcore/pkgcore-9999.ebuild | 4 +- sys-apps/plocate/Manifest | 2 + sys-apps/plocate/plocate-1.1.6.ebuild | 79 +++ sys-apps/pmount-gui/Manifest | 2 +- sys-apps/pmount-gui/metadata.xml | 5 +- sys-apps/policycoreutils/Manifest | 4 +- .../policycoreutils/policycoreutils-3.2.ebuild | 162 ++++++ .../policycoreutils/policycoreutils-9999.ebuild | 22 +- sys-apps/portage/Manifest | 11 +- sys-apps/portage/portage-2.3.99-r2.ebuild | 266 ---------- sys-apps/portage/portage-3.0.12.ebuild | 269 ---------- sys-apps/portage/portage-3.0.13.ebuild | 2 +- sys-apps/portage/portage-3.0.17-r2.ebuild | 2 +- sys-apps/portage/portage-3.0.18.ebuild | 279 +++++++++++ sys-apps/prctl/Manifest | 2 +- sys-apps/prctl/prctl-1.6-r1.ebuild | 8 +- sys-apps/proot/Manifest | 2 +- sys-apps/proot/proot-5.1.0-r2.ebuild | 4 +- sys-apps/qdirstat/Manifest | 2 + sys-apps/qdirstat/qdirstat-1.7.1.ebuild | 55 +++ sys-apps/qingy/Manifest | 2 +- sys-apps/qingy/qingy-1.0.0-r5.ebuild | 2 +- sys-apps/radeontool/Manifest | 4 +- sys-apps/radeontool/radeontool-1.6.3.ebuild | 24 - .../radeontool/radeontool-1.6.3_p20181127.ebuild | 2 +- sys-apps/rescan-scsi-bus/Manifest | 2 +- .../rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild | 4 +- sys-apps/restorecond/Manifest | 4 +- sys-apps/restorecond/restorecond-3.2.ebuild | 50 ++ sys-apps/restorecond/restorecond-9999.ebuild | 8 +- sys-apps/rng-tools/Manifest | 4 +- sys-apps/rng-tools/rng-tools-6.10-r1.ebuild | 4 +- sys-apps/rng-tools/rng-tools-6.11-r1.ebuild | 2 +- sys-apps/rootlesskit/Manifest | 107 ++++ sys-apps/rootlesskit/metadata.xml | 11 + sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild | 128 +++++ sys-apps/s390-tools/Manifest | 4 +- sys-apps/s390-tools/s390-tools-2.12.0.ebuild | 4 +- sys-apps/s390-tools/s390-tools-2.9.0.ebuild | 4 +- sys-apps/s6-linux-init/Manifest | 4 +- .../s6-linux-init/s6-linux-init-0.3.1.1.ebuild | 5 +- .../s6-linux-init/s6-linux-init-0.4.0.0.ebuild | 5 +- sys-apps/s6/Manifest | 2 +- sys-apps/s6/s6-2.1.3.0.ebuild | 18 +- sys-apps/sandbox/Manifest | 8 +- sys-apps/sandbox/sandbox-2.20.ebuild | 74 --- sys-apps/sandbox/sandbox-2.21.ebuild | 2 +- sys-apps/sandbox/sandbox-2.22.ebuild | 54 ++ sys-apps/sandbox/sandbox-2.23.ebuild | 54 ++ sys-apps/sdparm/Manifest | 6 +- sys-apps/sdparm/sdparm-1.10.ebuild | 34 -- sys-apps/sdparm/sdparm-1.11-r1.ebuild | 34 ++ sys-apps/sdparm/sdparm-1.11.ebuild | 34 -- sys-apps/sdparm/sdparm-1.12.ebuild | 34 ++ sys-apps/secilc/Manifest | 4 +- sys-apps/secilc/secilc-3.2.ebuild | 33 ++ sys-apps/secilc/secilc-9999.ebuild | 12 +- sys-apps/sed/Manifest | 4 +- sys-apps/sed/sed-4.7.ebuild | 6 +- sys-apps/sed/sed-4.8.ebuild | 6 +- sys-apps/selinux-python/Manifest | 4 +- sys-apps/selinux-python/selinux-python-3.2.ebuild | 85 ++++ sys-apps/selinux-python/selinux-python-9999.ebuild | 18 +- sys-apps/semodule-utils/Manifest | 4 +- sys-apps/semodule-utils/semodule-utils-3.2.ebuild | 41 ++ sys-apps/semodule-utils/semodule-utils-9999.ebuild | 14 +- sys-apps/setserial/Manifest | 2 +- sys-apps/setserial/setserial-2.17-r5.ebuild | 4 +- sys-apps/sg3_utils/Manifest | 6 +- sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 4 +- sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild | 43 -- sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild | 43 ++ sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild | 43 ++ sys-apps/shadow/Manifest | 4 +- sys-apps/shadow/shadow-4.8-r5.ebuild | 8 +- sys-apps/shadow/shadow-4.8.1-r3.ebuild | 6 +- sys-apps/sparc-utils/Manifest | 2 +- sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild | 4 +- sys-apps/spu-tools/Manifest | 2 +- sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild | 5 +- sys-apps/superdiag/Manifest | 2 +- sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild | 2 +- sys-apps/systemd-tmpfiles/Manifest | 2 +- .../systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 1 + sys-apps/systemd/Manifest | 9 +- sys-apps/systemd/files/248-rfkill.patch | 35 ++ sys-apps/systemd/metadata.xml | 1 + sys-apps/systemd/systemd-247.2-r4.ebuild | 2 +- sys-apps/systemd/systemd-248.ebuild | 549 +++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 113 ++--- sys-apps/sysvinit/Manifest | 4 +- sys-apps/sysvinit/sysvinit-2.97.ebuild | 4 +- sys-apps/sysvinit/sysvinit-2.98-r1.ebuild | 2 +- sys-apps/tcp-wrappers/Manifest | 2 +- sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild | 4 +- sys-apps/texinfo/Manifest | 4 +- sys-apps/texinfo/texinfo-6.6-r1.ebuild | 4 +- sys-apps/texinfo/texinfo-6.7.ebuild | 2 +- sys-apps/the_silver_searcher/Manifest | 8 +- .../the_silver_searcher-2.0.0.ebuild | 51 -- .../the_silver_searcher-2.1.0.ebuild | 54 -- .../the_silver_searcher-2.2.0.ebuild | 4 +- .../the_silver_searcher-2.2.0_p20201217.ebuild | 55 +++ sys-apps/timer_entropyd/Manifest | 2 +- sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild | 4 +- sys-apps/tomoyo-tools/Manifest | 2 +- .../tomoyo-tools-2.5.0_p20130214.ebuild | 4 +- sys-apps/toybox/Manifest | 10 +- sys-apps/toybox/toybox-0.8.0.ebuild | 57 --- sys-apps/toybox/toybox-0.8.1.ebuild | 57 --- sys-apps/toybox/toybox-0.8.3.ebuild | 57 --- sys-apps/toybox/toybox-0.8.4.ebuild | 3 +- sys-apps/toybox/toybox-9999.ebuild | 3 +- sys-apps/ucspi-proxy/Manifest | 6 +- sys-apps/ucspi-proxy/metadata.xml | 5 +- sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild | 31 -- sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild | 11 +- sys-apps/ucspi-ssl/Manifest | 2 +- sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild | 2 +- sys-apps/ucspi-tcp/Manifest | 2 +- sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild | 4 +- sys-apps/usb_modeswitch/Manifest | 7 +- sys-apps/usb_modeswitch/metadata.xml | 11 +- .../usb_modeswitch/usb_modeswitch-2.5.2.ebuild | 67 --- .../usb_modeswitch/usb_modeswitch-2.6.0.ebuild | 2 +- sys-apps/usbmon/Manifest | 2 +- sys-apps/usbmon/usbmon-6-r1.ebuild | 4 +- sys-apps/usbredir/Manifest | 11 +- sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild | 44 -- sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild | 44 -- sys-apps/usbredir/usbredir-0.8.0.ebuild | 9 +- sys-apps/usbredir/usbredir-0.9.0.ebuild | 45 ++ sys-apps/usbredir/usbredir-9999.ebuild | 17 +- sys-apps/usbutils/Manifest | 4 +- sys-apps/usbutils/usbutils-012.ebuild | 4 +- sys-apps/usbutils/usbutils-013.ebuild | 4 +- sys-apps/utempter/Manifest | 2 +- sys-apps/utempter/utempter-0.5.5.6.ebuild | 4 +- sys-apps/util-linux/Manifest | 18 +- ...til-linux-2.33.1-fix-struct_termios-check.patch | 30 -- ...-linux-2.36.1-libmount_dont_use_symfollow.patch | 40 -- .../files/util-linux-2.36.1-riscv32.patch | 29 -- sys-apps/util-linux/util-linux-2.33.2.ebuild | 290 ----------- sys-apps/util-linux/util-linux-2.34-r3.ebuild | 301 ----------- sys-apps/util-linux/util-linux-2.35.2.ebuild | 12 +- sys-apps/util-linux/util-linux-2.36.1-r1.ebuild | 316 ------------ sys-apps/util-linux/util-linux-2.36.2.ebuild | 10 +- sys-apps/util-linux/util-linux-2.37_rc1.ebuild | 356 +++++++++++++ sys-apps/util-linux/util-linux-9999.ebuild | 81 ++- sys-apps/which/Manifest | 2 +- sys-apps/which/which-2.21.ebuild | 2 +- sys-apps/xdg-desktop-portal-gtk/Manifest | 2 +- .../xdg-desktop-portal-gtk-1.8.0.ebuild | 2 +- sys-apps/xdg-desktop-portal/Manifest | 4 +- .../xdg-desktop-portal-1.8.0-r1.ebuild | 2 +- .../xdg-desktop-portal-1.8.1.ebuild | 2 +- sys-apps/xinetd/Manifest | 4 +- sys-apps/xinetd/xinetd-2.3.15-r3.ebuild | 4 +- sys-apps/xinetd/xinetd-2.3.15.3.ebuild | 4 +- sys-apps/zorroutils/Manifest | 2 +- sys-apps/zorroutils/zorroutils-0.05.ebuild | 4 +- 462 files changed, 6889 insertions(+), 6981 deletions(-) delete mode 100644 sys-apps/baobab/baobab-3.34.1.ebuild create mode 100644 sys-apps/baobab/baobab-40.0.ebuild delete mode 100644 sys-apps/baselayout/baselayout-2.4.1-r2.ebuild delete mode 100644 sys-apps/baselayout/baselayout-2.6-r1.ebuild create mode 100644 sys-apps/baselayout/baselayout-2.7-r2.ebuild delete mode 100644 sys-apps/busybox/busybox-1.32.0-r1.ebuild create mode 100644 sys-apps/checkpolicy/checkpolicy-3.2.ebuild create mode 100644 sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch create mode 100644 sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild delete mode 100644 sys-apps/fakeroot/fakeroot-1.25.3.ebuild create mode 100644 sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch delete mode 100644 sys-apps/file/file-5.37-r1.ebuild delete mode 100644 sys-apps/file/file-5.38-r1.ebuild delete mode 100644 sys-apps/file/file-5.39-r3.ebuild delete mode 100644 sys-apps/file/file-5.39-r4.ebuild create mode 100644 sys-apps/file/file-5.40-r2.ebuild delete mode 100644 sys-apps/file/files/file-5.37-CVE-2019-18218.patch delete mode 100644 sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch delete mode 100644 sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch delete mode 100644 sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch delete mode 100644 sys-apps/file/files/file-5.39-add-missing-termios.patch delete mode 100644 sys-apps/file/files/file-5.39-allow-futex-seccomp.patch delete mode 100644 sys-apps/file/files/file-5.39-seccomp-musl.patch create mode 100644 sys-apps/file/files/file-5.40-seccomp-faccessat.patch create mode 100644 sys-apps/file/files/file-5.40-seccomp-fstatat64.patch create mode 100644 sys-apps/file/files/file-5.40-xz_magic.patch delete mode 100644 sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch delete mode 100644 sys-apps/fwupd/files/fwupd-r1 delete mode 100644 sys-apps/fwupd/fwupd-1.4.6.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.4.8.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.5.6.ebuild delete mode 100644 sys-apps/fwupd/fwupd-1.5.7-r1.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.5.9.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.3.ebuild create mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild create mode 100644 sys-apps/hdparm/hdparm-9.61.ebuild delete mode 100644 sys-apps/help2man/help2man-1.48.1.ebuild create mode 100644 sys-apps/help2man/help2man-1.48.3.ebuild create mode 100644 sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch delete mode 100644 sys-apps/iproute2/iproute2-5.10.0.ebuild create mode 100644 sys-apps/iproute2/iproute2-5.12.0.ebuild delete mode 100644 sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild create mode 100644 sys-apps/irqbalance/irqbalance-1.8.0.ebuild delete mode 100644 sys-apps/kmscon/files/kmscon-SIGUNUSED.patch delete mode 100644 sys-apps/kmscon/files/kmscon-sysmacros-fix.patch delete mode 100644 sys-apps/kmscon/kmscon-8-r1.ebuild delete mode 100644 sys-apps/kmscon/kmscon-8_p20180906.ebuild delete mode 100644 sys-apps/less/less-580.ebuild create mode 100644 sys-apps/less/less-581.2.ebuild create mode 100644 sys-apps/lsd/lsd-0.20.1.ebuild create mode 100644 sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild delete mode 100644 sys-apps/lsvpd/lsvpd-1.7.11.ebuild create mode 100644 sys-apps/mcstrans/mcstrans-3.2.ebuild create mode 100644 sys-apps/miller/miller-5.10.2.ebuild delete mode 100644 sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch delete mode 100644 sys-apps/most/most-5.0.0a-r1.ebuild delete mode 100644 sys-apps/netloc/Manifest delete mode 100644 sys-apps/netloc/metadata.xml delete mode 100644 sys-apps/netloc/netloc-0.5.ebuild delete mode 100644 sys-apps/newrelic-sysmond/Manifest delete mode 100644 sys-apps/newrelic-sysmond/files/newrelic-sysmond.rc delete mode 100644 sys-apps/newrelic-sysmond/metadata.xml delete mode 100644 sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild create mode 100644 sys-apps/openrc/openrc-0.43.1.ebuild create mode 100644 sys-apps/openrc/openrc-0.43.2.ebuild create mode 100644 sys-apps/openrc/openrc-0.43.3.ebuild delete mode 100644 sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild delete mode 100644 sys-apps/osinfo-db/osinfo-db-20200529.ebuild delete mode 100644 sys-apps/osinfo-db/osinfo-db-20201015.ebuild create mode 100644 sys-apps/osinfo-db/osinfo-db-20210426.ebuild delete mode 100644 sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch create mode 100644 sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch delete mode 100644 sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild create mode 100644 sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild create mode 100644 sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.11.6.ebuild create mode 100644 sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild create mode 100644 sys-apps/plocate/plocate-1.1.6.ebuild create mode 100644 sys-apps/policycoreutils/policycoreutils-3.2.ebuild delete mode 100644 sys-apps/portage/portage-2.3.99-r2.ebuild delete mode 100644 sys-apps/portage/portage-3.0.12.ebuild create mode 100644 sys-apps/portage/portage-3.0.18.ebuild create mode 100644 sys-apps/qdirstat/qdirstat-1.7.1.ebuild delete mode 100644 sys-apps/radeontool/radeontool-1.6.3.ebuild create mode 100644 sys-apps/restorecond/restorecond-3.2.ebuild create mode 100644 sys-apps/rootlesskit/Manifest create mode 100644 sys-apps/rootlesskit/metadata.xml create mode 100644 sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.20.ebuild create mode 100644 sys-apps/sandbox/sandbox-2.22.ebuild create mode 100644 sys-apps/sandbox/sandbox-2.23.ebuild delete mode 100644 sys-apps/sdparm/sdparm-1.10.ebuild create mode 100644 sys-apps/sdparm/sdparm-1.11-r1.ebuild delete mode 100644 sys-apps/sdparm/sdparm-1.11.ebuild create mode 100644 sys-apps/sdparm/sdparm-1.12.ebuild create mode 100644 sys-apps/secilc/secilc-3.2.ebuild create mode 100644 sys-apps/selinux-python/selinux-python-3.2.ebuild create mode 100644 sys-apps/semodule-utils/semodule-utils-3.2.ebuild delete mode 100644 sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild create mode 100644 sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild create mode 100644 sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild create mode 100644 sys-apps/systemd/files/248-rfkill.patch create mode 100644 sys-apps/systemd/systemd-248.ebuild delete mode 100644 sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild delete mode 100644 sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild create mode 100644 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild delete mode 100644 sys-apps/toybox/toybox-0.8.0.ebuild delete mode 100644 sys-apps/toybox/toybox-0.8.1.ebuild delete mode 100644 sys-apps/toybox/toybox-0.8.3.ebuild delete mode 100644 sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild delete mode 100644 sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild delete mode 100644 sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild delete mode 100644 sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild create mode 100644 sys-apps/usbredir/usbredir-0.9.0.ebuild delete mode 100644 sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch delete mode 100644 sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch delete mode 100644 sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch delete mode 100644 sys-apps/util-linux/util-linux-2.33.2.ebuild delete mode 100644 sys-apps/util-linux/util-linux-2.34-r3.ebuild delete mode 100644 sys-apps/util-linux/util-linux-2.36.1-r1.ebuild create mode 100644 sys-apps/util-linux/util-linux-2.37_rc1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 0c28c92184d5..acafb483f623 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index 51d0503e75aa..9d144407a179 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1,7 +1,7 @@ DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716 DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892 -EBUILD acl-2.2.53-r1.ebuild 1388 BLAKE2B bb54a8d13adcdbc8c349501a314f08dcbbcc88ba35c511ed9d000f34495652474fa021e4eecbae1dd77a5b7ac6a04fbdc008aa07207dc79a216ab1518fb240e5 SHA512 ef48ffdf0891f550ae6b86d5b81cc00436ca791fb5583d976e6bad502e6a410498f468526fddf69ff1ec58db3c8c32e1803fe9d2ab2333dc983e6eec70cc0e53 +EBUILD acl-2.2.53-r1.ebuild 1389 BLAKE2B 3f315dce6b0f21880ed3d9bd5c050773ee4bdfa1041980946310e274c49d7300fb8d6b8fe95f9d497bf8097c6370ac2c7913a938e122b1c9936b0fbea4d46f7e SHA512 c1bc01a8c97730bdc6c69d0c3987c52ce0070a94d4e6efdf6be427d07bbe987ba402ea6e83bb96dc1474dbb1d5202a355026d5914d03ff33026b253b8ecaf30a EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317 EBUILD acl-2.3.1.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild index 36ef9c8cb34a..1c5fd4005593 100644 --- a/sys-apps/acl/acl-2.2.53-r1.ebuild +++ b/sys-apps/acl/acl-2.2.53-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="nls static-libs" RDEPEND=" diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest index 413dd0ad6c52..5e1085386e20 100644 --- a/sys-apps/agedu/Manifest +++ b/sys-apps/agedu/Manifest @@ -1,6 +1,6 @@ AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b DIST agedu-20200617.cec3021.tar.gz 181804 BLAKE2B 19acc1ac37d09f45227e08b92483c1a0be7d9faaf4b2bf65479ca99a0294305788e88d6494508ac742a4396c4a22352d927c125ed7437fe29cb71890dbb2217b SHA512 d7a913a867817a0457c8ec3644a6986ed3632721df1040de1db96c04e85f9e59c4aba632dc1f3f3666496435b6be3f68335a2ec3e50440c844ebd4ab81b2682a DIST agedu-20200705.2a7d4a2.tar.gz 181809 BLAKE2B 2802b223979b2f15efd14b6f1f445b9ca00312068ade3c26a057d54a65d5074fdcdee043c9673a59e4e6cc222deba7c817ee078a0a742f09ec1087ec921414bd SHA512 a65f90990706493fc2a080dc313706107ab603f461dcd63531f9afbc1efe785747947f2222559ab2b0b354453a7d9242025c7b96df7f4cac608b8422855c55d6 -EBUILD agedu-20200617.ebuild 817 BLAKE2B 8ae8b06a95d40ada2ac01194808b0c4f2c9b450824579e08b29bd5805573c45ac43f3a91e26e189eb0253032905882b33523ab56d2985736a93db77ec95c5ef5 SHA512 7b087160a3165e4ffa3b35fc165e41ba17b20cf052d1f8790635e77742694a8aa17f78a9c1fef6ef9a114be12c736610f75260d116cc99f60b1f38e57333c591 -EBUILD agedu-20200705.ebuild 817 BLAKE2B 8f574eb51c4a49355b2e325c0bd4c5122a624f07711aadc586025d41cb5efdfa871752e7edab351c5ea0c3936cdb56acc110ac47176ab3a50ae4539ddb020913 SHA512 2a44168dc23904b6c39e397b5cd9a9da04ea44e8bb173c1917f81b8f714211a2071e91c03899bfd3e365fe963c4af2a3aa86691db126975bdba4390d8860ee7b +EBUILD agedu-20200617.ebuild 810 BLAKE2B 630a990f3002327d6581856e5b4146df7277ddbd631d798bbb8494cc2c501fa7906a69c4c555763231ad9896cf58418ae8b88b3bac2898daad1a09ad2627631f SHA512 07c26d320976498fde96dbd9b644abb1ad11f31220faf7c27434bfa3f324877177ea9800691294bfd944e0d9312611b5590f31c4d975836a8df0c02ad0c7df05 +EBUILD agedu-20200705.ebuild 810 BLAKE2B ae805dfc46890b17fced092675bedbcf9c8d06979b3f66b79832e72f544260cef2bd102a5aa49f13511ef62b05617ac90f9c0e48f5c7d46346d5b45099ca2ba5 SHA512 5ba38f2aad20d8fb0fe7f771864fffc70d71d44c7462cb17871ce85ddea2726b4ebfab3356914f1d2103c889132c0b9ce7604fdcfa0b9e8330379b45869c6715 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 diff --git a/sys-apps/agedu/agedu-20200617.ebuild b/sys-apps/agedu/agedu-20200617.ebuild index f33c3651492e..6e773cca11b6 100644 --- a/sys-apps/agedu/agedu-20200617.ebuild +++ b/sys-apps/agedu/agedu-20200617.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils +inherit autotools # agedu-20151213.59b0ed3.ebuild is not a legitimate name # so we'll drop versionator and just set MY_P manually. diff --git a/sys-apps/agedu/agedu-20200705.ebuild b/sys-apps/agedu/agedu-20200705.ebuild index a49e4fc983bc..be1c1f08bf7d 100644 --- a/sys-apps/agedu/agedu-20200705.ebuild +++ b/sys-apps/agedu/agedu-20200705.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils +inherit autotools # agedu-20151213.59b0ed3.ebuild is not a legitimate name # so we'll drop versionator and just set MY_P manually. diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest index 9e13c82014a7..49f278cb9e5e 100644 --- a/sys-apps/apmd/Manifest +++ b/sys-apps/apmd/Manifest @@ -2,5 +2,5 @@ AUX apmd.confd 56 BLAKE2B 59236d42a8b27ba98ce06c61e19da23f0f131f82892e1a9907712f AUX apmd.rc6 568 BLAKE2B 10519550d5ed67ecdb2ae192517ecd9c4a8943309b31371be847aef4894b5171b50eca0b7a74655cbfd6fa4aa1a7a08c3fc2700b28b3945bb75962f93e5a60f0 SHA512 ac4578dd1b49207b8d1c50f3481a3652d8cfb83ea3c1984a553aa5acefd17fee5fa71a903fa9dca4d1991c47c6b14d6901352fc03df741cae0aed337ee55cf14 DIST apmd_3.2.2-14.diff.gz 19195 BLAKE2B 554c84005fe443d3587169847b14cac186af0295e9b0dc4b9f564f014d2e717eb9c2d0ef0d6a4d701b81be26c2b0b8781f0bede008ac3bfcd2a20802a1e55ffa SHA512 a3578d0c43950f832fb437a744f8a4c3058c731649decb90f7b42c901b06f4df5f9a75599b4278e15af1c8a30d8043b0d76eb7d2cb67b05bf6bb210d5912a16d DIST apmd_3.2.2.orig.tar.gz 72757 BLAKE2B 1b93d831c1d24cbf8c061969dd915ce219bbf62374e4e82b8fd61b7154f3a1a8bd7da740c2b6a557a335f4aeed41feea13fb85bdedad80ab9197e1355d1b20e9 SHA512 fdc74703e75a700397bb2c907986f0cf0792ee4128d7a7ae08adf090bff0ea595044ba7a935d34929745bb702eb8bfe232e0ee9156efd23a995dc087f1b20bf4 -EBUILD apmd-3.2.2_p14-r1.ebuild 1816 BLAKE2B 31cf8d103146ac87656373f59a65b1b3abf4c40971945b55f8b95efda0e83eefb44e4481a70a332767d0cd69141a0c2daeeb2773da9d19c8fcaecf8c390502ab SHA512 48003312c87fc75bed146cfa833e4d6e9ac7c162309cb839c7798178506eea9357a0fecfc7ff378b683c1992504cee3558a27b1b22acafba509bcba32478c09f +EBUILD apmd-3.2.2_p14-r1.ebuild 1813 BLAKE2B 9038ec4ec6adbea1c2ddd4bce959dda00fdd65dc9d24b4b1aee5b52fac46ffa601ca1ec2e92872745ba2abc8a83a0973497d418df77fe57db02be51943e376ea SHA512 2bc5f9f371acc7c168e31cbda3969986478681b5184a394910ff6eda12934e5fd5c73e9f8cb2785058c9ad24dc39a03f8b96842be77a74df751b63627a722405 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild b/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild index 166a03b1cf8e..fefa3c983ce8 100644 --- a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild +++ b/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils multilib toolchain-funcs +inherit epatch multilib toolchain-funcs MY_PV=${PV%_p*} MY_P=${PN}_${MY_PV} diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index 6c58b0840e1e..e0a499dc1ad8 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -4,7 +4,7 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b -EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa +EBUILD attr-2.4.48-r4.ebuild 2353 BLAKE2B 47e89fd3a2737de71b9a526c816b24ad0dad2c38c333333b4217fcdefd46caaa0148ddbe27ffe0baeb3be1517839a146c0e564fb1a00c67e1c01df2a441508ee SHA512 e384c8cfb28af3885e2ed1e5813d14f95af2081c457efb14757d4ed9a9f40c2ce9d007c2f28f3473d4743597bfe236c966c55f0784ccfc402ad4ae8270e1005a EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7 EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41 EBUILD attr-2.5.1.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41 diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild index 4ed1fc5d9cc0..02c33f7c1f4f 100644 --- a/sys-apps/attr/attr-2.4.48-r4.ebuild +++ b/sys-apps/attr/attr-2.4.48-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="debug nls static-libs" BDEPEND="nls? ( sys-devel/gettext )" diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest index a87aff1f4399..cb048e6faac7 100644 --- a/sys-apps/baobab/Manifest +++ b/sys-apps/baobab/Manifest @@ -1,5 +1,5 @@ -DIST baobab-3.34.1.tar.xz 458500 BLAKE2B 1f27640bb369cf1712c7b1c79d1261fd4a99e427a99debbf7d2f31f191f5e0ddaec7b366cb6b34add6a552c9728b9b1f4b64bdc05f06b29e0071ccad73a77c6a SHA512 8234f26fde68d6ebe578360345dcb45314b6a818aa899f858b7e3b9ae1874165e4f1d644d169d6ba56270689a34e8cd78d993e99c08f66b3f2c7c9fd0b7ea516 DIST baobab-3.38.0.tar.xz 579948 BLAKE2B b0ad702ff105e8308b7b9a5904b9331c0fe99db8b78a154a4b67ebc8b09992d967d896c713df42640319bab3c03de1130b88daf4f23be996ee3bc0bdb633a625 SHA512 764fc97ccab01d056fb657cda3c04e742d865e4c6ca16d4a5212a9d5470e961c8fe3523a27ab28945c38c25c1155903897e178b9ffaf0a6c07c6a044e29a750c -EBUILD baobab-3.34.1.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40 -EBUILD baobab-3.38.0.ebuild 717 BLAKE2B a5383d37770463b26d900cc56f46cd9dca2146e05891c7baae6d39d4686f183d9b7bb2bc0802bc522bcfbf20db6b79e78a99079c97ac8918c1e865d1c8cd3603 SHA512 84418b7ed2944bf9957f660ce4cc619e5764c2a165cf0422e4a63c4c37bccc9b8bccd7a023f2c8b4a45910f40956d937783a1e9e917c27f9c568705d8ac3fd95 +DIST baobab-40.0.tar.xz 581744 BLAKE2B 12fc2023a19512117c235a54ac36045e1a733c4d64d8ff1ea77d6be624d442ed66bca83788ffc19be36855207cb693c8f1aa4793c8750e84d60c1b84e79b869b SHA512 31ab768f7e089c12717bc363111fe936f4a15986b69ee53b8f9aab19973ff5bf4970fdfa4d936af4d46673a9f08063518a6c314453e698e6068485152e400650 +EBUILD baobab-3.38.0.ebuild 716 BLAKE2B 4517ebecc5a6c6c9d96fe680cedaccfb69967f435afd05e92a2036be150dbe3687b723be81ce1ce5a63d4efc944144e476cd8b61ce1c815bc16a831f564ec736 SHA512 8ebe2322af4370235c695c1ba813184696cda7882898dde65ce5b65ebfd68d8580a50cfe273d33bef6733393b8b0cef7b28dd11559b40410be0af38afe8cb0bf +EBUILD baobab-40.0.ebuild 814 BLAKE2B d873a555763d064b111c26fd5acf5976083a89909820b4a2d085cb1b445ca01ddc5081bdebe5f308c47d447af20bd7b8c4e96dbd4ef4578b636d1fe3c78a24bc SHA512 415dc3a9a5c1627e28b78b5c3969c31829a061426c1e8a1d9602f41fa981a17f0e3e837f8f0346595e42846f8a67511b460637de5b2b2a546379870e3531beb5 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/baobab/baobab-3.34.1.ebuild b/sys-apps/baobab/baobab-3.34.1.ebuild deleted file mode 100644 index 0202a6950ad9..000000000000 --- a/sys-apps/baobab/baobab-3.34.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome.org gnome2-utils meson vala xdg - -DESCRIPTION="Disk usage browser for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" - -LICENSE="GPL-2+ FDL-1.1+" -SLOT="0" -IUSE="" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.44:2 - >=x11-libs/gtk+-3.20:3 -" -DEPEND="${RDEPEND} - $(vala_depend) - dev-libs/appstream-glib - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/baobab/baobab-3.38.0.ebuild b/sys-apps/baobab/baobab-3.38.0.ebuild index 31b963eaf1c0..b3ff70089509 100644 --- a/sys-apps/baobab/baobab-3.38.0.ebuild +++ b/sys-apps/baobab/baobab-3.38.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" LICENSE="GPL-2+ FDL-1.1+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.44:2 diff --git a/sys-apps/baobab/baobab-40.0.ebuild b/sys-apps/baobab/baobab-40.0.ebuild new file mode 100644 index 000000000000..ff893b860427 --- /dev/null +++ b/sys-apps/baobab/baobab-40.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +inherit gnome.org gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Disk usage browser for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" + +LICENSE="GPL-2+ FDL-1.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + >=dev-libs/glib-2.44:2 + >=x11-libs/gtk+-3.24.1:3 + >=gui-libs/libhandy-1.0.0:1= +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + $(vala_depend) + dev-util/itstool + >=sys-devel/gettext-0.21 + virtual/pkgconfig +" + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 64574bab0e35..edc9de757e65 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,9 +1,6 @@ -DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 -DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e -EBUILD baselayout-2.4.1-r2.ebuild 8567 BLAKE2B 35400fafd5addba2128aab3ce0476893302572d16c9becd92963c99b4a260ccceb2b104e0a49e75ba3fd4ac25b623c22b31af78d689c71a68843b7071c51a0f9 SHA512 bfa7d130955aa6d8a55cdd1685f639ae009847ce88bed3088c26479dd47b8c47ff6775d6addf92716513b490544e2937a0ebff35b32eab4f3a98f0e308547a73 -EBUILD baselayout-2.6-r1.ebuild 9560 BLAKE2B 03f1513752235adeffe7274004ab9e6e3f11ce38c4715c3db4a5619571c11764385fc8e3bbf1b57120ac9b19efafaf6d2bb006c4be884eaf9d8db00ceceae2b7 SHA512 446b72d50abb3624e0e73590a903054b227b47d2ef6d65f1ca5e268fc0177d7f04139944afdc5b8cef1952d64c5d12067c00565c1ca84e904a29a4ac45515657 EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737 -EBUILD baselayout-2.7.ebuild 10023 BLAKE2B 9e2d853215dbe206197fc40877f98df48a4d225cd47281dc557a6adc87efb35465a00434034176df3f4bdac2286373e56c2b310a8e4c3cc9211271073a32c76f SHA512 c9f534f789f3e9de15f2326066daa59eb28fd7ae3fa287e6f193bfc21b0e1ea4397d854ade1cf57bdb6b8be1af7fe626b8750081b0c726df1920d1c6d5d414db -EBUILD baselayout-9999.ebuild 9940 BLAKE2B 6354e020354282c0ee7dadbf3044ed8a410b986149f25c565e015e8b3d616fc40b357490b322f7f2d749790c98bc7d1bfb34f80a7da7f99419540a88b5538e2d SHA512 e4f0ecf7b329f71835cd7667282def8acd114485390900279beb19d1d37c153d802f02c45a2993e28ae09f293eadd90fd7942b4bdcc7ee85d82708f8428089a0 +EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b +EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71 +EBUILD baselayout-9999.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b MISC metadata.xml 382 BLAKE2B 7c360eab19fc55da87cf2a432c1f2407918be3cf32ec581b974fea953aea00a51998cd05facd0c4b6d609e38bd1f243380a5c3a9effcb5e7bebbf22ec6d9418c SHA512 1a444b5b8fc6573fae97c6e0bf5e3dc69f9e18a42d2a7c91ac2742bca17580468be8b17ca6349451817b0087f619bad90a1050b1fd8511fc5e57b792b5006d72 diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild deleted file mode 100644 index 81f43cd133be..000000000000 --- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils multilib versionator prefix - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="build kernel_linux" - -pkg_setup() { - multilib_layout -} - -# Create our multilib dirs - the Makefile has no knowledge of this -multilib_layout() { - local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - [ -z "${def_libdir}" ] && - die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" - - # figure out which paths should be symlinks and which should be directories - local dirs syms exp d - for libdir in ${libdirs} ; do - exp=( {,usr/,usr/local/}${libdir} ) - for d in "${exp[@]}" ; do - # most things should be dirs - if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then - [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" - else - [ -h "${d}" ] && syms+=" ${d}" - fi - done - done - if [ -n "${syms}${dirs}" ] ; then - ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" - ewarn "have these paths configured as follows:" - [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" - [ -n "${syms}" ] && ewarn "directories:${syms}" - ewarn "The ebuild will attempt to fix these, but only for trivial conversions." - ewarn "If things fail, you will need to manually create/move the directories." - echo - fi - - # setup symlinks and dirs where we expect them to be; do not migrate - # data ... just fall over in that case. - local prefix - for prefix in "${EROOT}"{,usr/,usr/local/} ; do - if [ "${SYMLINK_LIB}" = yes ] ; then - # we need to make sure "lib" points to the native libdir - if [ -h "${prefix}lib" ] ; then - # it's already a symlink! assume it's pointing to right place ... - continue - elif [ -d "${prefix}lib" ] ; then - # "lib" is a dir, so need to convert to a symlink - ewarn "Converting ${prefix}lib from a dir to a symlink" - rm -f "${prefix}lib"/.keep - if rmdir "${prefix}lib" 2>/dev/null ; then - ln -s ${def_libdir} "${prefix}lib" || die - else - die "non-empty dir found where we needed a symlink: ${prefix}lib" - fi - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a symlink" - mkdir -p "${prefix}" || die - rm -f "${prefix}lib" || die - ln -s ${def_libdir} "${prefix}lib" || die - mkdir -p "${prefix}${def_libdir}" #423571 - fi - else - # we need to make sure "lib" is a dir - if [ -h "${prefix}lib" ] ; then - # "lib" is a symlink, so need to convert to a dir - ewarn "Converting ${prefix}lib from a symlink to a dir" - rm -f "${prefix}lib" || die - if [ -d "${prefix}lib32" ] ; then - ewarn "Migrating ${prefix}lib32 to ${prefix}lib" - mv "${prefix}lib32" "${prefix}lib" || die - else - mkdir -p "${prefix}lib" || die - fi - elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then - # make sure the old "lib" ABI location does not exist; we - # only symlinked the lib dir on systems where we moved it - # to "lib32" ... - case ${CHOST} in - *-gentoo-freebsd*) ;; # We want it the other way on fbsd. - i?86*|x86_64*|powerpc*|sparc*|s390*) - if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then - rm -f "${prefix}lib32"/.keep - if ! rmdir "${prefix}lib32" 2>/dev/null ; then - ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" - die "non-empty dir found where there should be none: ${prefix}lib32" - fi - fi - ;; - esac - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a dir" - mkdir -p "${prefix}lib" || die - fi - fi - done -} - -pkg_preinst() { - # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of - # the baselayout-1.x ebuild copies all the real configs from the user's - # /etc/conf.d into ${D}, it makes them all appear to be the default - # versions. In order to protect them from being unmerged after this - # upgrade, modify their timestamps. - touch "${EROOT}"/etc/conf.d/* 2>/dev/null - - # This is written in src_install (so it's in CONTENTS), but punt all - # pending updates to avoid user having to do etc-update (and make the - # pkg_postinst logic simpler). - rm -f "${EROOT}"/etc/._cfg????_gentoo-release - - # We need to install directories and maybe some dev nodes when building - # stages, but they cannot be in CONTENTS. - # Also, we cannot reference $S as binpkg will break so we do this. - multilib_layout - if use build ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout - fi - rm -f "${ED}"/usr/share/${PN}/Makefile -} - -src_prepare() { - default - if use prefix; then - hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile - hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd - echo PATH=/usr/bin:/bin >> etc/env.d/99host - echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host - fi - - # handle multilib paths. do it here because we want this behavior - # regardless of the C library that you're using. we do explicitly - # list paths which the native ldconfig searches, but this isn't - # problematic as it doesn't change the resulting ld.so.cache or - # take longer to generate. similarly, listing both the native - # path and the symlinked path doesn't change the resulting cache. - local libdir ldpaths - for libdir in $(get_all_libdirs) ; do - ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" - ldpaths+=":${EPREFIX}/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > etc/gentoo-release -} - -src_install() { - emake \ - OS=$(usex kernel_FreeBSD BSD Linux) \ - DESTDIR="${ED}" \ - install - dodoc ChangeLog - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile -} - -pkg_postinst() { - local x - - # We installed some files to /usr/share/baselayout instead of /etc to stop - # (1) overwriting the user's settings - # (2) screwing things up when attempting to merge files - # (3) accidentally packaging up personal files with quickpkg - # If they don't exist then we install them - for x in master.passwd passwd shadow group fstab ; do - [ -e "${EROOT}etc/${x}" ] && continue - [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue - cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc - done - - # Force shadow permissions to not be world-readable #260993 - for x in shadow ; do - [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" - done - - # Take care of the etc-update for the user - if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release - fi - - # whine about users that lack passwords #193541 - if [[ -e "${EROOT}"etc/shadow ]] ; then - local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) - if [[ -n ${bad_users} ]] ; then - echo - ewarn "The following users lack passwords!" - ewarn ${bad_users} - fi - fi - - # baselayout leaves behind a lot of .keep files, so let's clean them up - find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null - find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null - - # whine about users with invalid shells #215698 - if [[ -e "${EROOT}"etc/passwd ]] ; then - local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) - if [[ -n ${bad_shells} ]] ; then - echo - ewarn "The following users have non-existent shells!" - ewarn "${bad_shells}" - fi - fi - - # https://bugs.gentoo.org/361349 - if use kernel_linux; then - mkdir -p "${EROOT}"run - - local found fstype mountpoint - while read -r _ mountpoint fstype _; do - [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 - done < "${ROOT}"proc/mounts - [[ -z ${found} ]] && - ewarn "You should reboot now to get /run mounted with tmpfs!" - fi - - for x in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.4 ${v}; then - ewarn "After updating ${EROOT}etc/profile, please run" - ewarn "env-update and . /etc/profile" - break - fi - done - - if [[ -e "${EROOT}"etc/env.d/00basic ]]; then - ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout" - ewarn "Please migrate your changes." - fi -} diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild deleted file mode 100644 index 5471a444eb25..000000000000 --- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib versionator prefix - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="build kernel_FreeBSD kernel_linux +split-usr" - -pkg_setup() { - multilib_layout -} - -# Create our multilib dirs - the Makefile has no knowledge of this -multilib_layout() { - local dir def_libdir libdir libdirs - local prefix prefix_lst - def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then - prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) - for prefix in ${prefix_lst[@]}; do - for libdir in ${libdirs}; do - dir="${prefix}${libdir}" - if [[ -e "${dir}" ]]; then - [[ ! -d "${dir}" ]] && - die "${dir} exists but is not a directory" - continue - fi - if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then - einfo "symlinking ${dir} to usr/${libdir}" - ln -s usr/${libdir} ${dir} || - die " Unable to make ${dir} symlink" - else - einfo "creating directory ${dir}" - mkdir -p "${dir}" || - die "Unable to create ${dir} directory" - fi - done - done - return 0 - fi - - [ -z "${def_libdir}" ] && - die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" - - # figure out which paths should be symlinks and which should be directories - local dirs syms exp d - for libdir in ${libdirs} ; do - if use split-usr ; then - exp=( {,usr/,usr/local/}${libdir} ) - else - exp=( {usr/,usr/local/}${libdir} ) - fi - for d in "${exp[@]}" ; do - # most things should be dirs - if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then - [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" - else - [ -h "${d}" ] && syms+=" ${d}" - fi - done - done - if [ -n "${syms}${dirs}" ] ; then - ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" - ewarn "have these paths configured as follows:" - [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" - [ -n "${syms}" ] && ewarn "directories:${syms}" - ewarn "The ebuild will attempt to fix these, but only for trivial conversions." - ewarn "If things fail, you will need to manually create/move the directories." - echo - fi - - # setup symlinks and dirs where we expect them to be; do not migrate - # data ... just fall over in that case. - if use split-usr ; then - prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) - else - prefix_lst=( "${EROOT}"{usr/,usr/local/} ) - fi - for prefix in "${prefix_lst[@]}"; do - if [ "${SYMLINK_LIB}" = yes ] ; then - # we need to make sure "lib" points to the native libdir - if [ -h "${prefix}lib" ] ; then - # it's already a symlink! assume it's pointing to right place ... - continue - elif [ -d "${prefix}lib" ] ; then - # "lib" is a dir, so need to convert to a symlink - ewarn "Converting ${prefix}lib from a dir to a symlink" - rm -f "${prefix}lib"/.keep - if rmdir "${prefix}lib" 2>/dev/null ; then - ln -s ${def_libdir} "${prefix}lib" || die - else - die "non-empty dir found where we needed a symlink: ${prefix}lib" - fi - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a symlink" - mkdir -p "${prefix}" || die - rm -f "${prefix}lib" || die - ln -s ${def_libdir} "${prefix}lib" || die - mkdir -p "${prefix}${def_libdir}" #423571 - fi - else - # we need to make sure "lib" is a dir - if [ -h "${prefix}lib" ] ; then - # "lib" is a symlink, so need to convert to a dir - ewarn "Converting ${prefix}lib from a symlink to a dir" - rm -f "${prefix}lib" || die - if [ -d "${prefix}lib32" ] ; then - ewarn "Migrating ${prefix}lib32 to ${prefix}lib" - mv "${prefix}lib32" "${prefix}lib" || die - else - mkdir -p "${prefix}lib" || die - fi - elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then - # make sure the old "lib" ABI location does not exist; we - # only symlinked the lib dir on systems where we moved it - # to "lib32" ... - case ${CHOST} in - *-gentoo-freebsd*) ;; # We want it the other way on fbsd. - i?86*|x86_64*|powerpc*|sparc*|s390*) - if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then - rm -f "${prefix}lib32"/.keep - if ! rmdir "${prefix}lib32" 2>/dev/null ; then - ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" - die "non-empty dir found where there should be none: ${prefix}lib32" - fi - fi - ;; - esac - else - # nothing exists, so just set it up sanely - ewarn "Initializing ${prefix}lib as a dir" - mkdir -p "${prefix}lib" || die - fi - fi - done - if ! use split-usr ; then - for libdir in ${libdirs}; do - if [[ ! -e "${EROOT}${libdir}" ]]; then - ln -s usr/"${libdir}" "${EROOT}${libdir}" - fi - done - fi -} - -pkg_preinst() { - # This is written in src_install (so it's in CONTENTS), but punt all - # pending updates to avoid user having to do etc-update (and make the - # pkg_postinst logic simpler). - rm -f "${EROOT}"/etc/._cfg????_gentoo-release - - # We need to install directories and maybe some dev nodes when building - # stages, but they cannot be in CONTENTS. - # Also, we cannot reference $S as binpkg will break so we do this. - multilib_layout - if use build ; then - if use split-usr ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout - else - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge - fi - fi - rm -f "${ED}"/usr/share/${PN}/Makefile -} - -src_prepare() { - default - if use prefix; then - hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile - hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd - echo PATH=/usr/bin:/bin >> etc/env.d/99host - echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host - fi - - # handle multilib paths. do it here because we want this behavior - # regardless of the C library that you're using. we do explicitly - # list paths which the native ldconfig searches, but this isn't - # problematic as it doesn't change the resulting ld.so.cache or - # take longer to generate. similarly, listing both the native - # path and the symlinked path doesn't change the resulting cache. - local libdir ldpaths - for libdir in $(get_all_libdirs) ; do - ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" - ldpaths+=":${EPREFIX}/usr/local/${libdir}" - done - echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > etc/gentoo-release -} - -src_install() { - emake \ - OS=$(usex kernel_FreeBSD BSD Linux) \ - DESTDIR="${ED}" \ - install - dodoc ChangeLog - - # need the makefile in pkg_preinst - insinto /usr/share/${PN} - doins Makefile -} - -pkg_postinst() { - local x - - # We installed some files to /usr/share/baselayout instead of /etc to stop - # (1) overwriting the user's settings - # (2) screwing things up when attempting to merge files - # (3) accidentally packaging up personal files with quickpkg - # If they don't exist then we install them - for x in master.passwd passwd shadow group fstab ; do - [ -e "${EROOT}etc/${x}" ] && continue - [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue - cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc - done - - # Force shadow permissions to not be world-readable #260993 - for x in shadow ; do - [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" - done - - # Take care of the etc-update for the user - if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release - fi - - # whine about users that lack passwords #193541 - if [[ -e "${EROOT}"etc/shadow ]] ; then - local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) - if [[ -n ${bad_users} ]] ; then - echo - ewarn "The following users lack passwords!" - ewarn ${bad_users} - fi - fi - - # whine about users with invalid shells #215698 - if [[ -e "${EROOT}"etc/passwd ]] ; then - local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) - if [[ -n ${bad_shells} ]] ; then - echo - ewarn "The following users have non-existent shells!" - ewarn "${bad_shells}" - fi - fi - - # https://bugs.gentoo.org/361349 - if use kernel_linux; then - mkdir -p "${EROOT}"run - - local found fstype mountpoint - while read -r _ mountpoint fstype _; do - [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 - done < "${ROOT}"proc/mounts - [[ -z ${found} ]] && - ewarn "You should reboot now to get /run mounted with tmpfs!" - fi - - for x in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.4 ${x}; then - ewarn "After updating ${EROOT}etc/profile, please run" - ewarn "env-update && . /etc/profile" - fi - - if ! version_is_at_least 2.6 ${x}; then - ewarn "Please run env-update then log out and back in to" - ewarn "update your path." - fi - # clean up after 2.5 typos - # https://bugs.gentoo.org/show_bug.cgi?id=656380 - if [[ ${x} == 2.5 ]]; then - rm -fr "${EROOT}{,usr" - fi - done - - if [[ -e "${EROOT}"etc/env.d/00basic ]]; then - ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout" - ewarn "Please migrate your changes." - fi -} diff --git a/sys-apps/baselayout/baselayout-2.7-r2.ebuild b/sys-apps/baselayout/baselayout-2.7-r2.ebuild new file mode 100644 index 000000000000..a37d17f3b8d1 --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.7-r2.ebuild @@ -0,0 +1,318 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib prefix + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build kernel_FreeBSD kernel_linux +split-usr" + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_layout() { + local dir def_libdir libdir libdirs + local prefix prefix_lst + def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + libdirs=$(get_all_libdirs) + + if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then + prefix_lst=( "${EROOT}"/{,usr/,usr/local/} ) + for prefix in "${prefix_lst[@]}"; do + for libdir in ${libdirs}; do + dir="${prefix}${libdir}" + if [[ -e "${dir}" ]]; then + [[ ! -d "${dir}" ]] && + die "${dir} exists but is not a directory" + continue + fi + if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then + libdir="${libdir%%/*}" + dir="${prefix}${libdir}" + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die "Unable to make ${dir} symlink" + else + einfo "creating directory ${dir}" + mkdir -p "${dir}" || + die "Unable to create ${dir} directory" + fi + done + done + return 0 + fi + + [ -z "${def_libdir}" ] && + die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + if use split-usr ; then + exp=( {,usr/,usr/local/}${libdir} ) + else + exp=( {usr/,usr/local/}${libdir} ) + fi + for d in "${exp[@]}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + if use split-usr ; then + prefix_lst=( "${EROOT}"/{,usr/,usr/local/} ) + else + prefix_lst=( "${EROOT}"/{usr/,usr/local/} ) + fi + for prefix in "${prefix_lst[@]}"; do + if [ "${SYMLINK_LIB}" = yes ] ; then + # we need to make sure "lib" points to the native libdir + if [ -h "${prefix}lib" ] ; then + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep || die + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" || die #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then + # make sure the old "lib" ABI location does not exist; we + # only symlinked the lib dir on systems where we moved it + # to "lib32" ... + case ${CHOST} in + *-gentoo-freebsd*) ;; # We want it the other way on fbsd. + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then + rm -f "${prefix}lib32"/.keep || die + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}lib" || die + fi + fi + done + if ! use split-usr ; then + for libdir in ${libdirs}; do + if [[ ! -e "${EROOT}${libdir}" ]]; then + ln -s usr/"${libdir}" "${EROOT}${libdir}" || + die "Unable to make ${EROOT}${libdir} symlink" + fi + done + fi +} + +pkg_preinst() { + # This is written in src_install (so it's in CONTENTS), but punt all + # pending updates to avoid user having to do etc-update (and make the + # pkg_postinst logic simpler). + rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile || die +} + +src_prepare() { + default + if use prefix; then + hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile + hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd + echo PATH=/usr/bin:/bin >> etc/env.d/99host + echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + fi + + # don't want symlinked directories in PATH on systems with usr-merge + if ! use split-usr; then + sed \ + -e 's|/usr/local/sbin:||g' \ + -e 's|:/usr/sbin:|:|g' \ + -e 's|:/sbin:|:|g' \ + -e 's|:/bin:|:|g' \ + -i etc/env.d/50baselayout || die + fi + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + use split-usr && ldpaths+=":${EPREFIX}/${libdir}" + ldpaths+=":${EPREFIX}/usr/${libdir}" + ldpaths+=":${EPREFIX}/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${PV}" > etc/gentoo-release +} + +src_install() { + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + install + dodoc ChangeLog + rm "${ED}"/etc/sysctl.d/README || die + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile + + # This is needed for https://bugs.gentoo.org/732142 + dodir /usr/lib + mv "${ED}"/etc/os-release "${ED}"/usr/lib || die + dosym ../usr/lib/os-release /etc/os-release +} + +pkg_postinst() { + local x + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${EROOT}/etc/${x}" ] && continue + [ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue + cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die + done + + # Force shadow permissions to not be world-readable #260993 + for x in shadow ; do + if [ -e "${EROOT}/etc/${x}" ] ; then + chmod o-rwx "${EROOT}/etc/${x}" || die + fi + done + + # Take care of the etc-update for the user + if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then + mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die + fi + + # whine about users that lack passwords #193541 + if [[ -e "${EROOT}"/etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi + + # whine about users with invalid shells #215698 + if [[ -e "${EROOT}"/etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort) + if [[ -n ${bad_shells} ]] ; then + echo + ewarn "The following users have non-existent shells!" + ewarn "${bad_shells}" + fi + fi + + # https://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${EROOT}"/run || die + + local found fstype mountpoint + while read -r _ mountpoint fstype _; do + [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 + done < "${ROOT}"/proc/mounts + [[ -z ${found} ]] && + ewarn "You should reboot now to get /run mounted with tmpfs!" + fi + + for x in ${REPLACING_VERSIONS}; do + if ver_test 2.4 -lt ${x}; then + ewarn "After updating ${EROOT}/etc/profile, please run" + ewarn "env-update && . /etc/profile" + fi + + if ver_test 2.6 -lt ${x}; then + ewarn "Please run env-update then log out and back in to" + ewarn "update your path." + fi + # clean up after 2.5 typos + # https://bugs.gentoo.org/show_bug.cgi?id=656380 + if [[ ${x} == 2.5 ]]; then + rm -fr "${EROOT}/{,usr" || die + fi + done + + if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then + ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" + ewarn "Please migrate your changes." + fi +} diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild index 1a631d10b938..cb06c4a3e20d 100644 --- a/sys-apps/baselayout/baselayout-2.7.ebuild +++ b/sys-apps/baselayout/baselayout-2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index ee4f298e8409..a37d17f3b8d1 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib versionator prefix +inherit multilib prefix DESCRIPTION="Filesystem baselayout and init scripts" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -29,10 +29,9 @@ multilib_layout() { local prefix prefix_lst def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then - prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) + prefix_lst=( "${EROOT}"/{,usr/,usr/local/} ) for prefix in "${prefix_lst[@]}"; do for libdir in ${libdirs}; do dir="${prefix}${libdir}" @@ -41,10 +40,12 @@ multilib_layout() { die "${dir} exists but is not a directory" continue fi - if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then + if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then + libdir="${libdir%%/*}" + dir="${prefix}${libdir}" einfo "symlinking ${dir} to usr/${libdir}" ln -s usr/${libdir} ${dir} || - die " Unable to make ${dir} symlink" + die "Unable to make ${dir} symlink" else einfo "creating directory ${dir}" mkdir -p "${dir}" || @@ -88,9 +89,9 @@ multilib_layout() { # setup symlinks and dirs where we expect them to be; do not migrate # data ... just fall over in that case. if use split-usr ; then - prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) + prefix_lst=( "${EROOT}"/{,usr/,usr/local/} ) else - prefix_lst=( "${EROOT}"{usr/,usr/local/} ) + prefix_lst=( "${EROOT}"/{usr/,usr/local/} ) fi for prefix in "${prefix_lst[@]}"; do if [ "${SYMLINK_LIB}" = yes ] ; then @@ -101,7 +102,7 @@ multilib_layout() { elif [ -d "${prefix}lib" ] ; then # "lib" is a dir, so need to convert to a symlink ewarn "Converting ${prefix}lib from a dir to a symlink" - rm -f "${prefix}lib"/.keep + rm -f "${prefix}lib"/.keep || die if rmdir "${prefix}lib" 2>/dev/null ; then ln -s ${def_libdir} "${prefix}lib" || die else @@ -113,7 +114,7 @@ multilib_layout() { mkdir -p "${prefix}" || die rm -f "${prefix}lib" || die ln -s ${def_libdir} "${prefix}lib" || die - mkdir -p "${prefix}${def_libdir}" #423571 + mkdir -p "${prefix}${def_libdir}" || die #423571 fi else # we need to make sure "lib" is a dir @@ -135,7 +136,7 @@ multilib_layout() { *-gentoo-freebsd*) ;; # We want it the other way on fbsd. i?86*|x86_64*|powerpc*|sparc*|s390*) if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then - rm -f "${prefix}lib32"/.keep + rm -f "${prefix}lib32"/.keep || die if ! rmdir "${prefix}lib32" 2>/dev/null ; then ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" die "non-empty dir found where there should be none: ${prefix}lib32" @@ -154,7 +155,7 @@ multilib_layout() { for libdir in ${libdirs}; do if [[ ! -e "${EROOT}${libdir}" ]]; then ln -s usr/"${libdir}" "${EROOT}${libdir}" || - die " Unable to make ${EROOT}${libdir} symlink" + die "Unable to make ${EROOT}${libdir} symlink" fi done fi @@ -164,7 +165,7 @@ pkg_preinst() { # This is written in src_install (so it's in CONTENTS), but punt all # pending updates to avoid user having to do etc-update (and make the # pkg_postinst logic simpler). - rm -f "${EROOT}"/etc/._cfg????_gentoo-release + rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die # We need to install directories and maybe some dev nodes when building # stages, but they cannot be in CONTENTS. @@ -177,7 +178,7 @@ pkg_preinst() { emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge fi fi - rm -f "${ED}"/usr/share/${PN}/Makefile + rm -f "${ED}"/usr/share/${PN}/Makefile || die } src_prepare() { @@ -223,11 +224,16 @@ src_install() { DESTDIR="${ED}" \ install dodoc ChangeLog - rm "${ED}"/etc/sysctl.d/README + rm "${ED}"/etc/sysctl.d/README || die # need the makefile in pkg_preinst insinto /usr/share/${PN} doins Makefile + + # This is needed for https://bugs.gentoo.org/732142 + dodir /usr/lib + mv "${ED}"/etc/os-release "${ED}"/usr/lib || die + dosym ../usr/lib/os-release /etc/os-release } pkg_postinst() { @@ -239,23 +245,25 @@ pkg_postinst() { # (3) accidentally packaging up personal files with quickpkg # If they don't exist then we install them for x in master.passwd passwd shadow group fstab ; do - [ -e "${EROOT}etc/${x}" ] && continue - [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue - cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc + [ -e "${EROOT}/etc/${x}" ] && continue + [ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue + cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die done # Force shadow permissions to not be world-readable #260993 for x in shadow ; do - [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" + if [ -e "${EROOT}/etc/${x}" ] ; then + chmod o-rwx "${EROOT}/etc/${x}" || die + fi done # Take care of the etc-update for the user - if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release + if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then + mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die fi # whine about users that lack passwords #193541 - if [[ -e "${EROOT}"etc/shadow ]] ; then + if [[ -e "${EROOT}"/etc/shadow ]] ; then local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) if [[ -n ${bad_users} ]] ; then echo @@ -265,8 +273,8 @@ pkg_postinst() { fi # whine about users with invalid shells #215698 - if [[ -e "${EROOT}"etc/passwd ]] ; then - local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) + if [[ -e "${EROOT}"/etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort) if [[ -n ${bad_shells} ]] ; then echo ewarn "The following users have non-existent shells!" @@ -276,35 +284,35 @@ pkg_postinst() { # https://bugs.gentoo.org/361349 if use kernel_linux; then - mkdir -p "${EROOT}"run + mkdir -p "${EROOT}"/run || die local found fstype mountpoint while read -r _ mountpoint fstype _; do [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 - done < "${ROOT}"proc/mounts + done < "${ROOT}"/proc/mounts [[ -z ${found} ]] && ewarn "You should reboot now to get /run mounted with tmpfs!" fi for x in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.4 ${x}; then - ewarn "After updating ${EROOT}etc/profile, please run" + if ver_test 2.4 -lt ${x}; then + ewarn "After updating ${EROOT}/etc/profile, please run" ewarn "env-update && . /etc/profile" fi - if ! version_is_at_least 2.6 ${x}; then + if ver_test 2.6 -lt ${x}; then ewarn "Please run env-update then log out and back in to" ewarn "update your path." fi # clean up after 2.5 typos # https://bugs.gentoo.org/show_bug.cgi?id=656380 if [[ ${x} == 2.5 ]]; then - rm -fr "${EROOT}{,usr" + rm -fr "${EROOT}/{,usr" || die fi done - if [[ -e "${EROOT}"etc/env.d/00basic ]]; then - ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout" + if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then + ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" ewarn "Please migrate your changes." fi } diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest index 37da7d898d79..c3376a06fa4b 100644 --- a/sys-apps/biosdisk/Manifest +++ b/sys-apps/biosdisk/Manifest @@ -1,3 +1,3 @@ DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537 -EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c +EBUILD biosdisk-1.01.ebuild 572 BLAKE2B 4330e72ee57c3d212627aaa82e3d48f398ef864c557c3909a26a4a05abc86a48a23805e8249f8b679b0b4cef034b836df2ba53a66eb9b6923c0d458ff527d46e SHA512 253d4694d255149fde8ef1a3c4ee43b05215178b0e53911c2c08e61f957c7998e5ba5e6397648ac1621844ebd04704c6a7440c0c3ac4cdd83e8820602fed82ca MISC metadata.xml 245 BLAKE2B cfb1c75ae97a85e469dede0ae542d146c40033c7220b383abaf7ffbb38325cb5132c98f4d920f7f33833b98ec5a1b51ca1b7574df675830a9e65468f01063e08 SHA512 d4a6599b57a5234bf178a387868bc06977b83bd56117edb8ff6dc4f0e3c8739cbb9acd9aa6ab7c053e6d84a2e14de474b0e9e76cf75938d492ccd7b87c314d9f diff --git a/sys-apps/biosdisk/biosdisk-1.01.ebuild b/sys-apps/biosdisk/biosdisk-1.01.ebuild index f4ae904c895e..ddd33591ce56 100644 --- a/sys-apps/biosdisk/biosdisk-1.01.ebuild +++ b/sys-apps/biosdisk/biosdisk-1.01.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils - DESCRIPTION="FreeDOS based BIOS updating utility for Dell machines" HOMEPAGE="https://github.com/dell/biosdisk" SRC_URI="https://github.com/dell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest index 681d4d91227b..3a2a6595195a 100644 --- a/sys-apps/bolt/Manifest +++ b/sys-apps/bolt/Manifest @@ -2,5 +2,5 @@ AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f -EBUILD bolt-0.9-r3.ebuild 1349 BLAKE2B 06096ee9038a236782116306126ec7838827788173da85f59debc72ff70cc1ff71ee3f48f0a5b293990609fca2d0770ec3a6e68eb6f3225b3fd06873f2c6d3e2 SHA512 1c207d5b6d983700e1d6bbf04c5e8339203a6ad1da70ec74644f67c6df0f8b0562b99af905ea744c14244917c74081c67bb0ada05a2c4d128ac68ef651ca037d +EBUILD bolt-0.9-r3.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 diff --git a/sys-apps/bolt/bolt-0.9-r3.ebuild b/sys-apps/bolt/bolt-0.9-r3.ebuild index 34cd766665ec..d0f8d019bc70 100644 --- a/sys-apps/bolt/bolt-0.9-r3.ebuild +++ b/sys-apps/bolt/bolt-0.9-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc systemd" DEPEND=" diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 2784f3ddab2f..0202d3735b29 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -13,11 +13,9 @@ AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe7 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5 -DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a -EBUILD busybox-1.32.0-r1.ebuild 9485 BLAKE2B 0749d7f1a94bcbcae70ef9e305720a20c309397fb0013a411a8ea6caa4d24c93772a583a808d2467d81ce970be5762fcd2850b84295ac78a05f1e3b1ae788529 SHA512 c4dbabff8ee7ebfb3515ae94efa39b6c4e6de3bd478a243fb3156ef70f0f5b4b75c70beb77531d12abdbec3af4ea4a1c59437cbf462fd62c70a8d9bf82e74f7a -EBUILD busybox-1.32.1.ebuild 9485 BLAKE2B 0749d7f1a94bcbcae70ef9e305720a20c309397fb0013a411a8ea6caa4d24c93772a583a808d2467d81ce970be5762fcd2850b84295ac78a05f1e3b1ae788529 SHA512 c4dbabff8ee7ebfb3515ae94efa39b6c4e6de3bd478a243fb3156ef70f0f5b4b75c70beb77531d12abdbec3af4ea4a1c59437cbf462fd62c70a8d9bf82e74f7a -EBUILD busybox-1.33.0.ebuild 9493 BLAKE2B 54b44ae3a230bf7fd6f03b76b293e0e42b351049a3b2200928c2a6dfff459a62115e48bc279b280151a73cfbc660f8403a5f9673e88d4e1e30445029fe9c4cc0 SHA512 54af8a0e8f4c1d6c4bf28f85f2c205487c6d0449baab0f7872b9cb11121d7ddf7f142dd902a2abed3a770080d70e7b2d0b39f4f7d775d83dd3b22013c05d1aa9 -EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d +EBUILD busybox-1.32.1.ebuild 9579 BLAKE2B ca46d5c3161015e8623926604d79dd230eb7587ba442e5249fcaede9c9156ddcbd19e0a15eeacda3816dd51ec8ea0b11a9a4177a4ebb4dcdfd327612e2f4ad4e SHA512 ee80215d96d29bee8d675ba462046139dba49a00e4d089e29f471d296acc1d5b7ba04143a2821ca13cbc46d1814c9c8380abe2ef82a065ee926e34d67acfcf4a +EBUILD busybox-1.33.0.ebuild 9586 BLAKE2B 8e8f1adbd071258c916ec7be204528854b9a8312f86ea67eaeab08b0b9b3a1b8a71bd802e338a105f6e32c7784aa1c7b038f9d786c776844865a2918c2dcfdc5 SHA512 43d16032edae71ed1c03a141c82525086f454dbc320c6f3746d0a6e17a124271a0eefa75cc2ac90e8faad11cee86e382fcb4002ee046e4772aada0498d517227 +EBUILD busybox-9999.ebuild 9550 BLAKE2B 2c2706c0ba15593df3b377c4b2fd10dc163c7f07ca1d99307ffd2a5ea3de8d5ebfa6c0876f3d5319d3d75fc15e2aca7d6873abb0424341b0d3b8a7677e473fde SHA512 ff39fd205050834de39a706df3c7b360d5a9b394d55d2f2633c7f7bcfe739e8f6d5ce566656593a01c351c69d54468cac2f0ebbd470d557b6106cf23544f5c92 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff --git a/sys-apps/busybox/busybox-1.32.0-r1.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild deleted file mode 100644 index a0431ffc93b7..000000000000 --- a/sys-apps/busybox/busybox-1.32.0-r1.ebuild +++ /dev/null @@ -1,337 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI=7 - -inherit flag-o-matic savedconfig toolchain-funcs - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="https://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${P} - EGIT_REPO_URI="https://git.busybox.net/busybox" - inherit git-r3 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" # GPL-2 only -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" -REQUIRED_USE="pam? ( !static )" -RESTRICT="test" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam ) - virtual/libcrypt:=" -DEPEND="${COMMON_DEPEND} - static? ( - virtual/libcrypt[static-libs] - selinux? ( sys-libs/libselinux[static-libs(+)] ) - ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} - mdev? ( !::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s allyesconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_2_4_MODULES #607548 - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - # triming the BSS size may be dangerous - busybox_config_option n FEATURE_USE_BSS_TAIL - - # These cause trouble with musl. - if use elibc_musl; then - busybox_config_option n FEATURE_UTMP - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - fi - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option y SH_IS_ASH - busybox_config_option n HUSH - busybox_config_option n SH_IS_HUSH - - busybox_config_option '"/run"' PID_FILE_PATH - busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - busybox_config_option pam PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # disable features that uClibc doesn't (yet?) provide. - if use elibc_uclibc; then - busybox_config_option n FEATURE_SYNC_FANCY #567598 - busybox_config_option n NSENTER - fi - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG_SANITIZE - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - docinto html - dodoc *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild index a0431ffc93b7..56929b85f919 100644 --- a/sys-apps/busybox/busybox-1.32.1.ebuild +++ b/sys-apps/busybox/busybox-1.32.1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P=${PN}-${PV/_/-} SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" # GPL-2 only @@ -25,6 +25,7 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo REQUIRED_USE="pam? ( !static )" RESTRICT="test" +# TODO: Could make pkgconfig conditional on selinux? bug #782829 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:=" @@ -34,6 +35,7 @@ DEPEND="${COMMON_DEPEND} selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39" +BDEPEND="virtual/pkgconfig" RDEPEND="${COMMON_DEPEND} mdev? ( ! +Date: Mon, 22 Feb 2021 21:44:07 -0800 +Subject: [PATCH 1/6] tmpnam.c: fix heap overflow + +Signed-off-by: Ilya Lipnitskiy +--- + src/tmpnam.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tmpnam.c b/src/tmpnam.c +index ce60817..917ee6b 100644 +--- a/src/tmpnam.c ++++ b/src/tmpnam.c +@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s)) + + expand_chroot_path(ptr); + +- ptr2 = malloc(strlen(ptr)); ++ ptr2 = malloc(strlen(ptr) + 1); + if (ptr2 == NULL) return NULL; + + strcpy(ptr2, ptr); + +From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 22 Feb 2021 21:46:36 -0800 +Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat + +Signed-off-by: Ilya Lipnitskiy +--- + src/lstat.c | 8 +++++--- + src/lstat.h | 2 +- + src/mknod.c | 2 ++ + src/stat.c | 2 ++ + src/stat64.c | 2 ++ + 5 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/lstat.c b/src/lstat.c +index 3f6d819..54e3263 100644 +--- a/src/lstat.c ++++ b/src/lstat.c +@@ -28,9 +28,11 @@ + #include "lstat.h" + + +-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) ++wrapper(lstat, int, (const char * filename, struct stat * buf)) + { +- debug("lstat(%d, \"%s\", &buf)", ver, filename); ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("lstat(\"%s\", &buf)", filename); + + if (!fakechroot_localdir(filename)) { + if (filename != NULL) { +@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) + } + } + +- return lstat_rel(ver, filename, buf); ++ return lstat_rel(filename, buf); + } + + +diff --git a/src/lstat.h b/src/lstat.h +index 751c1ea..ee48303 100644 +--- a/src/lstat.h ++++ b/src/lstat.h +@@ -26,7 +26,7 @@ + + #ifndef HAVE___LXSTAT + +-wrapper_proto(lstat, int, (int, const char *, struct stat *)); ++wrapper_proto(lstat, int, (const char *, struct stat *)); + + int lstat_rel(const char *, struct stat *); + +diff --git a/src/mknod.c b/src/mknod.c +index 52fd33b..2771037 100644 +--- a/src/mknod.c ++++ b/src/mknod.c +@@ -28,6 +28,8 @@ + + wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev); + expand_chroot_path(pathname); + return nextcall(mknod)(pathname, mode, dev); +diff --git a/src/stat.c b/src/stat.c +index 7845662..7b37793 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -33,6 +33,8 @@ + + wrapper(stat, int, (const char * file_name, struct stat * buf)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("stat(\"%s\", &buf)", file_name); + expand_chroot_path(file_name); + return nextcall(stat)(file_name, buf); +diff --git a/src/stat64.c b/src/stat64.c +index aac9c75..a360f66 100644 +--- a/src/stat64.c ++++ b/src/stat64.c +@@ -34,6 +34,8 @@ + + wrapper(stat64, int, (const char * file_name, struct stat64 * buf)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("stat64(\"%s\", &buf)", file_name); + expand_chroot_path(file_name); + return nextcall(stat64)(file_name, buf); + +From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 22 Feb 2021 21:47:09 -0800 +Subject: [PATCH 3/6] fix glibc 2.33+ compatibility + +Signed-off-by: Ilya Lipnitskiy +--- + configure.ac | 20 ++++++++++++++++++++ + src/ftw.c | 2 +- + src/ftw64.c | 14 +++++++++++--- + src/libfakechroot.h | 15 +++++++++++++++ + src/lstat.c | 2 +- + src/lstat.h | 2 +- + src/lstat64.c | 2 +- + src/mknod.c | 2 +- + src/mknodat.c | 2 +- + src/stat.c | 2 +- + src/stat64.c | 2 +- + 11 files changed, 54 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f8cdb32..9cc2e77 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY + # Checks for libraries. + AC_CHECK_LIB([dl], [dlsym]) + ++AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33]) ++AC_MSG_CHECKING([for glibc 2.33+]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ #include ++ ]], [[ ++#ifdef __GLIBC__ ++#if !__GLIBC_PREREQ(2,33) ++#error glibc<2.33 ++#endif ++#else ++#error not glibc ++#endif ++ ]])],[ ++ AC_DEFINE(NEW_GLIBC,1) ++ AC_MSG_RESULT([yes]) ++ ],[ ++ AC_DEFINE(NEW_GLIBC,0) ++ AC_MSG_RESULT([no]) ++ ]) ++ + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +diff --git a/src/ftw.c b/src/ftw.c +index 92fc126..a9abc85 100644 +--- a/src/ftw.c ++++ b/src/ftw.c +@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *); + # define NFTW_NEW_NAME __new_nftw + # define INO_T ino_t + # define STAT stat +-# ifdef _LIBC ++# if defined(_LIBC) && !NEW_GLIBC + # define LXSTAT __lxstat + # define XSTAT __xstat + # define FXSTATAT __fxstatat +diff --git a/src/ftw64.c b/src/ftw64.c +index 7cc8cdf..cee1f2b 100644 +--- a/src/ftw64.c ++++ b/src/ftw64.c +@@ -18,6 +18,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include "config.h" ++ + #define __FTW64_C + #define FTW_NAME ftw64 + #define NFTW_NAME nftw64 +@@ -25,9 +27,15 @@ + #define NFTW_NEW_NAME __new_nftw64 + #define INO_T ino64_t + #define STAT stat64 +-#define LXSTAT __lxstat64 +-#define XSTAT __xstat64 +-#define FXSTATAT __fxstatat64 ++#if NEW_GLIBC ++# define LXSTAT(V,f,sb) lstat64 (f,sb) ++# define XSTAT(V,f,sb) stat64 (f,sb) ++# define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m) ++#else ++# define LXSTAT __lxstat64 ++# define XSTAT __xstat64 ++# define FXSTATAT __fxstatat64 ++#endif + #define FTW_FUNC_T __ftw64_func_t + #define NFTW_FUNC_T __nftw64_func_t + +diff --git a/src/libfakechroot.h b/src/libfakechroot.h +index 4cf199f..64ff15f 100644 +--- a/src/libfakechroot.h ++++ b/src/libfakechroot.h +@@ -200,6 +200,21 @@ + # endif + #endif + ++#ifndef _STAT_VER ++ #if defined (__aarch64__) ++ #define _STAT_VER 0 ++ #elif defined (__powerpc__) && __WORDSIZE == 64 ++ #define _STAT_VER 1 ++ #elif defined (__riscv) && __riscv_xlen==64 ++ #define _STAT_VER 0 ++ #elif defined (__s390x__) ++ #define _STAT_VER 1 ++ #elif defined (__x86_64__) ++ #define _STAT_VER 1 ++ #else ++ #define _STAT_VER 3 ++ #endif ++#endif + + typedef void (*fakechroot_wrapperfn_t)(void); + +diff --git a/src/lstat.c b/src/lstat.c +index 54e3263..fa38323 100644 +--- a/src/lstat.c ++++ b/src/lstat.c +@@ -20,7 +20,7 @@ + + #include + +-#ifndef HAVE___LXSTAT ++#if !defined(HAVE___LXSTAT) || NEW_GLIBC + + #include + #include +diff --git a/src/lstat.h b/src/lstat.h +index ee48303..c46a2b9 100644 +--- a/src/lstat.h ++++ b/src/lstat.h +@@ -24,7 +24,7 @@ + #include + #include "libfakechroot.h" + +-#ifndef HAVE___LXSTAT ++#if !defined(HAVE___LXSTAT) || NEW_GLIBC + + wrapper_proto(lstat, int, (const char *, struct stat *)); + +diff --git a/src/lstat64.c b/src/lstat64.c +index b6212fc..a332d7c 100644 +--- a/src/lstat64.c ++++ b/src/lstat64.c +@@ -20,7 +20,7 @@ + + #include + +-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64) ++#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC) + + #define _LARGEFILE64_SOURCE + #define _BSD_SOURCE +diff --git a/src/mknod.c b/src/mknod.c +index 2771037..aeb750b 100644 +--- a/src/mknod.c ++++ b/src/mknod.c +@@ -20,7 +20,7 @@ + + #include + +-#ifndef HAVE___XMKNOD ++#if !defined(HAVE___XMKNOD) || NEW_GLIBC + + #include + #include "libfakechroot.h" +diff --git a/src/mknodat.c b/src/mknodat.c +index 732a22b..3239b35 100644 +--- a/src/mknodat.c ++++ b/src/mknodat.c +@@ -20,7 +20,7 @@ + + #include + +-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT) ++#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC) + + #define _ATFILE_SOURCE + #include +diff --git a/src/stat.c b/src/stat.c +index 7b37793..5ef57ba 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -20,7 +20,7 @@ + + #include + +-#ifndef HAVE___XSTAT ++#if !defined(HAVE___XSTAT) || NEW_GLIBC + + #define _BSD_SOURCE + #define _DEFAULT_SOURCE +diff --git a/src/stat64.c b/src/stat64.c +index a360f66..993ce80 100644 +--- a/src/stat64.c ++++ b/src/stat64.c +@@ -20,7 +20,7 @@ + + #include + +-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64) ++#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC) + + #define _BSD_SOURCE + #define _LARGEFILE64_SOURCE + +From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001 +From: neok-m4700 +Date: Wed, 24 Feb 2021 17:36:57 +0100 +Subject: [PATCH 6/6] wrap fstatat and fstatat64 + +--- + configure.ac | 2 ++ + src/Makefile.am | 2 ++ + src/fstatat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 89 insertions(+) + create mode 100644 src/fstatat.c + create mode 100644 src/fstatat64.c + +diff --git a/configure.ac b/configure.ac +index 9cc2e77..5b3053e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([ + freopen64 + fstat + fstat64 ++ fstatat ++ fstatat64 + fts_children + fts_open + fts_read +diff --git a/src/Makefile.am b/src/Makefile.am +index 6066345..eb311c0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \ + fopen64.c \ + freopen.c \ + freopen64.c \ ++ fstatat.c \ ++ fstatat64.c \ + fts.c \ + fts64.c \ + ftw.c \ +diff --git a/src/fstatat.c b/src/fstatat.c +new file mode 100644 +index 0000000..ca7578b +--- /dev/null ++++ b/src/fstatat.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE_FSTATAT ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include ++#include ++#include "libfakechroot.h" ++ ++wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(fstatat)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/fstatat64.c b/src/fstatat64.c +new file mode 100644 +index 0000000..1863372 +--- /dev/null ++++ b/src/fstatat64.c +@@ -0,0 +1,43 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include ++ ++#ifdef HAVE_FSTATAT64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#define _LARGEFILE64_SOURCE ++#include ++#include ++#include "libfakechroot.h" ++ ++wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(fstatat64)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest index 2eefe6f6d81e..fb05a20aa165 100644 --- a/sys-apps/fakeroot/Manifest +++ b/sys-apps/fakeroot/Manifest @@ -1,15 +1,16 @@ AUX fakeroot-1.19-no-acl_h.patch 915 BLAKE2B 2392343f314e5cc3fa49def14a245cf2898902d99ff2fbe4bc0a883e70ae1382ed5c4c506533545b9c428958f8e4be54e795601063d48dd8ffe9e80d56ec267a SHA512 d077e8ba2bc4407ba1a57fb5920f2a866bdcb13fa359c2245e479019bbc19a3aab398cc25220079edf7c42c4d09429e57326b606ff5795f83de24c7a31835717 AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d72497145bcb8e5e1b2acf43608dd03f1a2b9ee688fda8859491d79c898e6f412eded6a5c8a24734640e2479eda95319a265 SHA512 824e71169877702c5d98970d62866d5074d1a728d5bc52460483117610f50f6869f65714608313f20e40b7432ea4c50cf9f47158d8f2f9ef4a3c00220ccbd52c +AUX fakeroot-1.25.3-glibc-2.33.patch 13646 BLAKE2B 1a83706a9e26f9c11d9851c24659086206df2d518c3103354971436565d59e8c5cdda47eaf40dc6645d7b09542e766593d57f731d7d8946ef96a1852b12ea2b0 SHA512 3f5402763d32a0b7461ef817e5aece42ff4807780ab886a7867d03019d0a4c501350a3520932e1ba6dcd592ae0cb9548c2cdf1da5498bfb6092f4cb6b4a09096 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 DIST fakeroot_1.25.1.orig.tar.gz 126880 BLAKE2B ea92815d005422ade80a91d1351c500614f7628b2173caf23bab2192f9395440ba4429ac773723c79a0f0205b7c750db9c1cecbefe7e9e2c442c8a92938df0cf SHA512 0e340aacfb49558ee6719aa11aa297ccda2afe2f66209da8fa10e45ec7954d5db689717db38f30cdfb9d89b75ca63ec6aed42e2cc314fd25c60262aa735eab0d DIST fakeroot_1.25.2.orig.tar.gz 126876 BLAKE2B 13c4457aed3d6df08fef0f3af6093eea05bcaedff280146a7d09e96a1e73d0615c2527ce32bc4999a0acc0478610241440ec9a70ee27860cd61d799f636c30d3 SHA512 3afc0d6c82bef4968f1eac293174d12f957788f173fa8b69753c422f0f3bb54e012d350eaa8e535501dd62185479c1d4cb1c6e3f605930ae5987a7f622c450c2 DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e -EBUILD fakeroot-1.22.ebuild 1068 BLAKE2B 24eb5e3273be5f6bf771c1930cf01495912a2a043ad39c80b3501abf211024b7a4bc8f09656fbb2b711368979377dfe46baa16528ee8de53890177e673082ab4 SHA512 096c63a170619f68f38b95013616e96881750c39b3f4d19d12bd5ff3cfae8c493f1b3ea5695ee8f584217d5d52d44c3ccb3041558db7f9770d53c5d8b0453a32 -EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904 -EBUILD fakeroot-1.24.ebuild 1081 BLAKE2B 83324f005105c63853a8609a59095032ba7c559c6a211257f5e834eccc331f0d6760ff46586ed64ca0847c2fcb4190160449538a201b3c480ecffac867d1d9c8 SHA512 aac064b0369eed287f53944cd7ce1be7455d8bd2eb647b2d7499b67d306def045a32dd994245d64c6ef632b7d240cbc258405563bd777e3239f154ec524ca531 -EBUILD fakeroot-1.25.1.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5 -EBUILD fakeroot-1.25.2.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5 -EBUILD fakeroot-1.25.3.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5 +EBUILD fakeroot-1.22.ebuild 1037 BLAKE2B b54f10e687853be1dfe56bacb01955086074150c1b5b0b31f85247843631df123b7ae28a546a536b703ce7ed73535f2a0b0dd002f6466a8edbfed7d8c64ed222 SHA512 a0cba5dbef10e56f65753266abb39b16c5ca749a6b2a6788737c99bb396b29a5b687ab102cb3dee28e55bc686b3ee741c909fe8d2e7d182d322e3d18ca944ca1 +EBUILD fakeroot-1.23.ebuild 1042 BLAKE2B 397a3e3eb5b8cd664ae33968c0f0f3f252d0bba0996bc3885b403ce7f0de37b6b4fe68fb5e67d09632f082be3f3ced19e489615ee1e8a26a3c57482b8f2b98d0 SHA512 4ffa843ad9ff3a35b7d51f9d5655641010f1cd835d747dd8318d65bdd2eec81057c3fde221481f677e7e3d4695c5a0d6d8032b628d4c79e9594d6ecfbc448af5 +EBUILD fakeroot-1.24.ebuild 1049 BLAKE2B 0a15c82db4fc1c07e1b8ca8a4b518d25f08709e9dbedde5207cbe99e0c42602e932dc591d5f62997df29259a5e40abd5084b79b3636524f1dea4593ae0e8acb3 SHA512 64731f11ed5eee897e2cb6564b16aeb5ccf1a564a7c37132eca91e13acf27bc06a7dfd715786bc2743944558d8cfaf9d43f6e92f5c011c39c643979d9461425d +EBUILD fakeroot-1.25.1.ebuild 1153 BLAKE2B 4b8ae014196e34b7858663d1141f3f7951780d2035751aa691a5ce90805a4216f56aec081b501be9be02f444453c61ce1ecacb0ea8c77e8f7a2e30c7d9950cb0 SHA512 ec9769a0ff90e7f89abefae9f6b881c37435b320530a3bf8cc187496b3bbc57bc1a95a0739243c5344621f5687334ec9e79397066313229fa17b6b49939dc4e9 +EBUILD fakeroot-1.25.2.ebuild 1153 BLAKE2B 4b8ae014196e34b7858663d1141f3f7951780d2035751aa691a5ce90805a4216f56aec081b501be9be02f444453c61ce1ecacb0ea8c77e8f7a2e30c7d9950cb0 SHA512 ec9769a0ff90e7f89abefae9f6b881c37435b320530a3bf8cc187496b3bbc57bc1a95a0739243c5344621f5687334ec9e79397066313229fa17b6b49939dc4e9 +EBUILD fakeroot-1.25.3-r1.ebuild 1283 BLAKE2B dca56bb4cffd09daf635e3b9f57ae4d202826eee3ee445571e4229d0355b566302be59dae1c55270c1f363e980195a91d342d734b331a83e542c037ea76437a0 SHA512 d7a0d8b3f4fe46be037ad992f1f11c3f4068864949f3f6c98114c64c8535f4f66d985166e3321348409b711b6852ddfe22b37debf6966f9976e079ac044b2949 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild index 1f8e88f9076b..de5c08838429 100644 --- a/sys-apps/fakeroot/fakeroot-1.22.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,8 +11,8 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.23.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild index c0f5629f8051..8ff11f2bd082 100644 --- a/sys-apps/fakeroot/fakeroot-1.23.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.24.ebuild b/sys-apps/fakeroot/fakeroot-1.24.ebuild index 1145abde6854..c0433bfb258d 100644 --- a/sys-apps/fakeroot/fakeroot-1.24.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild index eac32e7e9542..acc86b8534df 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -41,8 +41,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild index eac32e7e9542..acc86b8534df 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -41,8 +41,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild new file mode 100644 index 000000000000..86101250865e --- /dev/null +++ b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery" +HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html" +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl debug test" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-libs/libcap + acl? ( sys-apps/acl ) + test? ( app-arch/sharutils )" +BDEPEND="app-text/po4a" + +DOCS=( AUTHORS BUGS DEBUG README doc/README.saving ) + +src_prepare() { + local PATCHES=( + "${FILESDIR}/fakeroot-1.25.3-glibc-2.33.patch" + ) + default + eautoreconf +} + +src_configure() { + export ac_cv_header_sys_acl_h=$(usex acl) + use acl || export ac_cv_search_acl_get_fd=no # bug 759568 + use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING + + econf --disable-static +} + +src_compile() { + # Create translated man pages + pushd doc >/dev/null || die + po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die + popd >/dev/null || die + + default +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3.ebuild deleted file mode 100644 index eac32e7e9542..000000000000 --- a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery" -HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html" -SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/libcap - acl? ( sys-apps/acl ) - test? ( app-arch/sharutils )" -BDEPEND="app-text/po4a" - -DOCS="AUTHORS BUGS DEBUG README doc/README.saving" - -src_prepare() { - default - eautoreconf -} - -src_compile() { - # Create tranlated man pages - pushd doc &>/dev/null || die - po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die - popd &>/dev/null || die - - default -} - -src_configure() { - export ac_cv_header_sys_acl_h=$(usex acl) - - use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -o -name '*.a' -delete || die -} diff --git a/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch b/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch new file mode 100644 index 000000000000..87ae9e18b746 --- /dev/null +++ b/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch @@ -0,0 +1,413 @@ +From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 20:59:25 -0800 +Subject: [PATCH 1/6] libfakeroot.c: define _STAT_VER if not already defined + +Based on patch from Jan Pazdziora: +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/ + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 3e80e38..14cdbc4 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -90,6 +90,16 @@ + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) + #endif + ++#ifndef _STAT_VER ++ #if defined (__aarch64__) ++ #define _STAT_VER 0 ++ #elif defined (__x86_64__) ++ #define _STAT_VER 1 ++ #else ++ #define _STAT_VER 3 ++ #endif ++#endif ++ + /* + These INT_* (which stands for internal) macros should always be used when + the fakeroot library owns the storage of the stat variable. +-- +GitLab + + +From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 21:00:04 -0800 +Subject: [PATCH 2/6] libfakeroot.c: add wrappers for new glibc 2.33+ symbols + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 14cdbc4..d75c51f 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath, + #endif /* HAVE_FSTATAT */ + + ++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) ++/* Glibc 2.33 exports symbols for these functions in the shared lib */ ++ int lstat(const char *file_name, struct stat *statbuf) { ++ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); ++ } ++ int stat(const char *file_name, struct stat *st) { ++ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st); ++ } ++ int fstat(int fd, struct stat *st) { ++ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st); ++ } ++ ++ #ifdef HAVE_FSTATAT ++ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) { ++ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags); ++ } ++ #endif ++ ++ #ifdef STAT64_SUPPORT ++ int lstat64(const char *file_name, struct stat64 *st) { ++ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st); ++ } ++ int stat64(const char *file_name, struct stat64 *st) { ++ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st); ++ } ++ int fstat64(int fd, struct stat64 *st) { ++ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st); ++ } ++ ++ #ifdef HAVE_FSTATAT ++ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) { ++ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags); ++ } ++ #endif ++ #endif ++ ++ int mknod(const char *pathname, mode_t mode, dev_t dev) { ++ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev); ++ } ++ ++ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT) ++ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) { ++ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); ++ } ++ #endif ++#endif /* GLIBC_PREREQ */ ++ ++ + #ifdef FAKEROOT_FAKENET + pid_t fork(void) + { +-- +GitLab + + +From d074aaa34d6928989308a3870738d6b1c28f2bae Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 21:00:20 -0800 +Subject: [PATCH 3/6] libfakeroot.c: fix compile error with DEBUG enabled + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfakeroot.c b/libfakeroot.c +index d75c51f..31480f8 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta + + #ifdef LIBFAKEROOT_DEBUGGING + if (fakeroot_debug) { +- fprintf(stderr, "statx fd %d\n", fd); ++ fprintf(stderr, "statx fd %d\n", dirfd); + } + #endif /* LIBFAKEROOT_DEBUGGING */ + r=INT_NEXT_FSTATAT(dirfd, path, &st, flags); +-- +GitLab + + +From c3eebec293e35b997bb46c22fb5a4e114afb5e7f Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 19:32:08 -0800 +Subject: [PATCH 4/6] configure.ac: fix __xmknod{,at} pointer argument + +Switch default to assume * and not the absence of *. + +On glibc 2.33+, there is no definition for these functions in header +files, so the compile test doesn't work. But, we can default to using +the pointer (as is the case with newer glibc), and use the header file +on older platforms to fail the test and use no pointer. + +Signed-off-by: Ilya Lipnitskiy +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 73415d2..d85566f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) + ]], [[ + int __xmknod ( int ver, + const char *pathname , +- mode_t mode , dev_t dev); ++ mode_t mode , dev_t *dev); + ]])],[ +- AC_DEFINE(XMKNOD_FRTH_ARG,) +- AC_MSG_RESULT([no extra *]) +- ],[ + AC_DEFINE(XMKNOD_FRTH_ARG,[*]) + AC_MSG_RESULT([needs *]) ++ ],[ ++ AC_DEFINE(XMKNOD_FRTH_ARG,) ++ AC_MSG_RESULT([no extra *]) + + ]) + +@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) + int __xmknodat ( int ver, + int dirfd, + const char *pathname , +- mode_t mode , dev_t dev); ++ mode_t mode , dev_t *dev); + ]])],[ +- AC_DEFINE(XMKNODAT_FIFTH_ARG,) +- AC_MSG_RESULT([no extra *]) +- ],[ + AC_DEFINE(XMKNODAT_FIFTH_ARG,[*]) + AC_MSG_RESULT([needs *]) ++ ],[ ++ AC_DEFINE(XMKNODAT_FIFTH_ARG,) ++ AC_MSG_RESULT([no extra *]) + + ]) + +-- +GitLab + + +From 01671986b4ee8eb76dc7f63dfe034a7faf4a4c28 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 19:35:31 -0800 +Subject: [PATCH 5/6] libfakeroot.c: fix fts_read and fts_children + +Apply Debian patch from [0], since glibc is usually built without LFS. +__USE_LARGEFILE64 and FTSENT64 should be used anyway for proper support +of this, if needed. See [1] for more details. + +[0]: https://sources.debian.org/patches/fakeroot/1.25.3-1.1/eglibc-fts-without-LFS/ +[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676428 + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 31480f8..169f4da 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -2066,11 +2066,7 @@ FTSENT *fts_read(FTS *ftsp) { + || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK)) + r->fts_statp = NULL; /* Otherwise fts_statp may be a random pointer */ + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + + return r; +@@ -2089,11 +2085,7 @@ FTSENT *fts_children(FTS *ftsp, int options) { + first=next_fts_children(ftsp, options); + for(r = first; r; r = r->fts_link) { + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + } + +-- +GitLab + + +From f5e0a89ab6f0024f3d3bec5fd9cf631676b44f6c Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 20:05:17 -0800 +Subject: [PATCH 6/6] OS X portability + +OS X portability work from OpenWrt. + +Cc: Felix Fietkau +Signed-off-by: Ilya Lipnitskiy +--- + configure.ac | 1 + + libfakeroot.c | 36 ++++++++++++++++++++++++++++++++++-- + wrapawk_macosx | 10 +++++++--- + wrapfunc.inp | 4 ++-- + 4 files changed, 44 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d85566f..35f9ecf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -146,6 +146,7 @@ for first in size_t int; do + #include + #endif + #include ++#include + #ifdef HAVE_GRP_H + #include + #endif +diff --git a/libfakeroot.c b/libfakeroot.c +index 169f4da..7593dd6 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -122,8 +122,16 @@ + #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER) + #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER) + #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b) ++ ++/* 10.10 uses id_t in getpriority/setpriority calls, so pretend ++ id_t is used everywhere, just happens to be int on some OSes */ ++#ifndef _ID_T ++#define _ID_T ++typedef int id_t; ++#endif + #endif + ++#include + #include + #include + #include +@@ -135,7 +143,6 @@ + #include + #include + #include +-#include + #ifdef HAVE_SYS_ACL_H + #include + #endif /* HAVE_SYS_ACL_H */ +@@ -198,6 +205,15 @@ extern int unsetenv (const char *name); + #undef __lxstat64 + #undef _FILE_OFFSET_BITS + ++ ++#ifndef AT_EMPTY_PATH ++#define AT_EMPTY_PATH 0 ++#endif ++ ++#ifndef AT_NO_AUTOMOUNT ++#define AT_NO_AUTOMOUNT 0 ++#endif ++ + /* + // next_wrap_st: + // this structure is used in next_wrap, which is defined in +@@ -1969,7 +1985,7 @@ ssize_t fremovexattr(int fd, const char *name) + } + #endif /* HAVE_FREMOVEXATTR */ + +-int setpriority(int which, int who, int prio){ ++int setpriority(int which, id_t who, int prio){ + if (fakeroot_disabled) + return next_setpriority(which, who, prio); + next_setpriority(which, who, prio); +@@ -2570,3 +2586,19 @@ int sysinfo(int command, char *buf, long count) + } + } + #endif ++ ++#ifdef HAVE_OPENAT ++int openat(int dir_fd, const char *pathname, int flags, ...) ++{ ++ mode_t mode; ++ ++ if (flags & O_CREAT) { ++ va_list args; ++ va_start(args, flags); ++ mode = va_arg(args, int); ++ va_end(args); ++ } ++ ++ return next_openat(dir_fd, pathname, flags, mode); ++} ++#endif +diff --git a/wrapawk_macosx b/wrapawk_macosx +index 088a7f4..f783219 100644 +--- a/wrapawk_macosx ++++ b/wrapawk_macosx +@@ -46,26 +46,30 @@ BEGIN{ + argtype=$3; + argname=$4; + MACRO=$5; ++ argtype_def=$6 ++ if(!argtype_def) { ++ argtype_def = argtype ++ } + if(MACRO){ + print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile; + print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);" > structfile; + print "#undef " name > deffile + print "#define " name " MY_DEF(" name "_RAW)" > deffile + +- print "extern " ret, name, argtype ";" > tmpffile; ++ print "extern " ret, name, argtype_def ";" > tmpffile; + print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile; + print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile; + print " return " name, argname ";" > tmpffile; + print "}" > tmpffile; + print "" > tmpffile; + } else { +- print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile; ++ print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile; + print "#undef " name > structfile; + print "INTERPOSE(my_" name "," name ");" > structfile; + print "#define " name " my_" name > structfile + print "#define " name " my_" name > deffile + +- print "extern " ret, name, argtype ";" > tmpffile; ++ print "extern " ret, name, argtype_def ";" > tmpffile; + if(argname){ + print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile; + print "static __inline__ " ret " next_" name, argtype " {" > tmpffile; +diff --git a/wrapfunc.inp b/wrapfunc.inp +index f7ad186..556af34 100644 +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid) + initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group) + getgroups;int;(int size, gid_t list[]);(size, list) + setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list) +-setpriority;int;(int which, int who, int prio);(which, who, prio) ++setpriority;int;(int which, id_t who, int prio);(which, who, prio) + #ifdef HAVE_CAPSET + capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap) + #endif /* HAVE_CAPSET */ +@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *path, uid_t owner, gid_t group, int flags) + mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode) + #endif /* HAVE_MKDIRAT */ + #ifdef HAVE_OPENAT +-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags) ++openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...) + #endif /* HAVE_OPENAT */ + #ifdef HAVE_RENAMEAT + renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath) +-- +GitLab + diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest index 0bd7204055ee..5bc1d7ceac8a 100644 --- a/sys-apps/fbset/Manifest +++ b/sys-apps/fbset/Manifest @@ -1,5 +1,5 @@ AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28 -EBUILD fbset-2.1.ebuild 749 BLAKE2B ce9cb40ffab4ccc50d2328cc0f48f4ff371263d60286bc22e315635e1a0f8fefb79df45c0156eb4ece6990cc3dffb41f8adb7801d27d7e86a6d05f307f2715e9 SHA512 0debd81cb517984175257bf3b03af379ecd157f0a020d722bf4a5e28dd958456ec1fe0bb1383e60d48e38dbc35508a6a72e162b59d57f59713fbce17823af9e4 +EBUILD fbset-2.1.ebuild 750 BLAKE2B 2b128941a28747ad558cedf3733ecc23bcc05ece13dafedcd4e1736242dfdb9bfe228fb9398cf0ccfc20eff0617afc6ca1cbe17f98a6d794f777423a3c0018d4 SHA512 95103486a99b4f45ff0a4b8e10bbef467ad40943380df1706165c3aa43666611c2ae81c39c96ac7a8f7c202ce1ef09fb9a9486790c43c36f1b9f724ca288ac71 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild index 282b230b79a3..398f486926dd 100644 --- a/sys-apps/fbset/fbset-2.1.ebuild +++ b/sys-apps/fbset/fbset-2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="static" BDEPEND="sys-devel/bison diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index e520841378a7..6d6e9720bec4 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -1,17 +1,8 @@ -AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f574aac769c7728bada7b622fd670616efc12d42cabf95b32a8a98c811e171059af2e127c170c1935dc00def4a1fc05b6 SHA512 3517e35db03944bcca6da28ddac9f0d08ce052b03d1508d26851fd6691bedc89f3974822a1559576987c8c10a0343bc8788cc7df52406d66a591ddcd39b23a5c -AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c -AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c -AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417 -AUX file-5.39-add-missing-termios.patch 917 BLAKE2B 12a0dd712fe7b3755e5fa6dcda0d3a5586be36b0e4fee237ba86b9dcc7b533e57f6094e49599489b8563756764c8a7d6c31d9d20245cb3971c4944ee05413cc2 SHA512 a56a617a212f2e0e348d358e09076ea25bd396f426ce4ab7c090ba702d2d20fdc5b425e2a7baac5abc78bab0320fe1b917b511c0a87b40067f7f1489508107e3 -AUX file-5.39-allow-futex-seccomp.patch 473 BLAKE2B d575e64d3d3b7f772b240bb30ad171a85e69b5282dbef43ece466dfcfed4b1ead9c8f038948010e00d7c0a029d8896d32e252ad02789725eb9fa2d61f3abf1b0 SHA512 c22098f467b41f23f9b94dae91d89008c01b5bf7534df662541bd86170feb64190a4b742e2d7130fd57973b4d565d8bc63d0d67d83399afec943e00f2ad5b847 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890 -AUX file-5.39-seccomp-musl.patch 1021 BLAKE2B ffb395d7ebf1a96a7f74c8c8462e561f31a6d46bf8d0b047b370edd0bc9ada254ddfdf1de6217e0d1e85a973880c1f55add5c8dbd40b9db4c693c36d15c5250f SHA512 d5742e169c0a5b40e8dfe3830caf5c6ee21d09122ae409c4b3f357cb517abb8a39c6af2ba6a51fa9155437ae6aa5f30b76b1f8f3d31be9bcd6e6e4e666be1a87 -DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d -DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40 -DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6 -EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76 -EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff -EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088 -EBUILD file-5.39-r4.ebuild 3450 BLAKE2B 236f6da314ad6971e594e40853efc87b2fa32e4389553fa2a11b7cc3dbf4c1291e74285e0e2ed6489a5b67d843319d16b23471f1a74e0e201a9935bb2d4db63f SHA512 3056f15679b56f34406a2e9669ed56c33ea7185435c8a7c0b75b3e58480ddf1e204955932ff1b31ef09a7cf71ee7f1e3533606bf87d3f4d65b9501df60448886 -EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c +AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb639744f11f2fb094f0870d10071a472dc3e6036cfe6cce4a1570a0876fd6c7c3f8f7f4e1ae39aa46f7cc39ee7e49ea1c9c1b22a SHA512 a475835fac9556ef4a799a5b406acdbbdb7bd09233a5563a386f110355a8e5a4581eed69bcc968df12985f6e910ea7da0deec9f510dd891b633b369afd816ff8 +AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c +AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5 +DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb +EBUILD file-5.40-r2.ebuild 3418 BLAKE2B 05d0f47c954197f1105e0ce284a0986f0352072caf98b4dd3af439e58cc6e1015786f1cd4196fbf5950d1def62717a5bbbf3a58aacf2a012d6bb4dd3b1d73842 SHA512 d9fd16e393b90d09edc074cb0f58f972e99f5f7a22d8a106ed74db95cd30f508a48aaf5a476f900d2914b6b3c6668c6a09a7fcb11ca46efaa61f65069414738b +EBUILD file-9999.ebuild 3272 BLAKE2B d585df4df18b289e21ef901b9abcde83cbf99aa234107013fe896974018176cc78d02f92c49fe13785b2ee2f9350d017993f38a78897ef20617214f14c9dd481 SHA512 bf305f9f9e635cdf3edd8c33cad98c0cc05a6bbb190ffb3df9d8cb46517fb50b66089becf395fd44457c69f5ccf91dcb64979fcf4e1507bfc9488d26e21cf90b MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857 diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild deleted file mode 100644 index 8daeba6eac10..000000000000 --- a/sys-apps/file/file-5.37-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="python static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic )" - -PATCHES=( "${FILESDIR}"/${P}-CVE-2019-18218.patch ) - -src_prepare() { - default - - [[ ${PV} == "9999" ]] && eautoreconf - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --disable-libseccomp - --enable-fsect-man5 - $(use_enable static-libs static) - $(use_enable zlib) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_configure() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - tc-export_build_env BUILD_C{C,XX} - ECONF_SOURCE="${S}" \ - ac_cv_header_zlib_h=no \ - ac_cv_lib_z_gzopen=no \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} -static" \ - CC=${BUILD_CC} \ - CXX=${BUILD_CXX} \ - econf --disable-shared --disable-libseccomp - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - emake -C "${WORKDIR}"/build/src file - PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - # Required for `file -C` - dodir /usr/share/misc/magic - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-apps/file/file-5.38-r1.ebuild b/sys-apps/file/file-5.38-r1.ebuild deleted file mode 100644 index d318c4e309e9..000000000000 --- a/sys-apps/file/file-5.38-r1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="bzip2 lzma python static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic )" - -PATCHES=( - "${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch - "${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch - "${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch -) - -src_prepare() { - default - - [[ ${PV} == "9999" ]] && eautoreconf - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --disable-libseccomp - --enable-fsect-man5 - $(use_enable bzip2 bzlib) - $(use_enable lzma xzlib) - $(use_enable static-libs static) - $(use_enable zlib) - ) - econf "${myeconfargs[@]}" -} - -build_src_configure() { - local myeconfargs=( - --disable-shared - --disable-libseccomp - --disable-bzlib - --disable-xzlib - --disable-zlib - ) - tc-env_build econf "${myeconfargs[@]}" -} - -need_build_file() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" -} - -src_configure() { - local ECONF_SOURCE=${S} - - if need_build_file; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - build_src_configure - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if need_build_file; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - emake -C "${WORKDIR}"/build/src file - local -x PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - # Required for `file -C` - dodir /usr/share/misc/magic - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-apps/file/file-5.39-r3.ebuild b/sys-apps/file/file-5.39-r3.ebuild deleted file mode 100644 index b64fe567d8eb..000000000000 --- a/sys-apps/file/file-5.39-r3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="bzip2 lzma python seccomp static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416 - "${FILESDIR}/file-5.39-seccomp-musl.patch" - "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - eautoreconf - fi - - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --enable-fsect-man5 - $(use_enable bzip2 bzlib) - $(use_enable lzma xzlib) - $(use_enable seccomp libseccomp) - $(use_enable static-libs static) - $(use_enable zlib) - ) - econf "${myeconfargs[@]}" -} - -build_src_configure() { - local myeconfargs=( - --disable-shared - --disable-libseccomp - --disable-bzlib - --disable-xzlib - --disable-zlib - ) - tc-env_build econf "${myeconfargs[@]}" -} - -need_build_file() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" -} - -src_configure() { - local ECONF_SOURCE=${S} - - if need_build_file; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - build_src_configure - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if need_build_file; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - emake -C "${WORKDIR}"/build/src file - local -x PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - # Required for `file -C` - dodir /usr/share/misc/magic - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild deleted file mode 100644 index 14b4cbfa64a4..000000000000 --- a/sys-apps/file/file-5.39-r4.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="bzip2 lzma python seccomp static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416 - "${FILESDIR}/file-5.39-seccomp-musl.patch" - "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 - "${FILESDIR}/file-5.39-allow-futex-seccomp.patch" #771096 -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - eautoreconf - fi - - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --enable-fsect-man5 - $(use_enable bzip2 bzlib) - $(use_enable lzma xzlib) - $(use_enable seccomp libseccomp) - $(use_enable static-libs static) - $(use_enable zlib) - ) - econf "${myeconfargs[@]}" -} - -build_src_configure() { - local myeconfargs=( - --disable-shared - --disable-libseccomp - --disable-bzlib - --disable-xzlib - --disable-zlib - ) - tc-env_build econf "${myeconfargs[@]}" -} - -need_build_file() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" -} - -src_configure() { - local ECONF_SOURCE=${S} - - if need_build_file; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - build_src_configure - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if need_build_file; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - emake -C "${WORKDIR}"/build/src file - local -x PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - # Required for `file -C` - dodir /usr/share/misc/magic - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-apps/file/file-5.40-r2.ebuild b/sys-apps/file/file-5.40-r2.ebuild new file mode 100644 index 000000000000..036079303892 --- /dev/null +++ b/sys-apps/file/file-5.40-r2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 libtool toolchain-funcs multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/glensc/file.git" + inherit autotools git-r3 +else + SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="identify a file's format by scanning binary data for patterns" +HOMEPAGE="https://www.darwinsys.com/file/" + +LICENSE="BSD-2" +SLOT="0" +IUSE="bzip2 lzma python seccomp static-libs zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND} + python? ( !dev-python/python-magic ) + seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 + "${FILESDIR}/file-5.40-xz_magic.patch" #784773 + "${FILESDIR}/file-5.40-seccomp-faccessat.patch" + "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857 +) + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi + + elibtoolize + + # don't let python README kill main README #60043 + mv python/README.md python/README.python.md || die + sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 +} + +multilib_src_configure() { + local myeconfargs=( + --enable-fsect-man5 + $(use_enable bzip2 bzlib) + $(use_enable lzma xzlib) + $(use_enable seccomp libseccomp) + $(use_enable static-libs static) + $(use_enable zlib) + ) + econf "${myeconfargs[@]}" +} + +build_src_configure() { + local myeconfargs=( + --disable-shared + --disable-libseccomp + --disable-bzlib + --disable-xzlib + --disable-zlib + ) + tc-env_build econf "${myeconfargs[@]}" +} + +need_build_file() { + # when cross-compiling, we need to build up our own file + # because people often don't keep matching host/target + # file versions #362941 + tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" +} + +src_configure() { + local ECONF_SOURCE="${S}" + + if need_build_file ; then + mkdir -p "${WORKDIR}"/build || die + cd "${WORKDIR}"/build || die + build_src_configure + fi + + multilib-minimal_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + cd src || die + emake magic.h #586444 + emake libmagic.la + fi +} + +src_compile() { + if need_build_file ; then + emake -C "${WORKDIR}"/build/src magic.h #586444 + emake -C "${WORKDIR}"/build/src file + local -x PATH="${WORKDIR}/build/src:${PATH}" + fi + multilib-minimal_src_compile + + if use python ; then + cd python || die + distutils-r1_src_compile + fi +} + +multilib_src_install() { + if multilib_is_native_abi ; then + default + else + emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" + fi +} + +multilib_src_install_all() { + dodoc ChangeLog MAINT README + + # Required for `file -C` + insinto /usr/share/misc/magic + doins -r magic/Magdir/* + + if use python ; then + cd python || die + distutils-r1_src_install + fi + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index 8e6aab3b29e6..67c33d9f4859 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.ebuild @@ -43,7 +43,7 @@ PATCHES=( src_prepare() { default - if [[ ${PV} == 9999 ]]; then + if [[ ${PV} == 9999 ]] ; then eautoreconf fi @@ -85,9 +85,9 @@ need_build_file() { } src_configure() { - local ECONF_SOURCE=${S} + local ECONF_SOURCE="${S}" - if need_build_file; then + if need_build_file ; then mkdir -p "${WORKDIR}"/build || die cd "${WORKDIR}"/build || die build_src_configure @@ -107,7 +107,7 @@ multilib_src_compile() { } src_compile() { - if need_build_file; then + if need_build_file ; then emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file local -x PATH="${WORKDIR}/build/src:${PATH}" @@ -132,7 +132,6 @@ multilib_src_install_all() { dodoc ChangeLog MAINT README # Required for `file -C` - dodir /usr/share/misc/magic insinto /usr/share/misc/magic doins -r magic/Magdir/* diff --git a/sys-apps/file/files/file-5.37-CVE-2019-18218.patch b/sys-apps/file/files/file-5.37-CVE-2019-18218.patch deleted file mode 100644 index 1cd02b778abf..000000000000 --- a/sys-apps/file/files/file-5.37-CVE-2019-18218.patch +++ /dev/null @@ -1,36 +0,0 @@ -CVE-2019-18218 -https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 - ---- a/src/cdf.c -+++ b/src/cdf.c -@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - } - nelements = CDF_GETUINT32(q, 1); -- if (nelements == 0) { -- DPRINTF(("CDF_VECTOR with nelements == 0\n")); -+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { -+ DPRINTF(("CDF_VECTOR with nelements == %" -+ SIZE_T_FORMAT "u\n", nelements)); - goto out; - } - slen = 2; -@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - inp += nelem; - } -- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", -- nelements)); - for (j = 0; j < nelements && i < sh.sh_properties; - j++, i++) - { ---- a/src/cdf.h -+++ b/src/cdf.h -@@ -48,6 +48,7 @@ - typedef int32_t cdf_secid_t; - - #define CDF_LOOP_LIMIT 10000 -+#define CDF_ELEMENT_LIMIT 100000 - - #define CDF_SECID_NULL 0 - #define CDF_SECID_FREE -1 diff --git a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch b/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch deleted file mode 100644 index 240edc11f680..000000000000 --- a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c9d21a58bea2ecb2dc8876e09e471094d54a25e4 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Mon, 13 Apr 2020 01:08:12 +0200 -Subject: [PATCH 1/3] Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and - count as dynamically linked" - -This reverts commit 24c9c086cd7c55b7b0a003a145b32466468e2608. - -Fixes misdetection of shared libraries as statically linked as -reported in bug 717264. - -Bug: https://bugs.gentoo.org/717264 -Signed-off-by: Thomas Deutschmann ---- - src/readelf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/readelf.c b/src/readelf.c -index 40bcfab1..afec31d1 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -1638,6 +1638,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, - /* Things we can determine before we seek */ - switch (xph_type) { - case PT_DYNAMIC: -+ linking_style = "dynamically"; - doread = 1; - break; - case PT_NOTE: -@@ -1653,7 +1654,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, - } - /*FALLTHROUGH*/ - case PT_INTERP: -- linking_style = "dynamically"; - doread = 1; - break; - default: --- -2.26.0 - diff --git a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch b/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch deleted file mode 100644 index bb211f355f77..000000000000 --- a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ed971e5e3ae79bd28697d16c8b78b693052484e4 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Wed, 12 Feb 2020 22:17:33 +0000 -Subject: [PATCH 3/3] The executable bit is only set when DF_1_PIE bit is set - so it is fine. - ---- - magic/Magdir/elf | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/magic/Magdir/elf b/magic/Magdir/elf -index b5a2e00b..f5e1af9a 100644 ---- a/magic/Magdir/elf -+++ b/magic/Magdir/elf -@@ -50,8 +50,9 @@ - !:mime application/x-object - >16 leshort 2 executable, - !:mime application/x-executable -->16 leshort 3 shared object, --!:mime application/x-sharedlib -+>16 leshort 3 ${x?pie executable:shared object}, -+ -+!:mime application/x-${x?pie-executable:sharedlib} - >16 leshort 4 core file, - !:mime application/x-coredump - # OS-specific --- -2.26.0 - diff --git a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch b/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch deleted file mode 100644 index 09fcaef151ea..000000000000 --- a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c49dc91df427f89ebcf9cdec556b8fc88cdfc3c1 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 17 Dec 2019 15:27:27 +0000 -Subject: [PATCH 2/3] %td is for ptrdiff_t not for off_t. - ---- - src/readelf.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/readelf.c b/src/readelf.c -index afec31d1..8ac3b7d6 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -1349,8 +1349,8 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, - name_off = xsh_offset; - - if (fsize != SIZE_UNKNOWN && fsize < name_off) { -- if (file_printf(ms, ", too large section header offset %td", -- name_off) == -1) -+ if (file_printf(ms, ", too large section header offset %jd", -+ (intmax_t)name_off) == -1) - return -1; - return 0; - } --- -2.26.0 - diff --git a/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch deleted file mode 100644 index 0614f52dd275..000000000000 --- a/sys-apps/file/files/file-5.39-add-missing-termios.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 471e2c6c61ecd30ba6e304ae0444d364cfd44254 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Thu, 18 Jun 2020 16:25:12 +0000 -Subject: [PATCH] PR/168: gyakovlev: Include - ---- - src/seccomp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/seccomp.c b/src/seccomp.c -index e667adfe4..68c56485d 100644 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -27,7 +27,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $") -+FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $") - #endif /* lint */ - - #if HAVE_LIBSECCOMP -@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $") - #include /* prctl */ - #include - #include -+#include - #include - #include - #include diff --git a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch b/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch deleted file mode 100644 index 8d9e3d1eb660..000000000000 --- a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch +++ /dev/null @@ -1,18 +0,0 @@ -In some situations, futex() is called even when lzma -support is not compiled in. Let's enable it unconditionally -for now. - -https://bugs.gentoo.org/771096 -https://bugs.astron.com/view.php?id=241 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -175,9 +175,7 @@ enable_sandbox_full(void) - ALLOW_RULE(fcntl64); - ALLOW_RULE(fstat); - ALLOW_RULE(fstat64); --#ifdef XZLIBSUPPORT - ALLOW_RULE(futex); --#endif - ALLOW_RULE(getdents); - #ifdef __NR_getdents64 - ALLOW_RULE(getdents64); diff --git a/sys-apps/file/files/file-5.39-seccomp-musl.patch b/sys-apps/file/files/file-5.39-seccomp-musl.patch deleted file mode 100644 index 72836de67e58..000000000000 --- a/sys-apps/file/files/file-5.39-seccomp-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 93c91e2ba8042d499fee168e27cbd526438454c6 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sat, 5 Sep 2020 17:20:32 +0000 -Subject: [PATCH] PR/194: puchuu: Handle muslc syscalls - ---- - src/seccomp.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/seccomp.c b/src/seccomp.c -index 68c56485d..db9364ae4 100644 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -27,7 +27,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $") -+FILE_RCSID("@(#)$File: seccomp.c,v 1.17 2020/09/05 17:20:32 christos Exp $") - #endif /* lint */ - - #if HAVE_LIBSECCOMP -@@ -220,12 +220,14 @@ enable_sandbox_full(void) - ALLOW_RULE(rt_sigreturn); - ALLOW_RULE(select); - ALLOW_RULE(stat); -+ ALLOW_RULE(statx); - ALLOW_RULE(stat64); - ALLOW_RULE(sysinfo); - ALLOW_RULE(umask); // Used in file_pipe2file() - ALLOW_RULE(getpid); // Used by glibc in file_pipe2file() - ALLOW_RULE(unlink); - ALLOW_RULE(write); -+ ALLOW_RULE(writev); - - - #if 0 diff --git a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch new file mode 100644 index 000000000000..4aeb88cfe875 --- /dev/null +++ b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch @@ -0,0 +1,34 @@ +From abcd583135bb0762e6bfd0f2e06c50bea1fb3cd0 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Tue, 6 Apr 2021 22:02:17 +0000 +Subject: [PATCH] On ARM64 Linux access() syscall is no longer a real syscall + to the kernel. Instead it's emulated by glibc with a new faccessat() syscall. + (Icenowy Zheng) + +--- + src/seccomp.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 0da907ff7..81842cf5c 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -27,7 +27,7 @@ + #include "file.h" + + #ifndef lint +-FILE_RCSID("@(#)$File: seccomp.c,v 1.18 2021/03/14 17:01:58 christos Exp $") ++FILE_RCSID("@(#)$File: seccomp.c,v 1.19 2021/04/06 22:02:17 christos Exp $") + #endif /* lint */ + + #if HAVE_LIBSECCOMP +@@ -171,6 +171,9 @@ enable_sandbox_full(void) + ALLOW_RULE(dup2); + ALLOW_RULE(exit); + ALLOW_RULE(exit_group); ++#ifdef __NR_faccessat ++ ALLOW_RULE(faccessat); ++#endif + ALLOW_RULE(fcntl); + ALLOW_RULE(fcntl64); + ALLOW_RULE(fstat); diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch new file mode 100644 index 000000000000..57d04e5f40cf --- /dev/null +++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch @@ -0,0 +1,29 @@ +From e3d0265a147878b6c2903bcc83b9842dff68ceb4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 23 Apr 2021 15:00:42 -0400 +Subject: [PATCH] seccomp: allow fstatat64 + +This is needed for the libsandbox LD_PRELOAD wrapper on Gentoo Linux. + +Bug: https://bugs.gentoo.org/784857 +--- + src/seccomp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 81842cf5..43abc684 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -178,6 +178,9 @@ enable_sandbox_full(void) + ALLOW_RULE(fcntl64); + ALLOW_RULE(fstat); + ALLOW_RULE(fstat64); ++#ifdef __NR_fstatat64 ++ ALLOW_RULE(fstatat64); ++#endif + ALLOW_RULE(futex); + ALLOW_RULE(getdents); + #ifdef __NR_getdents64 +-- +2.31.1 + diff --git a/sys-apps/file/files/file-5.40-xz_magic.patch b/sys-apps/file/files/file-5.40-xz_magic.patch new file mode 100644 index 000000000000..e4fed0421f78 --- /dev/null +++ b/sys-apps/file/files/file-5.40-xz_magic.patch @@ -0,0 +1,37 @@ +From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 19 Apr 2021 17:01:45 +0000 +Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic. + +--- + magic/Magdir/compress | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/magic/Magdir/compress b/magic/Magdir/compress +index 64d11a736..41a65738f 100644 +--- a/magic/Magdir/compress ++++ b/magic/Magdir/compress +@@ -1,5 +1,5 @@ + #------------------------------------------------------------------------------ +-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $ ++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $ + # compress: file(1) magic for pure-compression formats (no archives) + # + # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc. +@@ -265,14 +265,13 @@ + + # http://tukaani.org/xz/xz-file-format.txt + 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum ++!:strength * 2 ++!:mime application/x-xz + >7 byte&0xf 0x0 NONE + >7 byte&0xf 0x1 CRC32 + >7 byte&0xf 0x4 CRC64 + >7 byte&0xf 0xa SHA-256 + +-!:strength * 2 +-!:mime application/x-xz +- + # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt + 0 string LRZI LRZIP compressed data + >4 byte x - version %d diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest index ea6dccf0814a..cd3ad3e8e058 100644 --- a/sys-apps/findutils/Manifest +++ b/sys-apps/findutils/Manifest @@ -1,5 +1,5 @@ DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e -EBUILD findutils-4.7.0.ebuild 1647 BLAKE2B 5ce7a4a9ed1df65f4e7fff84ea0657340af44b5c030c5a0a3ffa1d22bc827238e7ef0d299b0648159dc45c7c30b8c2d2971080f24d3f12245661f391da240cdd SHA512 5d11f2a2c4a3704e118d38971b2c421707d2bd0b71f9742bbf72ac9d26bb65436158d5624bab55a6ae90d50ae8ee8600c643207a4ba00f1e375b4d7cb492b8e3 +EBUILD findutils-4.7.0.ebuild 1648 BLAKE2B 25c2b7765f22e7f568dcc0c277189f86a1f2068a640686701990115b1b86fbebd42915be85bbdf4c6c364b788ddfd928e7b9c2622b826e51b1418ae8d7c0c1a0 SHA512 5efa3ec30e2fd0d8599debd73e649bbcdc0eb60f28de6ac2e5102a9701215f886a0552082d76e50ba2219635858e03b18dcf928e3a1272c84b85163540fa02ed EBUILD findutils-4.8.0.ebuild 1655 BLAKE2B d339685af7c75c4a271e5dca2e1b1450c02facea9d9aed5fd2984817dc46fb494a8a0affa81a18cfb6e33ac1af8a9566449f2aa4322a8f5ec90917e8b2fe3ec1 SHA512 57f1d599017d16f52292a451e87e0c9f9d850efba95e1da30a2a2f808ef6b27efa00a710987cb1d3aa53ad22f555132e31df1cbedd28a23d5a045bca8672f8a1 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00 diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild index d2bc6103e747..611bb9a6662a 100644 --- a/sys-apps/findutils/findutils-4.7.0.ebuild +++ b/sys-apps/findutils/findutils-4.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls selinux static test" RESTRICT="!test? ( test )" diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest index 5846a48c389a..c687169760ab 100644 --- a/sys-apps/flashrom/Manifest +++ b/sys-apps/flashrom/Manifest @@ -2,5 +2,5 @@ AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f70 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8 EBUILD flashrom-1.2-r3.ebuild 4333 BLAKE2B 7aff14f2c2dfa58af2ab24d59908e3194adc05887e9e3faf0a617914e067409f1426c8cf1825ba1399e104fe82bcda63746498727e6351dc44b01dc0eeef8dad SHA512 39af8a0ccf443284c26766c8034b2cdf51c0eda686fef506255e5c4859e7638f0a872762e932a42c7f5134ef4dde96d2b66c94f6a6d2c9b3d2fde9c9be7e8abc -EBUILD flashrom-9999.ebuild 4494 BLAKE2B be2488baa66fe2ba326403f686fe29132757c6ae29afb7859c99697f61288bc47f9315d60f37ec8868180b947893753b62fd04c945fb12f2a5b35ed1c0247ad8 SHA512 4033afcec2a2450ce4426b71960a1a86583a09f0dcdcdb51f2efc7f58aabbc8f3b9baea71f51af531c97a452d61a954dbd13c090ce906ab2c01bb00d6258c5ed +EBUILD flashrom-9999.ebuild 4522 BLAKE2B 4f56084b6fa495cdad7df4ebe4991df07f4210d3dff115f2a42abc994ae1fab159add3e4dabad6d98d916acebb4c74ed77c04627dc1b0d7bf36644a4e120101b SHA512 1d700fbea79892e5cde4197c5e22780f9180db56c283c320ad4ca359f225231c40ed4882b394a78d02f3c4489f195c3dd3ac79e19f78ff9bde3c3f2c208f7211 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8 diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild index 64c28bcfbecc..fe588c7916e0 100644 --- a/sys-apps/flashrom/flashrom-9999.ebuild +++ b/sys-apps/flashrom/flashrom-9999.ebuild @@ -97,6 +97,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) sys-apps/diffutils" +BDEPEND="virtual/pkgconfig" RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )" _flashrom_enable() { diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index e0b98090754b..8fe790156b38 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,17 +1,13 @@ AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e -AUX fwupd-1.5.6-gusb_deps.patch 1553 BLAKE2B 799957e4902ae31d94a1a5f304c6a814862c7b4d4c5020e47fb24210f5ab80fca4977d9fec102c751d7944ce7f4dcc76ce8a6c712c78346f578c949783b3881d SHA512 295a00515968e4beea761f2552e4de32bb7b6028cf889412988fd4df7df61f352551c46639a4c4e5d9cf33f6d89af58711288f50d71c0215055e25eb442ef813 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb -AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb AUX fwupd-r2 315 BLAKE2B fda26d20febea2564cc670df466fdde76679e69731d1d1d621ea2c0c8a6318a93cd17885cdf154540d62eb915ce3888a6a143143e4ba2c4f30c3beb7393efc22 SHA512 68328ad9e11eaf899f186f3ce0bfba09e1a8145af4001b52298f2a6cd9e54ba8cd24c67742db52a74d1f559989a4664517c77c07c975865def767d54b247a2dd -DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9 DIST fwupd-1.4.7.tar.gz 2370660 BLAKE2B 8f04ced69610278576e41c12c7c51e326bdfbea8e1470ae586795b0c20f6a5fd4385701583195f49e14d749016987a7e02fb0d071b5315cca635f69d99bb63d6 SHA512 9d293adf6e9eba9537c4be9b7a4ccc26cd5519843f1bf94557148fabef8076e4846f7018949d8ad83afd01ce4874833bf8984c2ee3981fc6b1309ebda8e313f9 -DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe -DIST fwupd-1.5.7.tar.gz 2498618 BLAKE2B ff0bf4d07a7df84232e90f5c85321dde3e08edd12f5ebf7a48130f076a52344e8654232bd0227d992fa5efbb3ce03e353da8b1511a9f39e5eab07c888b499463 SHA512 340a114123bd31a7a31370faaaa10e6517316d8f9c2b06f22d8b70bef64b7e6d9427682b8ceeea05570c8960eb7854ed5fc91aa450ff53d114fb97be43065213 +DIST fwupd-1.4.8.tar.gz 2375361 BLAKE2B 14951c8ec7d59ec53fed7b98bf0e277a7544f04f72f6a827971d45f9996190ebd46767e373850b269d8d718ec8c2b9df41bdd44614e5065832bd21c4071f012a SHA512 25c49f5a814aaf5cd614074936f6a222c513a0e74446a48ddc19aa51fc3d3e9e79dfa77e9b80055a4e3755bca99f13d260c2e4ddf6853ba0a583162523fe7d47 DIST fwupd-1.5.8.tar.gz 3708769 BLAKE2B e18738d5f681fd9016a609ce9d48e452628c32e731b2a1f3635ff4897ff2a910b1ca0d7836bd12f14b27254c23eb2b6d74a2c35939ac5c8484e2050ab89a33a3 SHA512 d4fecd13a223e7f544026a5ac684bd570af2b63fb509a21e98ef72ccc4d7818f32abf730e2a40943bc762f04ecd5af03bf71201518d55090bb95fe6e9dc6969e -EBUILD fwupd-1.4.6.ebuild 4056 BLAKE2B 061c425224845a2f3d3947abe7bcedcd11c3d859b111c68ee12b438a2788297e37b296d0ea8b7b2118fda490fa37a3bf9f801735ec4b2b9634b63ccd55000a9d SHA512 84b58cf5c6aef3d0bd5645cb19114b01e173049e1a263276ecb195d4925e22d2d36f248df1c3254e3fb6520e7cf72de35cffc4554bbe0353222d682b12ddc47a -EBUILD fwupd-1.4.7.ebuild 4058 BLAKE2B c8ea9e8560f5a62b622e110facb01b9db44ca39d28ed05632ef5aaae7bafa1d42462d5b0b56dcf9523fcefccf7b626664da2a7437eaa7261136bef6e8a392283 SHA512 7f00faeaf03285a3d130dccb173bbad5eb4c0609645ad29d1f4e43c374e74d536dd82877719c9cecc5168c0688f69131de7dc3f7f1d90eccf31829a147b57d20 -EBUILD fwupd-1.5.6.ebuild 4440 BLAKE2B 4c12a21a99aa943aaa16020a6ad61858c7397599654fed0cbccf5d3e644aea74e4ff8985d61bc6cf135e9769d5f7e47b9e46f94f5e6aa92d6a84b56208761ba2 SHA512 94b058117ca1707880df50ab4c4a375f58451382b6f31475f85ab5f80c027ee9b8fedc1ac49acc9ca120248073178c94923bb75809a2c6b5cf34c9b9dc32a674 -EBUILD fwupd-1.5.7-r1.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b +DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78 +EBUILD fwupd-1.4.7.ebuild 4070 BLAKE2B ccea5065c6839de0f81cfbe441e9cb10f968aaf7da32ab3234f8708756b11a40828c3362d12fba0b761f0a89b6d8bed6cad452d6a7621c1b420ffb91749a0ff0 SHA512 d01e9b10d509915a4bb3996123d16fece081f3d1a7f32e6566999a2f680aebb035cb629ce515859c79e4cb63d2dc4bad8485d36e2b56883e7e08f84e8f490063 +EBUILD fwupd-1.4.8.ebuild 4058 BLAKE2B d79ac644532c0efc0a15c6356ceb485e179ff473f8a5125fcf7bbf4d5f808956648355fa3ea23d1b5d60e6f6fad770543f29161af1e596d3fdb7cb16a31cdbcf SHA512 ff26f4ce3f0b841b937699920de414dfd4f3389b84120bc777aa63f6e7f7cbaffb72481dbb7eac7f52f882529aaf02cadb9f8fe8b724a11d0fe8ea944a8844ad EBUILD fwupd-1.5.8.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b +EBUILD fwupd-1.5.9.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b MISC metadata.xml 1142 BLAKE2B a7b7aa9cad916ad7c23a3f7bb405a62a4e8f2c83049412901f7b5055477465b3a0bfa7ef5617a4de704b49fdefb094190b764e7b4b4c8004225ce3d45feaf2da SHA512 6266ecd35bd0426ea76b434b053c1955a894b8d1faa389ec6b55b824507bca3dcb6f9d757ef03d09eeb1073d8d1592ed63276e1874c487a804ce88810aa5533e diff --git a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch deleted file mode 100644 index 00c79d7853b8..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c74992c62a32080208baf137d61f7d73b0cade2d Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Tue, 16 Feb 2021 16:57:36 +0100 -Subject: [PATCH] system76-launch plugin requires gusb -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise the following build error happens: - - ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:117:9: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function) - 117 | G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:133:11: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function) - 133 | G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---- - plugins/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/meson.build b/plugins/meson.build -index 138c47a4..12c7cb31 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -25,7 +25,6 @@ subdir('ata') - subdir('elantp') - subdir('optionrom') - subdir('superio') --subdir('system76-launch') - subdir('thelio-io') - subdir('wacom-raw') - endif -@@ -59,6 +58,7 @@ subdir('solokey') - subdir('steelseries') - subdir('synaptics-cxaudio') - subdir('synaptics-prometheus') -+subdir('system76-launch') - subdir('vli') - subdir('wacom-usb') - --- -2.30.1 - diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1 deleted file mode 100644 index 4a4865ef15af..000000000000 --- a/sys-apps/fwupd/files/fwupd-r1 +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Firmware update daemon" -pidfile="/var/run/fwupd.pid" -command="/usr/libexec/fwupd/fwupd" -command_background="true" - -depend() { - need %SEAT_MANAGER% dbus - before xdm -} diff --git a/sys-apps/fwupd/fwupd-1.4.6.ebuild b/sys-apps/fwupd/fwupd-1.4.6.ebuild deleted file mode 100644 index 0b4925f443b8..000000000000 --- a/sys-apps/fwupd/fwupd-1.4.6.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit linux-info meson python-single-r1 vala xdg toolchain-funcs - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( elogind minimal systemd ) - dell? ( uefi ) - minimal? ( !introspection ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) - test? ( - thunderbolt? ( dev-util/umockdev ) - net-libs/gnutls[tools] - ) -" -CDEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - app-arch/libarchive:= - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 - dev-libs/json-glib - dev-libs/libgpg-error - dev-libs/libgudev:= - >=dev-libs/libgusb-0.2.9[introspection?] - >=dev-libs/libjcat-0.1.0[gpg,pkcs7] - >=dev-libs/libxmlb-0.1.13:= - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - dev-python/pycairo[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] - ') - >=net-libs/libsoup-2.51.92:2.4[introspection?] - virtual/libelf:0= - virtual/udev - dell? ( - sys-libs/efivar - >=sys-libs/libsmbios-2.4.0 - ) - elogind? ( sys-auth/elogind ) - !minimal? ( - >=sys-auth/polkit-0.103 - ) - nvme? ( sys-libs/efivar ) - redfish? ( sys-libs/efivar ) - systemd? ( >=sys-apps/systemd-211 ) - tpm? ( app-crypt/tpm2-tss ) - uefi? ( - app-crypt/tpm2-tss - media-libs/fontconfig - media-libs/freetype - sys-boot/gnu-efi - sys-boot/efibootmgr - >=sys-libs/efivar-33 - x11-libs/cairo - ) -" -# Block sci-chemistry/chemical-mime-data for bug #701900 -RDEPEND=" - != 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use gtk-doc gtkdoc) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use introspection) - $(meson_use redfish plugin_redfish) - $(meson_use synaptics plugin_synaptics) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi) - # Although our sys-apps/flashrom package now provides - # libflashrom.a, meson still can't find it - -Dplugin_flashrom="false" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - -Dconsolekit="false" - ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - sed "s@%SEAT_MANAGER%@elogind@" \ - "${FILESDIR}"/${PN}-r1 \ - > "${T}"/${PN} || die - doinitd "${T}"/${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from "${T}"/${PN} || die doinitd "${T}"/${PN} diff --git a/sys-apps/fwupd/fwupd-1.4.8.ebuild b/sys-apps/fwupd/fwupd-1.4.8.ebuild new file mode 100644 index 000000000000..3ec65898041a --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.4.8.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit linux-info meson python-single-r1 vala xdg toolchain-funcs + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + net-libs/gnutls[tools] + thunderbolt? ( dev-util/umockdev ) + ) +" +CDEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + app-arch/libarchive:= + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libgusb-0.2.9[introspection?] + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:= + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + virtual/libelf:0= + virtual/udev + dell? ( + sys-libs/efivar + >=sys-libs/libsmbios-2.4.0 + ) + elogind? ( sys-auth/elogind ) + !minimal? ( + >=sys-auth/polkit-0.103 + ) + nvme? ( sys-libs/efivar ) + redfish? ( sys-libs/efivar ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + app-crypt/tpm2-tss + media-libs/fontconfig + media-libs/freetype + sys-boot/gnu-efi + sys-boot/efibootmgr + >=sys-libs/efivar-33 + x11-libs/cairo + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + vala_src_prepare +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + $(meson_use agent) + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use elogind) + $(meson_use gtk-doc gtkdoc) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use introspection) + $(meson_use redfish plugin_redfish) + $(meson_use synaptics plugin_synaptics) + $(meson_use systemd) + $(meson_use test tests) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi) + # Although our sys-apps/flashrom package now provides + # libflashrom.a, meson still can't find it + -Dplugin_flashrom="false" + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + -Dconsolekit="false" + ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + sed "s@%SEAT_MANAGER%@elogind@" \ + "${FILESDIR}"/${PN}-r2 \ + > "${T}"/${PN} || die + doinitd "${T}"/${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + elog "In case you are using openrc as init system" + elog "and you're upgrading from = 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - sed '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use archive libarchive) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use flashrom plugin_flashrom) - $(meson_use gnutls) - $(meson_use gtk-doc gtkdoc) - $(meson_use gusb) - $(meson_use gusb plugin_altos) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_pk) - -Dconsolekit="false" - -Dcurl="true" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - use ppc64 && emesonargs+=( -Dplugin_msr="false" ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - sed "s@%SEAT_MANAGER%@elogind@" \ - "${FILESDIR}"/${PN}-r1 \ - > "${T}"/${PN} || die - doinitd "${T}"/${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from = 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - sed '/platform-integrity/d' \ - -i plugins/meson.build || die #753521 - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use archive libarchive) - $(meson_use bluetooth bluez) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use flashrom plugin_flashrom) - $(meson_use gnutls) - $(meson_use gtk-doc gtkdoc) - $(meson_use gusb) - $(meson_use gusb plugin_altos) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use introspection) - $(meson_use policykit polkit) - $(meson_use synaptics plugin_synaptics_mst) - $(meson_use synaptics plugin_synaptics_rmi) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi_capsule) - $(meson_use uefi plugin_uefi_pk) - -Dconsolekit="false" - -Dcurl="true" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - use ppc64 && emesonargs+=( -Dplugin_msr="false" ) - use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - sed "s@%SEAT_MANAGER%@elogind@" \ - "${FILESDIR}"/${PN}-r2 \ - > "${T}"/${PN} || die - doinitd "${T}"/${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from = 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + sed '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + vala_src_prepare +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + $(meson_use agent) + $(meson_use amt plugin_amt) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use dell plugin_dell) + $(meson_use elogind) + $(meson_use flashrom plugin_flashrom) + $(meson_use gnutls) + $(meson_use gtk-doc gtkdoc) + $(meson_use gusb) + $(meson_use gusb plugin_altos) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use systemd) + $(meson_use test tests) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_pk) + -Dconsolekit="false" + -Dcurl="true" + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + ) + use ppc64 && emesonargs+=( -Dplugin_msr="false" ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + sed "s@%SEAT_MANAGER%@elogind@" \ + "${FILESDIR}"/${PN}-r2 \ + > "${T}"/${PN} || die + doinitd "${T}"/${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + elog "In case you are using openrc as init system" + elog "and you're upgrading from + +Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler +Added libcap to v4.17.0 by Lars Wendler +Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler +Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler +Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler + +--- iproute2-5.12.0/bridge/Makefile ++++ iproute2-5.12.0/bridge/Makefile +@@ -2,6 +2,7 @@ + BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o + + include ../config.mk ++include ../config.include + + all: bridge + +--- iproute2-5.12.0/config.include ++++ iproute2-5.12.0/config.include +@@ -0,0 +1,32 @@ ++# We can only modify CFLAGS/LDLIBS after all the config options are known. ++ifeq ($(IP_CONFIG_SETNS),y) ++ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) ++endif ++ifeq ($(HAVE_ELF),y) ++ CFLAGS += $(HAVE_ELF_CFLAGS) ++ LDLIBS += $(HAVE_ELF_LDLIBS) ++endif ++ifeq ($(HAVE_SELINUX),y) ++ CFLAGS += $(HAVE_SELINUX_CFLAGS) ++ LDLIBS += $(HAVE_SELINUX_LDLIBS) ++endif ++ifeq ($(HAVE_MNL),y) ++ CFLAGS += $(HAVE_MNL_CFLAGS) ++ LDLIBS += $(HAVE_MNL_LDLIBS) ++endif ++ifeq ($(HAVE_CAP),y) ++ CFLAGS += $(HAVE_CAP_CFLAGS) ++ LDLIBS += $(HAVE_CAP_LDLIBS) ++endif ++ifeq ($(HAVE_LIBBSD),y) ++ CFLAGS += $(HAVE_LIBBSD_CFLAGS) ++ LDLIBS += $(HAVE_LIBBSD_LDLIBS) ++else ++ CFLAGS += -DNEED_STRLCPY ++endif ++ ++# Rules can only be declared after all variables in them are known. ++%.o: %.c ++ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $< ++ ++# vim: ft=make: +--- iproute2-5.12.0/configure ++++ iproute2-5.12.0/configure +@@ -195,7 +195,7 @@ + if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then + echo "IP_CONFIG_SETNS:=y" >>$CONFIG + echo "yes" +- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG ++ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG + else + echo "no" + fi +@@ -238,8 +238,8 @@ + echo "HAVE_ELF:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG +- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG ++ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG ++ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG + else + echo "no" + fi +@@ -357,8 +357,8 @@ + echo "HAVE_SELINUX:=y" >>$CONFIG + echo "yes" + +- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG +- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG + else + echo "no" + fi +@@ -370,8 +370,8 @@ + echo "HAVE_MNL:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG ++ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG ++ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG + else + echo "no" + fi +@@ -411,8 +411,8 @@ + echo "no" + else + if ${PKG_CONFIG} libbsd --exists; then +- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG ++ echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG ++ echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG + echo "no" + else + echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG +@@ -428,8 +428,8 @@ + echo "HAVE_CAP:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG ++ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG ++ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG + else + echo "no" + fi +@@ -512,7 +512,3 @@ + + echo -n "libcap support: " + check_cap +- +-echo >> $CONFIG +-echo "%.o: %.c" >> $CONFIG +-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG +--- iproute2-5.12.0/dcb/Makefile ++++ iproute2-5.12.0/dcb/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-5.12.0/devlink/Makefile ++++ iproute2-5.12.0/devlink/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-5.12.0/genl/Makefile ++++ iproute2-5.12.0/genl/Makefile +@@ -2,6 +2,7 @@ + GENLOBJ=genl.o + + include ../config.mk ++include ../config.include + SHARED_LIBS ?= y + + CFLAGS += -fno-strict-aliasing +--- iproute2-5.12.0/ip/Makefile ++++ iproute2-5.12.0/ip/Makefile +@@ -16,6 +16,7 @@ + RTMONOBJ=rtmon.o + + include ../config.mk ++include ../config.include + + ALLOBJ=$(IPOBJ) $(RTMONOBJ) + SCRIPTS=ifcfg rtpr routel routef +--- iproute2-5.12.0/lib/Makefile ++++ iproute2-5.12.0/lib/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + CFLAGS += -fPIC + +--- iproute2-5.12.0/misc/Makefile ++++ iproute2-5.12.0/misc/Makefile +@@ -5,6 +5,7 @@ + TARGETS=ss nstat ifstat rtacct lnstat + + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_BERKELEY_DB),y) + TARGETS += arpd +--- iproute2-5.12.0/netem/Makefile ++++ iproute2-5.12.0/netem/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + DISTGEN = maketable normal pareto paretonormal + DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist +--- iproute2-5.12.0/rdma/Makefile ++++ iproute2-5.12.0/rdma/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-5.12.0/tc/Makefile ++++ iproute2-5.12.0/tc/Makefile +@@ -4,6 +4,7 @@ + emp_ematch.tab.o emp_ematch.lex.o + + include ../config.mk ++include ../config.include + + SHARED_LIBS ?= y + +--- iproute2-5.12.0/tipc/Makefile ++++ iproute2-5.12.0/tipc/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-5.12.0/vdpa/Makefile ++++ iproute2-5.12.0/vdpa/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + diff --git a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild index 98e5c3cf25bd..cc079e1e1d94 100644 --- a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild +++ b/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/iproute2/iproute2-5.10.0.ebuild b/sys-apps/iproute2/iproute2-5.10.0.ebuild deleted file mode 100644 index 8747ab940d69..000000000000 --- a/sys-apps/iproute2/iproute2-5.10.0.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND=" - !net-misc/arpd - dev-libs/libbsd - !minimal? ( net-libs/libmnl ) - caps? ( sys-libs/libcap ) - elf? ( virtual/libelf ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - berkdb? ( sys-libs/db:= ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux ) -" -# We require newer linux-headers for ipset support #549948 and some defines #553876 -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-3.16 -" -BDEPEND=" - app-arch/xz-utils - >=sys-devel/bison-2.4 - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 - "${FILESDIR}"/${PN}-5.1.0-portability.patch - "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch -) - -src_prepare() { - if ! use ipv6 ; then - PATCHES+=( - "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 - ) - fi - - default - - # Fix version if necessary - local versionfile="include/version.h" - if ! grep -Fq "${PV}" ${versionfile} ; then - einfo "Fixing version string" - sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ - -i ${versionfile} || die - fi - - # echo -n is not POSIX compliant - sed 's@echo -n@printf@' -i configure || die - - sed -i \ - -e '/^CC :\?=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # build against system headers - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - if use minimal ; then - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die - fi -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - printf '#include \nint main(){return setns(0, 0);}\n' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'int main(){return 0;}' > test.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - # run "configure" script first which will create "config.mk"... - econf - - # ...now switch on/off requested features via USE flags - # this is only useful if the test did not set other things, per bug #643722 - cat <<-EOF >> config.mk - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_CAP := $(usex caps y n) - HAVE_MNL := $(usex minimal n y) - HAVE_ELF := $(usex elf y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_compile() { - emake V=1 NETNS_RUN_DIR=/run/netns -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - keepdir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - elif [[ -d "${ED}"/var/lib/arpd ]]; then - rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die - fi -} diff --git a/sys-apps/iproute2/iproute2-5.12.0.ebuild b/sys-apps/iproute2/iproute2-5.12.0.ebuild new file mode 100644 index 000000000000..475fe98775ba --- /dev/null +++ b/sys-apps/iproute2/iproute2-5.12.0.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl ) + atm? ( net-dialup/linux-atm ) + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-3.16 +" +BDEPEND=" + app-arch/xz-utils + >=sys-devel/bison-2.4 + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch +) + +src_prepare() { + if ! use ipv6 ; then + PATCHES+=( + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 + ) + fi + + default + + # Fix version if necessary + local versionfile="include/version.h" + if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # build against system headers + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null + printf '#include \nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null + + # run "configure" script first which will create "config.mk"... + LIBBPF_FORCE="$(usex bpf on off)" \ + econf + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, #144265 #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) + EOF +} + +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED}"/{s,}bin/ip || die #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. #467716 + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die + + if use berkdb ; then + keepdir /var/lib/arpd + # bug 47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die + fi +} diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild index b3f552ae70f1..bc327d2142f7 100644 --- a/sys-apps/iproute2/iproute2-5.7.0.ebuild +++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index fb33a26ea6af..ae69e78cd831 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -47,7 +47,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-5.11.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722 #"${FILESDIR}"/${PN}-5.1.0-portability.patch "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest index 6bbb9de36c88..e45bd3876c39 100644 --- a/sys-apps/irqbalance/Manifest +++ b/sys-apps/irqbalance/Manifest @@ -1,7 +1,7 @@ AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c -DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16 DIST irqbalance-1.7.0.tar.gz 54209 BLAKE2B 1213b21c7d3979c9ba7d2298c21f7f0b75217d251ecfa02660ea0602a032d62c9c9b0254bf158e07e0fdcf55b35f332f5a17f929c7393dfdb894ca952dad52b4 SHA512 2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea -EBUILD irqbalance-1.6.0-r1.ebuild 1328 BLAKE2B e5964f3030ca33c236e2418b506b7c24154308fee412680d36e85a29aeb1346ce191711d5fd9a8c36f346c1a1bc3e541b65b024da3c22416cfd4838fbcf431b7 SHA512 8084138972ac5c3a7d2191caea86e3cabd86358a8f63c8430ef75a16543419a86fe0987cb861c3299cb1249a3287a552390e6571967a8a19c3693ff90dc2b86b +DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740 EBUILD irqbalance-1.7.0.ebuild 1326 BLAKE2B b016fd1bd29bd101ba2f7d9fe779d7d2f89e2c6bab9ef24b9b6e8ee1cff5251d4d4bfe5e92e091beaaaf6d84a23ae3340710031a822bdb7a99639cde5a7621aa SHA512 27be7fc08b8a4f8a3d767b7caecdaded2e203bff3e427cc361ff7972e74c5e71aabfe4dbb5095506cd7f383f408dc0716d6f56c779939d682a82b5f2e4c80558 +EBUILD irqbalance-1.8.0.ebuild 1331 BLAKE2B a99bd8fefbf7839d7fdbf8e578b18e9efc3d93242d22faa1bc53fea87ba8d6d26739f6d27d07edebaeeb5b1dd6c47dd8d5e568a53b3168edcb352c543defdfa8 SHA512 f5b577811f4aa86a9fd4a4cb14b04d32b1282774537cc3708d55ff57a03225f4686f2cd81f77c80934f2e48106c07d94589d6ead2fb7dd3c8cac2b136dfcae2c MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04 diff --git a/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild deleted file mode 100644 index 918aff3e877a..000000000000 --- a/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd linux-info - -DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system" -HOMEPAGE="https://github.com/Irqbalance/irqbalance" -SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="caps +numa selinux tui" - -DEPEND=" - dev-libs/glib:2 - caps? ( sys-libs/libcap-ng ) - numa? ( sys-process/numactl ) - tui? ( sys-libs/ncurses:0=[unicode] ) -" -BDEPEND=" - virtual/pkgconfig -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-irqbalance ) -" - -pkg_setup() { - CONFIG_CHECK="~PCI_MSI" - linux-info_pkg_setup -} - -src_prepare() { - # Follow systemd policies - # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy - sed \ - -e 's/ $IRQBALANCE_ARGS//' \ - -e '/EnvironmentFile/d' \ - -i misc/irqbalance.service || die - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with caps libcap-ng) - $(use_enable numa) - $(use_with tui irqbalance-ui) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance - newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance - systemd_dounit misc/irqbalance.service -} diff --git a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild new file mode 100644 index 000000000000..9702732fb4b5 --- /dev/null +++ b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd linux-info + +DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system" +HOMEPAGE="https://github.com/Irqbalance/irqbalance" +SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="caps +numa selinux tui" + +DEPEND=" + dev-libs/glib:2 + caps? ( sys-libs/libcap-ng ) + numa? ( sys-process/numactl ) + tui? ( sys-libs/ncurses:0=[unicode] ) +" +BDEPEND=" + virtual/pkgconfig +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-irqbalance ) +" + +pkg_setup() { + CONFIG_CHECK="~PCI_MSI" + linux-info_pkg_setup +} + +src_prepare() { + # Follow systemd policies + # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy + sed \ + -e 's/ $IRQBALANCE_ARGS//' \ + -e '/EnvironmentFile/d' \ + -i misc/irqbalance.service || die + + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with caps libcap-ng) + $(use_enable numa) + $(use_with tui irqbalance-ui) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance + newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance + systemd_dounit misc/irqbalance.service +} diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest index 8356c355f47f..710dd18995d1 100644 --- a/sys-apps/keyutils/Manifest +++ b/sys-apps/keyutils/Manifest @@ -5,6 +5,6 @@ AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 -EBUILD keyutils-1.6.1.ebuild 3878 BLAKE2B d86332485aa58d81586b9f4abcaa050b62076225d23828c6cd0f1c288a147f5a898db3dc9ac53c504939edec240e774335d3dec9d8089c285d3322a4e6e48521 SHA512 4f36a474a9062524acb5437884a96f7ad96cfb0fb57ec5eabcf387a6736e04d41e0a4ef1ecedb5ecbd450b5c4f9e734d9d267d0bc93fea3503381eed86dc09ea +EBUILD keyutils-1.6.1.ebuild 3879 BLAKE2B a9e264f0338bff757b45d35362c193e7ff1e9ceb8f84ac2bb595d48ea84f8594dac61ab013c69b9d22b73e469e6991d777b5a28f4fcec1c7d33b5f2ced3defbf SHA512 5570ebec1856e06fdf5627a0d0280d06950b4fcf55484df12b1585d0d33d35992e21cf352f64a16e61aebc1e62d48ee5be5d781f1f7068d6b5a98ec254a54846 EBUILD keyutils-1.6.3.ebuild 3786 BLAKE2B 4c9ea1e6a0df38009e35bd67838edb161690b81ee552a674005da215c3cc87f86012ea5519a59e270fc88845e63d69fe64b637138d2fbb4e2e0e07aa7698d31a SHA512 b017e18f118abf50c16f100a86dd8b152c64e233c44f90b7b7a0d561af2393ded77fd400bb3118e5107ffaf29ddc48051624161d8b86bbe9944e3c42ff7a4b2c MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild index 3189087a0eff..35de8f2bff11 100644 --- a/sys-apps/keyutils/keyutils-1.6.1.ebuild +++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s LICENSE="GPL-2 LGPL-2.1" SLOT="0/1.9" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 1d58e11229b2..cceee126209d 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -2,7 +2,7 @@ AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f0 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a -EBUILD kmod-27-r2.ebuild 5266 BLAKE2B fdaaf909ed59811f502c721f1c616c8c0145afecb62df6bcd13b163a477b2dbd3110edc28baf3bf824c6e9d3bfc95a01f5ce69b7dc6345fa393370f0008ac529 SHA512 8863d4522fa38fa7425ea1ee4c733b57e89b4e794f106e50edf1be40424f3f5c549423a3c3ee1db938f657cb8e04b54656273979350a1097ebce6bb0355b0add -EBUILD kmod-28.ebuild 5287 BLAKE2B 36b748cc728a80090ea297b4fdbe4fb20526fe2107d088394f443c7b0d5ba34bb28ad6ea855f952ae9ec388391482b93f0afc00c624a10194de4aa31e399dfe7 SHA512 3403f581327fbc1f23f8e7a79602297ef7902c56a3e30944385a9322ae40925a8628fba094e6d3557523892d3bbf689e5d573703ca6ba2c2ae63d9d0f1a022d1 -EBUILD kmod-9999.ebuild 5300 BLAKE2B 1be8c47e29ac88475b5ab201147c5870e5b10fa9c1340b627ae690603c87aca6928587baa592e22fb1b9a7e3101236a2ad843974b6ea97cf795f589b01aab17a SHA512 9027d8b39b45a30c7721576a220a923c8a1a18adfae7348128c9303cce30aa7bbfc889de44c37addcb8b5c4aefae2084128c678403fd6d3da28f704396e0bc89 +EBUILD kmod-27-r2.ebuild 5267 BLAKE2B d57a986acc394e6429a75b146ea2f322d2a8db867aec2c90652c4164022c3000c8df136d81f08f849e0115c5d3adad2291b0a3b4ec11ad33289644c2cdd8602c SHA512 094e256d0914073ba61ecc509a946beb185f0dd5ce13a74c077888b8f360a40e02d0421e3029b0b6116237dea4f690f5086c30247c60631a0b1b1f8b35eeb98f +EBUILD kmod-28.ebuild 5288 BLAKE2B 01361611c062c28cfea1d02c131c917299f66b0c6d1d78256c7a95bd7871da1442d10d73441fc96ffcf4a4929dd516529f9feb6ec9d36b5b8045df9f84ea8334 SHA512 95461da418ea57db7f29184932a6850ee796922facef5767a3240f17bc39ebaea399ddc90133a7601442fa4fd55f2fbdde636ec235a373bb750bb67bb6dc5ad2 +EBUILD kmod-9999.ebuild 5300 BLAKE2B 35d2369c790062accaa546d58f46b27bb7af159ce1999008c10c2773ac2c79f72fbe24a54982d87f54bada29548d2a0f3555ab128faac015a68c83320aa83b85 SHA512 57997f391cffb6c91fc5cf081761e646c8c61996ad698ed908aafe71cef6073bb18235b27f41093622de3bbb0a0ef6cc607d2487c6b2f91db65a147888ac3226 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild index 2f6ec83339bf..c086f244d301 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi @@ -70,7 +70,7 @@ src_prepare() { if [[ ! -e configure ]] || use doc ; then if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild index 3a10626ae5cf..b631bb43ef36 100644 --- a/sys-apps/kmod/kmod-28.ebuild +++ b/sys-apps/kmod/kmod-28.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" #inherit libtool fi @@ -70,7 +70,7 @@ src_prepare() { if [[ ! -e configure ]] || use doc ; then if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index cf4d5e008df5..462317680995 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -70,7 +70,7 @@ src_prepare() { if [[ ! -e configure ]] || use doc ; then if use doc; then - cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest index b720b3a1f917..b82fdc3fdf6b 100644 --- a/sys-apps/kmscon/Manifest +++ b/sys-apps/kmscon/Manifest @@ -1,8 +1,3 @@ -AUX kmscon-SIGUNUSED.patch 385 BLAKE2B 0384e96bb5809d7b8c702f2cfe79e885bd469b4bfc44eda7f313c0b4caf0b72e278a537c5b0d4a053dcef604baa3cf6acacba61e636c23fa6cf46803d38642f2 SHA512 5bbdbd7f3f8a11d4fb8b5ff01455214de2aef5b65ee04c8da868d62ab1bba75f4bae0f348d15cee8667586d935afb7a8165a041f2c7df5f5e79d1f6fb6baaa36 -AUX kmscon-sysmacros-fix.patch 339 BLAKE2B c088bf8bad2ac171af219e763f404b6311c67541ac4febf0e8a02349783c49720912eebbc31f0a7c124b563394477ef9de4e2461931a20ae8c4448a1dd0ea593 SHA512 2b227b6cfa959002938209e85e0aac85d4bd4c567a7023ce0734f5d2131b001f29bdb3a62304d295747adb487ff10da9df4080c87139120da2eb9c8dda6f18df -DIST kmscon-8.tar.xz 950068 BLAKE2B 7c4bbcc6eb0967d8e38e05a3e6fac60109a0ce468bc8967364b621274a9af4dd12a31af692be2efe0cc234af36f760836ec421b6567460efd4b7b1c3d913f44b SHA512 ac1581c2520a9c30406848dafc27231b38d392b2176e3ed4dd95b03cd54e256dd22f09e04057fc089effbbe08eb25546164bb885e0e5cbdbd752d4c27d07a41d DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a -EBUILD kmscon-8-r1.ebuild 2978 BLAKE2B 778c7acd8c5d2fec8d9f3adea8e47f9f1d8b27688f18dcfcf92fca9e0bba15ab32aedff2000907ed88e12f9412ea54fa6d813c29e92fc181ff5222ec8c588fe8 SHA512 e762b0372dd21c6afd8b7a46572d5f005eeb8f18ccaa50f5dd05f9f0fd63bb12d448b12fa44c398ccd50f6a7e2ea4430cfc92322aaaf816643f5058e449fb173 EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a -EBUILD kmscon-8_p20180906.ebuild 2856 BLAKE2B a794c5360d3214ec1b6928525b5333e721c313d73bcb5df7be4bbc2c48624a2dc52971bb5af43db18ccd50b38cbbc070340491681108d1f9fd63311874ad1fe5 SHA512 a07cce39e1db29f5efe8291a53141b7a3fc0e5d267d45e62bfc5f101966fb4fb6ec60c68e8b2727897d5b3b37093e6915ad3c6d2728ab406da5f93ad83c8ee6b MISC metadata.xml 664 BLAKE2B 3e24275e972d23c41dbab76a90f4a47b589f652f580f5e019b44d5e926556ac2e5138a23f36beee31c53f3f5c344908832ca0d008826a720256d756425048063 SHA512 96f2c383dda46a41505e4aaf01376ed51cb2856516b800652d9ddb43c4794c1f57840368d31b822230ed3f16b6009699ee0ccec62f4967cbdaa8781a845d96b3 diff --git a/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch b/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch deleted file mode 100644 index dc69f7700c67..000000000000 --- a/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur kmscon-8/src/pty.c kmscon-8.new/src/pty.c ---- kmscon-8/src/pty.c 2018-01-10 09:03:09.477962638 -0600 -+++ kmscon-8.new/src/pty.c 2018-01-10 09:04:21.620658836 -0600 -@@ -299,8 +299,10 @@ - if (ret) - log_warn("cannot reset blocked signals: %m"); - -+ #ifdef SIGUNUSED - for (i = 1; i < SIGUNUSED; ++i) - signal(i, SIG_DFL); -+ #endif - - ret = grantpt(master); - if (ret < 0) { diff --git a/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch b/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch deleted file mode 100644 index cd8a374e5ca1..000000000000 --- a/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur a/src/uterm_vt.c b/src/uterm_vt.c ---- a/src/uterm_vt.c 2017-08-12 12:14:46.213183769 -0500 -+++ b/src/uterm_vt.c 2017-08-12 12:16:12.011069210 -0500 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/sys-apps/kmscon/kmscon-8-r1.ebuild b/sys-apps/kmscon/kmscon-8-r1.ebuild deleted file mode 100644 index 831393bd22a7..000000000000 --- a/sys-apps/kmscon/kmscon-8-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" -KEYWORDS="~amd64 ~x86" - -inherit autotools systemd flag-o-matic - -DESCRIPTION="KMS/DRM based virtual Console Emulator" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/kmscon" - -LICENSE="MIT LGPL-2.1 BSD-2" -SLOT="0" -IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode" - -COMMON_DEPEND=" - >=virtual/udev-172 - x11-libs/libxkbcommon - dev-libs/libtsm:= - media-libs/mesa[X(+)] - drm? ( x11-libs/libdrm - >=media-libs/mesa-8.0.3[egl,gbm] ) - gles2? ( >=media-libs/mesa-8.0.3[gles2] ) - systemd? ( sys-apps/systemd ) - pango? ( x11-libs/pango dev-libs/glib:2 ) - pixman? ( x11-libs/pixman )" -RDEPEND="${COMMON_DEPEND} - x11-misc/xkeyboard-config" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( dev-util/gtk-doc )" - -REQUIRED_USE="gles2? ( drm )" - -# args - names of renderers to enable -renderers_enable() { - if [[ "x${RENDER}" == "x" ]]; then - RENDER="$1" - shift - else - for i in $@; do - RENDER+=",${i}" - done - fi -} - -# args - names of font renderer backends to enable -fonts_enable() { - if [[ "x${FONTS}" == "x" ]]; then - FONTS="$1" - shift - else - for i in $@; do - FONTS+=",${i}" - done - fi -} - -# args - names of video backends to enable -video_enable() { - if [[ "x${VIDEO}" == "x" ]]; then - VIDEO="$1" - shift - else - for i in $@; do - VIDEO+=",${i}" - done - fi -} - -src_prepare() { - eapply "${FILESDIR}/kmscon-sysmacros-fix.patch" - eapply "${FILESDIR}/kmscon-SIGUNUSED.patch" - eapply_user - sed -i -e 's/\[libsystemd-daemon libsystemd-login\]/\[libsystemd\]/' configure.ac - eautoreconf -} - -src_configure() { - # Video backends - - if use fbdev; then - video_enable fbdev - fi - - if use drm; then - video_enable drm2d - fi - - if use gles2; then - video_enable drm3d - fi - - # Font rendering backends - - if use unicode; then - fonts_enable unifont - fi - - if use pango; then - fonts_enable pango - fi - - # Console rendering backends - - renderers_enable bbulk - - if use gles2; then - renderers_enable gltex - fi - - if use pixman; then - renderers_enable pixman - fi - - # kmscon sets -ffast-math unconditionally - strip-flags - - # xkbcommon not in portage - econf \ - $(use_enable static-libs static) \ - $(use_enable debug) \ - $(use_enable optimizations) \ - $(use_enable systemd multi-seat) \ - --with-video=${VIDEO} \ - --with-fonts=${FONTS} \ - --with-renderers=${RENDER} \ - --with-sessions=dummy,terminal -} - -src_install() { - emake DESTDIR="${D}" install - systemd_dounit "${S}/docs"/kmscon{,vt@}.service -} - -pkg_postinst() { - grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \ - ewarn "It is recommended that you comment out the ERASECHAR line in" && \ - ewarn " /etc/login.defs for proper backspace functionality at the" && \ - ewarn " kmscon login prompt. For details see:" && \ - ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797" -} diff --git a/sys-apps/kmscon/kmscon-8_p20180906.ebuild b/sys-apps/kmscon/kmscon-8_p20180906.ebuild deleted file mode 100644 index c24fedc3f965..000000000000 --- a/sys-apps/kmscon/kmscon-8_p20180906.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT="01dd0a231e2125a40ceba5f59fd945ff29bf2cdc" -SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -inherit autotools flag-o-matic systemd vcs-snapshot - -DESCRIPTION="KMS/DRM based virtual Console Emulator" -HOMEPAGE="https://github.com/Aetf/kmscon" - -LICENSE="MIT LGPL-2.1 BSD-2" -SLOT="0" -IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode" - -COMMON_DEPEND=" - >=virtual/udev-172 - x11-libs/libxkbcommon - >=dev-libs/libtsm-4.0.0:= - media-libs/mesa[X(+)] - drm? ( x11-libs/libdrm - >=media-libs/mesa-8.0.3[egl,gbm] ) - gles2? ( >=media-libs/mesa-8.0.3[gles2] ) - systemd? ( sys-apps/systemd ) - pango? ( x11-libs/pango dev-libs/glib:2 ) - pixman? ( x11-libs/pixman )" -RDEPEND="${COMMON_DEPEND} - x11-misc/xkeyboard-config" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( dev-util/gtk-doc )" - -REQUIRED_USE="gles2? ( drm )" - -# args - names of renderers to enable -renderers_enable() { - if [[ "x${RENDER}" == "x" ]]; then - RENDER="$1" - shift - else - for i in $@; do - RENDER+=",${i}" - done - fi -} - -# args - names of font renderer backends to enable -fonts_enable() { - if [[ "x${FONTS}" == "x" ]]; then - FONTS="$1" - shift - else - for i in $@; do - FONTS+=",${i}" - done - fi -} - -# args - names of video backends to enable -video_enable() { - if [[ "x${VIDEO}" == "x" ]]; then - VIDEO="$1" - shift - else - for i in $@; do - VIDEO+=",${i}" - done - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Video backends - - if use fbdev; then - video_enable fbdev - fi - - if use drm; then - video_enable drm2d - fi - - if use gles2; then - video_enable drm3d - fi - - # Font rendering backends - - if use unicode; then - fonts_enable unifont - fi - - if use pango; then - fonts_enable pango - fi - - # Console rendering backends - - renderers_enable bbulk - - if use gles2; then - renderers_enable gltex - fi - - if use pixman; then - renderers_enable pixman - fi - - # kmscon sets -ffast-math unconditionally - strip-flags - - # xkbcommon not in portage - econf \ - $(use_enable static-libs static) \ - $(use_enable debug) \ - $(use_enable optimizations) \ - $(use_enable systemd multi-seat) \ - --with-video=${VIDEO} \ - --with-fonts=${FONTS} \ - --with-renderers=${RENDER} \ - --with-sessions=dummy,terminal -} - -src_install() { - emake DESTDIR="${D}" install - systemd_dounit "${S}/docs"/kmscon{,vt@}.service -} - -pkg_postinst() { - grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \ - ewarn "It is recommended that you comment out the ERASECHAR line in" && \ - ewarn " /etc/login.defs for proper backspace functionality at the" && \ - ewarn " kmscon login prompt. For details see:" && \ - ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797" -} diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 47a5770722dc..e57e78bfb7f7 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,7 +1,7 @@ AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535 -DIST less-580.tar.gz 348881 BLAKE2B f518ea569201daed6f1772df890cbd2a8968937d9b8fd7b36ae277dc4b1f928892da073266fe39e4135cba15f2d52e0e540a6033cb56de9cc7577153e41e05c8 SHA512 52ff06854f58b5f41bc49fa13334a1ba11fae9316bb99f877abebbe8eb90226991b1820fcccfa85ab8cdfba87f6872160c1177edb044df2e9dd9c1c7d44e3c13 -EBUILD less-563-r1.ebuild 1364 BLAKE2B 3ec233e47b0061ca470790d05ac51c37230ce367458263e3b583d7bfee362be31a7a31ea73f61adf8e7da040ac02542ab712ef499f60a9009f5e8cbbccd226e6 SHA512 06c13fc26c49bbad4e78d02ec0e6f193b1cc02f7b19d83371e2671c7a714d6b68569a0e19cf9ce3b090470dbdc3fa1a45040527b9d37498ca2e937561185ef9d -EBUILD less-580.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3 +DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92 +EBUILD less-563-r1.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53 +EBUILD less-581.2.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95 diff --git a/sys-apps/less/less-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild index 3b0f698785b3..10671e00e64e 100644 --- a/sys-apps/less/less-563-r1.ebuild +++ b/sys-apps/less/less-563-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sys-apps/less/less-580.ebuild b/sys-apps/less/less-580.ebuild deleted file mode 100644 index c91345dc9f3b..000000000000 --- a/sys-apps/less/less-580.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Excellent text file viewer" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" -SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pcre unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:0= - pcre? ( dev-libs/libpcre2 )" -RDEPEND="${DEPEND}" - -src_configure() { - export ac_cv_lib_ncursesw_initscr=$(usex unicode) - export ac_cv_lib_ncurses_initscr=$(usex !unicode) - local myeconfargs=( - --with-regex=$(usex pcre pcre2 posix) - --with-editor="${EPREFIX}"/usr/libexec/editor - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe - newenvd "${FILESDIR}"/less.envd 70less -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-483-r1" ; then - elog "The lesspipe.sh symlink has been dropped. If you are still setting" - elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." - elog "Colorization support has been dropped. If you want that, check out" - elog "the new app-text/lesspipe package." - fi -} diff --git a/sys-apps/less/less-581.2.ebuild b/sys-apps/less/less-581.2.ebuild new file mode 100644 index 000000000000..c91345dc9f3b --- /dev/null +++ b/sys-apps/less/less-581.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pcre unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + pcre? ( dev-libs/libpcre2 )" +RDEPEND="${DEPEND}" + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + local myeconfargs=( + --with-regex=$(usex pcre pcre2 posix) + --with-editor="${EPREFIX}"/usr/libexec/editor + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest index c6d47bdc60e4..191eb48a2c5b 100644 --- a/sys-apps/linux-misc-apps/Manifest +++ b/sys-apps/linux-misc-apps/Manifest @@ -1,5 +1,5 @@ AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 -EBUILD linux-misc-apps-5.8.ebuild 6542 BLAKE2B 3fc4c24460611e65d8b72bfd51a7a671f3e06cbf946e043278528ef90975028fa721ecfa10dd6ef036fdbc2a949bc489e053dc171dfc987ab68a29c23ab8824a SHA512 07a6b499ca3164a73a496dcebc5e2bb2871f2725a83ab133e4ff98bf324334222c6efeb03d3f89dd1785958cc54f957148761d0e3c9a832b95d1496bc9bf5f99 +EBUILD linux-misc-apps-5.8.ebuild 6544 BLAKE2B 28a99d9acc4bd41c57b3ccb4beb2f51c276daa30d9f001695a87ac258d3debd28d67a3aaac19405832e83d61bb012d457acec79769b26c6b58890b111980314b SHA512 1c6c083cb8e32fb3cdd4a70417ef070ff7fe959759911ca9a5f67b82ddcf28964b5859e58d6085c8c661ed813b027ac58ff970de91a1c1dcad2b70d6a3193689 MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild index b6ac148f3e6c..305b9ee03e9a 100644 --- a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild +++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs linux-info autotools flag-o-matic +inherit autotools flag-o-matic linux-info toolchain-funcs DESCRIPTION="Misc tools bundled with kernel sources" HOMEPAGE="https://kernel.org/" @@ -18,7 +18,7 @@ MY_PV="${MY_PV/-pre/-git}" LINUX_V=$(ver_cut 1-2) -get_version_component_count() { +_get_version_component_count() { local cnt=( $(ver_rs 1- ' ') ) echo ${#cnt[@]} || die } @@ -29,7 +29,7 @@ if [ ${PV/_rc} != ${PV} ]; then LINUX_PATCH=patch-${PV//_/-}.xz SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH} https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [ $(get_version_component_count) == 4 ]; then +elif [ $(_get_version_component_count) == 4 ]; then # stable-release series LINUX_VER=$(ver_cut 1-3) LINUX_PATCH=patch-${PV}.xz diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest index b15ceffebf75..787ab4cd1103 100644 --- a/sys-apps/lmctfy/Manifest +++ b/sys-apps/lmctfy/Manifest @@ -1,3 +1,3 @@ DIST lmctfy-0.5.0.tar.gz 2447650 BLAKE2B f40126ccb16b43921e39c23b82ee81a982e97c8bcd7e316568a313e3dd854cc0995f18aba7f6dd48418c3754a3ab92516b2c896136d00006d162044e6f6cd0e6 SHA512 638472b3e8cc98e7ff7ecc48eb0f58fb6a74600db22b7a1962ac3fe137d3549233f3f3b0c97f5783dff6f1851f9c3f9b0607fedea91cb23c1124ed8e2b54aea1 -EBUILD lmctfy-0.5.0-r1.ebuild 757 BLAKE2B f0d2fce9e00442751506b2363824ff67aaf1758639146b8370fcd74aa08280812e317614f6ae73a09f9981c40551897471307ecb56673a34bb9b3d58ade7527b SHA512 7a6d014cd5e6d282cca9e1b3fd8e2b17c02afab6e2226160bfb9a78172443a9e0347a1d6d7834600bf729ccaa9b244931c34541707558ad277f97441af1fd647 +EBUILD lmctfy-0.5.0-r1.ebuild 741 BLAKE2B c54012c8d2c91f64c53faa0a474abc4eea31eb219c256ea4c4191b7643b1ee9129ea2d1ac88e574a8072a23553a9d721bd2e74e819cdace575d5ec084e9b1d82 SHA512 2ec763efcbbde9ded5dc50cfb42c712d953489dd9d61bb73184036d7d920398b7967052a15a208af969c701b7cc85b7d3f370f690af55912ef7570eb9346bc36 MISC metadata.xml 335 BLAKE2B ea4fa6ebfc263db5fb52d6f5a30f46799eb5c7488287b7d77ac34a6d791d8e53576424a21b346c67185f293bc689787744287223c43fa8eeee6e5d157bb500e2 SHA512 ae6e68f29f452d34b44b2afb53623f3fe0fdcc76d32d5aa7c5f394cb7f1caad288b320ccf3f1e628a4f42ce8a7f789fd4e8216d07eb539ffec7954632ea68c5c diff --git a/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild b/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild index b55a5841ffc9..6ca084097656 100644 --- a/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild +++ b/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils - DESCRIPTION="Linux application container management from Google" HOMEPAGE="https://github.com/google/lmctfy" SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest index 9531042852dc..76bf95baca6b 100644 --- a/sys-apps/lnxhc/Manifest +++ b/sys-apps/lnxhc/Manifest @@ -1,5 +1,5 @@ AUX lnxhc-1.2-ifconfig-path.patch 654 BLAKE2B 6872b7412c63a1ca3e4d63831269c5a77062f5be777dfb63cd9090131dc045dd0e203ffdec7c5f805788518094b5047e30909e6a61c8d237f3cdf927f42f9adb SHA512 a29bc332e918e44fe3659f520c32df34ca293edc1545534853495a41182f7e28cb049e20e746f4cbf83c30140f4ae450d034e806a4c87e4d642f4ff2cce27cc1 AUX lnxhc-1.2-usrlocal.patch 1455 BLAKE2B 8d154c43ba460a09366e0b7d93c4fb69309682a49a1346b94c4410e4b49098718c9bfcc3a8a1c5df9ce2dcbef485f65f28d6e6bea08920904dc7ee70ce25b444 SHA512 43be5d638f46caee028802e8675621a7e6ec8499f4490ed1f9df167a8b9b82a3002bac5a28ab3116507eb0eccaad33d865cb64f6cbc4b134717541cd2424087f DIST lnxhc-1.2.tar.gz 360869 BLAKE2B d92321f02be65ea8aaacdc55d19c480031c03d162e80207b306ef70f512917c506a27075e9326ff4be67e1ddc233096fdd44cf0ab06073a6b29ff8255f49ead8 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0 -EBUILD lnxhc-1.2-r1.ebuild 481 BLAKE2B 4896345dceb4e2ff3b6f47f5114d344c82d24fb8241ba68e23d1ed5fd9364121fd451e72ff211f7fb0613a4815d2432cdbb9673fe7a83858e4c3f1e441a3d524 SHA512 e82e4ab73e589b07a471d855589ef686d29b19d5d60cfe3650cc0ac9679da204a8f8782ef3b0484ab09a6c5fea522e8944761973677b12819ce727a2e826eb5f +EBUILD lnxhc-1.2-r1.ebuild 478 BLAKE2B 8a559080a0ffcc31d44a128aa2e9bd3a460e985d022bb4a0bfec18eb261bdb4fc37c5ed7e1acf6fc27f4956f03ab0ebfacea97bc06a498824ff07d1a2ec12635 SHA512 077981873855788cbcc11f684b8faea428919bd986c8e1d7336046769a8d5b645511bde5cd4c5b879e6afbb5177162a40784de3a72470688ea47a89ae5c94581 MISC metadata.xml 242 BLAKE2B 869d8b0b4c7fa3b941911743f4a3c17d6a2c608cdbd3ae4cc1e3a84a12282f5197c263d99d1c5836f64c3868ad986d22d40e98f9083e24a8de41da5e305c8db5 SHA512 24a593f580269cba11ab3b8b83d8199b577480e448bbfe04cd2ee49da165537423dc4d38f9f2366a44605c8c70ca43ade3140da5718cc2cad01fc549d217f9c3 diff --git a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild index 2b878ef587d8..e45de7621e9b 100644 --- a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild +++ b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch DESCRIPTION="Linux Health Checker" HOMEPAGE="http://lnxhc.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest index f8ef5e760f4a..311782191a86 100644 --- a/sys-apps/lsb-release/Manifest +++ b/sys-apps/lsb-release/Manifest @@ -1,4 +1,4 @@ AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde -EBUILD lsb-release-1.4-r3.ebuild 904 BLAKE2B 1ed7678cc226354fd3c35be6afead4817a714d1054cb389dc6c8e81c66ef737f5fbde84435e3cf164d2858ddd1fc624b37f06b580a7a5a6e2f4c081f744b4524 SHA512 2a029b9ebade00e225973b49f493328bacf69eb5cf1c3e1f6fc8b8e3db24ddd7ee5d8697b2b93df89974cf04c7721c28dadf5966f56e0aa72f82633252da4056 +EBUILD lsb-release-1.4-r3.ebuild 905 BLAKE2B 906bf53a6780d2e5b928df28417644ebf7ae2dbdb0ef8080fa690915b3bee4c205ce59ecc58e5007f87982c45b0338e9861e5fc28fe4eb76439edb076f90fb84 SHA512 b6ba1930983fe26b6af0ec01471d753dc945fa2a1dd51afab0bccc59f90e5a2b977287065298155b4a2fc96ce2a515dd08f6ea4e085e84eb8c6e910483f243c5 MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87 diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild index 02f6bc5de4cf..cac335bca5cb 100644 --- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild +++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils prefix +inherit epatch prefix DESCRIPTION="LSB version query program" HOMEPAGE="https://wiki.linuxfoundation.org/lsb/" @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" # Perl isn't needed at runtime, it is just used to generate the man page. DEPEND="dev-lang/perl" diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest index fb952fd8de3a..0ba55b23c100 100644 --- a/sys-apps/lsd/Manifest +++ b/sys-apps/lsd/Manifest @@ -16,9 +16,11 @@ DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST chrono-0.4.15.crate 150581 BLAKE2B 89f1fb1840e7d25e226f4ca1100d85a8d02e0e386a5820bc68c8b5fca8eb94eafa01d90ad895a8b3e2c237f79593056f48a4a0954b6bee1a6eebb5d6f53e7cde SHA512 64ec4c7fad26ce7dd107e3e1b176507cd8f4b10c3ff47940c45ccec0b882858dc35d5cebed36b64e2bd1b611ad8b48dfaa7cfe4a7b687887b4f0a8be1de24dbc DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caeefe4c4847c1864c51fa2538769c9c8cea2c45176910f594f7e208c8bca8d1479ceac27c41fe393a02187572d508836bb6 SHA512 47ca23567abf41975007025bdbb2b30ae9a59d8381069408716ff9d2c60f77bcd8c9aadd5cb672902d73cb85b3123b7818c20c8823a27f3a99cecd50cae47cd3 +DIST chrono-humanize-0.1.1.crate 11737 BLAKE2B 7a4ba416febbec63ac4bc17948a6e59370d99f1dff9fe36080a0c474a29dc8313f312860c1d5e4f0481d95e54d12dd14618697dc9dd14e5adb95710622ed1d8a SHA512 26bc8d9a0209adbf3b52ad7e3029e171f50f1a5723bf777fddcf96f6f4d3d76f30a5ac2f68a762804d656bf9414091a8c3559e9c2f7f63a2c314309e72f6075e DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c @@ -40,23 +42,28 @@ DIST globwalk-0.7.3.crate 12714 BLAKE2B ec9d0036c2556010111edd645494be456664e4f5 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9 DIST human-sort-0.2.2.crate 3024 BLAKE2B 0e112295ee73e6450bbf6431ff6841c9584de5daefeac077eec9eced452de61bebb8d3c3e13edd48b9e1002c421a8903da57a6a23a4c42576f2abaa7c6f02560 SHA512 062259992075a1be4c923379489410d856485682950cc31a05ad6ab6d04129f7e52dab016047c4de30c18f2ccc5c094c4469d9a920da0f450de3865a713bc987 DIST ignore-0.4.16.crate 52343 BLAKE2B fa232eec0a35a2b144225ac804f2d8d198a95ab58d63d9a80378fcd9e9dc99b7aa800d8855da59d51a6004be496bb51a3eb9d318bcfc6c38b257c1de68a86abd SHA512 23d0205d25dee02067a6af9ccaab9abcf1eb812e309d029697f0b0a3fd6062e33d8fb1dcae8c78494867e82132ee6797bd4af716d7c1523afc29feebed6d6698 +DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.55.crate 400416 BLAKE2B 157b4f9d221f562e37ccfdd662a6777c8c6c45d1d2c9f9ff0f9d4d1bdf1aa66dac9f61a220e5be65fd7bc01273335eed86291e158f64da26bd7b398af26663e2 SHA512 649155c45a098dc043a42a0df19a7a43100f104bda1ce1a3bad9e5070b5a9c3a73f67197e286fb508c9257315b2e1d2a6eb4cba35f909ef0a2b1f61e1a29b196 DIST libc-0.2.77.crate 507233 BLAKE2B f02ee13e41dfa6317a6cf7f0724f891cc9f98a68cd25e865e744ebbe49d93c86f16c2fd71ef4410ff28e0b386c5b4dff605c1236db83bdb91292ae48d0900782 SHA512 1e6dbd6f646a50fffd294ea56146c42dec6c4e027f2cd886ce2bbab9a5a2d036e4787f95201c448bef9ceddd52d863153c849343791d92900bf1378fbacee0f7 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1 +DIST lock_api-0.4.2.crate 20375 BLAKE2B 0b24bdf98aaee9870f558971f437e728c8e52a853cc886a0de30cb9a84c2733175e6152a2d7ff1f28a83df5443091b16ac5410cb67d05ce464e01db64ba98cb0 SHA512 815de5198ba4a952490fbc7e08e899ce855588d794c22890839ad55caa81642745fa6bf81a2a2fc8f6713575f0d1b801a2f2107ed7c405101011927b6b40be31 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013 DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776 DIST lsd-0.16.0.crate 39872 BLAKE2B cdf78606856d689e22edad5cf1f4f555edff2030e1b10ff0e706f7dbbe98c5836ef4a8ad6d061fd3c968f8499815b79c97595d0fff43d513e8fec40a4f3a632b SHA512 cd761e039f810c6fcb925228bdbc284ea0a3a9b16a11038de3086bf89ad1f99b442e33a0020612079bc40e7adb1a3ae056565f4022e2714bc9cc47767e7fc03e DIST lsd-0.16.0.tar.gz 43284 BLAKE2B fb8813f33fa487afea428a3dd3a01fe6c9e56616a8c69e7a97430e41deb4a0ed0cd5b4c6ee79ba02d145267d2fd2ee2167365b81fdcf868bec2cdce0a98a1535 SHA512 562c070d3e716af26ff3a54632cd176a1b95471fbb7e947f8175f89df483ff5b337d1a0d7578fa6ee41f77fa7ed1a618d37e91ebf1b8428e6a857918b415aa39 DIST lsd-0.19.0.tar.gz 69118 BLAKE2B 32f5fe37e2fd4d5b714101ba19b6f36d9b0d0d71e88e1d8e715e32c2c804735366d8ab517e5abf5193e478096c6dc2724be2a6bd68b75c2603f0954926ac315f SHA512 f9a1202f49b0e02746ba4034b199142a4b5224ba6cee8690a6fb01c18c046a26c531d0b4480838a28b3ca8de7ae522451bdc5ece43f902605a61f18571fb07fd +DIST lsd-0.20.1.tar.gz 72380 BLAKE2B dcae55c795daa10abc71f6afdb78b4202a83832664cd2054abbb5008f45aa11f3482658ca463d01f2fce37a79e5a5128be26e05f269d681e5c5e5f3e611e20a6 SHA512 d4e340947c1d94fa675d85b8cf07df4be5da28441b0d93449d4ab266bdfae8a0556f98ec320c07b968094a07250dc9e41a0165d6c27fc153e5a1730bfeb5d549 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c +DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2 +DIST parking_lot_core-0.8.2.crate 32142 BLAKE2B fca96047d33b5501fa34655e6f32ff204d72f07c9501e5bb2465fd4b9f7b50a6501cea295d10d1c994c89803b6bf4b6e73a174120e769fec2e2353cbe60553d8 SHA512 0d705f348fa125312a7adcf392001ba79eb3932d489f4e9a3c9a2c1b9f65175458561a61e456830999d3d1eb95f3558f58ee80106c8b01720427c1dd4b602d51 DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010 DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4 @@ -88,9 +95,13 @@ DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe371539 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c +DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d DIST serde_yaml-0.8.13.crate 37683 BLAKE2B a6739f29e638fa77516ae106314a332a6cc86022db4a029eb7615e5deca712b67669330f02ba0d04cc53b9e3f661a5e970f7ebe723be18cd44c309218123a74a SHA512 12621a641ccc68f90a962e9a6d84ab922d9b30e58be88c26e8fa0cf921981f573bb929113108cfd08f47988902997d4b685db2cd361cbf83119612e95ff6e686 +DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e +DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e +DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3 @@ -134,4 +145,5 @@ DIST xdg-2.1.0.crate 12444 BLAKE2B 616b52f46f3904f3da7584fba331b730a3fbc78e2b41f DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a EBUILD lsd-0.16.0.ebuild 1392 BLAKE2B c1b8865714c255758cce5d34664ba768436fc50e4eb86eb9b5d6cd1794f6e7f0f902be5f586f44e3546765261345b0725340351403351a50284b841d917930a4 SHA512 d5e9098898f97cc1e6e5e2c796c90c66f6965967164871aabf876277f95b8214fcc552dad926ae8d4b27c91bdfc3a2a582055d185bb83fdcdec1e3bb0f7384c7 EBUILD lsd-0.19.0.ebuild 2064 BLAKE2B 18d8629dce22033901a6baf22c888d06fd7f5c5b24eb7b5738fa212cabbdeffcf8854311062c37e99c7643047d24c6dba700c6b80be0ecd919a4c7916f83022b SHA512 8596e21e238b81c3fe14955dec85e528358580610313816ee8d872d45573dad6ebceacc0ccf3d0f023dd9788a6b43ac3b17696adb2819f6ba4d5c885aa49ef96 +EBUILD lsd-0.20.1.ebuild 2602 BLAKE2B 446e01519bafd2bbe8acaf79112cdc7e1d7f4957ed6e0da410559a6215d7435ebc737d7976fd6a6d093f84a901aa29c0d322847629c56e5aa4ed7e6f39d364d4 SHA512 851e2d845cc773d67249adbd328b52d7814d3d680853f84e2cfc74178c4827247b31ca0941385fdf701e3d27f0a2d62037a3490b5361b665a3318d0aaeeb432b MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599 diff --git a/sys-apps/lsd/lsd-0.20.1.ebuild b/sys-apps/lsd/lsd-0.20.1.ebuild new file mode 100644 index 000000000000..d21203f06999 --- /dev/null +++ b/sys-apps/lsd/lsd-0.20.1.ebuild @@ -0,0 +1,142 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" +aho-corasick-0.7.13 +ansi_term-0.11.0 +ansi_term-0.12.1 +arrayref-0.3.6 +arrayvec-0.5.1 +assert_cmd-1.0.1 +assert_fs-1.0.0 +atty-0.2.14 +autocfg-1.0.1 +base64-0.12.3 +bitflags-1.2.1 +blake2b_simd-0.5.10 +bstr-0.2.13 +cfg-if-0.1.10 +cfg-if-1.0.0 +chrono-0.4.15 +chrono-humanize-0.1.1 +clap-2.33.3 +constant_time_eq-0.1.5 +crossbeam-utils-0.7.2 +difference-2.0.0 +dirs-3.0.1 +dirs-sys-0.3.5 +doc-comment-0.3.3 +dtoa-0.4.6 +float-cmp-0.8.0 +fnv-1.0.7 +getrandom-0.1.15 +glob-0.3.0 +globset-0.4.5 +globwalk-0.7.3 +hermit-abi-0.1.16 +human-sort-0.2.2 +ignore-0.4.16 +instant-0.1.9 +lazy_static-1.4.0 +libc-0.2.77 +linked-hash-map-0.5.3 +lock_api-0.4.2 +log-0.4.11 +lscolors-0.7.1 +memchr-2.3.3 +normalize-line-endings-0.3.0 +num-integer-0.1.43 +num-traits-0.2.12 +parking_lot-0.11.1 +parking_lot_core-0.8.2 +ppv-lite86-0.2.9 +predicates-1.0.5 +predicates-core-1.0.0 +predicates-tree-1.0.0 +proc-macro2-1.0.24 +quote-1.0.7 +rand-0.7.3 +rand_chacha-0.2.2 +rand_core-0.5.1 +rand_hc-0.2.0 +redox_syscall-0.1.57 +redox_users-0.3.5 +regex-1.3.9 +regex-syntax-0.6.18 +remove_dir_all-0.5.3 +rust-argon2-0.8.2 +same-file-1.0.6 +scopeguard-1.1.0 +serde-1.0.117 +serde_derive-1.0.117 +serde_yaml-0.8.13 +serial_test-0.5.1 +serial_test_derive-0.5.1 +smallvec-1.6.1 +strsim-0.8.0 +syn-1.0.48 +tempfile-3.1.0 +term_grid-0.1.7 +terminal_size-0.1.13 +term_size-0.3.2 +textwrap-0.11.0 +thread_local-1.0.1 +time-0.1.44 +treeline-0.1.0 +unicode-width-0.1.8 +unicode-xid-0.2.1 +users-0.11.0 +vec_map-0.8.2 +version_check-0.9.2 +wait-timeout-0.2.0 +walkdir-2.3.1 +wasi-0.10.0+wasi-snapshot-preview1 +wasi-0.9.0+wasi-snapshot-preview1 +wild-2.0.4 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +xdg-2.1.0 +yaml-rust-0.4.4 +" + +inherit bash-completion-r1 cargo + +DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons" +HOMEPAGE="https://github.com/Peltoche/lsd" +SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris ${CRATES})" + +LICENSE="Apache-2.0 BSD-2 ISC MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" +BDEPEND="" + +QA_FLAGS_IGNORED="/usr/bin/lsd" + +src_compile() { + export SHELL_COMPLETIONS_DIR="${T}/shell_completions" + cargo_src_compile +} + +src_install() { + cargo_src_install + + local DOCS=( CHANGELOG.md README.md doc/lsd.md ) + einstalldocs + + newbashcomp "${T}"/shell_completions/lsd.bash lsd + + insinto /usr/share/fish/vendor_completions.d + doins "${T}"/shell_completions/lsd.fish + + insinto /usr/share/zsh/site-functions + doins "${T}"/shell_completions/_lsd +} diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index 4a962f84c521..aab09158ea69 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,11 +1,11 @@ -AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a108fc6f29c6cb62d2a3a64d4de5412be7a460ba217f0ba625aec5cc4efb7ff9c0750cd14073f3b0783a883c1dd1 SHA512 c9492cf301ba06f225d8afab62ab889572f9acede7b63cfc0ae665275b1056981dd85b02d4d49fc6294194a71fc405ded6bf27b3f461e550b0e5a3dc6fb939d7 +AUX lshw-02.18b-gentoo.patch 4709 BLAKE2B 5e07b8bba96f5ddd6717bb765965962a64638d8137ad1008a760b685b8dafc5da1a79862adad35612aa7038de096337e7d8506267328da70f22d916acfadd750 SHA512 42d2b966207173ba78926610100d7567f8e115d20378b02231de962d6949bee5de2cfcec1ac1399478b144ec19cb739e37f314d2c02b9f58c7895f9e099d5988 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5 DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 -EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B cdcdef6003f3c8daccd8ea442822908813914f2b155887f9f3c2f0a4b843ff3833380e5bb0657b50293af35de36b305cfd741dfdd61b30d38063b98cf705d4d5 SHA512 b5a21f8effa23ab0154249d1e37fc7c966a4b6ac1896943903bfeb66a1105c682a2e9a7fc1e603179cf1ce5ea8955d162276681c8946e3bd3f1c98d7665a926f -EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 51a1020346e3ac0856d1c7dbbe5827c430db0b017b35ae70876e6b8fcfcea7d134f942dc507b8158ad9010242cf9f94c92b8521b981b8d569137cd0fb0eb0273 SHA512 9065cd8709e623d6ee770f2fb499bb433bcf383795e8b280171da3b7a2d9a93e32956aaaeaa347dfbedd81d29c4bd964f8839d7ab98124c86d9fb65e7feb07cd -EBUILD lshw-02.19.2b.ebuild 2143 BLAKE2B a2ffef5fd6e729e670b13a596f6aac6d15e33d8388c02efec0e410f6ffb5fbfff64ac8ae15c97adfea61cee639e9dad29fd7f8bb4a50e5a89502f96ff4ce3c0d SHA512 98d66f43361a8fd5a7e39cb939804392e9f5c763affd448217a18a45b6276588e1f8e11a775fbc9ef1953ffca5f77f1a7ae0b807182341fab42efd0c847958bb -EBUILD lshw-02.19.2b_p20210121.ebuild 2147 BLAKE2B faad40e16dc2e37e0c92805e3f8f6287ee41f30b2f82935fdbf4cacca8b19d44955f12f6c980bb22b7a201e3a47f3a6f137c0880e9590be9812ae528775cf604 SHA512 e6aaa0917953fe2483f474c256b062725801c6e7a7dfb84a1baddb9622ed909aaf079ebb520aa4e621d2dc12a6fc1ade9256ec8b40d0bb88312c37639921d5c3 +EBUILD lshw-02.18b-r1.ebuild 1786 BLAKE2B 827c53ca19545e3435c1d797000d2460b4fb170226958f523467705821bc9086f8fa145bc2090c4660369df2788faf7ed64f4572d39f92dde5ce4e56586bf1b8 SHA512 3bc735eeab8d1ba80326cc2c2fe432ed7a44915d1653f2a8bd8147e5299eeac5de63aa2aa3af210fe8d6d71ca1c066c0928d3b27d54e29b9119618f6289be8b0 +EBUILD lshw-02.18b.ebuild 1728 BLAKE2B eb1cd904c324bd1e3e4256aa882e2895d3c12daf11dc46dfe208f645915c22b04bc04196beb828bbd69edcfd1841b6df0eb6cea7d5414c6e668df0f4bb9f18cb SHA512 44adbbb8b82c816b5a36cff686e251023ba0263e0c64fa596baddd5a096018d4147e128894666738f725c0680adb2843732c89fa92bb7edc318185e5bfb2d4b3 +EBUILD lshw-02.19.2b.ebuild 2134 BLAKE2B d71b2f4cd8a0ae26bfb414bbfec683452edee62aac75a218fed8bb5ae899f00aa7bce577edf2a909b7309b1b5106bd8b5240ed401bd4e05a7cbe771a463d713c SHA512 033b096652d7732fbc256344b1de2fa4e4345a8375f090fd27ec6db1f020ab8f71b0df238ed0174c2d871913a2a2e95cccd897df266744fb17f4e7f3dcafbfd9 +EBUILD lshw-02.19.2b_p20210121.ebuild 2227 BLAKE2B ccf17dd0b2f86b8bfac33423a815cdaf0479cd05a8574b848e6c47226fc1731117c9e7c625a6d4436a10bb7c4d73908f38c353ebff0cf2987a25243a9d095db6 SHA512 4c2f06c4109ba86f7cb435b37f6242c9f80a16e7c889b0aae1d545961fd6fa759ff44463928aaf1d9cbb6af2423124f7fab99a226ad6cccab417d6379ec98ca3 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3 diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch index 0a50e9dc868c..dd42df9b5282 100644 --- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch +++ b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch @@ -1,5 +1,5 @@ ---- lshw-B.02.18/src/Makefile -+++ lshw-B.02.18/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -21,11 +21,11 @@ CXX?=c++ INCLUDES=-I./core/ @@ -82,8 +82,8 @@ .timestamp: date --utc +%Y%m%d%H%M%S > $@ ---- lshw-B.02.18/src/core/Makefile -+++ lshw-B.02.18/src/core/Makefile +--- a/src/core/Makefile ++++ b/src/core/Makefile @@ -1,10 +1,9 @@ PACKAGENAME?=lshw @@ -97,8 +97,8 @@ LDSTATIC= LIBS= ---- lshw-B.02.18/src/core/pci.cc -+++ lshw-B.02.18/src/core/pci.cc +--- a/src/core/pci.cc ++++ b/src/core/pci.cc @@ -17,7 +17,7 @@ #define PROC_BUS_PCI "/proc/bus/pci" @@ -108,8 +108,8 @@ #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ #define PCI_VENDOR_ID 0x00 /* 16 bits */ ---- lshw-B.02.18/src/core/usb.cc -+++ lshw-B.02.18/src/core/usb.cc +--- a/src/core/usb.cc ++++ b/src/core/usb.cc @@ -27,7 +27,7 @@ #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" @@ -119,8 +119,8 @@ #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ #define USB_CLASS_AUDIO 1 ---- lshw-B.02.18/src/gui/Makefile -+++ lshw-B.02.18/src/gui/Makefile +--- a/src/gui/Makefile ++++ b/src/gui/Makefile @@ -1,5 +1,7 @@ PACKAGENAME?=lshw diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild index 5df82efaafaf..f3e16336e3f6 100644 --- a/sys-apps/lshw/lshw-02.18b-r1.ebuild +++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild @@ -5,13 +5,13 @@ EAPI="5" PLOCALES='fr' -inherit flag-o-matic eutils toolchain-funcs l10n +inherit desktop flag-o-matic toolchain-funcs l10n MAJ_PV=${PV:0:${#PV}-1} MIN_PVE=${PV:0-1} MIN_PV=${MIN_PVE/b/B} -MY_P="$PN-$MIN_PV.$MAJ_PV" +MY_P="${PN}-${MIN_PV}.${MAJ_PV}" DESCRIPTION="Hardware Lister" HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz" diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild index 74e8e232c50e..8243b8bc20c7 100644 --- a/sys-apps/lshw/lshw-02.18b.ebuild +++ b/sys-apps/lshw/lshw-02.18b.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" PLOCALES='fr' -inherit flag-o-matic eutils toolchain-funcs l10n +inherit desktop flag-o-matic toolchain-funcs l10n MAJ_PV=${PV:0:${#PV}-1} MIN_PVE=${PV:0-1} MIN_PV=${MIN_PVE/b/B} -MY_P="$PN-$MIN_PV.$MAJ_PV" +MY_P="${PN}-${MIN_PV}.${MAJ_PV}" DESCRIPTION="Hardware Lister" HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz" diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild index 471abbf1b243..9ddf5f85eb28 100644 --- a/sys-apps/lshw/lshw-02.19.2b.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b.ebuild @@ -70,7 +70,6 @@ src_compile() { } src_install() { - default emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') if use gtk ; then newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild index 20087b02f948..bf17c8b0223a 100644 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild @@ -5,7 +5,7 @@ EAPI=7 PLOCALES='fr' -inherit desktop flag-o-matic toolchain-funcs l10n +inherit desktop flag-o-matic toolchain-funcs l10n xdg MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1" MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) @@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="gtk sqlite static" REQUIRED_USE="static? ( !gtk !sqlite )" @@ -71,7 +71,6 @@ src_compile() { } src_install() { - default emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') if use gtk ; then newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest index d90ad8a24696..a0d73a6ae268 100644 --- a/sys-apps/lsvpd/Manifest +++ b/sys-apps/lsvpd/Manifest @@ -1,3 +1,3 @@ DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5 -EBUILD lsvpd-1.7.11.ebuild 574 BLAKE2B 20b45740c87d91ba4393af9841b77bb41d624a416ca82cb04315f8319f5788535d76c189e340bd167988d4038922944d11d2438502a6859c7f2c90390149875b SHA512 2575ab1d7c815bf1a2fe10334cca7bf52c454021fe30f96dd064372bbc1c79e7efdfdb9646e7636462c441c11978892a67e832a4bc6ba38e96636ebaca133912 +EBUILD lsvpd-1.7.11-r1.ebuild 582 BLAKE2B 34afe81d81a3a2a012a8c3f54eeca008a2cf2b9dc14bf8aa0b2f43a65c9b068370bf57a25655a378e39e4c1878460c0fec4d8f21edbc698d1d0154d7ca24e230 SHA512 ae5640d4f8fca09cf00d23e7d1accb9bc80cf809cdff7febdd1185e99043273f206bdd6e75569153f1b680e45dca78d8e719aa2d80eb5c6d3d011f9916abc79e MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b diff --git a/sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild b/sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild new file mode 100644 index 000000000000..da50d494b20a --- /dev/null +++ b/sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Utility to List Device Vital Product Data (VPD)" +HOMEPAGE="https://github.com/power-ras/lsvpd" +SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="ppc64" +IUSE="" + +RDEPEND=" + dev-db/sqlite:3 + sys-apps/sg3_utils:0= + sys-libs/librtas + sys-libs/libvpd + sys-libs/zlib +" + +DEPEND="${RDEPEND} + virtual/os-headers +" + +BDEPEND="" + +src_prepare() { + default + eautoreconf +} diff --git a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild b/sys-apps/lsvpd/lsvpd-1.7.11.ebuild deleted file mode 100644 index ee450bf1b3be..000000000000 --- a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Utility to List Device Vital Product Data (VPD)" -HOMEPAGE="https://github.com/power-ras/lsvpd" -SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="ppc64" -IUSE="" - -RDEPEND=" - dev-db/sqlite:3 - sys-apps/sg3_utils - sys-libs/librtas - sys-libs/libvpd - sys-libs/zlib -" - -DEPEND="${RDEPEND} - virtual/os-headers -" - -BDEPEND="" - -src_prepare() { - default - eautoreconf -} diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest index 9c663cea8e0b..0bc04b33a793 100644 --- a/sys-apps/makedev/Manifest +++ b/sys-apps/makedev/Manifest @@ -1,4 +1,4 @@ AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc -EBUILD makedev-3.23.1-r1.ebuild 1352 BLAKE2B 6849b1526f685b4a83c358cee557b1e571c03f7e5b2fb734ebf17b0c6db917ef7af1ae2d46c5f70e7ed6a6d8168ef9b48659b04bfe83de174d9ebe6d048d377a SHA512 72c08598ebe85a8d1c81d96ed593079b1e3d686b7d0cf9db4f97af3c51844daffd84f30a0ac4a982e537251312474fef9f7646f79d1cb5976b559c2196a79e05 +EBUILD makedev-3.23.1-r1.ebuild 1346 BLAKE2B 041c624f426a6e3e1627b0fcd688550f5f28d1f4cdd3cae2d1ddba09361fd0af30686644f88ce12dcf50377242dee76f5b61769702e53e9c11f1e9ba038aa2b5 SHA512 5baecf59aa6da0a7f10ba2bdf995a96a955344a220ac0b6f81d34e69cb57cfc2d759c702e18b4cb1972b443af98caae93dc5b1a34a22a705bfe24da6e49be15b MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild index 4b1c6985f562..bd14e7054c69 100644 --- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild +++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs MY_PN="MAKEDEV" MY_VER=${PV%.*} @@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="build selinux" RDEPEND="!>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include /* for off_t */ -- #include -+#include - int - main () - { --int (*fp) (FILE *, off_t, int) = fseeko; -- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); -+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); - ; - return 0; - } -@@ -9110,13 +9106,11 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #define _LARGEFILE_SOURCE 1 --#include /* for off_t */ -- #include -+#include - int - main () - { --int (*fp) (FILE *, off_t, int) = fseeko; -- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); -+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); - ; - return 0; - } -@@ -9777,42 +9771,6 @@ OBJDIR=$SRCDIR/"$ARCH"objs - ELFDIR=$SRCDIR/elf"$ARCH"objs - - --{ echo "$as_me:$LINENO: checking for Terminfo" >&5 --echo $ECHO_N "checking for Terminfo... $ECHO_C" >&6; } --MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo" --if test ! -d $MISC_TERMINFO_DIRS --then -- MISC_TERMINFO_DIRS="" --fi -- --JD_Terminfo_Dirs="/usr/lib/terminfo \ -- /usr/share/terminfo \ -- /usr/share/lib/terminfo \ -- /usr/local/lib/terminfo \ -- $MISC_TERMINFO_DIRS" -- --TERMCAP=-ltermcap -- --for terminfo_dir in $JD_Terminfo_Dirs --do -- if test -d $terminfo_dir -- then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- TERMCAP="" -- break -- fi --done --if test "$TERMCAP"; then -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- cat >>confdefs.h <<\_ACEOF --#define USE_TERMCAP 1 --_ACEOF -- --fi -- -- - if test "X$jd_prefix" = "X" - then - jd_prefix=$ac_default_prefix -@@ -10858,8 +10816,6 @@ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim - SRCDIR!$SRCDIR$ac_delim - OBJDIR!$OBJDIR$ac_delim - ELFDIR!$ELFDIR$ac_delim --TERMCAP!$TERMCAP$ac_delim --MISC_TERMINFO_DIRS!$MISC_TERMINFO_DIRS$ac_delim - SLANG_LIB!$SLANG_LIB$ac_delim - SLANG_INC!$SLANG_INC$ac_delim - PROGRAM_OFILES!$PROGRAM_OFILES$ac_delim -@@ -10868,9 +10824,10 @@ PROGRAM_HFILES!$PROGRAM_HFILES$ac_delim - PROGRAM_OBJECTS!$PROGRAM_OBJECTS$ac_delim - PROGRAM_ELFOBJECTS!$PROGRAM_ELFOBJECTS$ac_delim - LIBOBJS!$LIBOBJS$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -10906,50 +10863,6 @@ CEOF$ac_eof - _ACEOF - - --ac_delim='%!_!# ' --for ac_last_try in false false false false false :; do -- cat >conf$$subs.sed <<_ACEOF --LTLIBOBJS!$LTLIBOBJS$ac_delim --_ACEOF -- -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then -- break -- elif $ac_last_try; then -- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -- else -- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -- fi --done -- --ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` --if test -n "$ac_eof"; then -- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -- ac_eof=`expr $ac_eof + 1` --fi -- --cat >>$CONFIG_STATUS <<_ACEOF --cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end --_ACEOF --sed ' --s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g --s/^/s,@/; s/!/@,|#_!!_#|/ --:n --t n --s/'"$ac_delim"'$/,g/; t --s/$/\\/; p --N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n --' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF --:end --s/|#_!!_#|//g --CEOF$ac_eof --_ACEOF -- -- - # VPATH may cause trouble with some makes, so we remove $(srcdir), - # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and - # trailing colons and then remove the whole line if VPATH becomes empty -@@ -11193,7 +11106,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - s&@INSTALL@&$ac_INSTALL&;t t - $ac_datarootdir_hack --" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -Index: most-5.0.0a/src/Makefile.in -=================================================================== ---- most-5.0.0a.orig/src/Makefile.in -+++ most-5.0.0a/src/Makefile.in -@@ -3,7 +3,6 @@ CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@ - LDFLAGS = @LDFLAGS@ - SLANG_INC = @SLANG_INC@ - SLANG_LIB = @SLANG_LIB@ -lslang --MISCLIBS = @TERMCAP@ - RPATH = @RPATH@ - - #----------------------------------------------------------------------------- -@@ -44,7 +43,7 @@ EXEC = most - CONFIG_H = config.h - INCS = $(SLANG_INC) - ALL_CFLAGS = $(CFLAGS) -Dunix $(INCS) --EXECLIBS = $(RPATH) $(SLANG_LIB) $(MISCLIBS) -lm -+EXECLIBS = $(RPATH) $(SLANG_LIB) -lm - # - most_O_DEP = $(SRCDIR)/version.h - UPDATE_VERSION_SCRIPT = $(HOME)/bin/update_changes_version diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild deleted file mode 100644 index f57fbba42dd5..000000000000 --- a/sys-apps/most/most-5.0.0a-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="Paging program that displays, one windowful at a time, the contents of a file" -HOMEPAGE="ftp://space.mit.edu/pub/davis/most" -SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="" - -RDEPEND=">=sys-libs/slang-2.1.3" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-5.0.0a-no-explicit-termcap.patch - epatch "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch - sed -i -e 's:$(INSTALL) -s:$(INSTALL):' src/Makefile.in || die - export MAKEOPTS+=" -j1" -} - -src_configure() { - unset ARCH - econf -} - -src_install() { - emake DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \ - install -} diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild index 9268240d6aeb..18b707ef38fb 100644 --- a/sys-apps/most/most-5.1.0.ebuild +++ b/sys-apps/most/most-5.1.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="" RDEPEND=">=sys-libs/slang-2.1.3" diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest index 836d2b545eb0..58880c1b1d0d 100644 --- a/sys-apps/mount-gtk/Manifest +++ b/sys-apps/mount-gtk/Manifest @@ -1,4 +1,4 @@ AUX mount-gtk-1.4.2-c++11.patch 1125 BLAKE2B 25871ab418def7d5723455afbf481be81f022978e563e904595de506f897349659b72a4ce5614e8ecccc5edfa9a71c988da71b5b2bc8650493fcb53795c9faeb SHA512 8ecbbec87ab65d1b69b3a64301c10168589a30a0b1487f841388c269ea705b3b04662b35d196daa8f17e9c708670597a2fe6c10f6dceab3d3cce62fa24318501 DIST mount-gtk-1.4.5.1.tar.gz 239116 BLAKE2B 94ca6b0b4b9aec8989169c7a52e3e38f65c490e88e07531eb398c06be8c61b4d5ecbcaddabb2286ce7353294991a35e0f3b2d94a7b255817651e6570a6c7be1b SHA512 3cd69b872c278db80b6f91a8f66054c56be964d23f1a4e5a435343de5178c5a64440ba871e6e4b6b76b55bb01e156e8cacc8e4e3c7cfdb4bc55f95680d6dc511 EBUILD mount-gtk-1.4.5.1.ebuild 789 BLAKE2B ef94101f5aab2dacb2faf251fb0c2aecc77e796256caa22ada2cd86562da19c07e83eae0d451522dec931feca862fcde965445e069f0f873fd5d9423908a564e SHA512 0db26cd5bc2fea834ba6909105830d354d072d4fd322cc4f1fff1d6c2ac3979ac40326ca22d444025d7e4710ad78aa2389296b982546b49bf6cfb851afeb02ac -MISC metadata.xml 355 BLAKE2B 2057650f632b2f484a75473cf9bb2054392e41704767bd7d33c3182230e4e386b4d99cc1b654b2e3b5b5c0d06cc574cf9f097ae78bd981334abbbcd4eece2d82 SHA512 a2160b97106975c45262beb68b1c6e1412edf2df400868ece4a93c1318a2e24b0a178cca0b0a4ac7c766e0a3c1e98b1a812d0fe079ec1412a05aaa1eb5f8d8e3 +MISC metadata.xml 245 BLAKE2B 99ce6c5debed7306c9d73ead614217d127c8cb7e05faff9fbbe14fdc0804ef42fd28288074b5a1655b74e5143d6992a3489cf79cc429bf23b56de2a5915a3e27 SHA512 5c77c0f76c7c8ab3d0db25b18c0710fe4f9238ff456ac9bd4f60f6dd5bc3db256a66803ecdb89119c392843f8be6fcd11ce6a90e03336678f3e06793b3636821 diff --git a/sys-apps/mount-gtk/metadata.xml b/sys-apps/mount-gtk/metadata.xml index d5655724c0ba..4ff82cc8913b 100644 --- a/sys-apps/mount-gtk/metadata.xml +++ b/sys-apps/mount-gtk/metadata.xml @@ -1,11 +1,7 @@ - - desktop-misc@gentoo.org - Gentoo Desktop Miscellaneous Project - - + mount-gtk diff --git a/sys-apps/msr-tools/Manifest b/sys-apps/msr-tools/Manifest index dee6af8d0e66..c75cfa2ebd35 100644 --- a/sys-apps/msr-tools/Manifest +++ b/sys-apps/msr-tools/Manifest @@ -1,3 +1,3 @@ DIST msr-tools-1.3.zip 7693 BLAKE2B 9ba92a6b3d71bf89e1b4a62226fa1eb2c53a588900fe52f1fa3a84443a471aab547e46e73826874c251ec32dcbb40ef9b787eef80fd93b65f3bb2c5d0312e310 SHA512 9605eed0b6211d0ecbe48a14d66b5d61965770f249c5c1b15416d4f2e9a37a68ecfde171077c3acc74bb6b951749bcff186acbb4d6d8a3051695d2d97c0e332b -EBUILD msr-tools-1.3.ebuild 617 BLAKE2B f52b69d0380f0d8c77ebb339e4c40509070188f439dd5725e82116013311f90ed6a0d66da927af5d270bb3ca8888122c0f9883d488737bb1eb63a7659ec3b22f SHA512 03f27fe945f5d60c65c5fcf500b961acfca808ead9798ec2cb51e7e7482ed495adc443d2f6bbc615df2675362ef05ffca2589c9ce888e777abfabb395a785fb7 +EBUILD msr-tools-1.3.ebuild 607 BLAKE2B e17fb11b64318693060f25b4747bc0771dfded5eecb0f2241e94dac6b837f387907290fc70fab7d342a008f8388e8a55d234d32217aec2cfa0fc7d4ddaa748bb SHA512 38bcd61294017e77be18e1bd4dc3bf9f113f44e6b112df1b1bfa51d208f1a09d395049bcac66c522d919cec1897ea4017316450b04f670a7025871f040712340 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353 diff --git a/sys-apps/msr-tools/msr-tools-1.3.ebuild b/sys-apps/msr-tools/msr-tools-1.3.ebuild index 424b21ea6e63..8ed18a3caf39 100644 --- a/sys-apps/msr-tools/msr-tools-1.3.ebuild +++ b/sys-apps/msr-tools/msr-tools-1.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 CONFIG_CHECK="~X86_MSR" -inherit eutils linux-info toolchain-funcs +inherit linux-info toolchain-funcs DESCRIPTION="Utilities allowing the read and write of CPU model-specific registers (MSR)" HOMEPAGE="https://01.org/msr-tools" diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest index c74ecbf3256b..d03be1d13f2e 100644 --- a/sys-apps/net-tools/Manifest +++ b/sys-apps/net-tools/Manifest @@ -1,6 +1,6 @@ DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf -EBUILD net-tools-1.60_p20180626073013.ebuild 2450 BLAKE2B bf0d8623306be59d53c0b475e053a2a2905de64c4488b8940080fda7c667d46bc2309daa450b654fbe719b2df1af8096101039b4658da84ff08494923f5ec71b SHA512 5b8917dd63904c5c9a66e8cd856a551b6dcc8e25a662ddd693dd12c2f87cdc4d02d9b20bb684a7b0237edd85873475718533df9de6f4191a308e9deb4a7cddd9 +EBUILD net-tools-1.60_p20180626073013.ebuild 2451 BLAKE2B e97d4e7f39cf1a9d8ea294cc560eced78beddb5d43ada2cc1f9649f8bafa0f036764fd04cf9c3da0c601466c211912ee747b03d941b433965084228723f788e8 SHA512 3cd707e4b0be080097576cf9b83ff81116e051d7a7d2c7f00fbbbc5b4c924740920e6924e4c40c2554435b4fbd37621f2cf1eccd0eddd16df5eef9ed9bda4006 EBUILD net-tools-2.10.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037 diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild index b6f687b457f3..bc8fbeabb0ba 100644 --- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild +++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Standard Linux networking tools" diff --git a/sys-apps/netloc/Manifest b/sys-apps/netloc/Manifest deleted file mode 100644 index 96d5ff4be1db..000000000000 --- a/sys-apps/netloc/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST netloc-0.5.tar.gz 474646 BLAKE2B 8d6524b6006e2a9b284092288e2bc97064703602362be469990ac396bc9a08840260db4d371748c65cfb97c294bae3284bfe8ac579f529d93125889d1afc6d17 SHA512 88600c59302cd8e5ed024373a57b27e54b288288091ed0ab3852bee59c255a8b520d38c59d64f6c1eafe307f0d5e61d64c799a92e9695c42ecc1e33dcc2df6ba -EBUILD netloc-0.5.ebuild 587 BLAKE2B 9a956165f649ea5ab675578cd7f7f1b6731ee982bc90e24205e46706aaba3bbbf9633b54d84204f3b6f4d03086d5e1ee1c547986f6369205fec435201bf4a204 SHA512 9f6ccee57b32878af7797e7a167d3fc316cfcc053bf6c7079d62634c4112c92a4d13f248aedda35e09ebf0898eb9414a2484033a74b0df9b88c3603edbed5eb6 -MISC metadata.xml 804 BLAKE2B 05c9a601184026f950fe8e830a1f7a146376f7900bba2501a0a6a5d06b55e5f749fb7f96f6a7904dd18b062bb0f87f93a5baaaac663b7f796484e9cdfba29d54 SHA512 137cc64ca02b01abb060c0a5b14b3d34d0c225ef1bf5af8eef5304df129a621aa8d8644ae2b324610d7405961f17f10fae6d15d50d3ddb6836ca71f1baacc5ad diff --git a/sys-apps/netloc/metadata.xml b/sys-apps/netloc/metadata.xml deleted file mode 100644 index 07151826f89f..000000000000 --- a/sys-apps/netloc/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - cluster@gentoo.org - Gentoo Cluster Project - - - The Portable Network Locality (netloc) software package provides network topology discovery tools, and an abstract representation of those networks topologies for a range of network types and configurations. It is provided as a companion to the Portable Hardware Locality (hwloc) package. These two software packages work together to provide a comprehensive view of the HPC system topology, spanning from the processor cores in one server to the cores in another – including the complex network(s) in between. - - diff --git a/sys-apps/netloc/netloc-0.5.ebuild b/sys-apps/netloc/netloc-0.5.ebuild deleted file mode 100644 index 1f68e7c5f381..000000000000 --- a/sys-apps/netloc/netloc-0.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib versionator - -MY_PV=v$(get_version_component_range 1-2) - -DESCRIPTION="Portable Network Locality (netloc)" -HOMEPAGE="https://www.open-mpi.org/projects/netloc/" -SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-libs/jansson - - - - - diff --git a/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild b/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild deleted file mode 100644 index 6f423204612f..000000000000 --- a/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user - -DESCRIPTION="NewRelic System Monitor" -HOMEPAGE="https://www.newrelic.com/" -SRC_URI="http://download.newrelic.com/server_monitor/archive/${PV}/${P}-linux.tar.gz" - -LICENSE="newrelic Apache-2.0 MIT ISC openssl GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="strip" - -S="${WORKDIR}/${P}-linux" - -pkg_setup() { - enewgroup newrelic - enewuser newrelic -1 -1 -1 newrelic -} - -src_install() { - if [[ "${ARCH}" == "amd64" ]]; then - NR_ARCH="x64" - elif [[ "${ARCH}" == "x86" ]]; then - NR_ARCH="x86" - else - die "Unsupported architecture (${ARCH})" - fi - - dosbin "scripts/nrsysmond-config" - newsbin "daemon/nrsysmond.${NR_ARCH}" "nrsysmond" - newinitd "${FILESDIR}/newrelic-sysmond.rc" "newrelic-sysmond" - - keepdir "/etc/newrelic" - insinto "/etc/newrelic" - doins nrsysmond.cfg - - keepdir "/var/run/newrelic" - fowners newrelic.newrelic "/var/run/newrelic" - fperms 0775 "/var/run/newrelic" - - keepdir "/var/log/newrelic" - fowners newrelic.newrelic "/var/log/newrelic" - fperms 0775 "/var/log/newrelic" - - dodoc INSTALL.txt LICENSE.txt -} - -pkg_postinst() { - elog "Remember to set your license key via:" - elog "$ nrsysmond-config --set license_key=\$YOUR_KEY" -} diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest index b70b5ae6507b..ed59c5aecd1f 100644 --- a/sys-apps/opal-utils/Manifest +++ b/sys-apps/opal-utils/Manifest @@ -2,5 +2,5 @@ AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b89 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459 DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3 -EBUILD opal-utils-6.7.ebuild 2473 BLAKE2B 00b5371a58fdaec4459131e2f762dd9aedcb0713e3de23c9c91c966acac4f6d77c9df6ee9a202247d39295568f44e71d10c7e1acb330e5e5e8cd273e1a67797a SHA512 a65eca0d4c84f7cab5f5541ca7948cebd337c67fae139c2b998ed5f3daa593e74d271ba0395604a4fe8786a04e35619267544755a39dedcd539815a0b6cde137 +EBUILD opal-utils-6.7.ebuild 2475 BLAKE2B de4715513ac5bf263634fd468ba762855ace15e63f678e6bc3b0a8faea353f12a76c1132fc85d29a33834fb1fbec4a2d6eada7299b3499fb82f6d7d4706f040d SHA512 9b22701b32998c75742714ecec9d6860463740ba4c0ff1252ac2b1b8c5b99f087304220302f2cc319c03d49ad459eb4ab3051547d852161e1e8df56b59f04aa1 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666 diff --git a/sys-apps/opal-utils/opal-utils-6.7.ebuild b/sys-apps/opal-utils/opal-utils-6.7.ebuild index 62ba3a2a07e6..fdaa7271922d 100644 --- a/sys-apps/opal-utils/opal-utils-6.7.ebuild +++ b/sys-apps/opal-utils/opal-utils-6.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit linux-info python-any-r1 systemd toolchain-funcs diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 9b799738f9d9..c84001d67def 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -2,6 +2,12 @@ AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646 -EBUILD openrc-0.42.1-r1.ebuild 5470 BLAKE2B c0ad9fffd6fa294a0dff8ab4a25a21e7b7a2a3fe0c9c839ef0d8a40515d644df2fc10dac8f0ef5e420f5c20a97e63c4c4864a6863cb27a82c4abcf9891046870 SHA512 4e099110647827915fad4619e3eaea04dfe61e71f47bf941518756bfc398a4828f874598682e1548b6fbdc8b16f4f74ee4911077552ab14843b5ae9b7c87a063 +DIST openrc-0.43.1.tar.gz 240008 BLAKE2B 0db27cca0a6e965c5333ee07a7f9f361dc7c32b82d413efa7ee472ecf253f82be03bb9006f7d9f2ff45af5b8de685b5700095175fde444bb8ba08b8d770f0500 SHA512 0c4590b6cc15872622824ac53d574d831f536ba983ab7171b227e22441651566d36cfd7e69b28223fa25aab9f3457fb889e6e3225069d08552d440df12e6af84 +DIST openrc-0.43.2.tar.gz 240267 BLAKE2B a279833861c2e060aa6a95997bf384407bce395589b3a29cc9ab30c3ec11584da8e16501dfaaebe72ba0342513efdca6fa402995c22ceeb78d5ddd9f1f0d2252 SHA512 ecf55ec003a597bb13f1726082f062f426d23ac98ac680a913486bf4fb340fa6a26678d3e9f5158874b9591266903c5627188aef734a7e946c5e22db3a1b70ce +DIST openrc-0.43.3.tar.gz 240431 BLAKE2B 4e7326e2cb87fbb9101b616f0ad5a955f38f387e9d940a0ae1d00a8b48e7733411b3f0a4bb70bfc6a63cb4769354d7836cb4accd695b73f601d9b6bab8b8a8ea SHA512 a6b0a3b7eba7624ed00cb33253cec71059b9af194f3828eb7417f9faba551ecdff7c1e1b5132772969a9c868ff60a92378b28e56e54edfe8e0f4e143aa43b8c5 +EBUILD openrc-0.42.1-r1.ebuild 5471 BLAKE2B a3749af382add50151e08b679ac8548f4a229784de8ca796c1c5d113ea190c42980e18ad8bd5598fee43a049538e4d806398aabe7bdfa27a79361529bfdd5445 SHA512 638ff01c5c1de288e462790dbc9c5801b326768051933a96a9338278b36208a39934be4e7b9605ca286e30baa9e83dab58075e50ee9de112ce4e117cc0767b97 +EBUILD openrc-0.43.1.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906 +EBUILD openrc-0.43.2.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906 +EBUILD openrc-0.43.3.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906 EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1 diff --git a/sys-apps/openrc/openrc-0.42.1-r1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild index 61b6aefded84..24ee8a894fc5 100644 --- a/sys-apps/openrc/openrc-0.42.1-r1.ebuild +++ b/sys-apps/openrc/openrc-0.42.1-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD-2" diff --git a/sys-apps/openrc/openrc-0.43.1.ebuild b/sys-apps/openrc/openrc-0.43.1.ebuild new file mode 100644 index 000000000000..f6eaa2172d22 --- /dev/null +++ b/sys-apps/openrc/openrc-0.43.1.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="https://github.com/openrc/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode" + +COMMON_DEPEND=" + ncurses? ( sys-libs/ncurses:0= ) + pam? ( + sys-auth/pambase + sys-libs/pam + ) + audit? ( sys-process/audit ) + sys-process/psmisc + !=sys-libs/libselinux-2.6 + ) + !