From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- sys-apps/Manifest.gz | Bin 48909 -> 49086 bytes sys-apps/accountsservice/Manifest | 6 +- .../accountsservice-0.6.50-r1.ebuild | 7 +- .../accountsservice/accountsservice-0.6.55.ebuild | 5 +- sys-apps/accountsservice/metadata.xml | 1 - sys-apps/acl/Manifest | 2 +- sys-apps/acl/acl-2.2.53-r1.ebuild | 2 +- sys-apps/apparmor-utils/Manifest | 2 + .../apparmor-utils/apparmor-utils-3.0.0-r1.ebuild | 88 ++++ sys-apps/apparmor/Manifest | 4 + sys-apps/apparmor/apparmor-3.0.0.ebuild | 72 +++ .../apparmor/files/apparmor-3.0.0-makefile.patch | 18 + sys-apps/apparmor/files/apparmor-init-1 | 88 ++++ sys-apps/attr/Manifest | 2 +- sys-apps/attr/attr-2.4.48-r4.ebuild | 2 +- sys-apps/baobab/Manifest | 2 - sys-apps/baobab/baobab-3.34.0.ebuild | 40 -- sys-apps/baselayout/Manifest | 1 + sys-apps/baselayout/baselayout-2.7-r1.ebuild | 317 ++++++++++++ sys-apps/bat/Manifest | 75 +++ sys-apps/bat/bat-0.17.1.ebuild | 200 ++++++++ sys-apps/bolt/Manifest | 3 +- sys-apps/bolt/bolt-0.9-r1.ebuild | 2 +- sys-apps/bolt/bolt-0.9-r2.ebuild | 57 +++ sys-apps/busybox/Manifest | 6 +- sys-apps/busybox/busybox-1.31.1-r2.ebuild | 338 ------------- sys-apps/busybox/busybox-1.31.1-r3.ebuild | 338 +++++++++++++ sys-apps/busybox/busybox-1.32.0-r1.ebuild | 337 +++++++++++++ sys-apps/busybox/busybox-1.32.0.ebuild | 337 ------------- sys-apps/busybox/busybox-9999.ebuild | 6 +- sys-apps/cpint/Manifest | 2 +- sys-apps/cpint/cpint-2.5.3.ebuild | 17 +- sys-apps/cpuid/Manifest | 4 +- sys-apps/cpuid/cpuid-20200427.ebuild | 33 -- sys-apps/cpuid/cpuid-20201006.ebuild | 33 ++ sys-apps/dbus-broker/Manifest | 4 +- sys-apps/dbus-broker/dbus-broker-24.ebuild | 2 +- sys-apps/dbus-broker/dbus-broker-9999.ebuild | 2 +- sys-apps/dbus/Manifest | 4 +- sys-apps/dbus/dbus-1.12.16.ebuild | 272 ----------- sys-apps/dbus/dbus-1.12.20.ebuild | 2 +- sys-apps/dmidecode/Manifest | 4 +- sys-apps/dmidecode/dmidecode-3.1.ebuild | 42 -- sys-apps/dmidecode/dmidecode-3.3.ebuild | 43 ++ sys-apps/dtc/Manifest | 2 +- sys-apps/dtc/dtc-1.6.0.ebuild | 2 +- sys-apps/etckeeper/Manifest | 2 + sys-apps/etckeeper/etckeeper-1.18.15.ebuild | 78 +++ sys-apps/ethtool/Manifest | 6 +- sys-apps/ethtool/ethtool-5.6-r1.ebuild | 20 - sys-apps/ethtool/ethtool-5.7.ebuild | 20 - sys-apps/ethtool/ethtool-5.9.ebuild | 20 + sys-apps/fakeroot/Manifest | 4 + sys-apps/fakeroot/fakeroot-1.25.2.ebuild | 51 ++ sys-apps/fakeroot/fakeroot-1.25.3.ebuild | 51 ++ sys-apps/firejail-lts/Manifest | 2 +- sys-apps/firejail-lts/metadata.xml | 8 +- sys-apps/firejail/Manifest | 10 +- sys-apps/firejail/firejail-0.9.62-r1.ebuild | 80 ---- sys-apps/firejail/firejail-0.9.62.ebuild | 76 --- sys-apps/firejail/firejail-0.9.64-r1.ebuild | 98 ++++ sys-apps/firejail/firejail-0.9.64.ebuild | 88 ++++ sys-apps/firejail/firejail-9999.ebuild | 65 ++- sys-apps/firejail/metadata.xml | 12 +- sys-apps/flashrom/Manifest | 5 +- .../flashrom/files/flashrom-1.2_meson-fixes.patch | 289 +++++++++++ .../files/flashrom-1.2_meson-install-manpage.patch | 43 ++ sys-apps/flashrom/flashrom-1.2-r2.ebuild | 2 +- sys-apps/flashrom/flashrom-1.2-r3.ebuild | 148 ++++++ sys-apps/flatpak/Manifest | 3 + sys-apps/flatpak/flatpak-1.8.2.ebuild | 101 ++++ sys-apps/flatpak/metadata.xml | 11 + sys-apps/fwupd/Manifest | 14 +- sys-apps/fwupd/fwupd-1.3.10.ebuild | 9 +- sys-apps/fwupd/fwupd-1.3.11.ebuild | 9 +- sys-apps/fwupd/fwupd-1.4.5.ebuild | 165 ------- sys-apps/fwupd/fwupd-1.4.6.ebuild | 11 +- sys-apps/fwupd/fwupd-1.5.1-r1.ebuild | 160 +++++++ sys-apps/fwupd/fwupd-1.5.2.ebuild | 160 +++++++ sys-apps/fwupd/metadata.xml | 2 +- sys-apps/gentoo-functions/Manifest | 2 + .../gentoo-functions/gentoo-functions-0.14.ebuild | 28 ++ sys-apps/gentoo-systemd-integration/Manifest | 2 +- .../gentoo-systemd-integration-8.ebuild | 2 +- sys-apps/gnome-disk-utility/Manifest | 4 - .../gnome-disk-utility-3.34.5.ebuild | 62 --- .../gnome-disk-utility-3.36.1.ebuild | 62 --- sys-apps/grep/Manifest | 8 +- sys-apps/grep/grep-3.3-r1.ebuild | 50 -- sys-apps/grep/grep-3.4.ebuild | 4 +- sys-apps/grep/grep-3.5.ebuild | 4 +- sys-apps/grep/grep-3.6.ebuild | 53 ++ sys-apps/hdparm/Manifest | 5 +- sys-apps/hdparm/files/hdparm-9.60-build.patch | 32 ++ sys-apps/hdparm/hdparm-9.56.ebuild | 43 -- sys-apps/hdparm/hdparm-9.60.ebuild | 43 ++ sys-apps/hw-probe/Manifest | 4 +- sys-apps/hw-probe/hw-probe-1.5-r1.ebuild | 64 --- sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild | 2 +- sys-apps/hwdata-gentoo/Manifest | 2 +- sys-apps/hwdata-gentoo/metadata.xml | 4 +- sys-apps/hwloc/Manifest | 2 + sys-apps/hwloc/hwloc-2.3.0.ebuild | 98 ++++ sys-apps/hwsetup/Manifest | 2 +- sys-apps/hwsetup/metadata.xml | 4 +- sys-apps/i2c-tools/Manifest | 2 + sys-apps/i2c-tools/i2c-tools-4.2.ebuild | 74 +++ sys-apps/ibm-powerpc-utils/Manifest | 8 +- .../ibm-powerpc-utils-1.3.6.ebuild | 37 -- .../ibm-powerpc-utils-1.3.7.ebuild | 37 -- .../ibm-powerpc-utils-1.3.8-r1.ebuild | 36 ++ .../ibm-powerpc-utils-1.3.8.ebuild | 36 -- .../ibm-powerpc-utils-99999.ebuild | 2 +- sys-apps/ipmicfg/Manifest | 4 +- sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild | 47 -- sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild | 41 ++ sys-apps/ipmitool/Manifest | 15 +- .../files/exchange-bmc-os-info-1.8.18.initd | 23 + sys-apps/ipmitool/files/ipmievd.service | 10 + .../ipmitool/files/ipmitool-1.8.18-ipmievd.confd | 27 ++ .../ipmitool/files/ipmitool-1.8.18-ipmievd.initd | 28 ++ sys-apps/ipmitool/files/log_bmc-1.8.18.initd | 25 + sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild | 96 ++++ .../ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild | 145 ++++++ .../ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild | 201 ++++++++ .../ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild | 203 ++++++++ sys-apps/ipmitool/metadata.xml | 1 + sys-apps/iproute2/Manifest | 2 + sys-apps/iproute2/iproute2-5.9.0.ebuild | 167 +++++++ sys-apps/isapnptools/Manifest | 3 +- .../files/isapnptools-1.27-fno-common.patch | 22 + sys-apps/isapnptools/isapnptools-1.27.ebuild | 12 +- sys-apps/kmod/Manifest | 4 +- sys-apps/kmod/kmod-27-r2.ebuild | 2 +- sys-apps/kmod/kmod-9999.ebuild | 2 +- sys-apps/lcdtest/Manifest | 4 - sys-apps/lcdtest/files/1.18-build-system.patch | 62 --- sys-apps/lcdtest/lcdtest-1.18.ebuild | 60 --- sys-apps/lcdtest/metadata.xml | 11 - sys-apps/less/Manifest | 8 +- sys-apps/less/files/lesspipe-r1.sh | 287 +++++++++++ sys-apps/less/files/lesspipe.sh | 284 ----------- sys-apps/less/less-551.ebuild | 44 -- sys-apps/less/less-562.ebuild | 44 -- sys-apps/less/less-563-r1.ebuild | 44 ++ sys-apps/less/less-563.ebuild | 44 -- sys-apps/lm-sensors/Manifest | 2 +- sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild | 2 +- sys-apps/man-pages-posix/Manifest | 2 + .../man-pages-posix/man-pages-posix-2017a.ebuild | 28 ++ sys-apps/man-pages/Manifest | 4 +- sys-apps/man-pages/man-pages-5.08.ebuild | 2 +- sys-apps/man-pages/man-pages-5.09.ebuild | 52 ++ sys-apps/memtester/Manifest | 2 + sys-apps/memtester/memtester-4.5.0.ebuild | 27 ++ sys-apps/moreutils/Manifest | 2 +- sys-apps/moreutils/moreutils-0.64.ebuild | 2 +- sys-apps/netkit-base/Manifest | 2 +- sys-apps/netkit-base/netkit-base-0.17-r9.ebuild | 18 +- sys-apps/opal-utils/Manifest | 8 +- sys-apps/opal-utils/opal-utils-6.5.2.ebuild | 11 + sys-apps/opal-utils/opal-utils-6.6.2.ebuild | 11 + sys-apps/opal-utils/opal-utils-6.6.3.ebuild | 92 ---- sys-apps/opal-utils/opal-utils-6.7.ebuild | 94 ++++ sys-apps/opentmpfiles/Manifest | 4 +- sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild | 54 +++ sys-apps/opentmpfiles/opentmpfiles-9999.ebuild | 2 +- sys-apps/osinfo-db-tools/Manifest | 2 - .../osinfo-db-tools-1.6.0-r1.ebuild | 53 -- sys-apps/osinfo-db/Manifest | 4 +- sys-apps/osinfo-db/osinfo-db-20200325.ebuild | 27 -- sys-apps/osinfo-db/osinfo-db-20201015.ebuild | 25 + sys-apps/pkgcore/Manifest | 5 +- .../files/pkgcore-0.10.13-metadata-xsd.patch | 24 + sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild | 51 ++ sys-apps/pkgcore/pkgcore-0.10.13.ebuild | 47 -- sys-apps/pkgcore/pkgcore-9999.ebuild | 2 +- sys-apps/pmount/Manifest | 2 +- sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild | 2 +- sys-apps/policycoreutils/Manifest | 4 +- .../policycoreutils/policycoreutils-3.1.ebuild | 5 +- .../policycoreutils/policycoreutils-9999.ebuild | 5 +- sys-apps/portage/Manifest | 6 +- sys-apps/portage/portage-3.0.10-r1.ebuild | 272 +++++++++++ sys-apps/portage/portage-3.0.8.ebuild | 2 +- sys-apps/portage/portage-3.0.9.ebuild | 267 +++++++++++ sys-apps/powerpc-utils/Manifest | 2 +- .../powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild | 53 -- .../powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild | 54 +++ sys-apps/pv/Manifest | 4 +- sys-apps/pv/metadata.xml | 18 +- sys-apps/pv/pv-1.6.6.ebuild | 4 +- sys-apps/qingy/Manifest | 5 +- sys-apps/qingy/metadata.xml | 1 - sys-apps/qingy/qingy-1.0.0-r4.ebuild | 13 +- sys-apps/rng-tools/Manifest | 3 +- sys-apps/rng-tools/rng-tools-6.10-r1.ebuild | 85 ++++ sys-apps/rng-tools/rng-tools-6.10.ebuild | 2 +- sys-apps/s6-linux-init/Manifest | 2 + .../s6-linux-init/s6-linux-init-1.0.4.2.ebuild | 66 +++ sys-apps/s6-linux-utils/Manifest | 2 + .../s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild | 40 ++ sys-apps/s6-portable-utils/Manifest | 2 + .../s6-portable-utils-2.2.3.0.ebuild | 40 ++ sys-apps/s6-rc/Manifest | 2 + sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild | 53 ++ sys-apps/s6/Manifest | 4 +- sys-apps/s6/metadata.xml | 3 + sys-apps/s6/s6-2.9.2.0.ebuild | 46 ++ sys-apps/sandbox/Manifest | 12 +- sys-apps/sandbox/sandbox-2.12.ebuild | 76 --- sys-apps/sandbox/sandbox-2.13.ebuild | 76 --- sys-apps/sandbox/sandbox-2.14.ebuild | 76 --- sys-apps/sandbox/sandbox-2.15.ebuild | 76 --- sys-apps/sandbox/sandbox-2.17.ebuild | 72 --- sys-apps/sandbox/sandbox-2.20.ebuild | 2 +- sys-apps/selinux-python/Manifest | 3 +- .../selinux-python/selinux-python-3.1-r1.ebuild | 95 ++++ sys-apps/selinux-python/selinux-python-9999.ebuild | 1 + sys-apps/servicelog/Manifest | 2 + sys-apps/servicelog/servicelog-1.1.15.ebuild | 28 ++ sys-apps/smartmontools/Manifest | 2 +- sys-apps/smartmontools/smartmontools-7.1.ebuild | 2 +- sys-apps/smc-sum/Manifest | 4 +- sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild | 39 -- sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild | 39 ++ sys-apps/smcipmitool/Manifest | 5 +- .../smcipmitool/smcipmitool-2.21.0.181029.ebuild | 85 ---- .../smcipmitool/smcipmitool-2.23.0.191216.ebuild | 10 +- sys-apps/systemd-tmpfiles/Manifest | 7 + .../systemd-tmpfiles/files/stmpfiles-dev.initd | 20 + .../systemd-tmpfiles/files/stmpfiles-setup.initd | 19 + sys-apps/systemd-tmpfiles/files/stmpfiles.confd | 2 + sys-apps/systemd-tmpfiles/metadata.xml | 8 + .../systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 209 ++++++++ sys-apps/systemd/Manifest | 15 +- .../gentoo-Dont-enable-audit-by-default.patch | 30 -- .../systemd/files/gentoo-generator-path-r1.patch | 27 -- sys-apps/systemd/files/gentoo-pam.patch | 33 ++ .../gentoo-systemctl-disable-sysv-sync-r1.patch | 25 + .../systemd/files/gentoo-systemd-user-pam.patch | 16 - sys-apps/systemd/systemd-245.7-r1.ebuild | 527 -------------------- sys-apps/systemd/systemd-246-r1.ebuild | 527 -------------------- sys-apps/systemd/systemd-246-r2.ebuild | 530 ++++++++++++++++++++ sys-apps/systemd/systemd-246.6.ebuild | 531 +++++++++++++++++++++ sys-apps/systemd/systemd-247_rc2.ebuild | 531 +++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 12 +- sys-apps/sysvinit/Manifest | 7 +- sys-apps/sysvinit/files/inittab-2.98 | 62 +++ sys-apps/sysvinit/sysvinit-2.96.ebuild | 2 +- sys-apps/sysvinit/sysvinit-2.97.ebuild | 4 +- sys-apps/sysvinit/sysvinit-2.98.ebuild | 144 ++++++ sys-apps/tas/Manifest | 2 +- sys-apps/tas/tas-1.6.0.200601.ebuild | 10 +- 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 | 2 +- sys-apps/unscd/Manifest | 6 +- sys-apps/unscd/metadata.xml | 7 + sys-apps/unscd/unscd-0.53.ebuild | 36 -- sys-apps/unscd/unscd-0.54-r1.ebuild | 36 ++ sys-apps/usbutils/Manifest | 2 + sys-apps/usbutils/usbutils-013.ebuild | 52 ++ sys-apps/util-linux/Manifest | 11 +- .../util-linux-2.35.1-hwclock-glibc-2.31.patch | 165 ------- ...til-linux-2.35.1-include_sys_types-header.patch | 58 --- ...-linux-2.36.1-libmount_dont_use_symfollow.patch | 40 ++ sys-apps/util-linux/util-linux-2.35.1-r2.ebuild | 317 ------------ sys-apps/util-linux/util-linux-2.36.1-r1.ebuild | 315 ++++++++++++ sys-apps/util-linux/util-linux-2.36.ebuild | 2 +- sys-apps/util-linux/util-linux-9999.ebuild | 3 +- sys-apps/x86info/Manifest | 2 +- sys-apps/x86info/x86info-1.30_p20190617.ebuild | 2 +- sys-apps/xdg-dbus-proxy/Manifest | 2 +- .../xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild | 2 +- sys-apps/xdg-desktop-portal-gtk/Manifest | 4 +- .../xdg-desktop-portal-gtk-1.7.1_pre.ebuild | 47 -- .../xdg-desktop-portal-gtk-1.8.0.ebuild | 47 ++ sys-apps/xdg-desktop-portal/Manifest | 4 +- .../xdg-desktop-portal-1.7.2.ebuild | 43 -- .../xdg-desktop-portal-1.8.0.ebuild | 2 +- sys-apps/yarn/Manifest | 2 + sys-apps/yarn/yarn-1.22.10.ebuild | 40 ++ 284 files changed, 9141 insertions(+), 5288 deletions(-) create mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild create mode 100644 sys-apps/apparmor/apparmor-3.0.0.ebuild create mode 100644 sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch create mode 100644 sys-apps/apparmor/files/apparmor-init-1 delete mode 100644 sys-apps/baobab/baobab-3.34.0.ebuild create mode 100644 sys-apps/baselayout/baselayout-2.7-r1.ebuild create mode 100644 sys-apps/bat/bat-0.17.1.ebuild create mode 100644 sys-apps/bolt/bolt-0.9-r2.ebuild delete mode 100644 sys-apps/busybox/busybox-1.31.1-r2.ebuild create mode 100644 sys-apps/busybox/busybox-1.31.1-r3.ebuild create mode 100644 sys-apps/busybox/busybox-1.32.0-r1.ebuild delete mode 100644 sys-apps/busybox/busybox-1.32.0.ebuild delete mode 100644 sys-apps/cpuid/cpuid-20200427.ebuild create mode 100644 sys-apps/cpuid/cpuid-20201006.ebuild delete mode 100644 sys-apps/dbus/dbus-1.12.16.ebuild delete mode 100644 sys-apps/dmidecode/dmidecode-3.1.ebuild create mode 100644 sys-apps/dmidecode/dmidecode-3.3.ebuild create mode 100644 sys-apps/etckeeper/etckeeper-1.18.15.ebuild delete mode 100644 sys-apps/ethtool/ethtool-5.6-r1.ebuild delete mode 100644 sys-apps/ethtool/ethtool-5.7.ebuild create mode 100644 sys-apps/ethtool/ethtool-5.9.ebuild create mode 100644 sys-apps/fakeroot/fakeroot-1.25.2.ebuild create mode 100644 sys-apps/fakeroot/fakeroot-1.25.3.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.62-r1.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.62.ebuild create mode 100644 sys-apps/firejail/firejail-0.9.64-r1.ebuild create mode 100644 sys-apps/firejail/firejail-0.9.64.ebuild create mode 100644 sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch create mode 100644 sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch create mode 100644 sys-apps/flashrom/flashrom-1.2-r3.ebuild create mode 100644 sys-apps/flatpak/Manifest create mode 100644 sys-apps/flatpak/flatpak-1.8.2.ebuild create mode 100644 sys-apps/flatpak/metadata.xml delete mode 100644 sys-apps/fwupd/fwupd-1.4.5.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.5.1-r1.ebuild create mode 100644 sys-apps/fwupd/fwupd-1.5.2.ebuild create mode 100644 sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.ebuild delete mode 100644 sys-apps/grep/grep-3.3-r1.ebuild create mode 100644 sys-apps/grep/grep-3.6.ebuild create mode 100644 sys-apps/hdparm/files/hdparm-9.60-build.patch delete mode 100644 sys-apps/hdparm/hdparm-9.56.ebuild create mode 100644 sys-apps/hdparm/hdparm-9.60.ebuild delete mode 100644 sys-apps/hw-probe/hw-probe-1.5-r1.ebuild create mode 100644 sys-apps/hwloc/hwloc-2.3.0.ebuild create mode 100644 sys-apps/i2c-tools/i2c-tools-4.2.ebuild delete mode 100644 sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild delete mode 100644 sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild create mode 100644 sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild delete mode 100644 sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild delete mode 100644 sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild create mode 100644 sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild create mode 100644 sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd create mode 100644 sys-apps/ipmitool/files/ipmievd.service create mode 100644 sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd create mode 100644 sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd create mode 100644 sys-apps/ipmitool/files/log_bmc-1.8.18.initd create mode 100644 sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild create mode 100644 sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild create mode 100644 sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild create mode 100644 sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild create mode 100644 sys-apps/iproute2/iproute2-5.9.0.ebuild create mode 100644 sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch delete mode 100644 sys-apps/lcdtest/Manifest delete mode 100644 sys-apps/lcdtest/files/1.18-build-system.patch delete mode 100644 sys-apps/lcdtest/lcdtest-1.18.ebuild delete mode 100644 sys-apps/lcdtest/metadata.xml create mode 100644 sys-apps/less/files/lesspipe-r1.sh delete mode 100644 sys-apps/less/files/lesspipe.sh delete mode 100644 sys-apps/less/less-551.ebuild delete mode 100644 sys-apps/less/less-562.ebuild create mode 100644 sys-apps/less/less-563-r1.ebuild delete mode 100644 sys-apps/less/less-563.ebuild create mode 100644 sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild create mode 100644 sys-apps/man-pages/man-pages-5.09.ebuild create mode 100644 sys-apps/memtester/memtester-4.5.0.ebuild delete mode 100644 sys-apps/opal-utils/opal-utils-6.6.3.ebuild create mode 100644 sys-apps/opal-utils/opal-utils-6.7.ebuild create mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild delete mode 100644 sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild delete mode 100644 sys-apps/osinfo-db/osinfo-db-20200325.ebuild create mode 100644 sys-apps/osinfo-db/osinfo-db-20201015.ebuild create mode 100644 sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch create mode 100644 sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild delete mode 100644 sys-apps/pkgcore/pkgcore-0.10.13.ebuild create mode 100644 sys-apps/portage/portage-3.0.10-r1.ebuild create mode 100644 sys-apps/portage/portage-3.0.9.ebuild delete mode 100644 sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild create mode 100644 sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild create mode 100644 sys-apps/rng-tools/rng-tools-6.10-r1.ebuild create mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild create mode 100644 sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild create mode 100644 sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild create mode 100644 sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild create mode 100644 sys-apps/s6/s6-2.9.2.0.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.12.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.13.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.14.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.15.ebuild delete mode 100644 sys-apps/sandbox/sandbox-2.17.ebuild create mode 100644 sys-apps/selinux-python/selinux-python-3.1-r1.ebuild create mode 100644 sys-apps/servicelog/servicelog-1.1.15.ebuild delete mode 100644 sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild create mode 100644 sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild delete mode 100644 sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild create mode 100644 sys-apps/systemd-tmpfiles/Manifest create mode 100644 sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd create mode 100644 sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd create mode 100644 sys-apps/systemd-tmpfiles/files/stmpfiles.confd create mode 100644 sys-apps/systemd-tmpfiles/metadata.xml create mode 100644 sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild delete mode 100644 sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch delete mode 100644 sys-apps/systemd/files/gentoo-generator-path-r1.patch create mode 100644 sys-apps/systemd/files/gentoo-pam.patch create mode 100644 sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch delete mode 100644 sys-apps/systemd/files/gentoo-systemd-user-pam.patch delete mode 100644 sys-apps/systemd/systemd-245.7-r1.ebuild delete mode 100644 sys-apps/systemd/systemd-246-r1.ebuild create mode 100644 sys-apps/systemd/systemd-246-r2.ebuild create mode 100644 sys-apps/systemd/systemd-246.6.ebuild create mode 100644 sys-apps/systemd/systemd-247_rc2.ebuild create mode 100644 sys-apps/sysvinit/files/inittab-2.98 create mode 100644 sys-apps/sysvinit/sysvinit-2.98.ebuild delete mode 100644 sys-apps/unscd/unscd-0.53.ebuild create mode 100644 sys-apps/unscd/unscd-0.54-r1.ebuild create mode 100644 sys-apps/usbutils/usbutils-013.ebuild delete mode 100644 sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch delete mode 100644 sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch create mode 100644 sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch delete mode 100644 sys-apps/util-linux/util-linux-2.35.1-r2.ebuild create mode 100644 sys-apps/util-linux/util-linux-2.36.1-r1.ebuild delete mode 100644 sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild create mode 100644 sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild delete mode 100644 sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild create mode 100644 sys-apps/yarn/yarn-1.22.10.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 4c513fcc75a1..9c07b9ccce44 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest index 7c316ff15b9a..0c9f35910f77 100644 --- a/sys-apps/accountsservice/Manifest +++ b/sys-apps/accountsservice/Manifest @@ -2,6 +2,6 @@ AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581 AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740424844d62e0e559ad458651965e3ae00853ab4e226dfb0f035daeada6adaa568ac9d9eee517413770d73501d8d712a9f51385f653c3 SHA512 303c933389be6c19e01e43eb074a5e5f72f80cf3f4ef88d8ba52d07c3b6500b6d81a0a209d4abf15a46c617f57486654a74e9f17ba8b39aa438495ccbfa19186 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d -EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf -EBUILD accountsservice-0.6.55.ebuild 1770 BLAKE2B 11ebc342660ae9dd53a6578145d7603e2157368a219028ff2f77cff3fb08cdcf3ec8c47e9cba4ff600bd1e93695e75456bd0acaabfd1f7f23d439bfbf74da37c SHA512 25295434bc749323379277087aa16ef73c96d1f05db3c99f19365ec278b241aed1868551ad3d4b8253d93e5a848a51bf36dc35913ab3e7839887e5c64f52c9ef -MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a +EBUILD accountsservice-0.6.50-r1.ebuild 1555 BLAKE2B 1e15144179c307d9bf5c416d61530b7ac52fba53dcb0382d791aff4b2c9f3771aef62fb24bb62cca41563ffa8480c6b6e6e91faf50c4075ea79f0a9377ee8272 SHA512 fe72073aa66755b56fd167310f1b47da4d8381b6db2ee7f5deeec26915dc82ded0707d6018c32eba2604f1816794c742318b3104ecce59698342dc1aeba6a379 +EBUILD accountsservice-0.6.55.ebuild 1711 BLAKE2B f71ce4a94c6484d8ca291bd398abf55fc28de44f023b0bd5a760e09112f8810abc4a86db2cb12975b19eba3f8677930ce38dea5804691d75aefb1fec76512320 SHA512 d60b8af40b98993ef58c589d64a9af8474ebd637640f30d9084b0b9343c81bbd2d0e506e80d540daea2d4c150b5f52373b5ace7d15cb7031fba5c91bbe40f5db +MISC metadata.xml 434 BLAKE2B 46541f7aaa7da92604569da647a34de043cb792782e618369705b62ddb1054ad6f4a68259e729cff9a56eaa983ec564bdfda88bbc1e0ff8a5e0105111b56cc16 SHA512 7c299dbf564c82b4f10e665bd5d7238e7869fd2e499e9824a27594ece220419bff6c167a47f5d1ed0955707f7d0f6309301220e43939a6fcdcff3cc3d17181a9 diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild index 231fdc7776b3..11a90ec3611e 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,13 +14,12 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" -IUSE="doc consolekit elogind +introspection selinux systemd" -REQUIRED_USE="^^ ( consolekit elogind systemd )" +IUSE="doc elogind +introspection selinux systemd" +REQUIRED_USE="^^ ( elogind systemd )" CDEPEND=" >=dev-libs/glib-2.44:2 sys-auth/polkit - consolekit? ( sys-auth/consolekit ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild index d9188e5e3060..6ffab7fa4eda 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild @@ -13,13 +13,12 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" -IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd" -REQUIRED_USE="^^ ( consolekit elogind systemd )" +IUSE="doc elogind gtk-doc +introspection selinux systemd" +REQUIRED_USE="^^ ( elogind systemd )" CDEPEND=" >=dev-libs/glib-2.44:2 sys-auth/polkit - consolekit? ( sys-auth/consolekit ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml index 35e1d4b2c2bd..e52d976d85ab 100644 --- a/sys-apps/accountsservice/metadata.xml +++ b/sys-apps/accountsservice/metadata.xml @@ -6,7 +6,6 @@ Gentoo GNOME Desktop - Use sys-auth/consolekit for session tracking Use sys-auth/elogind for session tracking Use sys-apps/systemd for session tracking diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest index 27b07726eec9..add13f344a9d 100644 --- a/sys-apps/acl/Manifest +++ b/sys-apps/acl/Manifest @@ -1,4 +1,4 @@ DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716 -EBUILD acl-2.2.53-r1.ebuild 1246 BLAKE2B dd11d386218cf76cf495c596892517461f07e0c70c6596fa8570e9d5fbc628fa02e48c0691d580957d318265bc5ce39e0b5d32d5433583d1f21844e44fdebda6 SHA512 817d35922503285465a2848cf544c5dd5e7d2c81c6b0c0b091e1b8d2c546143761a3dab25361e8d458db434763f776fb96248e8f304eac80d5530860dd4842fc +EBUILD acl-2.2.53-r1.ebuild 1237 BLAKE2B 39f5f0317821aa2e09fb82a6f4e73a873ca325d26739dc12a588c118462a9c39e71c3e4d1ff62c835ab7fa30f770583de26ca688543b3db66f3feb1b2d8bc98d SHA512 ad373842f2ad07fa2ef5c180f483e99fc1594e28855316e2c3bf7f3ea5632fb40a8a880ec2cf60bb59080aa8451b00cf2d9292d1036b89cad55e82324641fc0e EBUILD acl-2.2.53.ebuild 1230 BLAKE2B 48c9e7a881e0d12f57c44a6ba93d4082d48152aa613c732102f5bf4cea4c88e6ee4c7ab1d1dfed8e60e233c66b8b3777fdc4dfb8a107e79d0c1a0053377ea1fb SHA512 b5d5a459509e116a3decc93ae6d49abf12f7b74b9f23176db8eeefb4a244cbb266ff6470c8af6cc65af2e553a49d25556fd027667f2c449ff5fc4f62fc647c17 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 4965f72787ce..261639dbb408 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/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index 925ba4575c07..9b7893431933 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,3 +1,5 @@ DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 +DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 EBUILD apparmor-utils-2.13.4-r1.ebuild 2231 BLAKE2B e8ae0a0c14c50d533d960931ad070c2b77c8eee6262dfd97139abfdc378983532b5108ec724745b6d932e1807bd2ac95b599af7f189e927c3eebc11f6906bd77 SHA512 c1b24fd63aa32e3719301c8412c2abd11bcb7bad5da72b93b663d517498bcdd5fa0e2e70864a0735cf0f40c395da003f44bd29ad70d474458d7431f509d87df0 +EBUILD apparmor-utils-3.0.0-r1.ebuild 2270 BLAKE2B 754fcc4a9c6678754464d9a6db5d6ff506ca3cdabdfd02aec93aff745b6a8b1288c5237bc42eaee73fb526a1af471438bfd27fc3eca68359bd075f9875627779 SHA512 7dc19b60215e83caf6a833c88e11802ea86837c74e4a8390acd9309a64d77a4efc3f9b24d381cef342b6f9f8c8cee33cca17d7fb4b41c90acfb30099106a1316 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild new file mode 100644 index 000000000000..5dceaae3b4d8 --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{3_6,3_7} ) +inherit eapi7-ver perl-module python-r1 toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-lang/perl + ~sys-libs/libapparmor-${PV} + ${PYTHON_DEPS}" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] + ~sys-apps/apparmor-${PV} + dev-perl/Locale-gettext + dev-perl/RPC-XML + dev-perl/TermReadKey + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long" + +S=${WORKDIR}/apparmor-${PV} + +src_prepare() { + default + + sed -i binutils/Makefile \ + -e 's/Bstatic/Bdynamic/g' || die + + sed -i utils/aa-remove-unknown \ + -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die +} + +src_compile() { + python_setup + + pushd utils > /dev/null || die + # launches non-make subprocesses causing "make jobserver unavailable" + # error messages to appear in generated code + emake -j1 + popd > /dev/null || die + + pushd binutils > /dev/null || die + export EXTRA_CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" USE_SYSTEM=1 + popd > /dev/null || die +} + +src_install() { + pushd utils > /dev/null || die + perl_set_version + emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \ + VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install + + install_python() { + local -x PYTHONDONTWRITEBYTECODE= + "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ + --root="${D}" --optimize 2 + } + + python_foreach_impl install_python + python_replicate_script "${D}"/usr/bin/aa-easyprof \ + "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined} + popd > /dev/null || die + + pushd binutils > /dev/null || die + emake install DESTDIR="${D}" USE_SYSTEM=1 + popd > /dev/null || die +} diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index a32c7541f927..7f51aaa55470 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1,9 +1,13 @@ AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c AUX apparmor-2.13.1-makefile.patch 884 BLAKE2B 4400b00ab143c0ea3b1c14f996131fd023b66c01e694dcd9306d6e00f561f72a608df7a26e3692a8e851b0c91a227eb84d96fb5145b19535ee50ac61c37ec811 SHA512 c324d1dc2101e073df2bc6c3696396becb45e5c25e4c1d6797145554e0499c79353d3a2ad2cced18f42bb1cc315f8590ea2c1b7ee9a3882d5c483380f7c86c6d +AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548 AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148 +AUX apparmor-init-1 1238 BLAKE2B d41ff2534219e60b1495e53aea251d292d87cadd43a53c3d51ec8b49b5428b0ef183073469b2ae3817c306ae377779c98f250bca09d2c93e640350e78528b532 SHA512 0d8bae7b6f77335a34e2371b08f3fb2a7fb7b4684419a1e269a3b5ea37f71a9d173f4bd56abd37d34a45d1faa879663c828b66ebdcbeb202efd33b652ccb4d08 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 +DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 EBUILD apparmor-2.13.4.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919 +EBUILD apparmor-3.0.0.ebuild 1631 BLAKE2B 554f5fbdcdcde96debac49f3ecd615346c17f3f916f24b21ddec5970978d21e08450084cfd80135f273b153fe61596b96c55fd31b5eeef7f2b288c605d63c221 SHA512 4bd655a6fd9f99cfb1b53cba3a8441bccb864ff826f4e27c0bc91a84e7e35e3bd76a97b00f45c87aabf9d196be26b516a02d24f9ea22cccce43eb9ac77623451 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild b/sys-apps/apparmor/apparmor-3.0.0.ebuild new file mode 100644 index 000000000000..36c5b717c4b8 --- /dev/null +++ b/sys-apps/apparmor/apparmor-3.0.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${PN}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +RESTRICT="test" # bug 675854 + +RDEPEND="~sys-libs/libapparmor-${PV}" +DEPEND="${RDEPEND} + dev-lang/perl + sys-devel/bison + sys-devel/gettext + sys-devel/flex + doc? ( dev-tex/latex2html ) +" + +S=${WORKDIR}/apparmor-${PV}/parser + +PATCHES=( + "${FILESDIR}/${PN}-3.0.0-makefile.patch" + "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" +) + +src_prepare() { + default + + # remove warning about missing file that controls features + # we don't currently support + sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die + + # bug 634782 + sed -e "s/cpp/$(tc-getCPP) -/" \ + -i ../common/list_capabilities.sh \ + -i ../common/list_af_names.sh || die +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages + use doc && emake pdf +} + +src_test() { + emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check +} + +src_install() { + emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install + + dodir /etc/apparmor.d/disable + + newinitd "${FILESDIR}/${PN}-init-1" ${PN} + systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service + + use doc && dodoc techdoc.pdf + + exeinto /usr/share/apparmor + doexe "${FILESDIR}/apparmor_load.sh" + doexe "${FILESDIR}/apparmor_unload.sh" +} diff --git a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch new file mode 100644 index 000000000000..9c03a4465c36 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch @@ -0,0 +1,18 @@ +* Avoid installing empty /var/lib/apparmor +* Install rc.apparmor.functions to Gentoo-appropriate location + +--- a/Makefile ++++ b/Makefile +@@ -407,10 +407,10 @@ + .PHONY: install-indep + install-indep: indep + install -m 755 -d $(INSTALL_CONFDIR) ++ install -m 755 -d ${DESTDIR}/usr/libexec + install -m 644 parser.conf $(INSTALL_CONFDIR) +- install -m 755 -d ${DESTDIR}/var/lib/apparmor + install -m 755 -d $(APPARMOR_BIN_PREFIX) +- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX) ++ install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec + $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} + $(MAKE) install_manpages DESTDIR=${DESTDIR} + diff --git a/sys-apps/apparmor/files/apparmor-init-1 b/sys-apps/apparmor/files/apparmor-init-1 new file mode 100644 index 000000000000..4addaee294b3 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-init-1 @@ -0,0 +1,88 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Load all configured profiles for the AppArmor security module." +description_reload="Reload all profiles" + +extra_started_commands="reload" + +aa_action() { + local arg=$1 + local return + + shift + $* + return=$? + + if [ ${return} -eq 0 ]; then + aa_log_success_msg $arg + else + aa_log_failure_msg arg + fi + + return $return +} + +aa_log_action_start() { + ebegin $1 +} + +aa_log_action_end() { + eend $1 +} + +aa_log_success_msg() { + einfo $1 +} + +aa_log_warning_msg() { + ewarn $1 +} + +aa_log_failure_msg() { + eerror $1 +} + +aa_log_skipped_msg() { + einfo $1 +} + +aa_log_daemon_msg() { + einfo $1 +} + +aa_log_end_msg() { + eend $1 +} + +. /usr/libexec/rc.apparmor.functions + +start() { + ebegin "Starting AppArmor" + eindent + + if ! is_apparmor_loaded ; then + eerror "AppArmor kernel support is not present" + eend 1 + return 1 + fi + + parse_profiles load + + eoutdent +} + +stop() { + ebegin "Stopping AppArmor" + eindent + apparmor_stop + eoutdent +} + +reload() { + # todo: split out clean_profiles into its own function upstream + # so we can do parse_profiles reload && clean_profiles + # and do a proper reload instead of restart + apparmor_restart +} diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index ad21c7c44eca..218c51efa593 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -3,6 +3,6 @@ AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45b AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 EBUILD attr-2.4.48-r3.ebuild 2359 BLAKE2B 51ade9db9989ec3613f7d2fdb36b140584550e5aa1ee56fbc0874e2444eb56ae642bc938a27cef5e094c07e111bfcb0b1512314afcde58d809681ad310f1d163 SHA512 35a0f35163df7b904fa32d1dc553b0f447d06e3f2bea8eaad71c9f716c9838603c0d26e06b7f25955584716743991bb7e209005426f5d56e9c79e272440026ca -EBUILD attr-2.4.48-r4.ebuild 2361 BLAKE2B 176c9578d1dec432cd8244d409439b59fdb62a25923c9bedb58577b5a56f73bfd851b6d20fd67fe1dbb1caf394f19a2dd90f39879e9314361e60deaa3694517c SHA512 4c2e06df10c9df729159bec80c3c0b2faa4d79c7b7d66f1b2595e3eeb00ed06f890fb06bf5ad7a5eb6dc541425670cd5806e161f4923e8e935a3f6ff9b4abf4d +EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa EBUILD attr-9999.ebuild 2444 BLAKE2B e14a033fc704cbfe4c1695d7246f7d1250b6232172fc2dd79e533891508e435a4d6f7382832ec654889b06b71d6f0448d320d7f7fea4b2793d5a32fbfa6c5c23 SHA512 3777897c5e5889ee81efcfa8af4814b6856211155d073938c88905776280dea5115837ef621f97c4c885e6f0a318ef723d66674696fcd3e9c983cd6c79f4dbc0 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild index 61b24dcb0c84..4ed1fc5d9cc0 100644 --- a/sys-apps/attr/attr-2.4.48-r4.ebuild +++ b/sys-apps/attr/attr-2.4.48-r4.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="debug nls static-libs" BDEPEND="nls? ( sys-devel/gettext )" diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest index 0ac5a77ba260..54ae6a191b41 100644 --- a/sys-apps/baobab/Manifest +++ b/sys-apps/baobab/Manifest @@ -1,5 +1,3 @@ -DIST baobab-3.34.0.tar.xz 454960 BLAKE2B c9e695074711442418bfd9c9c1453feeaf573429f1d9a03ef6c542d581d39c5bf1cb14d98025cc522705b1f8649150f418d39c05cf06f77f5900780eb058f67e SHA512 e821ba445c65742e92580e12be9b82ff352c6a2a8a58bab7fba97b01a120a948b06e35459196f16e9eef347cc6c5aeacfd563e86d78c758099fbab2ecfc4aa0e DIST baobab-3.34.1.tar.xz 458500 BLAKE2B 1f27640bb369cf1712c7b1c79d1261fd4a99e427a99debbf7d2f31f191f5e0ddaec7b366cb6b34add6a552c9728b9b1f4b64bdc05f06b29e0071ccad73a77c6a SHA512 8234f26fde68d6ebe578360345dcb45314b6a818aa899f858b7e3b9ae1874165e4f1d644d169d6ba56270689a34e8cd78d993e99c08f66b3f2c7c9fd0b7ea516 -EBUILD baobab-3.34.0.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40 EBUILD baobab-3.34.1.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/baobab/baobab-3.34.0.ebuild b/sys-apps/baobab/baobab-3.34.0.ebuild deleted file mode 100644 index 0202a6950ad9..000000000000 --- a/sys-apps/baobab/baobab-3.34.0.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/baselayout/Manifest b/sys-apps/baselayout/Manifest index 6cf5fe5ed0a8..64574bab0e35 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -3,6 +3,7 @@ DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b 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 MISC metadata.xml 382 BLAKE2B 7c360eab19fc55da87cf2a432c1f2407918be3cf32ec581b974fea953aea00a51998cd05facd0c4b6d609e38bd1f243380a5c3a9effcb5e7bebbf22ec6d9418c SHA512 1a444b5b8fc6573fae97c6e0bf5e3dc69f9e18a42d2a7c91ac2742bca17580468be8b17ca6349451817b0087f619bad90a1050b1fd8511fc5e57b792b5006d72 diff --git a/sys-apps/baselayout/baselayout-2.7-r1.ebuild b/sys-apps/baselayout/baselayout-2.7-r1.ebuild new file mode 100644 index 000000000000..3d5fac97ac66 --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.7-r1.ebuild @@ -0,0 +1,317 @@ +# 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 || 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 " $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 ! 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" || 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/bat/Manifest b/sys-apps/bat/Manifest index 0db0159ede11..14ff114c82f6 100644 --- a/sys-apps/bat/Manifest +++ b/sys-apps/bat/Manifest @@ -1,5 +1,7 @@ +DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b +DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 @@ -9,24 +11,36 @@ DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3 +DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33 DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660 +DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02 DIST bat-0.15.4.tar.gz 1021888 BLAKE2B 88ebac97807a81a2734325c4d1d86bd3d340572850ba9ff61fb23c8c6a1f902f95be04388e38c862b48b792df71fce2f97e97ca1041c3664868cd147b3b60a0e SHA512 f4338799047c1169c759a0ddf61481972d53103c5e29374ec2fb7bf814458ff6b724aacd551264ad7fc5e135c1e4484a38e391e046e76e113d404a92442db538 +DIST bat-0.17.1.tar.gz 1302347 BLAKE2B b46fdbf088d9033ae3e34155a774d3436ab0753ccfb5a8128aee2e6d5859a38cca27f5a01fa4146a0e8a17ecd66274a352ccdfb9111b4d169cb48edf5e62f732 SHA512 22222bb19cfa0804165d599e491fe2b1ad9220c5ea79c0cccd3292edca024963d6dc435c576bac19214849a1ffcc2b826488c6995758c4773af64ef945c2e460 DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7 +DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4 DIST bit-set-0.5.1.crate 14125 BLAKE2B 570b78834400bd6d69b2ad4a3a77766941503fceee069f9b616eab00fe7aff40fb25fc44b1f6506997bd655511c3e941afb0f9bf220b414e4e8cb8a6de4e93da SHA512 1b58b9a1e6dc33483f302415e0a77544dab288c819ed5d899f6ef3969750a17227c5aeb1b563aef41e77e06e665cfa995e358a566f5783a2d3af0087d5fc65c1 +DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34 DIST bit-vec-0.5.1.crate 18765 BLAKE2B 17d08d7813893a02a588197f84d9c5bbce574f77150d018889f690902691d83bd42eed4ca9b968789915d09c84e32147b1631ca6323a9fbfd328f6734196c5dc SHA512 c0d57ec2c07ea660919ab7e17881b544496de0d6ee51cc8008b7da0bb39a2dd1ca680cc07051e007d6efaa91b25335e13a799e11a7a9d9a8084cc47525742cc7 +DIST bit-vec-0.6.2.crate 19630 BLAKE2B 84580a6f99393e507f3fd76b543fd357fc018745e029ebb6b3e71ac3b91b6f760a0474b4d90506e36581ec432ad336be6dc67c07be206917ba2af2322e15b867 SHA512 27cafa198a55853585d76c89490878c43bccdb0fe7dd68b0b4809497be2d497056e7ca6fbef321d71dfbe18272a2571b33d79e2a1458891a420eb7a1910ff383 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89 +DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9 DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90 +DIST cc-1.0.60.crate 53351 BLAKE2B 95fec29226818496e56c132d45eaf728df17f3ab1b939842dc228febe7bdfabc9b0b407fab65a6a7d308a1e57a40702a2810516882f712319de119ca7cad4b52 SHA512 3aaeb5f6b0fed31dd65f8c884252d8a6f8f79cd801edf7626aebf4f2843a414cf45ec72b4d6f88f9e9fdd959e0547b9ee5da817b7c34235196113cdbe915b888 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9 +DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 +DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf +DIST clircle-0.1.3.crate 8026 BLAKE2B 33c18a0f9ed204597fad1720b8e361ca4d1beb2dc2db82eb0fe6632ea7fd1213ca55d5fb88f84c099aacb8c14dd2468f07d9563512b8ef4e1c2fe38b6590bc86 SHA512 1a51fd8a35b4179748d654916e0713c31dde2a96627c08a82cadcc05dcf816f8266ccd4fe75af2532dcb92dcd0043942c2150c76264a39760cc2d4e8e5455836 DIST console-0.11.2.crate 20816 BLAKE2B 4e2c92739fee932e31b28948fa982c1d5feb2c0f590495fcb22ea07d2f88422f475f54b47273bb33556b595e12410ec9592e861e86df9e27466518b15cd4ba26 SHA512 d3f51204654289c59f310730cd1968f6f628cfc7c557f1d645940e78f3831b24b1cc142ac904b5f98ee5dbbbdf51bc91e4914cb203054128e9aeacfb16a1d6e5 +DIST console-0.13.0.crate 22451 BLAKE2B a02b87a53b5f6e3adc88b0369e9e5b786fb60741263d5441752c51164562704d93c8954ecabc2ddf7a999139aa236cfbb0e9b8baa27901837f731591636044a8 SHA512 b687031ebfec1ee705c47e147239b602ffc147eec021ce7c9a4f400db7e3e0b1cf124b4c1664f9ffd1f3719f13a5d65c67bb15146bf42dccc5733373bd10b20c DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0 @@ -34,9 +48,12 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396 +DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1 +DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba DIST dtoa-0.4.5.crate 14840 BLAKE2B d6e46d8d53baf565931d0796cdebd030a0f6fae8c6b88f738b7dd00db35bdb130a2b3778192e90fcf06183e706db7c30cc3e2b05909dabc04472e3f6ca9fca7a SHA512 7f9cd7d2e8f143c81896f8a242b09de3384d9dd6c375659a48b4e4f0506b2eb642c8aba6d500a989668760458861f2249bd82f5f3d6fa22d0ffb68e508d059c0 +DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e @@ -47,46 +64,71 @@ DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe7 DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6 DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4 +DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 DIST fancy-regex-0.3.3.crate 63336 BLAKE2B 365bcc78e68aa5e5c61f76695c93178892137ebcea24e63c74baad2ed2b9bcf928ec82a1a058aba1eb837cb69805dcb44652ba62e4b0cfcad40bb5eac85e92da SHA512 6451ee6a994f29c1e10341de80e17b9c208b62bf1ebbe3cb90fd850cf03e4b43f3cbf9635357448d5eb29b98291b3aa6c564dedf28299e985a120f1ee7424d5c +DIST fancy-regex-0.3.5.crate 64304 BLAKE2B b0da0024bd7dba0a574109859984919102d02044ed7c389a3ba1f10aceaf5fc908094e865eee829a1ad65de6f0d9a6d8c1bf59091d35bf8637ef7c55f21bb593 SHA512 0edf91221f7088719607492accb71158d7ff445a2893eec90fef402df30ded30fdf388fe05f0d334577b642d5c5b724bc4a1724359dc4738c9bc34823dbe33f2 DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152 +DIST flate2-1.0.18.crate 74164 BLAKE2B 7defdf3f084f18c9e7776edda9bb3cea5692de0d9d2d006bcba0895ae3555f4ca006c76733175e4982932c67e6c65fd59b21275f19572e23dc2eed8f331eafbd SHA512 3695e7de578da3bc935988fdc67b22ded26f00bcae6818eaa6313c47628a19b66ad589b06e164ddc4c30c49eeec2011e41031287071a43460a8c5bf8e7cb5cef +DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957 +DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f +DIST git2-0.13.12.crate 175580 BLAKE2B 18321da8e89b18dbec31bbee75cd779994363ff6e9f2dd15e6d85b301e495d769fd66ba4dc4ee5edd9c806d8acad94336e403899f2da147430c89cc984ab03c1 SHA512 aab4564c385e378d5df34b8b8aab12107bc9e4b3b1cec1b5206e32fe72fbd0a7a2fd4c40d0ce75deed6ee9a51edb0383f26af2a53e59a5384c74dac4162f312b DIST git2-0.13.5.crate 166321 BLAKE2B da23d425d90e117c226509ca3d5247db0ec395808e741cdca24506ea2daff95916ba28581055a1b628c12cb92bb72e1baf45f777e2e5c5f191309f90aa8e838a SHA512 a1833899e8391ae81a91786e7e57382efe86c77929ed334c51071c3710c3572912e62b14dd0c64c688b74f0366d074aee705702fac8437019312d663ea238c86 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088 +DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc +DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd DIST hermit-abi-0.1.11.crate 9203 BLAKE2B ff6f5325f9439979db9b592a4465f343399991e7ec6f0f38a5ab8e1621d83b1b8e9f46b3ac4b6a76f22364367546dd6fd8edb87556eca4c690f93ea9d09126e4 SHA512 b44fbe8d7674dc5a610da9d2c58baede69f7b942e08c214131a449483bd41afd0d221be2eed8ce8d71581be066b1717ee6d80876c7621a10391199fbb79ef1fd +DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb +DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3 +DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b DIST kstring-0.1.0.crate 12465 BLAKE2B 8c004826a246e982e5e62ac300a056897d07f543d6db710e276cc0a41e62ea3ea64cd6d02cb08693a7c649be8f9eee7bd0f0b7402b8a2cce6f039d7959f06fe8 SHA512 65529fe62435a77504d38e1bbb5be911ff350c445cc568947aa9e1da254655eb0e3b5d38ef351d4b331bb9c97917a6b4b2bdeed153a9cbbd1760c47fd7bd0206 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2 +DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6 +DIST libc-0.2.78.crate 508428 BLAKE2B 0bb5545c24cc14f8831edd69785e43f169afdbe0343d480a76d4784b1784a68ab26e7d049418cb09643af61cac47a6d19f7658227e5e23c195389bb915e3651e SHA512 91cb2cd8541082822480e248c373f3320bca99483174aef295b373e6d051190bc5b100350cf680e1d48bda442b3e450741314dd9cf4f8536adbd2c6d7e869cd4 +DIST libgit2-sys-0.12.14+1.1.0.crate 1603930 BLAKE2B 8fd9366e09a8d6ab9f3df865aea3d9ecd43e4c2a339597c939a09cc36c28146e6ca6cd94656a9d17519b008fe65bbf6901ed639308b857a68977de4695f477e5 SHA512 d0fe6243b07c0d0711e832f4efdd69701c27fafb7df82d6010f24f79393c80bff3fc5639707863f2a8073c57bbc9fdfa0eab32c64eb053799c1c1e08de5c9854 DIST libgit2-sys-0.12.5+1.0.0.crate 1549598 BLAKE2B 62c018ebe05a525cf138f7c412f34d38d273b6a9d38dc18af836fe8ec013a7dfcaa3b11c5b619df33028b784ec393ecd5f1867b585c8acd063771915de77fd64 SHA512 7c6b9aa2294bd9ab752ed44d4735af7741b9d16a2e84736c21543b842b25278909dbb434fe59c83d4e8b705f7d4e21c172fa5359805522a0950d95f5249bdf6e DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547 +DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94 +DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1 DIST liquid-0.20.0.crate 53764 BLAKE2B be3f7e48985cfce462cb809a31e24e92e4f7ce69aa1f023debfcf4eef276907a07a6b2d56ff8e95ace041efdd161cf1214d6ada495047bbc45dd517ba6d3d605 SHA512 38c51b04d5d5c25753bb26ada44dd667d3d9fc62bf8100e2ffb88370cbe3863fad8cf9d2543fd7e5fab079afb798bf32ed784e21dafa1c4c7faa5ef8b5b10136 DIST liquid-core-0.20.0.crate 52462 BLAKE2B f2033aa5e573b764ecf3af3d74348723e4a017a6a3b1fea4261d2d51352f515cf2558db1e62493f7cef8fbb53e6a9ee2c5177b66a079da5d5c026d78295a8d83 SHA512 46bcc6742c871ed69337b6e4c38872ac745ea243195f9bfa9ca412974e03e704dd367bf89f935817d90b0bb2e945f88b4678d5ee6546aae39c56e94d7966c745 DIST liquid-derive-0.20.0.crate 19587 BLAKE2B 12de1c4c3c599926d7972e60dc40dbb2c1f3dd233413198ab2281f07a9b0337d3ddf3c527aa90162eb33fc07a54ac22f6c25c903cc43764d0e2e457f2ae7f4b2 SHA512 7b9546251eb539aa47e29fdc206c3517c7e989190fe9e45f1b1b216b3a273476034712400cb836a77b355ebaec742184cf8fd425b96636aa3c97193dbed25234 DIST liquid-lib-0.20.0.crate 37174 BLAKE2B 977faa3272a14260cd9a2f9503c4f0c08a929c2f0f030844927c75cbb9289948d0197459adb5bd73b1196c9ff604c08078b9d5e0a1d2f041304926e75cbf123b SHA512 ca99b787ca70f665d2982dae3425483235aab43c345300d25a3664bf130fd59b364d522488e6460d6e21b97d49a00c64e6ccb551ffcaf58d0aba295c992695e1 +DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248 DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93 +DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c +DIST nix-0.19.0.crate 212652 BLAKE2B a9d3f87fac9591111e1977b9d8cc38d57b560ddd3cf27ce06342c97e10113c8a8e548096d537577267152467883e9ae82618b24b02b2ee355a8689f7147335aa SHA512 db31253c4520448156be3b3e8eb234236a33012b2933710d772f19a14ee83c856f5426057e2f8b87e19fb52d18302d1f8345036ed5dcb7f10e6e961d8e6cf238 +DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2 +DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2 DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9 +DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377 DIST once_cell-1.3.1.crate 23800 BLAKE2B 0dbb0d62ef11454bf8e6e56ab213d3abbe112e1a00d3b82af77e381f01818e7ca293fd2bd95dc12f887d3e5a4425546c40f4c062a349ef99ac3b7c0dc94254c0 SHA512 2e326096216f2b02a922cd2b16e6cd444b9b34ce46d8f77197bcc5e0988f7d4db8f2bf56bdef8daf0a8c9af7e93100f9a46bb434975ea7d4732e3ef5ff561a92 DIST onig-6.0.0.crate 30200 BLAKE2B 9e9ea6ff6345db408a09ee78e57acf12ba698bdd90c8a41c7c9a9e17df048570f6241de2ec3be8fcea661be66665a3ad70526e24113b09ee97d87700b1eed782 SHA512 f5ab1586c23a96b813300d0478c6f4d401f3a6e44c562f72cc251225374811d3d89ec77b2660a10b5b52d71e4c1656f1f9fb9ab640d227af308401162663be69 +DIST onig-6.1.0.crate 30287 BLAKE2B 1b8b4539432ddf128381212fe9fb705fc2e9ca366b09bc7e2d109486a95e3f51e29c81c879fd45f3986b05a73dee42d8e9cc86f732de0ce73371f123722b8f65 SHA512 8f08ddbb48ea0e75a8dd8d788dfcc6f88773c5cb44a93f42df8b32bcef8279e6d8280314a096950aa5cfeef17c881b509d5136de69fd805604a0ebce69921475 DIST onig_sys-69.5.0.crate 614674 BLAKE2B 3f98097a709b1e95e84404b81ea104a4800e0b9f0713e988c6417c36e578b8148a8b5bb8c6dacd2d59d760ed79d8cf1f93f2ae2cec7ee8abfcb607e5dbb92538 SHA512 644019ca67a89790bab5cb173f5499bf3b0af5a4c39e027e79a63e5752f471c6bff86f679e1c86502b6c3cf795c23cd461a87c36b2eb687dfe21e9d232bcb7ac +DIST onig_sys-69.5.1.crate 615126 BLAKE2B 964ddfffb677a8dd384a0ba5cf2096fb931eb73f48fd1f1ed6767402dd186343a83d68c06f834bd279e929121ead39a8860644dcffda08c52cf627e84c2682b6 SHA512 d85005612206a383af1a00ea508d076d27e31109659a9741e55deaa8423aa649a90af6cdaead67143943f3f9e1db212d5a88597b600a116067f7a5d855a9a379 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 DIST path_abs-0.5.0.crate 31108 BLAKE2B 5c6d52f445ffa2f1e87e5ee078b79bcc9dc709fa97a4246759ae1ca476842d87943610ea441b504212bbd9d5f23dcf9482d747294722df7dbdcd93ee187fba75 SHA512 978a3a4d769ebf870ac619f10615cc2375f740b6d329f89bf9af26dcf3e361b4779e95483b4ae11d3ab4440dd6392f7cf9fd5a94dcfd434f9a77a8cb880bf2e1 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 @@ -96,72 +138,105 @@ DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc +DIST pkg-config-0.3.18.crate 14674 BLAKE2B a03292e97a195f8eef0cb74f2f640193b2045846b7d79a898927d6b6849b65a7e6bbd45fcd4103d3152e64c6f9c0316f2abf1c86a8a24c0467564894e1d45b54 SHA512 b4cae39a11bb80f6df96262ed77844270c0a02793ace5dd255820e9ce52a5f3a43b36bd6296ab9428253e96f9b991bb6a7090d7b749db1ecb0b03aa721813d8a DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855 DIST predicates-1.0.4.crate 26239 BLAKE2B 12ca05a2d98f9a4b6ad5442cdd8c5f5bd90a691d5f9c61389d710a7dcc88998b251252b9dcee4f4d8f742e1e4c00b25ceda57e39fc23b431fa7f04b2d7e64bfb SHA512 20f2ae6853e665b262651d4a2bf1fb70f4ee8e536f4fef2de79225fae44a4f32b4680f06f06523675e5af23e301ff58b0cde3e61c0e58c27e412d2eeec96fc35 +DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05 DIST proc-macro-hack-0.5.15.crate 12806 BLAKE2B 7c6beaad31a2da23028e0a5517737fd9d8f8c81894c4aa09f15e7d323cfc6ee27ad69c5797843d05b360466e46d2e339b4c0b2a03f6a0d3e3bb2114db8c192b1 SHA512 a49115f1271c6a9df57fbfa647b725f84dcf87c6c3894c35d878a13fa5981c790de16f02823c2ea1b07da5fcde85e9b13398e7317aecb4119b80a4ced5dcf59b DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef +DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be DIST proc-quote-0.3.2.crate 17160 BLAKE2B 30034393cff6aced46d11b6b651b3fe02e73262c8c52760513a344b5f928e9e5869865681232d87d7fbd37c65359fe4a52b602ae309c75a893f7e586a88bbd12 SHA512 96946b74e3a0ec0572ca178a5651ca7eacc9df55abbf0d7688af6e7d0be2b6738a19d53a2b9368d5d7e50522f5e9551728b82661815c872823b53a9868da70d8 DIST proc-quote-impl-0.3.2.crate 8920 BLAKE2B 5a7932f3070f07514172c2ad9d5780c3c74d551cff7a8bbe5bba9557d1ee0a2d6d8d392ffdf3240248f3ed911fafcdea8dd2565d0f5f321f2c1b56f0154b458a SHA512 59c5205ee9bda70a5a449fb2deebae27805ccfa3300ad59053acd26f8f39a5615bebe3140aaeb625c1c84747e8cdca67178b8bbc9152a3347240e0b335779feb DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3 +DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 +DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831 +DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69 +DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f +DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd +DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc +DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414 +DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c +DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc +DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863 +DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5 +DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d DIST serde_json-1.0.51.crate 72691 BLAKE2B 7f17bd47618009a3e6f7fcabe623c476bd40a0fc92be0c736f5b367914f14a923a5ff8cc6183081e6b0957ef3c61451fbc22c15bc6b6f9de63454c2f4aecfb45 SHA512 0e9e1be1e1c7ef6af2b2b374df6680ccdce149ee7c0641cb518c678b06d72a335321dd857bb1dc64561c3cb090cc1388c7a016fe4cda66da1f1a19e338c1a470 +DIST serde_json-1.0.58.crate 114933 BLAKE2B eda53fe830e539b760ad968191077aab05512f33d613796856cd3df7cd7ce21e9b704f30a6748e9622bd47e9c0c69310edc12bbb1dbe90547eb3b7b97b93a475 SHA512 377a067b1aad851fe7056c080b7a3d07cf6d2c75122766f25b2bf30d6023e70a6f7b5211200019983bfb1f0ac9cf09da4a8c74aef45c819a785818a6ce33ca0a DIST serde_yaml-0.8.12.crate 35916 BLAKE2B 6a2cee8a83219dd804d1b8bdeeb8c7b14b6989a849c6707a56fd14c65099a4f67b0a9c0e5f85a6cc97d90abada3d736a18a022a8522aab6c7e6987f5accb43ec SHA512 53cc9327e2baed3583497922dd20870c570de2be20074a537d703d17d7038e2826bf4b5ebf6daa8f451204d07453dff05e931a66670b19910b2d04385229fb1f +DIST serde_yaml-0.8.14.crate 37928 BLAKE2B 58b5fe3678e022667696811fb0979081e50727f6efb288f97510eecacf86ad0ad1c6ae98a3916df574cfa73c9825414623f0a75e623e149048adf94369560c08 SHA512 de4b18f1e9bda434b93b32c8b3c8135ec3163ebf6f734920dc88c8736e40c05dd75f314d730c5c0c92eb259b85c5fa9263f5d0f3e78a7e214a9258e28c5ec06a DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9 DIST smallvec-1.3.0.crate 23930 BLAKE2B 3eac4d03ad4a6e111587bce612bcc540a619fc2f68a384a2e0aa0b52e8034a8738f6b56607c3457cb34593a701da2f3b3ff8afb523af050c38b732299fbea224 SHA512 3cb400f5f2e2a8619d6adb6b65e5b8515acddfb686c2545f66432ef279bca147cf4c55b09893a82bcb7f9f91c7c2b7099fa707da8939b1ac4a6b92326e7bb806 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f +DIST syn-1.0.42.crate 225244 BLAKE2B 814e7f8fcef54ffb87710fb271bf711b7d463d75e10cd0a686097d73d49767fbfdf3d84a09bc64b520d243db1b0be367ceb5900812a987fba48abec597ac629d SHA512 c758c4175fc9e48418224a02142f045eb0fcbb9ca6732a9ac36c55f075ec70268cc729f6b8002238d6c79a8ac4c3a9ef8c3ff69f78db9434fc9866152a2932eb DIST syntect-4.2.0.crate 750573 BLAKE2B a526ab895803a9779c08021cef315cf457aea88193cdfb5f5cf8eef45a02651e3847467e7e51d0b50d098098d8ee59e82079b8488589ef80a7f999b9d28498d7 SHA512 d2dcf5444b739b6f4466aa40c0f061573d89d639ab1c759a4bd0e1d5eaab706794e8f510e70dd146e4212617fa16c0cc1745e98323e65baa699b79ef37040df6 +DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f +DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88 DIST terminal_size-0.1.12.crate 8111 BLAKE2B a5b43c7fe8a3e13e49d7c9e787fc712f51313ea09648e474ac6eee4c0eceda346f5bd85ad69bac1eda67d6713d6d34230398a7b6b008cc3b58ee6d4d6b096bcd SHA512 6f0060529cda5a891a861566d22b0c3a17a702fccd8191387ec7e463bcd05cc88a80d889eb146ef704b6bc50c7b136d340b44897a300d6ef6269dd4b83837b5d +DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266 DIST termios-0.3.2.crate 16545 BLAKE2B a42ef0fdfe6d55784f628d6f39813a5fa02578c09c699cbad104d34e494e8b58d10ef411ac53cd1cd00203437063a0e1871dfa4dbed1e02c8b07379affa8258d SHA512 d672f0bf950da913ac94f94b01d1dc15f29064fc9ae8a0ccf09d399bfabc61c6906f255f60dfbd6b83a8493ac23f9f7c82a5852f854c498eddab1a04a48a4907 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25 +DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6 +DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 +DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 +DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb +DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141 DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 +DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf +DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47 DIST wild-2.0.3.crate 7059 BLAKE2B b4dfafc1a83bb6ae06f6f76a24cb7f2fd8b583ff6225b3ee05b6011ceb407bef48e62ec3b8562936cac884a1d7363751e75a5b754d6d7da1441877ce755f59d4 SHA512 e477b3701027ef6099c08f1b085b3e012debbf6688b249511108246792ba76b5462f581fdf2a6298a6fbcf4d34beccd14619031983ee0a83871d150ea434cd5c +DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST xml-rs-0.8.2.crate 52353 BLAKE2B e5f041831d7e15459704e031b22b018c82aa214c0d3041639aceca53661536d71f33f2ae254a6376f683fafea351e34e274190a8abfa57cde778acd35ca305b9 SHA512 b98dcb7e9293b372ab61739ea5c82782f4b8dab87c9f3de24fb2c98b87399c6990d77cff87921c4c5b3e072b79a3c5ebd9088d0476d19956b4771e879f575dd3 +DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3 +DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a EBUILD bat-0.15.4.ebuild 3975 BLAKE2B 1f53e7236725360091e06e9568a0b00f4e5193c7842ad4fe1929feb0021cd1c3f24dada83504b97d149517687802b33feb8760159a8f9f7f93127ffed69452e7 SHA512 301acd3940aad422b93aaae0cc7f6695cc7e6fcf3d93b70a40141c7e4e4000ca0dc40ff8e23dde4424b2f08b79e841e66e728677bf62fadbd5962685b38b30a7 +EBUILD bat-0.17.1.ebuild 3817 BLAKE2B 2b07c6231ec1cf4380875f5b8384fc357fc24be96d3f2545d60f5ba189b2414e35a666d70173f10fb8e88b760b8482a0f9e5134a806a853dd2571fa571c2612f SHA512 444fe3586c0f429fb26c87cb495c1dcde535f52257363fcfc0081277d06fecbe3fb7ce998b20eca164758aa73f30f29f9081f34e621e5049c50d80ff23677477 MISC metadata.xml 818 BLAKE2B a006c6a94fd0c73b87ec6395c42e29e0b6986224606ee98d1eb058b22bb7530048035fbad80f58696d651e4192bcd0c841610011390a7e043a425520b92a9df8 SHA512 0f74f00f4e135e8daaa1744b3d3c7b05d1d5b8c1bc1a6bdeb72d9a7375c5ec2a15be332489ba8d9f7bb24d3d2c695ed592407b672990e58a762bf754780a100e diff --git a/sys-apps/bat/bat-0.17.1.ebuild b/sys-apps/bat/bat-0.17.1.ebuild new file mode 100644 index 000000000000..0b9d7841bdae --- /dev/null +++ b/sys-apps/bat/bat-0.17.1.ebuild @@ -0,0 +1,200 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" +adler-0.2.3 +aho-corasick-0.7.13 +ansi_colours-1.0.1 +ansi_term-0.11.0 +ansi_term-0.12.1 +arrayref-0.3.6 +arrayvec-0.5.1 +assert_cmd-1.0.1 +atty-0.2.14 +autocfg-1.0.1 +base64-0.12.3 +bincode-1.3.1 +bitflags-1.2.1 +bit-set-0.5.2 +bit-vec-0.6.2 +blake2b_simd-0.5.10 +block-buffer-0.7.3 +block-padding-0.1.5 +bstr-0.2.13 +byteorder-1.3.4 +byte-tools-0.3.1 +cc-1.0.60 +cfg-if-0.1.10 +chrono-0.4.19 +clap-2.33.3 +clircle-0.1.3 +console-0.13.0 +constant_time_eq-0.1.5 +content_inspector-0.2.4 +crc32fast-1.2.0 +crossbeam-utils-0.7.2 +difference-2.0.0 +digest-0.8.1 +dirs-3.0.1 +dirs-sys-0.3.5 +doc-comment-0.3.3 +dtoa-0.4.6 +encode_unicode-0.3.6 +encoding-0.2.33 +encoding-index-japanese-1.20141219.5 +encoding-index-korean-1.20141219.5 +encoding-index-simpchinese-1.20141219.5 +encoding-index-singlebyte-1.20141219.5 +encoding_index_tests-0.1.4 +encoding-index-tradchinese-1.20141219.5 +error-chain-0.12.4 +fake-simd-0.1.2 +fancy-regex-0.3.5 +flate2-1.0.18 +float-cmp-0.8.0 +fnv-1.0.7 +fuchsia-cprng-0.1.1 +generic-array-0.12.3 +getrandom-0.1.15 +git2-0.13.12 +glob-0.3.0 +globset-0.4.6 +hashbrown-0.9.1 +hermit-abi-0.1.16 +idna-0.2.0 +indexmap-1.6.0 +itoa-0.4.6 +jobserver-0.1.21 +lazycell-1.3.0 +lazy_static-1.4.0 +libc-0.2.78 +libgit2-sys-0.12.14+1.1.0 +libz-sys-1.1.2 +line-wrap-0.1.1 +linked-hash-map-0.5.3 +log-0.4.11 +maplit-1.0.2 +matches-0.1.8 +memchr-2.3.3 +miniz_oxide-0.4.2 +nix-0.19.0 +normalize-line-endings-0.3.0 +num-integer-0.1.43 +num-traits-0.2.12 +onig-6.1.0 +onig_sys-69.5.1 +opaque-debug-0.2.3 +path_abs-0.5.0 +percent-encoding-2.1.0 +pest-2.1.3 +pest_derive-2.1.0 +pest_generator-2.1.3 +pest_meta-2.1.3 +pkg-config-0.3.18 +plist-1.0.0 +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.4.6 +rand_core-0.3.1 +rand_core-0.4.2 +rdrand-0.4.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 +ryu-1.0.5 +safemem-0.3.3 +same-file-1.0.6 +semver-0.11.0 +semver-parser-0.10.0 +serde-1.0.117 +serde_derive-1.0.117 +serde_json-1.0.58 +serde_yaml-0.8.14 +sha-1-0.8.2 +shell-words-1.0.0 +std_prelude-0.2.12 +strsim-0.8.0 +syn-1.0.42 +syntect-4.4.0 +tempdir-0.3.7 +terminal_size-0.1.13 +term_size-0.3.2 +textwrap-0.11.0 +thread_local-1.0.1 +tinyvec-0.3.4 +treeline-0.1.0 +typenum-1.12.0 +ucd-trie-0.1.3 +unicode-bidi-0.3.4 +unicode-normalization-0.1.13 +unicode-width-0.1.8 +unicode-xid-0.2.1 +url-2.1.1 +vcpkg-0.2.10 +vec_map-0.8.2 +version_check-0.9.2 +wait-timeout-0.2.0 +walkdir-2.3.1 +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 +xml-rs-0.8.3 +yaml-rust-0.4.4 +" + +inherit cargo + +DESCRIPTION="cat(1) clone with syntax highlighting and Git integration" +HOMEPAGE="https://github.com/sharkdp/bat" +SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" $(cargo_crate_uris ${CRATES})" + +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + >=dev-libs/libgit2-0.99:= + dev-libs/oniguruma:= + sys-libs/zlib:= +" +# >app-backup/bacula-9.2[qt5] has file collisions, #686118 +RDEPEND="${DEPEND} + !>app-backup/bacula-9.2[qt5] +" + +DOCS=( README.md doc/alternatives.md ) + +QA_FLAGS_IGNORED="/usr/bin/bat" + +src_configure() { + export RUSTONIG_SYSTEM_LIBONIG=1 + export LIBGIT2_SYS_USE_PKG_CONFIG=1 + export PKG_CONFIG_ALLOW_CROSS=1 +} + +src_install() { + cargo_src_install + + einstalldocs + + doman target/release/build/bat-*/out/assets/manual/bat.1 + + insinto /usr/share/fish/vendor_completions.d/ + doins target/release/build/bat-*/out/assets/completions/bat.fish + + insinto /usr/share/zsh/site-functions/ + newins target/release/build/bat-*/out/assets/completions/bat.zsh _${PN} +} diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest index f2b6c2a45e9f..5f5e08dd151d 100644 --- a/sys-apps/bolt/Manifest +++ b/sys-apps/bolt/Manifest @@ -1,4 +1,5 @@ AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 -EBUILD bolt-0.9-r1.ebuild 1179 BLAKE2B 2275f3ce707e18f2481a34f7b96acfb2f58a03d511be185ffcaa50e93460b52cdb78d202f5b3bec36147aca04a4585bdbf4b5ecb4d98a70d9b05e58b7eccf716 SHA512 01e8bfa3ee62e9f28c3da06f7adf5c79be75b736a3fa7f1ce6f0cff559307f3e254a63bb6115fbecc0d70f95baae02f4fe4b5772cd225075d9541bf27192c279 +EBUILD bolt-0.9-r1.ebuild 1177 BLAKE2B a7a5ceab008d24574f7083de09add23527d5e40038f2ba4eb59f74976b5a78001d4bd1fee77dd4dcba158b7012c4c8488cd46d905f6c32241788d195e46cbad4 SHA512 d3012cc8b13f071d2a16b67bb0ccac040275068ff2044d403f6b6dcb19f9955fb69ccf3f3dd1e0ba93a161824570ae250b02b28fd7ca35275174b7b206d6a9c7 +EBUILD bolt-0.9-r2.ebuild 1346 BLAKE2B 43be6bb874f701c691ac94f8cb5d655e15048aaf5c0f99f4c287d9dc1cce35201f0c349e1d25b859f3bd57d5d835649e2f9ebf41eea7ac26422f1905d96a0655 SHA512 621f50a5d1dcd18e5a7ea7c1163f094537a67f03e2bc317e9f2271110737a6d32ae5649c3183ba2935063880b37563f448ca56ddfbc0fde5395ff21e566be12c MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 diff --git a/sys-apps/bolt/bolt-0.9-r1.ebuild b/sys-apps/bolt/bolt-0.9-r1.ebuild index 8145c75880e1..afb1c1ec6aad 100644 --- a/sys-apps/bolt/bolt-0.9-r1.ebuild +++ b/sys-apps/bolt/bolt-0.9-r1.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/bolt/bolt-0.9-r2.ebuild b/sys-apps/bolt/bolt-0.9-r2.ebuild new file mode 100644 index 000000000000..ddf044ade359 --- /dev/null +++ b/sys-apps/bolt/bolt-0.9-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info meson systemd + +DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3" +HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt" +SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc systemd" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + dev-util/glib-utils + virtual/libudev + virtual/udev + dev-util/umockdev + sys-auth/polkit[introspection] + systemd? ( sys-apps/systemd ) + doc? ( app-text/asciidoc )" +RDEPEND="${DEPEND}" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 5 6; then + CONFIG_CHECK="~THUNDERBOLT" + ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver." + else + CONFIG_CHECK="~USB4" + ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support." + fi + check_extra_config + + CONFIG_CHECK="~HOTPLUG_PCI" + ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support." + check_extra_config +} + +src_configure() { + local emesonargs=( + -Dman=$(usex doc true false) + --sysconfdir=/etc + --localstatedir=/var + --sharedstatedir=/var/lib + ) + meson_src_configure +} + +src_install() { + meson_src_install + newinitd "${FILESDIR}"/${PN}.openrc boltd + keepdir /var/lib/boltd +} diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index b742b0516257..9b8c09e29a2c 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -16,7 +16,7 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b -EBUILD busybox-1.31.1-r2.ebuild 9531 BLAKE2B 9b590ec44931fd6986385210681f607ab85f68ac5fc50cff9a31d6619735eb2b9c287a8d9a1917cd5e0f33ec0e89f1cc1ba0ee675f418d7853055273b1710a40 SHA512 c903448a82ce2889e203731aec408e93e89879ae935e5955b9ed2871662afcf3615d427cdcf5f0e206ac72defbb18f5c4bddf890f1f35c6af1f20f5d947226e3 -EBUILD busybox-1.32.0.ebuild 9495 BLAKE2B f0b5bbea9274936236b75b646726fc5bd5f95857aaccc702aad8a6ae16696399532dcf3dc75904c88078e914817027a041c372bc04815ab57e518bde1a3354db SHA512 c26f045878d30ed97c08686e77e7411ef5f3712208d6a4330900cfcc40885016739aa428e7ae82ae5bef80a27ca067efe9e6cf3d1be537b1973c7b30c2062b0e -EBUILD busybox-9999.ebuild 9438 BLAKE2B fdfb82402864e50f294dffc3b93f06d1fec142734918ccf9042d520098e803deb4c14095fbe4f6b2c536e8a3b58066ce217e78ff277adecd1535d90fb20713ca SHA512 b718d6272b43efa50d38064cffed0a284c4d70e351642da996ed759bbe4e9de1119b645c0adb1349782635661aa5bcb76f1f71ae85bbf52c9730a6967d4a28fd +EBUILD busybox-1.31.1-r3.ebuild 9529 BLAKE2B 1d46cd6f67af9ea4152607af1779f901c7c72779e8147e5408b3702b77e4a3e67f6c4b6e8e7d5968ba7b94e44809587d33662fe5516a870e7990a9ca7f6341fb SHA512 299260cb9e3d3127aaec5c0c71bf589a0deb5812c6337a1f16a5d1ae28d4370e41b1784bcb7097dd9bf3560423a8d2390001839ca0b1e0f67e6bf9ceabfe50d2 +EBUILD busybox-1.32.0-r1.ebuild 9493 BLAKE2B aa5309a1dbb2e863bdc820207c28f07ee0ec33b433508745d5df18e04623b08605564f22b347d908cffac38c832992482d4984e598c0a919e80e851a2754c9c8 SHA512 67025c4610d71461c775107f6fc391e574e1e9efc8298c7c198a89476b32e42e5c26a59c693a14cde7a6b0e630b0b5d1de2b0f4ec5f28fe8a77163e138e70a0b +EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r2.ebuild deleted file mode 100644 index 8457f9229a41..000000000000 --- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild +++ /dev/null @@ -1,338 +0,0 @@ -# Copyright 1999-2020 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" ]] && [[ ${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.31.1-r3.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild new file mode 100644 index 000000000000..ad50d096b749 --- /dev/null +++ b/sys-apps/busybox/busybox-1.31.1-r3.ebuild @@ -0,0 +1,338 @@ +# Copyright 1999-2020 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.0-r1.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild new file mode 100644 index 000000000000..6d7a58111698 --- /dev/null +++ b/sys-apps/busybox/busybox-1.32.0-r1.ebuild @@ -0,0 +1,337 @@ +# Copyright 1999-2020 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.0.ebuild b/sys-apps/busybox/busybox-1.32.0.ebuild deleted file mode 100644 index e4d93e71de3f..000000000000 --- a/sys-apps/busybox/busybox-1.32.0.ebuild +++ /dev/null @@ -1,337 +0,0 @@ -# Copyright 1999-2020 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" ]] && [[ ${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-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index bf29c9fb1d87..a82a8aa33318 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -3,7 +3,7 @@ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. -EAPI=6 +EAPI=7 inherit flag-o-matic savedconfig toolchain-funcs @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} mdev? ( ! "${T}"/dbus.initd || die - multilib-minimal_src_configure -} - -multilib_src_configure() { - local docconf myconf testconf - - # so we can get backtraces from apps - case ${CHOST} in - *-mingw*) - # error: unrecognized command line option '-rdynamic' wrt #488036 - ;; - *) - append-flags -rdynamic - ;; - esac - - # libaudit is *only* used in DBus wrt SELinux support, so disable it, if - # not on an SELinux profile. - myconf=( - --localstatedir="${EPREFIX}/var" - $(use_enable static-libs static) - $(use_enable debug verbose-mode) - --disable-asserts - --disable-checks - $(use_enable selinux) - $(use_enable selinux libaudit) - --disable-apparmor - $(use_enable kernel_linux inotify) - $(use_enable kernel_FreeBSD kqueue) - $(use_enable elogind) - $(use_enable systemd) - $(use_enable user-session) - --disable-embedded-tests - --disable-modular-tests - $(use_enable debug stats) - --with-session-socket-dir="${EPREFIX}"/tmp - --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid - --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-dbus-user=messagebus - $(use_with X x) - ) - - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( - --enable-launchd - --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents - ) - fi - - if multilib_is_native_abi; then - docconf=( - --enable-xml-docs - $(use_enable doc doxygen-docs) - ) - else - docconf=( - --disable-xml-docs - --disable-doxygen-docs - ) - myconf+=( - --disable-daemon - --disable-selinux - --disable-libaudit - --disable-elogind - --disable-systemd - --without-x - ) - fi - - einfo "Running configure in ${BUILD_DIR}" - ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" - - if multilib_is_native_abi && use test; then - mkdir "${TBD}" || die - cd "${TBD}" || die - testconf=( - $(use_enable test asserts) - $(use_enable test checks) - $(use_enable test embedded-tests) - $(use_enable test stats) - $(has_version dev-libs/dbus-glib && echo --enable-modular-tests) - ) - einfo "Running configure in ${TBD}" - ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}" - fi -} - -multilib_src_compile() { - if multilib_is_native_abi; then - # after the compile, it uses a selinuxfs interface to - # check if the SELinux policy has the right support - use selinux && addwrite /selinux/access - - einfo "Running make in ${BUILD_DIR}" - emake - - if use test; then - einfo "Running make in ${TBD}" - emake -C "${TBD}" - fi - else - emake -C dbus libdbus-1.la - fi -} - -src_test() { - DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - else - emake DESTDIR="${D}" install-pkgconfigDATA - emake DESTDIR="${D}" -C dbus \ - install-libLTLIBRARIES install-dbusincludeHEADERS \ - install-nodist_dbusarchincludeHEADERS - fi -} - -multilib_src_install_all() { - newinitd "${T}"/dbus.initd dbus - - if use X; then - # dbus X session script (#77504) - # turns out to only work for GDM (and startx). has been merged into - # other desktop (kdm and such scripts) - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}"/80-dbus - fi - - # needs to exist for dbus sessions to launch - keepdir /usr/share/dbus-1/services - keepdir /etc/dbus-1/{session,system}.d - # machine-id symlink from pkg_postinst() - keepdir /var/lib/dbus - # let the init script create the /var/run/dbus directory - rm -rf "${ED}"/var/run - - dodoc AUTHORS ChangeLog NEWS README doc/TODO - readme.gentoo_create_doc - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - readme.gentoo_print_elog - - # Ensure unique id is generated and put it in /etc wrt #370451 but symlink - # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse - # dependencies with hardcoded paths (although the known ones got fixed already) - dbus-uuidgen --ensure="${EROOT}"/etc/machine-id - ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id - - if [[ ${CHOST} == *-darwin* ]]; then - local plist="org.freedesktop.dbus-session.plist" - elog - elog - elog "For MacOS/Darwin we now ship launchd support for dbus." - elog "This enables autolaunch of dbus at session login and makes" - elog "dbus usable under MacOS/Darwin." - elog - elog "The launchd plist file ${plist} has been" - elog "installed in ${EPREFIX}/Library/LaunchAgents." - elog "For it to be used, you will have to do all of the following:" - elog " + cd ~/Library/LaunchAgents" - elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}" - elog " + logout and log back in" - elog - elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS" - elog "specified and refused to start otherwise, then export the" - elog "the following to your environment:" - elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\"" - fi -} diff --git a/sys-apps/dbus/dbus-1.12.20.ebuild b/sys-apps/dbus/dbus-1.12.20.ebuild index 3b9952f62bb9..dae892d4e87c 100644 --- a/sys-apps/dbus/dbus-1.12.20.ebuild +++ b/sys-apps/dbus/dbus-1.12.20.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" LICENSE="|| ( AFL-2.1 GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X" RESTRICT="!test? ( test )" diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest index 9631cc55f922..534f744accb8 100644 --- a/sys-apps/dmidecode/Manifest +++ b/sys-apps/dmidecode/Manifest @@ -1,5 +1,5 @@ -DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9 DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18 -EBUILD dmidecode-3.1.ebuild 1123 BLAKE2B e6dcec8395a95552a6a7d3b1e9af23f9a527883aa462050abf3bdd465148257bbab5bacfc694a6b7293564841aeb60bcfcbaca5b3a9e0ed912e23eb57d0bde07 SHA512 90324550580716ad2cc27da60d9db274a187b94420bf7fbeef2e016456150ac0ae0d5262448991ed7bd91b28aa39b61bb844779cfef932cf19011e0655c6af86 +DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 EBUILD dmidecode-3.2.ebuild 1134 BLAKE2B 01b280085bbb4b5e88a98bafecc7ffd923000568c9875021deee1013e2a5592bc5bb2baa102f7b5345762ebbf738d6c62447b3dc111894dc7924fdb2f3394b19 SHA512 c4880113ae36b10f5e4ba24272de557f5cf06189d32eb57b1278a7ca3ae9a5fdba8147d26542f8bce26bbcb96f00c31452714657756c4092b8895b67ce23805c +EBUILD dmidecode-3.3.ebuild 1141 BLAKE2B ac69c5afab870d62fee200c8c873f7a32d9a5a9ee2ba69041d7fb98f00698f39686c38c9d62cd349a2781364a6d3a6107ef3c576b7e54ff703f5aab47c62e62b SHA512 d9a4f534c1d617f0bc34a8f3b5c69ce23bb013dbb1575e379e216f3a35be8010f6272cd358611b274d7ca16779b83a02c2e3bf246e3e456335bb78dbda78a0ec MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild deleted file mode 100644 index 72de933a806a..000000000000 --- a/sys-apps/dmidecode/dmidecode-3.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic toolchain-funcs eutils - -DESCRIPTION="DMI (Desktop Management Interface) table related utilities" -HOMEPAGE="https://www.nongnu.org/dmidecode/" -SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-dmidecode )" -DEPEND="" - -src_prepare() { - sed -i \ - -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \ - -e "/^docdir/s:dmidecode:${PF}:" \ - -e '/^PROGRAMS !=/d' \ - Makefile || die -} - -src_compile() { - emake \ - CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CC="$(tc-getCC)" -} - -pkg_postinst() { - if [[ ${CHOST} == *-solaris* ]] ; then - einfo "dmidecode needs root privileges to read /dev/xsvc" - einfo "To make dmidecode useful, either run as root, or chown and setuid the binary." - einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar" - einfo "information without requiring root privileges." - fi -} diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild new file mode 100644 index 000000000000..8e6e738c4474 --- /dev/null +++ b/sys-apps/dmidecode/dmidecode-3.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="DMI (Desktop Management Interface) table related utilities" +HOMEPAGE="https://www.nongnu.org/dmidecode/" +SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-dmidecode )" +DEPEND="" + +src_prepare() { + default + sed -i \ + -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \ + -e "/^docdir/s:dmidecode:${PF}:" \ + -e '/^PROGRAMS !=/d' \ + Makefile || die +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" +} + +pkg_postinst() { + if [[ ${CHOST} == *-solaris* ]] ; then + einfo "dmidecode needs root privileges to read /dev/xsvc" + einfo "To make dmidecode useful, either run as root, or chown and setuid the binary." + einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar" + einfo "information without requiring root privileges." + fi +} diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest index 96d6a229d180..d1fc7bad2c24 100644 --- a/sys-apps/dtc/Manifest +++ b/sys-apps/dtc/Manifest @@ -5,6 +5,6 @@ DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3 EBUILD dtc-1.5.0-r2.ebuild 1663 BLAKE2B a819481eb057a777ff6f405b06a90c0af5e45f27d644b71835954af2e1f5fcb6a268a1553fba2119058516df17120da7221fc5a85fcc4e1da7dcc8a1bd784555 SHA512 7feab3bfbe64fda933b8034e1aee397244e7937502fea343512f6908709e9ae746aa43cbb8b25ba27ffb94ff90269a3d881cd08fdf9a764c05ed0bd90a2fdd4d EBUILD dtc-1.5.0.ebuild 1296 BLAKE2B c233996dc4f35d0ba521de4ede3a3eb37533c8cfd7655dac83602c70cb55093fa631e16785469ad41244dbf61836ef4cabf541ec166694c34e8960b0576f75ad SHA512 7b5dacd6a422da8e2353047f36cf47269a473e4c39809e0b71401e99bc27b7d37a2be743afe033fe444f00ed244e329bc82999d3cfef005504a3024160e918d1 -EBUILD dtc-1.6.0.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76 +EBUILD dtc-1.6.0.ebuild 1500 BLAKE2B cbae40f52e97c439937b52fa7f4ae101efc4d95b0a3568a883318e246b4aa887bcc17e7ffec2fbf400aa51f92779a71215b42707e8a2aee63d5d6b74cca67ac9 SHA512 a82144428f31989a932d6b7d19f73b5643e77aae246dc7e1c6c0d87108e1ca4319a0d892e31c5eb780b19717dfa78532a0c326260031fe29b11531f685efed6e EBUILD dtc-9999.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76 MISC metadata.xml 491 BLAKE2B e57c27c911b37572b2836c634b03b2fb52bae256c22972af19637113f467e3eaa270e8dca070dbb9522495db5bad1f1b4441fcaae9d47e7eff8efd0b4127628a SHA512 9e328b8fd47363cf6caaf40832df015d9055ae746118dd9c501311af24a12d5377781cfb2ad8d42d2c82539709597310c1dbded4e522d0b0272b23859735506a diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild index 5d8cb20a5b37..12c3ff004ae9 100644 --- a/sys-apps/dtc/dtc-1.6.0.ebuild +++ b/sys-apps/dtc/dtc-1.6.0.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/software/utils/${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="Open Firmware device tree compiler" diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 25f37aaf88ec..7d74516ad0b3 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -3,5 +3,7 @@ AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280 DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 +DIST etckeeper-1.18.15.tar.gz 92574 BLAKE2B 1498d01394c9c5607eb081aa579f06c696b5df20af2899cb3deb2ac75ddf2b1f6ca7e64741b7e24819db2f8c751f3dd49da70cccad35fbfad255b328e208e973 SHA512 7b2cca6c346a7c2b97ffd9b418169712ec46d947a3c8685490ce95eb9f5b6fa389e7b3ae6ad2c1ad6774bed88212b05c5ffe202ad055dea19fdde2509a349a85 EBUILD etckeeper-1.18.14.ebuild 1705 BLAKE2B 6e4b27820a9de14ea5e1e0f6a588589983e3326a23ec968b0a53e3b486749e31de39cc230a0568bb32e889aea159effd15bb11a9002498c10a2091b196d7cc05 SHA512 d31598fc22846eaef27c8a653b72964de28ef944de6b627032b74cce5e5dce2ad220f56fd34581cf47d9e6bfae0b4c9e146f42758daaead79656995276999a41 +EBUILD etckeeper-1.18.15.ebuild 1715 BLAKE2B 579d63e72dac91686cb03a58137747bf9ba85b93216e87b2f3d722383bfd65366dd288d4083623c5a293b2f56a3004b106bd5d7f6508de552f8941936b3b9172 SHA512 e87bc74e6664d79de090146718500f804f0b434e019b795f9ba1efabc9bb656b52bf4da59e893b8288a580f94053e7f638a4db30e958e89843d36a4e3bff70da MISC metadata.xml 784 BLAKE2B c9e0c9c6193bc006043882ca31347e796f8e6669d4ae6121bf4334b24209a69a128ea87fe797711a7bfd3238981017dbc889793eae8f3cdf4271542abe938fd6 SHA512 b896905b4940b22136b9f5a83db6d0625cd99ffbb8e586c2b1c29d8b780db1cd59a9eebaf72bea13a4e134f2014948fcf3c3247d38da06a49f952fd456d13181 diff --git a/sys-apps/etckeeper/etckeeper-1.18.15.ebuild b/sys-apps/etckeeper/etckeeper-1.18.15.ebuild new file mode 100644 index 000000000000..3765429cc700 --- /dev/null +++ b/sys-apps/etckeeper/etckeeper-1.18.15.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 prefix systemd tmpfiles + +DESCRIPTION="A collection of tools to let /etc be stored in a repository" +HOMEPAGE="https://etckeeper.branchable.com/" +SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +SLOT="0" +IUSE="cron test" + +BDEPEND="test? ( + dev-util/bats + dev-vcs/git +)" + +RDEPEND="app-portage/portage-utils + cron? ( virtual/cron ) + || ( + dev-vcs/git + dev-vcs/mercurial + dev-vcs/darcs + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch ) + +src_prepare() { + default + hprefixify *.d/* etckeeper + sed -i \ + -e s'@zsh/vendor-completions@zsh/site-functions@' \ + -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \ + Makefile || die + rm -v init.d/60darcs-deleted-symlinks || die +} + +src_compile() { + : +} + +src_install() { + emake DESTDIR="${ED}" install + + doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})" + + newbashcomp bash_completion ${PN} + dodoc doc/README.mdwn + newdoc "${FILESDIR}"/bashrc-r1 bashrc.example + + rm -rv "${ED}/var/cache" || die + newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf + + if use cron ; then + exeinto /etc/cron.daily + newexe debian/cron.daily etckeeper + fi +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "${PN} supports git, mercurial and darcs" + elog "This ebuild just ensures at least one is installed!" + elog + elog "You may want to adjust your /etc/portage/bashrc" + elog "see the example file in /usr/share/doc/${PF}" + elog + elog "To initialise your etc-dir as a repository run:" + elog "${PN} init -d /etc" +} diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index 4ba1d3ce6a2e..3015e503fbee 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -1,11 +1,9 @@ AUX ethtool-5.8-avoid_bashisms.patch 674 BLAKE2B 75b1fdd5980b91348eed8dbbfae00855e2c7f66e2ef4f95b2c8bc679b7d6759358c4d464825956bbb8ab01773d23af7cbe5bdc98eed856baa4589ac44b2cc172 SHA512 0755b7c05026935762b89ff58c083b4dbcc02227400285b0b64e5421f02c2c9c1fb373c8ba43eabe3d38110898fcdbbf664d6f1aff6e28d33759489339d1262b AUX ethtool-5.8-only-memset-non-NULL-link-settings.patch 703 BLAKE2B b5c2dca415555f1aa7411296abc3501a33018290772c14adc2ca5a73ad39e11a62d1033042ad0ab644b141c9438168edb995a2d2f877ce62ad834c26776a6739 SHA512 c6014e931ff2f96f26b5dde6b5ab99ac7592ff4077af15eb8612ded35186c09490ccbd6d4a00bff46e40da5d18a26c2b6d6e6664f581c7c111ff18e2dd6d049f DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b -DIST ethtool-5.6.tar.xz 281084 BLAKE2B 1fecc52e9031a3d13cbe6b3c508ebd7fc6dc03b02d4126b3ddd9ef40eedbef151b66f52e80b6570d45ebba09437b587124d2c22817da7d4f3658bd1ff1d3c8a1 SHA512 9308f8e4a297d842a7a5a51419e408951e669da1f58cb1eed41f52be4cd2f32f811d1d19e9bee59d8297938a6d5a4abff2b9bbf789d0c49ed5074a78826d3199 -DIST ethtool-5.7.tar.xz 283048 BLAKE2B 1f265ea452ec0d37b4bd4bb4e602a27d2d26144d750940b2c61638524626fffb59c3fbf054472e31ff755260d7cce8f6cdc31ef74a512a3656830b546b4bbe6d SHA512 195e24c48201412e0eaad7d7ca4e530c3a8cf50f3518cfe49d299fd091cf9198007c5d23be95109c735ceb2ccad37ac9f2e9cde0fb36ea426ab17b1dd064d4a9 DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e +DIST ethtool-5.9.tar.xz 307792 BLAKE2B 0cb5b56f6367bba18c92b1d420471be0b203e05d36fec1495f18de7a2e793fb12cd57b3f2f79369327be1b76a9ec749a65b91801c90da79de9d23da62e628fcb SHA512 9166a06b823373188e754b3085cf8e8f71455d83d1bcfcaf1350433b21bdbc6ae851f62108d3d2e3bbbca33ca595382cd2c68966ce4824b55f7f59eb0996bf36 EBUILD ethtool-5.4.ebuild 457 BLAKE2B ce0d2ef607cc8970596e8a27c677eaa8ca24d03c41d879f107a6c0981ef33cdc75b1a6f63ca402467d0e02a39e253866995867b2242e1f4a5c205bf19011129b SHA512 28e8a1049a95e8d6ab2ea8b2728af57c57c4e271cb1648059289bd176143607b7a332d9efb455f8ed86a1882ff779f1bd6c2d03555c02feb84c24f64bde5be9d -EBUILD ethtool-5.6-r1.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f -EBUILD ethtool-5.7.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f EBUILD ethtool-5.8-r1.ebuild 682 BLAKE2B 23b63341a624085d2733bded18283f0442119947827068a7e34eccd953fc7c0a08296ed5039223dc59db0179e96755d9f5f71a39ce832f96a5f70b4cb06b03e4 SHA512 890996f816dfd11084c0c37c1238d682f77c5d9ccc9eb8d4a1f411fe44b61f22d246574d68a13be850806cb81ca0570b0bb9938ebfde7a73e9873ad3afe4930b +EBUILD ethtool-5.9.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b diff --git a/sys-apps/ethtool/ethtool-5.6-r1.ebuild b/sys-apps/ethtool/ethtool-5.6-r1.ebuild deleted file mode 100644 index 804cce9dde3e..000000000000 --- a/sys-apps/ethtool/ethtool-5.6-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+netlink" - -DEPEND="app-arch/xz-utils" -RDEPEND="netlink? ( net-libs/libmnl )" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-5.7.ebuild b/sys-apps/ethtool/ethtool-5.7.ebuild deleted file mode 100644 index 804cce9dde3e..000000000000 --- a/sys-apps/ethtool/ethtool-5.7.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+netlink" - -DEPEND="app-arch/xz-utils" -RDEPEND="netlink? ( net-libs/libmnl )" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-5.9.ebuild b/sys-apps/ethtool/ethtool-5.9.ebuild new file mode 100644 index 000000000000..804cce9dde3e --- /dev/null +++ b/sys-apps/ethtool/ethtool-5.9.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" +HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" +SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+netlink" + +DEPEND="app-arch/xz-utils" +RDEPEND="netlink? ( net-libs/libmnl )" + +src_configure() { + econf $(use_enable netlink) +} diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest index 0c5f6099c799..64675554ca53 100644 --- a/sys-apps/fakeroot/Manifest +++ b/sys-apps/fakeroot/Manifest @@ -4,8 +4,12 @@ DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f 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 1067 BLAKE2B 12d38863a89eb5c073633b02fcf04845d48959821ad1a744b3329e98175164392dfa6cc14f006beefc3a07bb5df9b3944b016b59ad7755b8f3514e5bd7dd0d87 SHA512 5ef0839952eb6c3894faa97c9f0ca5e4676767b34c450d6375551301dc4d775188db6248d36d4abd0bf77e80176a7dc6701ecc79dd08a1ffda33d6d879d94d9d 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 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild new file mode 100644 index 000000000000..eac32e7e9542 --- /dev/null +++ b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild @@ -0,0 +1,51 @@ +# 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/fakeroot-1.25.3.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3.ebuild new file mode 100644 index 000000000000..eac32e7e9542 --- /dev/null +++ b/sys-apps/fakeroot/fakeroot-1.25.3.ebuild @@ -0,0 +1,51 @@ +# 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/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest index 88950ca9d405..23ea4753f2b0 100644 --- a/sys-apps/firejail-lts/Manifest +++ b/sys-apps/firejail-lts/Manifest @@ -2,4 +2,4 @@ AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a EBUILD firejail-lts-0.9.56.2-r1.ebuild 1217 BLAKE2B 1d7dcd7ebfee4c51d441a80dd59c1043b4accd6acdc95c7aaab747f79f4ded5ccd6bd7dbd7a687e09d8920b80f0cb179d56a6e9701d6839425051e3bd2080251 SHA512 d71262d24137f1f7f9f31e5f9a163c95a94b8680958d74e1729a7171197d6459e9e359994591201a469b110dd1da7ad51f9453296cb461534cdb5138bebe491a EBUILD firejail-lts-0.9.56.2-r2.ebuild 1405 BLAKE2B 059e7678dfb94f9049d3976f3d5ba2b9bb42b53875627257641627532e86ef4831d6bdda25f62b4557f6a4c596a478a637a70d3866d664d58e59c9fab87628b9 SHA512 6e44b5f8b4517762389320628a5c3b573df23288263eaa1b0cf6f3ad98fff7dd0ed55d6c1d738a9296cbb8ea4fe0e63c77417ca07c90ca928d360fd02bfc9dab -MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1 +MISC metadata.xml 1515 BLAKE2B 39fc57111fed8406749144c4404040e22dae6fa9b0fdfb1f74840a38f7abd39d7a222cab48d9d2658361195b378290f917f9f500704520a304d6d44810e0ce61 SHA512 d3af3ada41c5a1ebeee7cd48e876c1c06b8bd4ba114cef0f681d8d3a91a280a38cb9edb4a88129df58fad69fb6c3f1de97f94fe9ab24efabcc18c78f41c89599 diff --git a/sys-apps/firejail-lts/metadata.xml b/sys-apps/firejail-lts/metadata.xml index 74406c739693..d0dfd5bb16ba 100644 --- a/sys-apps/firejail-lts/metadata.xml +++ b/sys-apps/firejail-lts/metadata.xml @@ -2,8 +2,12 @@ - expeditioneer@gentoo.org - Dennis Lamm + hlein@korelogic.com + Hank Leininger + + + proxy-maint@gentoo.org + Proxy Maintainers Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest index 071d8d8b124c..a4f6d2c1615f 100644 --- a/sys-apps/firejail/Manifest +++ b/sys-apps/firejail/Manifest @@ -1,5 +1,5 @@ -DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f -EBUILD firejail-0.9.62-r1.ebuild 2102 BLAKE2B d30a3fa1db880a665b7f3754b14046d3e82e6a53fe9aa059dbfe6dfe48d97ece348efec04c94bba3f13961663bd39686a863039cd03a1ee2789a16511db3fe9d SHA512 6b6657dedcfea70e330e9240e0ee66c6658635bae9e10f58e07e0aa428803b8c4ece403f6530defca9782c2fe83972c223c9d1b7287445e6e88427e02884c679 -EBUILD firejail-0.9.62.ebuild 2162 BLAKE2B fbeced554b46369107e56846ebb4d8b4accd3c81996f81222a145a4d054ff1426f3514c59c4558c2f517cbc7a1f5035005c10fe778f152fa56a51c752eaaa40d SHA512 449e60bf793afa228f106e3b8913e8d7ba24e31f6e09da141750d0e607b91cd4dcdfa0092c88dcc16e593907182ada3fe20491df850e09cc95895ec1cb75a6c3 -EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a -MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e +DIST firejail-0.9.64.tar.xz 419464 BLAKE2B 9425910bd78739dc628a05247877f3e96065f9eab6be1fa87a70932ff04a53817e03cd67a81b35b0e5a69b5598fc5be9d6191f9c5c2bf511bc76c1edaf0eb22d SHA512 89bab9aee944ebde6221a96f0f028380f607cd49046cad5348d5974efcc92c50a172edf5e50c56606091d2060d1d8f0c50a41f05f63327672a3c3cb48eb93699 +EBUILD firejail-0.9.64-r1.ebuild 2482 BLAKE2B 3703d9d5ce29d3731c78d676a16ec3f2783be1e9a279d5097b91cde0bddfa947534f6daeb0de1248c1fad260a3b2d490866b9a62ae9ff7959f79fb82ab2f367c SHA512 99fcad32da86fbf263813f41a756027577875fd5a5836ec8211c4232aa1047d2408493410c05513aa4bbd15997fb5490d2be4f3132b5985d17042ff216ba0d54 +EBUILD firejail-0.9.64.ebuild 2280 BLAKE2B 2c8f17dab51ab876796b249dec5ac848cc22606d9d5ffa806a6fdf2f1a041a2b9c33b5e41fbce69315574a5304c077f45e0b33b2fe73186806f3198a8d200a9b SHA512 30c053e6779f15d97e9a7dbb2377429e0a4b3bcc25491f647d1b66076f50f76b7cc79cebc09da8fbaa8b5454867d00153c7eceb6eaa828666ef702d2dd7104f7 +EBUILD firejail-9999.ebuild 2283 BLAKE2B a7b65c61e0954035bcbadc74fdb2e81882114f2b163b4a3c45a73017224684fb4a8ae8bbf6cd2deb3d6676a6edfe2c7797178fe992a86f4372ed56bc51b06ecc SHA512 c97f99ede18629d656520e45c4767bd76c5e4432352002e000eb78675ea28f2d8733eebd8e61f0032597f574270acbf83c176d0b982bc8ad5451ff46bb1598e2 +MISC metadata.xml 1832 BLAKE2B aec785bbd3674d6ec089390d65c064b6ce1f56c9ae459f39808a393dd478b9225821dbaad8892f22f367d5c163f40b664b29afcd130aa6463a87fe6c46ef592f SHA512 c1f8ee756c4bd7e79cfa81b4c5ac92a3377ab58a5d8df6f5535d9906d3fcb55d9f34664f2206c950b3b8ba560e3ed7e4d18b7f5637463ac8cb1934a90b2b68d4 diff --git a/sys-apps/firejail/firejail-0.9.62-r1.ebuild b/sys-apps/firejail/firejail-0.9.62-r1.ebuild deleted file mode 100644 index 0521f812dbf4..000000000000 --- a/sys-apps/firejail/firejail-0.9.62-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~x86" - SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/netblue30/firejail.git" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" -RESTRICT="!test? ( test )" - -RDEPEND="apparmor? ( sys-libs/libapparmor )" - -DEPEND="${RDEPEND} - !sys-apps/firejail-lts - test? ( dev-tcltk/expect )" - -src_prepare() { - default - - find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die - - find -type f -name Makefile.in | xargs sed -i -r \ - -e '/^\tinstall .*COPYING /d' \ - -e '/CFLAGS/s: (-O2|-ggdb) : :g' || die - - sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die - - # remove compression of man pages - sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die - sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die - sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die -} - -src_configure() { - econf \ - --disable-firetunnel \ - $(use_enable apparmor) \ - $(use_enable chroot) \ - $(use_enable contrib contrib-install) \ - $(use_enable file-transfer) \ - $(use_enable globalcfg) \ - $(use_enable network) \ - $(use_enable overlayfs) \ - $(use_enable private-home) \ - $(use_enable seccomp) \ - $(use_enable suid) \ - $(use_enable userns) \ - $(use_enable whitelist) \ - $(use_enable x11) -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - default - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins contrib/vim/ftdetect/firejail.vim - - insinto /usr/share/vim/vimfiles/syntax - doins contrib/vim/syntax/firejail.vim - fi -} diff --git a/sys-apps/firejail/firejail-0.9.62.ebuild b/sys-apps/firejail/firejail-0.9.62.ebuild deleted file mode 100644 index 1b6e14740a13..000000000000 --- a/sys-apps/firejail/firejail-0.9.62.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~x86" - SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/netblue30/firejail.git" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - -RDEPEND="apparmor? ( sys-libs/libapparmor )" - -# TODO: enable tests -RESTRICT="test" - -src_prepare() { - default - - find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die - - find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \ - --expression='/^\tinstall .*COPYING /d' \ - --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die - - sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die - - # remove compression of man pages - sed --in-place '/gzip -9n $$man; \\/d' Makefile.in || die - sed --in-place '/rm -f $$man.gz; \\/d' Makefile.in || die - sed --in-place --regexp-extended 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die -} - -src_configure() { - econf \ - --disable-firetunnel \ - $(use_enable apparmor) \ - $(use_enable chroot) \ - $(use_enable contrib contrib-install) \ - $(use_enable file-transfer) \ - $(use_enable globalcfg) \ - $(use_enable network) \ - $(use_enable overlayfs) \ - $(use_enable private-home) \ - $(use_enable seccomp) \ - $(use_enable suid) \ - $(use_enable userns) \ - $(use_enable whitelist) \ - $(use_enable x11) -} - -src_install() { - default - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins contrib/vim/ftdetect/firejail.vim - - insinto /usr/share/vim/vimfiles/syntax - doins contrib/vim/syntax/firejail.vim - fi -} diff --git a/sys-apps/firejail/firejail-0.9.64-r1.ebuild b/sys-apps/firejail/firejail-0.9.64-r1.ebuild new file mode 100644 index 000000000000..32dabff199ad --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.64-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit toolchain-funcs python-single-r1 linux-info + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/netblue30/firejail.git" + EGIT_BRANCH="master" +fi + +DESCRIPTION="Security sandbox for any type of processes" +HOMEPAGE="https://firejail.wordpress.com/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist" +RESTRICT="!test? ( test )" + +RDEPEND="!sys-apps/firejail-lts + apparmor? ( sys-libs/libapparmor ) + contrib? ( ${PYTHON_DEPS} ) + dbusproxy? ( sys-apps/xdg-dbus-proxy )" + +DEPEND="${RDEPEND} + sys-libs/libseccomp + test? ( dev-tcltk/expect )" + +REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + default + + find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die + + sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + + # remove compression of man pages + sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die + + if use contrib; then + python_fix_shebang -f contrib/*.py + fi + + # some tests were missing from this release's tarball + if use test; then + sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die + fi +} + +src_configure() { + econf \ + --disable-firetunnel \ + $(use_enable apparmor) \ + $(use_enable chroot) \ + $(use_enable dbusproxy) \ + $(use_enable file-transfer) \ + $(use_enable globalcfg) \ + $(use_enable network) \ + $(use_enable overlayfs) \ + $(use_enable private-home) \ + $(use_enable suid) \ + $(use_enable userns) \ + $(use_enable whitelist) \ + $(use_enable X x11) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + default + + if use contrib; then + python_scriptinto /usr/$(get_libdir)/firejail + python_doscript contrib/*.py + insinto /usr/$(get_libdir)/firejail + dobin contrib/*.sh + fi +} + +pkg_postinst() { + CONFIG_CHECK="~SQUASHFS" + local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode" + check_extra_config +} diff --git a/sys-apps/firejail/firejail-0.9.64.ebuild b/sys-apps/firejail/firejail-0.9.64.ebuild new file mode 100644 index 000000000000..21d6c2b97361 --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.64.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit toolchain-funcs python-single-r1 + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~x86" + SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/netblue30/firejail.git" + EGIT_BRANCH="master" +fi + +DESCRIPTION="Security sandbox for any type of processes" +HOMEPAGE="https://firejail.wordpress.com/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist" +RESTRICT="!test? ( test )" + +RDEPEND="!sys-apps/firejail-lts + apparmor? ( sys-libs/libapparmor ) + contrib? ( ${PYTHON_DEPS} ) + dbusproxy? ( sys-apps/xdg-dbus-proxy )" + +DEPEND="${RDEPEND} + sys-libs/libseccomp + test? ( dev-tcltk/expect )" + +REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" + +src_prepare() { + default + + find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die + + sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + + # remove compression of man pages + sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die + + if use contrib; then + python_fix_shebang -f contrib/*.py + fi + + # some tests were missing from this release's tarball + if use test; then + sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die + fi +} + +src_configure() { + econf \ + --disable-firetunnel \ + $(use_enable apparmor) \ + $(use_enable chroot) \ + $(use_enable dbusproxy) \ + $(use_enable file-transfer) \ + $(use_enable globalcfg) \ + $(use_enable network) \ + $(use_enable overlayfs) \ + $(use_enable private-home) \ + $(use_enable suid) \ + $(use_enable userns) \ + $(use_enable whitelist) \ + $(use_enable X x11) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + default + + if use contrib; then + python_scriptinto /usr/$(get_libdir)/firejail + python_doscript contrib/*.py + insinto /usr/$(get_libdir)/firejail + dobin contrib/*.sh + fi +} diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild index 8dfef8571888..5858a542c311 100644 --- a/sys-apps/firejail/firejail-9999.ebuild +++ b/sys-apps/firejail/firejail-9999.ebuild @@ -3,9 +3,13 @@ EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) + +inherit toolchain-funcs python-single-r1 linux-info + if [[ ${PV} != 9999 ]]; then KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz" else inherit git-r3 EGIT_REPO_URI="https://github.com/netblue30/firejail.git" @@ -17,32 +21,37 @@ HOMEPAGE="https://firejail.wordpress.com/" LICENSE="GPL-2" SLOT="0" -IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" +IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist" +RESTRICT="!test? ( test )" -DEPEND="!sys-apps/firejail-lts +RDEPEND="!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) + contrib? ( ${PYTHON_DEPS} ) + dbusproxy? ( sys-apps/xdg-dbus-proxy )" + +DEPEND="${RDEPEND} + sys-libs/libseccomp test? ( dev-tcltk/expect )" -RDEPEND="apparmor? ( sys-libs/libapparmor )" +REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" -# TODO: enable tests -RESTRICT="test" +pkg_setup() { + python-single-r1_pkg_setup +} src_prepare() { default - find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die - - find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \ - --expression='/^\tinstall .*COPYING /d' \ - --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die + find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die - sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die # remove compression of man pages - sed --in-place '/gzip -9n $$man; \\/d' Makefile.in || die - sed --in-place '/rm -f $$man.gz; \\/d' Makefile.in || die - sed --in-place --regexp-extended 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die + sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die + + if use contrib; then + python_fix_shebang -f contrib/*.py + fi } src_configure() { @@ -50,27 +59,35 @@ src_configure() { --disable-firetunnel \ $(use_enable apparmor) \ $(use_enable chroot) \ - $(use_enable contrib contrib-install) \ + $(use_enable dbusproxy) \ $(use_enable file-transfer) \ $(use_enable globalcfg) \ $(use_enable network) \ $(use_enable overlayfs) \ $(use_enable private-home) \ - $(use_enable seccomp) \ $(use_enable suid) \ $(use_enable userns) \ $(use_enable whitelist) \ - $(use_enable x11) + $(use_enable X x11) +} + +src_compile() { + emake CC="$(tc-getCC)" } src_install() { default - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins contrib/vim/ftdetect/firejail.vim - - insinto /usr/share/vim/vimfiles/syntax - doins contrib/vim/syntax/firejail.vim + if use contrib; then + python_scriptinto /usr/$(get_libdir)/firejail + python_doscript contrib/*.py + insinto /usr/$(get_libdir)/firejail + dobin contrib/*.sh fi } + +pkg_postinst() { + CONFIG_CHECK="~SQUASHFS" + local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode" + check_extra_config +} diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml index 07938ac97ea4..a41213b778f7 100644 --- a/sys-apps/firejail/metadata.xml +++ b/sys-apps/firejail/metadata.xml @@ -2,8 +2,12 @@ - expeditioneer@gentoo.org - Dennis Lamm + hlein@korelogic.com + Hank Leininger + + + proxy-maint@gentoo.org + Proxy Maintainers Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of @@ -21,14 +25,14 @@ Enable support for custom AppArmor profiles Enable chrooting to custom directory Install contrib scripts + Enable DBus proxying to filter access in supporting profiles Enable file transfers between sandboxes and the host system Enable global config file Enable networking features Enable overlayfs Enable private home feature - Enable system call filtering Enable attaching a new user namespace to a sandbox (--noroot option) Enable whitelist - Enable X11 sandboxing + Enable X11 sandboxing diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest index e388f61ac11e..6607c85b4b5c 100644 --- a/sys-apps/flashrom/Manifest +++ b/sys-apps/flashrom/Manifest @@ -1,6 +1,9 @@ AUX flashrom-1.2_make-libflashrom-usable.patch 3230 BLAKE2B ddf5677e8a6b931d372059bf270b74a1dcd6ebfdfb1cf3e7c976e647fdc8180d005f19416ee15bb0b25f1f2b891348a42a83f8e6d44c528864947cd4be78e0da SHA512 dd60f4e25ab519f6b5f03c4e80be2fe24ab2c5c206c78aff2802f91026d5ef3889d2376f88bc4baa32de5c48951afe0cb1d62dbfc65c4965058caccfadff65d1 +AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664 +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-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f -EBUILD flashrom-1.2-r2.ebuild 5077 BLAKE2B 920633ca2e0139be61131b1ae752bd65584ec9d0c4d887ed6d99f8fdbcab07752aee64b44df46c7abd71006e24a922ad93a02fa138ca1da8bc33666efd086633 SHA512 c80d1ee1d91f3c06e23a6be41472561853d5ee9a4fca263190be3731f05b4abeb210e7e9cd46e61687c0b26f91260809cc320038f5c798203dcf5774b11f7841 +EBUILD flashrom-1.2-r2.ebuild 5072 BLAKE2B 4b1cf0e1cd5b1fb5c21ae2961d1360595a7c4a781c45976e931332f527b7933d5530371fc1293eec616407d3c0f1654153a6dfb2f2dec121cac4b883e33d0d01 SHA512 415bb76f8b9c23175c55b3d9ad2df2fe9938a018b65f27fab910fe5d2e32e4838a6d9dec76f76235506b8a1b1d85bd1948abb3197568ffba9917fcd8617e0783 +EBUILD flashrom-1.2-r3.ebuild 4344 BLAKE2B 35c916ff5dbc60e9033f0896720fe5c3feb2bcd610c4b228f54a5a41f8908c4a52a2b06dc62aa0300026900df8b4a07dea0f485beebb9f85fc11c8002a7c6133 SHA512 5675097256ae4add72b36a315fc580648f4ebfb7c24b59b1a6a8b4d0c2eac4202c566e98262792a583d755012aff0b1fdd7a613e9396e3e3af9c254e0123a024 EBUILD flashrom-9999.ebuild 4489 BLAKE2B d0fb29503061e75baf3edfe533297cbe657d2bf7cc69a03ac55c406cf50db0209620595d362e3a38873683e50794a9b719ef112639d6b439fc32d55880d484ee SHA512 712bb65c3b2e8a328a349c41ab102a6c774e2b1a1c96e2a85edb13ea747d4d1cc3234ec5476df8d99f49c1d10c294981cc260a87e57afd2f3824f6f418a215ee MISC metadata.xml 5027 BLAKE2B 3327749234a2c8fbab7b0058b082f7be52cd8108fa126973a4631bbd06da5a014a78c4e1871839ceb8cd993221059cf0235331c16d175fa4ac8f4324143865d4 SHA512 25e257b78992186e561e09cbce48872918191adb27b8cfce74644787e3d999d8cda18341a6208715ab3076ddb8cd9189bdddd1c856bbaabbad69ff017dfb7fd6 diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch new file mode 100644 index 000000000000..bb185fae8223 --- /dev/null +++ b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch @@ -0,0 +1,289 @@ +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ + version : run_command('util/getversion.sh', '-v').stdout().strip(), + license : 'GPL-2.0', + meson_version : '>=0.47.0', +- default_options : ['warning_level=2', 'c_std=c99'], ++ default_options : ['warning_level=2', 'c_std=gnu99'], + ) + + # libtool versioning +@@ -44,6 +44,7 @@ + config_gfxnvidia = get_option('config_gfxnvidia') + config_internal = get_option('config_internal') + config_it8212 = get_option('config_it8212') ++config_jlink_spi = get_option('config_jlink_spi') + config_linux_mtd = get_option('config_linux_mtd') + config_linux_spi = get_option('config_linux_spi') + config_mstarddc_spi = get_option('config_mstarddc_spi') +@@ -67,6 +68,10 @@ + deps = [] + srcs = [] + ++config_bitbang_spi = false ++need_libftdi = false ++need_libpci = false ++need_libusb = false + need_raw_access = false + need_serial = false + +@@ -81,24 +86,24 @@ + add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') + endif + +-# some programmers require libusb +-if get_option('usb') +- srcs += 'usbdev.c' +- deps += dependency('libusb-1.0') +-else ++if get_option('no_libftdi_programmers') ++ message('Disabling ALL libftdi-based programmers') ++ config_ft2232_spi = false ++ config_usbblaster_spi = false ++endif ++ ++if get_option('no_libusb_programmers') ++ message('Disabling ALL libusb-based programmers') + config_ch341a_spi = false + config_dediprog = false +- config_digilent_spi = false + config_developerbox_spi = false ++ config_digilent_spi = false + config_pickit2_spi = false ++ config_stlinkv3_spi = false + endif + +-# some programmers require libpci +-if get_option('pciutils') +- srcs += 'pcidev.c' +- deps += dependency('libpci') +- cargs += '-DNEED_PCI=1' +-else ++if get_option('no_libpci_programmers') ++ message('Disabling ALL libpci-based programmers') + config_atahpt = false + config_atapromise = false + config_atavia = false +@@ -121,14 +126,20 @@ + # set defines for configured programmers + if config_atahpt + srcs += 'atahpt.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_ATAHPT=1' + endif + if config_atapromise + srcs += 'atapromise.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_ATAPROMISE=1' + endif + if config_atavia + srcs += 'atavia.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_ATAVIA=1' + endif + if config_buspirate_spi +@@ -138,22 +149,28 @@ + endif + if config_ch341a_spi + srcs += 'ch341a_spi.c' ++ need_libusb = true + cargs += '-DCONFIG_CH341A_SPI=1' + endif + if config_dediprog + srcs += 'dediprog.c' ++ need_libusb = true + cargs += '-DCONFIG_DEDIPROG=1' + endif + if config_developerbox_spi + srcs += 'developerbox_spi.c' ++ need_libusb = true + cargs += '-DCONFIG_DEVELOPERBOX_SPI=1' + endif + if config_digilent_spi + srcs += 'digilent_spi.c' ++ need_libusb = true + cargs += '-DCONFIG_DIGILENT_SPI=1' + endif + if config_drkaiser + srcs += 'drkaiser.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_DRKAISER=1' + endif + if config_dummy +@@ -162,12 +179,14 @@ + endif + if config_ft2232_spi + srcs += 'ft2232_spi.c' ++ need_libftdi = true + cargs += '-DCONFIG_FT2232_SPI=1' +- deps += dependency('libftdi1') + cargs += '-DHAVE_FT232H=1' + endif + if config_gfxnvidia + srcs += 'gfxnvidia.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_GFXNVIDIA=1' + endif + if config_internal +@@ -186,6 +205,8 @@ + srcs += 'sb600spi.c' + srcs += 'wbsio_spi.c' + endif ++ need_libpci = true ++ need_raw_access = true + config_bitbang_spi = true + cargs += '-DCONFIG_INTERNAL=1' + if get_option('config_internal_dmi') +@@ -195,6 +216,8 @@ + endif + if config_it8212 + srcs += 'it8212.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_IT8212=1' + endif + if config_linux_mtd +@@ -211,36 +234,51 @@ + endif + if config_nic3com + srcs += 'nic3com.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_NIC3COM=1' + endif + if config_nicintel + srcs += 'nicintel.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_NICINTEL=1' + endif + if config_nicintel_eeprom + srcs += 'nicintel_eeprom.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_NICINTEL_EEPROM=1' + endif + if config_nicintel_spi + srcs += 'nicintel_spi.c' ++ need_libpci = true ++ need_raw_access = true + config_bitbang_spi = true + cargs += '-DCONFIG_NICINTEL_SPI=1' + endif + if config_nicnatsemi + srcs += 'nicnatsemi.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_NICNATSEMI=1' + endif + if config_nicrealtek + srcs += 'nicrealtek.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_NICREALTEK=1' + endif + if config_ogp_spi + config_bitbang_spi = true + srcs += 'ogp_spi.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_OGP_SPI=1' + endif + if config_pickit2_spi + srcs += 'pickit2_spi.c' ++ need_libusb = true + cargs += '-DCONFIG_PICKIT2_SPI=1' + endif + if config_pony_spi +@@ -252,15 +290,20 @@ + if config_rayer_spi + srcs += 'rayer_spi.c' + config_bitbang_spi = true ++ need_libpci = true + need_raw_access = true + cargs += '-DCONFIG_RAYER_SPI=1' + endif + if config_satamv + srcs += 'satamv.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_SATAMV=1' + endif + if config_satasii + srcs += 'satasii.c' ++ need_libpci = true ++ need_raw_access = true + cargs += '-DCONFIG_SATASII=1' + endif + if config_serprog +@@ -270,12 +313,19 @@ + endif + if config_usbblaster_spi + srcs += 'usbblaster_spi.c' ++ need_libftdi = true + cargs += '-DCONFIG_USBBLASTER_SPI=1' + endif + if config_stlinkv3_spi + srcs += 'stlinkv3_spi.c' ++ need_libusb = true + cargs += '-DCONFIG_STLINKV3_SPI=1' + endif ++if config_jlink_spi ++ srcs += 'jlink_spi.c' ++ cargs += '-DCONFIG_JLINK_SPI=1' ++ deps += dependency('libjaylink') ++endif + + # bitbanging SPI infrastructure + if config_bitbang_spi +@@ -296,6 +346,25 @@ + srcs += 'serial.c' + endif + ++# some programmers require libftdi ++if need_libftdi ++ deps += dependency('libftdi1') ++endif ++ ++# some programmers require libpci ++if need_libpci ++ srcs += 'pcidev.c' ++ deps += dependency('libpci') ++ cargs += '-DNEED_PCI=1' ++endif ++ ++# some programmers require libusb ++if need_libusb ++ srcs += 'usbdev.c' ++ deps += dependency('libusb-1.0') ++endif ++ ++ + prefix = get_option('prefix') + sbindir = join_paths(prefix, get_option('sbindir')) + libdir = join_paths(prefix, get_option('libdir')) +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ +-option('pciutils', type : 'boolean', value : true, description : 'use pciutils') +-option('usb', type : 'boolean', value : true, description : 'use libusb1') ++option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi') ++option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci') ++option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb') + + option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') + option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') +@@ -16,6 +17,7 @@ + option('config_internal', type : 'boolean', value : true, description : 'internal/onboard') + option('config_internal_dmi', type : 'boolean', value : true, description : 'Use internal DMI parser') + option('config_it8212', type : 'boolean', value : true, description : 'ITE IT8212F PATA') ++option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible') + option('config_linux_mtd', type : 'boolean', value : true, description : 'Linux MTD interfaces') + option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces') + option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support') diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch new file mode 100644 index 000000000000..8783cfeefa7e --- /dev/null +++ b/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch @@ -0,0 +1,43 @@ +This is essentially the upstream commit 7aea04f7099ad4dde7b1f5900b54ef603eadf25e, +modified so that MAN_DATE is set to simply '-' - the commit generates +the date using the script util/getrevision.sh, which is not included in +release tarballs. + +--- a/flashrom.8.tmpl ++++ b/flashrom.8.tmpl +@@ -40,7 +40,7 @@ + . \} + . \} + .. +-.TH FLASHROM 8 "" "" ++.TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@" + .SH NAME + flashrom \- detect, read, write, verify and erase flash chips + .SH SYNOPSIS +--- a/meson.build ++++ b/meson.build +@@ -321,6 +321,7 @@ endif + prefix = get_option('prefix') + sbindir = join_paths(prefix, get_option('sbindir')) + libdir = join_paths(prefix, get_option('libdir')) ++mandir = join_paths(prefix, get_option('mandir')) + + install_headers([ + 'libflashrom.h', +@@ -394,6 +395,16 @@ pkgg.generate( + description : 'library to interact with flashrom', + ) + ++conf.set('VERSION', version) ++conf.set('MAN_DATE', '-') ++configure_file( ++ input : 'flashrom.8.tmpl', ++ output : 'flashrom.8', ++ configuration : conf, ++ install: true, ++ install_dir: join_paths(mandir, 'man8'), ++) ++ + flashrom_dep = declare_dependency( + link_with : flashrom, + include_directories : include_directories('.'), diff --git a/sys-apps/flashrom/flashrom-1.2-r2.ebuild b/sys-apps/flashrom/flashrom-1.2-r2.ebuild index ae710e470315..3c603611e0aa 100644 --- a/sys-apps/flashrom/flashrom-1.2-r2.ebuild +++ b/sys-apps/flashrom/flashrom-1.2-r2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-v${PV}" SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild new file mode 100644 index 000000000000..106814bb570b --- /dev/null +++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://review.coreboot.org/flashrom.git" + inherit git-r3 +else + MY_P="${PN}-v${PV}" + SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" +HOMEPAGE="https://flashrom.org/" + +LICENSE="GPL-2" +SLOT="0" + +# The defaults match the upstream meson_options.txt. +IUSE_PROGRAMMERS=" + atahpt + atapromise + +atavia + +buspirate-spi + +ch341a-spi + +dediprog + +developerbox-spi + +digilent-spi + +drkaiser + +dummy + +ft2232-spi + +gfxnvidia + +internal + +it8212 + jlink-spi + +linux-mtd + +linux-spi + mstarddc-spi + +nic3com + +nicintel + +nicintel-eeprom + +nicintel-spi + nicnatsemi + +nicrealtek + +ogp-spi + +pickit2-spi + +pony-spi + +rayer-spi + +satamv + +satasii + +serprog + +stlinkv3-spi + +usbblaster-spi +" +IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools" + +LIB_DEPEND=" + atahpt? ( sys-apps/pciutils[static-libs(+)] ) + atapromise? ( sys-apps/pciutils[static-libs(+)] ) + atavia? ( sys-apps/pciutils[static-libs(+)] ) + ch341a-spi? ( virtual/libusb:1[static-libs(+)] ) + dediprog? ( virtual/libusb:1[static-libs(+)] ) + developerbox-spi? ( virtual/libusb:1[static-libs(+)] ) + digilent-spi? ( virtual/libusb:1[static-libs(+)] ) + drkaiser? ( sys-apps/pciutils[static-libs(+)] ) + ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) + gfxnvidia? ( sys-apps/pciutils[static-libs(+)] ) + internal? ( sys-apps/pciutils[static-libs(+)] ) + it8212? ( sys-apps/pciutils[static-libs(+)] ) + jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] ) + nic3com? ( sys-apps/pciutils[static-libs(+)] ) + nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] ) + nicintel-spi? ( sys-apps/pciutils[static-libs(+)] ) + nicintel? ( sys-apps/pciutils[static-libs(+)] ) + nicnatsemi? ( sys-apps/pciutils[static-libs(+)] ) + nicrealtek? ( sys-apps/pciutils[static-libs(+)] ) + ogp-spi? ( sys-apps/pciutils[static-libs(+)] ) + pickit2-spi? ( virtual/libusb:0[static-libs(+)] ) + rayer-spi? ( sys-apps/pciutils[static-libs(+)] ) + satamv? ( sys-apps/pciutils[static-libs(+)] ) + satasii? ( sys-apps/pciutils[static-libs(+)] ) + stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] ) + usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] ) +" +RDEPEND="${LIB_DEPEND//\[static-libs(+)]}" +DEPEND="${RDEPEND} + sys-apps/diffutils" +RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )" + +DOCS=( README Documentation/ ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.2_meson-fixes.patch + "${FILESDIR}"/${PN}-1.2_meson-install-manpage.patch +) + +src_configure() { + local emesonargs=( + $(meson_use atahpt config_atahpt) + $(meson_use atapromise config_atapromise) + $(meson_use atavia config_atavia) + $(meson_use buspirate-spi config_buspirate_spi) + $(meson_use ch341a-spi config_ch341a_spi) + $(meson_use dediprog config_dediprog) + $(meson_use developerbox-spi config_developerbox_spi) + $(meson_use digilent-spi config_digilent_spi) + $(meson_use drkaiser config_drkaiser) + $(meson_use dummy config_dummy) + $(meson_use ft2232-spi config_ft2232_spi) + $(meson_use gfxnvidia config_gfxnvidia) + $(meson_use internal config_internal) + $(meson_use internal-dmi config_internal_dmi) + $(meson_use it8212 config_it8212) + $(meson_use jlink-spi config_jlink_spi) + $(meson_use linux-mtd config_linux_mtd) + $(meson_use linux-spi config_linux_spi) + $(meson_use mstarddc-spi config_mstarddc_spi) + $(meson_use nic3com config_nic3com) + $(meson_use nicintel-eeprom config_nicintel_eeprom) + $(meson_use nicintel-spi config_nicintel_spi) + $(meson_use nicintel config_nicintel) + $(meson_use nicnatsemi config_nicnatsemi) + $(meson_use nicrealtek config_nicrealtek) + $(meson_use ogp-spi config_ogp_spi) + $(meson_use pickit2-spi config_pickit2_spi) + $(meson_use pony-spi config_pony_spi) + $(meson_use rayer-spi config_rayer_spi) + $(meson_use satamv config_satamv) + $(meson_use satasii config_satasii) + $(meson_use stlinkv3-spi config_stlinkv3_spi) + $(meson_use serprog config_serprog) + $(meson_use usbblaster-spi config_usbblaster_spi) + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if use tools; then + dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool + fi +} diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest new file mode 100644 index 000000000000..fcfe3887ebda --- /dev/null +++ b/sys-apps/flatpak/Manifest @@ -0,0 +1,3 @@ +DIST flatpak-1.8.2.tar.xz 1424468 BLAKE2B 4ade582176cd4ed494d0afc2a75b81168dc2263183d4ec2ef731b2d3ccbd96a7cc0fdb012f07966b4429529ab69c79b32abbcc4c1a8640b030d3ba2edfbce36d SHA512 f27c05b2621328dce31e4c31ae097765864bac84f6c1fada23f48c0235c6b85f447948a07861653f7bed4e17e43f8ff3d2c60263e23426c765c787b5f447a4e2 +EBUILD flatpak-1.8.2.ebuild 2341 BLAKE2B f27ddca127f893a74a0450e81178dafa9e01d2e824dee11e1a59f6fc584aef88c30735df457f5d5a34cf20236c69fa48251b1fd54c8167b9c89d404725437c2e SHA512 97afcccc5806149b2939ae93a725f83dd2899bfb37e66c27b6b44bdb83001b114a875ab8fa1b3a007269f9ec4be0eae8989fd549aac98aae48ab6721694c8c13 +MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d diff --git a/sys-apps/flatpak/flatpak-1.8.2.ebuild b/sys-apps/flatpak/flatpak-1.8.2.ebuild new file mode 100644 index 000000000000..2402feb98a35 --- /dev/null +++ b/sys-apps/flatpak/flatpak-1.8.2.ebuild @@ -0,0 +1,101 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools linux-info python-any-r1 + +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" +DESCRIPTION="Linux application sandboxing and distribution framework" +HOMEPAGE="https://flatpak.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="doc gtk kde introspection policykit seccomp systemd" +RESTRICT+=" test" + +RDEPEND=" + acct-group/flatpak + acct-user/flatpak + >=app-arch/libarchive-2.8:= + app-arch/zstd:= + >=app-crypt/gpgme-1.1.8:= + >=dev-libs/appstream-glib-0.5.10:= + >=dev-libs/glib-2.56:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + dev-libs/libassuan:= + >=dev-util/ostree-2019.5:=[gpg(+)] + || ( + dev-util/ostree[curl] + dev-util/ostree[soup] + ) + >=gnome-base/dconf-0.26:= + >=net-libs/libsoup-2.4:= + sys-apps/bubblewrap + sys-apps/dbus + >=sys-fs/fuse-2.9.9:0= + sys-apps/xdg-dbus-proxy + x11-apps/xauth + x11-libs/gdk-pixbuf:2= + x11-libs/libXau:= + policykit? ( >=sys-auth/polkit-0.98:= ) + seccomp? ( sys-libs/libseccomp:= ) + systemd? ( sys-apps/systemd:= ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/automake-1.13.4 + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + dev-util/gdbus-codegen + sys-devel/bison + introspection? ( >=dev-libs/gobject-introspection-1.40 ) + doc? ( + >=dev-util/gtk-doc-1.20 + dev-libs/libxslt + ) + $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') +" + +PDEPEND=" + gtk? ( sys-apps/xdg-desktop-portal-gtk ) + kde? ( kde-plasma/xdg-desktop-portal-kde ) +" + +python_check_deps() { + has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +pkg_setup() { + local CONFIG_CHECK="~USER_NS" + linux-info_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + # This line fails because locales are in /usr/lib/locale/locale-archive. + sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die +} + +src_configure() { + local myeconfargs=( + --enable-sandboxed-triggers + --enable-xauth + --localstatedir="${EPREFIX}"/var + --with-system-bubblewrap + --with-system-dbus-proxy + $(use_enable doc documentation) + $(use_enable doc gtk-doc) + $(use_enable introspection) + $(use_enable policykit system-helper) + $(use_enable seccomp) + $(use_with systemd) + ) + + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/flatpak/metadata.xml b/sys-apps/flatpak/metadata.xml new file mode 100644 index 000000000000..55de060f05cf --- /dev/null +++ b/sys-apps/flatpak/metadata.xml @@ -0,0 +1,11 @@ + + + + + zmedico@gentoo.org + Zac Medico + + + flatpak/flatpak + + diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index c78b4ced2278..4bc5042858ee 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -3,10 +3,12 @@ AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8af AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2 DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd -DIST fwupd-1.4.5.tar.gz 2318208 BLAKE2B 1e46137f5b72ff104d920771e54e3123bd0665cafd20c75327682a7e4284be93f8e284947db91892c29a153803013bab8ac45e5a0263fcda33b7491c53dd5558 SHA512 47eb40e8d84dc49af783b661db0fce0fb800c4581929becffb03b79c41ed8bfb0987f40fbb8262292b24af85b7f91978a6979ea7458058ee2bfc1a4353d0bd31 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9 -EBUILD fwupd-1.3.10.ebuild 4245 BLAKE2B c010711add27bf1c2526f4d3663d01b7cc0326f0099234f50c06f2e792eb59c59dcf510ee18354c5f4f214cf66f8b41faa2f535573400f07f1f16a266010fe07 SHA512 d99af54dc6d51b030d1515db64a8c3d13311fa6cedd8ac3b367b86671aa86205ac2cdac1219da2a27c555679764b6182fd3e2cb76752dc07a8fb750462bca523 -EBUILD fwupd-1.3.11.ebuild 4247 BLAKE2B 61bf6e25d7217e6025669d98086ad77d774ff310662f3335e711e60f6521ab40d1ba2de37058c0630174cb4d7c81ca79d8857c5b49addeb2c73da899ee6daa91 SHA512 94abbbfc2ab9265b0feda0e2e7d67206abff0a2938a11b08ef5e5c861d88e942c034dd0a5dcfa894cb53cb9dabed0106fcd364e643bfe1ce753757c88703560e -EBUILD fwupd-1.4.5.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098 -EBUILD fwupd-1.4.6.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098 -MISC metadata.xml 1183 BLAKE2B 1d98b79674b3d37f961dfa5f783d12f024865d2f29e53bb5e3de3daa47dbbc7993d0371ac93a7f1fd4411cee9dd0187a31d5904df23ea03ef4cd61e7a75f22dd SHA512 5357a5c7dd3e6578d5eb37296d484b8f5c89b0c619f0da783f642237cb00e72e8c6adc4c463c825959f2dcf58f52fe2f56623a4864b0bd41f26f530b7af51d42 +DIST fwupd-1.5.1.tar.gz 2398842 BLAKE2B dce2da9807bc28c502281a75b98b21bab8fc34778ca1ed5e43b944cec2043ced7d3b997402d904eaceeb62d139182b883dfac0f4b6228750b18f8d0c66539d4f SHA512 57fa13d0c24cf9c8ec5341dca5392e054194861885233284a5a26d7c351ccdaab5a9ac9853681258882d42d21732302324719a709ff7e713885a9977430683ce +DIST fwupd-1.5.2.tar.gz 2416756 BLAKE2B 8b5849c3b1a0758489cdc369dfa85658a3904bb9483484aded4a4f0d3ed39f0fa819171273dabf18c62a0249f09b1058269cdb57eb3c75590242f1ba6b1a0a85 SHA512 1ea7104c95f884ba52194d3136058f685ac1ad6d705930c4bc584aa4b1902164393d8702a14ec4a6af84e8b06d778a4896e63cbe9d3266f20da31d3795fc7ca7 +EBUILD fwupd-1.3.10.ebuild 4148 BLAKE2B d05855a501dd88e13c9845b1755e940cf231a0f706d5535ee3c836e9cff42555378d8b4614eba0c1ddfd18e94294eda890f7335a6601df6aaaa0518b5fbac455 SHA512 7aca24dc171a5bac2daf1e68b8003f02534bf6c425b9f56c19cabb0a7b21c93d89a7160bf9e094822d5a8aab30f6ad8be9831cd7a1055c6ed11612d36e3d3be8 +EBUILD fwupd-1.3.11.ebuild 4150 BLAKE2B 8fd9c91985f344d898cdd16a95807c5d67d83125ca7fc2035d23ed7e1559803ca5dfa84b5f678c84e7b7c480e93e860ce3f2fa9b84d19dcb0400b80455dec0d9 SHA512 a830693d00099e0ee12aa2d9e6b0be6239958c32684c517c0ca8d118ec9faccd88c6264b86f0d704c5d0e1f9595b34b75973169ab15c4abed62242ec4481b5df +EBUILD fwupd-1.4.6.ebuild 4058 BLAKE2B b5741ff3e24a276de100341b9a0bb37bcc71ac958ac19c2437b3c5471212247c75d71aad74c136ad4f103daf8397be495cc01ee858d3ea25886675e3ec637a37 SHA512 c25d3f5b6f8c74937761ba587959bc39a053ad74059750ee63d13ccc098f92c8fe91b1b8cb37d0ee86220f65f05235fd403de8a3cc670035e89a97ddceb90ff1 +EBUILD fwupd-1.5.1-r1.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1 +EBUILD fwupd-1.5.2.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1 +MISC metadata.xml 1181 BLAKE2B 467c8aa0e5816a75af46609baafd0472db7d28918e91032fb56cbf97eeaef3b196698d965f3e407d843d5f2fc90efbbdfcd4bf4263cab0919c09ec0e6e48b2a9 SHA512 77fbab8ce23a4e2e3568c4b08a7299d8aeea6a3333b12be6073bfc7a17020cd4122f04f8d592b891daf06176bbdcca345c0bae322a8d6db1da096f72ec2a93e6 diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild index f0c9fd71429f..a75d878756bd 100644 --- a/sys-apps/fwupd/fwupd-1.3.10.ebuild +++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild @@ -14,9 +14,9 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" +IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( consolekit elogind minimal systemd ) + ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) " @@ -53,7 +53,6 @@ CDEPEND="${PYTHON_DEPS} >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev - consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 @@ -119,7 +118,6 @@ src_configure() { -Dbuild="$(usex minimal standalone all)" $(meson_use agent) $(meson_use amt plugin_amt) - $(meson_use consolekit) $(meson_use dell plugin_dell) $(meson_use elogind) $(meson_use gpg) @@ -140,6 +138,7 @@ src_configure() { -Dplugin_flashrom="false" # Dependencies are not available (yet?) -Dplugin_modem_manager="false" + -Dconsolekit="false" ) export CACHE_DIRECTORY="${T}" meson_src_configure @@ -149,7 +148,7 @@ src_install() { meson_src_install if ! use minimal ; then - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ + sed "s@%SEAT_MANAGER%@elogind@" \ "${FILESDIR}"/${PN}-r1 \ > "${T}"/${PN} || die doinitd "${T}"/${PN} diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild index dd8d595a5892..378dc3009785 100644 --- a/sys-apps/fwupd/fwupd-1.3.11.ebuild +++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild @@ -14,9 +14,9 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" +IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( consolekit elogind minimal systemd ) + ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) " @@ -53,7 +53,6 @@ CDEPEND="${PYTHON_DEPS} >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev - consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 @@ -119,7 +118,6 @@ src_configure() { -Dbuild="$(usex minimal standalone all)" $(meson_use agent) $(meson_use amt plugin_amt) - $(meson_use consolekit) $(meson_use dell plugin_dell) $(meson_use elogind) $(meson_use gpg) @@ -140,6 +138,7 @@ src_configure() { -Dplugin_flashrom="false" # Dependencies are not available (yet?) -Dplugin_modem_manager="false" + -Dconsolekit="false" ) export CACHE_DIRECTORY="${T}" meson_src_configure @@ -149,7 +148,7 @@ src_install() { meson_src_install if ! use minimal ; then - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ + sed "s@%SEAT_MANAGER%@elogind@" \ "${FILESDIR}"/${PN}-r1 \ > "${T}"/${PN} || die doinitd "${T}"/${PN} diff --git a/sys-apps/fwupd/fwupd-1.4.5.ebuild b/sys-apps/fwupd/fwupd-1.4.5.ebuild deleted file mode 100644 index 246c5406ba15..000000000000 --- a/sys-apps/fwupd/fwupd-1.4.5.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,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 consolekit dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( consolekit 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 - consolekit? ( >=sys-auth/consolekit-1.0.0 ) - 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 consolekit) - $(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" - ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ - "${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.5.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild new file mode 100644 index 000000000000..9ab001c44f90 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,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 ~ppc64 ~x86" +IUSE="agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit 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.3.5[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/libsmbios-2.4.0 + ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + policykit? ( + >=sys-auth/polkit-0.103 + ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + media-libs/fontconfig + media-libs/freetype + sys-boot/gnu-efi + sys-boot/efibootmgr + 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 + 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 dell plugin_dell) + $(meson_use elogind) + $(meson_use flashrom plugin_flashrom) + $(meson_use gtk-doc gtkdoc) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use synaptics plugin_synaptics) + $(meson_use systemd) + $(meson_use test tests) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm) + $(meson_use uefi plugin_uefi) + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + -Dconsolekit="false" + ) + use ppc64 && emesonargs+=( -Dplugin_msr="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 = 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 dell plugin_dell) + $(meson_use elogind) + $(meson_use flashrom plugin_flashrom) + $(meson_use gtk-doc gtkdoc) + $(meson_use man) + $(meson_use nvme plugin_nvme) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use synaptics plugin_synaptics) + $(meson_use systemd) + $(meson_use test tests) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm) + $(meson_use uefi plugin_uefi) + # Dependencies are not available (yet?) + -Dplugin_modem_manager="false" + -Dconsolekit="false" + ) + use ppc64 && emesonargs+=( -Dplugin_msr="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 Enable update notification agent Build and install Intel AMT plugin - Use sys-auth/consolekit for session tracking Enable Dell-specific support. + Enable flashrom plugin via sys-apps/flashrom Enable GPG support. Build and install man pages Build and install NVMe plugin diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest index 3488d68e5ec7..58ccc4023503 100644 --- a/sys-apps/gentoo-functions/Manifest +++ b/sys-apps/gentoo-functions/Manifest @@ -1,4 +1,6 @@ DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd +DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc EBUILD gentoo-functions-0.13.ebuild 886 BLAKE2B 7bb2051509bc332c95b1a2d6ee7d0aebe3ddfeb487559de756474cd96d46263b5af57389a16f53df1c673daaec4dd618e5140800c79227d18337980091dd1c9d SHA512 5ba8f91873a2ad75848ef3b443c0c7a99665df73dc2c20a61a1b64ef3ac38478bda80abd0e0e059ed9ad97fcfa1eb73d6318c1e68efe4e7b79859ffce1600fff +EBUILD gentoo-functions-0.14.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2 EBUILD gentoo-functions-9999.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2 MISC metadata.xml 492 BLAKE2B cd68fc088438ae1171d801f7aeb93ac09a21dd2e628ab14c11e2f3f28fba3ad3653005d087ab5c44362b9b6fbc66b1c14256176c6f181313cbf3aa6a01c6739b SHA512 991fa3c3f302d26f4beb103c5dab1b943599aa83ca538b04a785ba608059471047061296d219b637a8b16185105c0ace8b0ff511ec2d94c840be27d96ac8e3c6 diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild new file mode 100644 index 000000000000..04f1a329e9ec --- /dev/null +++ b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild @@ -0,0 +1,28 @@ +# Copyright 2014-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git" +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="base functions required by all Gentoo systems" +HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +src_configure() { + tc-export CC + append-lfs-flags + export ROOTPREFIX="${EPREFIX}" + export PREFIX="${EPREFIX}/usr" +} diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest index bffe3cde4d66..55780e9f7998 100644 --- a/sys-apps/gentoo-systemd-integration/Manifest +++ b/sys-apps/gentoo-systemd-integration/Manifest @@ -1,6 +1,6 @@ DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c -EBUILD gentoo-systemd-integration-8.ebuild 744 BLAKE2B e44671d3e34f7665747b9d1fa10b10eee13c8d35a78dc786c993aa2d804dc2bdcf17b6a57edec0e1ef1fbaf3d2a397e01fc67e3c743fa32363b60a8432ef1532 SHA512 8bc93f6602fcc7736c8572318097577bec74e9096fc40dbb548ce14d32b154d1749391889fd242a099eb7022f533ddaab39a0032beaab04b9ddce27ef65500da +EBUILD gentoo-systemd-integration-8.ebuild 739 BLAKE2B 4f0e0dd931f86016bc196dc9fd53f841612b00f1960e94cdf4c19890d861980fa8fb3cf696abef6c2b9abab5faec062a6fd4b65ad4ad4b6fbed73a48becd3d74 SHA512 5abaf6ca527472ef12c7d2719c78511344cc314156f6afe6d997edd5bd75f5566df6a24e97b3253e58e0ae8c378d9eddde72cdfe4c5824f91cfc543496eb5809 EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0 diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild index 4c95169bb84b..406fc9773b03 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit autotools git-r3 else SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" fi inherit systemd diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 80a01e68dd29..4cd23be54944 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,7 +1,3 @@ -DIST gnome-disk-utility-3.34.5.tar.xz 1385256 BLAKE2B d13202abf77c62cdbf483486d7ed8204016111042f29fc810f0a55a9cd3dd48553d523523348e73a5d3dc3c3133939577b14227f2f5122471076cd93482dde15 SHA512 04c1ba0865b3947cfc332e479faae7b404f70907d04446bfe471d8fa2f8f5c921b1d59ab0f82fad13f4183401dacf3a516ee7ec439e94dc3e073a8dd62021a51 -DIST gnome-disk-utility-3.36.1.tar.xz 1370848 BLAKE2B 02f642de5f0d320396bb5d9a258ab184955c412cc4351a77f60fe65a55818ea82a7f702b6646428f6aa44a88a08327aae4efda742956971c30aea10925cda169 SHA512 7565ef3647b4ae562af60e0cc70577268bb2baa54ece3859e5dfbd5e661a963788598768d591592d1dee3541673331f99c2bdb947a2a0af09cb6096887dc71fd DIST gnome-disk-utility-3.36.3.tar.xz 1373276 BLAKE2B 445aeaf68aa6b56dd6731e69e8fecdd1ca0385ba481bd0c8cd2ed411f7b117261f7acf47651f5354d0832141c479a6cd1b0727257d6f533159dd2d437edc59db SHA512 160283e1b0864e08ba6feb9368791e4cd3b287dc628553a69a1c276fa66252b37b1d906451b4342d953504a4669056aed0ebb3233ff61cbb761e612258ca078f -EBUILD gnome-disk-utility-3.34.5.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e -EBUILD gnome-disk-utility-3.36.1.ebuild 1386 BLAKE2B 42ca1790d80525ac95924c17301247fd26471628fcaf92402510268b6fa5adbb85023ee440784b1ddab167462e8fa893ecbece2279d98aff97715ad21ae61c03 SHA512 0cf9e3572d9587c8ec4f5483670a7c2494c9b4043e759340e08ea513204b89023e10e365b4b5146b7d602570dfc7fef1e8e957a3db2efd3008cc1cc71fdc9cee EBUILD gnome-disk-utility-3.36.3.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild deleted file mode 100644 index 19aa489c4f18..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.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 gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://wiki.gnome.org/Apps/Disks" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -DEPEND=" - >=media-libs/libdvdread-4.2.0:0= - >=dev-libs/glib-2.31:2 - >=x11-libs/gtk+-3.16.0:3 - >=media-libs/libcanberra-0.1[gtk3] - >=app-arch/xz-utils-5.0.5 - >=x11-libs/libnotify-0.7:= - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=sys-fs/udisks-2.7.6:2 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# libxml2 for xml-stripblanks in gresource -BDEPEND=" - dev-libs/libxml2:2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) - $(meson_use gnome gsd_plugin) - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.ebuild deleted file mode 100644 index 6f3bb0f36d10..000000000000 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.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 gnome.org gnome2-utils meson xdg - -DESCRIPTION="Disk Utility for GNOME using udisks" -HOMEPAGE="https://wiki.gnome.org/Apps/Disks" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="fat elogind gnome systemd" -REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DEPEND=" - >=media-libs/libdvdread-4.2.0:0= - >=dev-libs/glib-2.31:2 - >=x11-libs/gtk+-3.16.0:3 - >=media-libs/libcanberra-0.1[gtk3] - >=app-arch/xz-utils-5.0.5 - >=x11-libs/libnotify-0.7:= - >=app-crypt/libsecret-0.7 - >=dev-libs/libpwquality-1.0.0 - >=sys-fs/udisks-2.7.6:2 - elogind? ( >=sys-auth/elogind-209 ) - systemd? ( >=sys-apps/systemd-209:0= ) -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - fat? ( sys-fs/dosfstools ) - gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) -" -# libxml2 for xml-stripblanks in gresource -BDEPEND=" - dev-libs/libxml2:2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) - $(meson_use gnome gsd_plugin) - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index d522d90fb31c..bd7917299861 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,7 +1,7 @@ -DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4 -EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693 -EBUILD grep-3.4.ebuild 1515 BLAKE2B eb01e846dab2fc7654fd5172d8b6dd9ba7c4affa278b28034d708a033604ceaefbda40c0c55500a6bac702e6503ebb6541029bef2faa94dc64405b79d41f970b SHA512 dadb38743f17805e0eb9f7592209645514edc0e36d6e8ccff23dba5e1c32db4cca3469fd7ea90efa10946018a60d3e915fa344963032f72d8dc5dcf8ead03d02 -EBUILD grep-3.5.ebuild 1522 BLAKE2B bcfd24d3219eb4daa64894084e592d277dae2cbebda55ed2c7cc71688cf4630766e5529ef9c04cd2ca4a57af7ad9cf49c88a0e04c7ec72a5ea76ab4e5da1cb40 SHA512 e2654150a88cb90c194e9cc20828ababa8290fbfabe98ab93c95c41fc80c0b29800b93bb415c0b5a9194705f1a7b518ff77b33cc16489057311435742cb9db69 +DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90 +EBUILD grep-3.4.ebuild 1515 BLAKE2B 1ac764198529abfe48e0f4fec6973404c29ba07ed8255bbb898109ced405c2445754065c0d8959d26e831988f12341c468883550a29f45e05e91cf7e1ff9fa6b SHA512 cace0e11249a7e1d35997379f41321fcb3fbff314cfa32e81276782c133bf5fd6bfd0459fd589d7531a467ec7a8779edbe0ef17354f23d7b2596d1ccc13130fb +EBUILD grep-3.5.ebuild 1516 BLAKE2B 29af64e0d4b5d7dda792e8b58dc78e20b2988f200a6c087791201cbc74f54a5b790a48ea39771cee9757355fc13015119f7f376938189ab3a5ca7c41fa701e5c SHA512 97074c1b4179c64c1584a065c65434fa48b7f4f23638bb17490abc2a501f01d2dee723d75a934d3e1fc60cd28078aea62867b349d0c2e90dd77b4c67dd725d94 +EBUILD grep-3.6.ebuild 1494 BLAKE2B a6bad3481f3cec277b4ce66d073de9ef750117d6becc72a8ec8c9dfb9323d16b5a98547c749103aa8afeb24d548ee5c1ff086aaed8186affcf823d51f01a16da SHA512 332901e74127528a3b761f7b600bd635b00cad534ded7bfd6e2ea2512307157b5a5aa9539663e0621c11543a1eebd1cb1cb8009239d169ccd31bdee421957480 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.3-r1.ebuild deleted file mode 100644 index f8c15a4f4d62..000000000000 --- a/sys-apps/grep/grep-3.3-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="https://www.gnu.org/software/grep/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls pcre static" - -LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - nls? ( virtual/libintl ) - virtual/libiconv" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - static? ( ${LIB_DEPEND} )" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -src_prepare() { - sed -i \ - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ - -e "s:@grep@:${EPREFIX}/bin/grep:" \ - src/egrep.sh || die #523898 - - default -} - -src_configure() { - use static && append-ldflags -static - # don't link against libsigsegv even when available - export ac_cv_libsigsegv=no - # Always use pkg-config to get lib info for pcre. - export ac_cv_search_pcre_compile=$( - usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' - ) - econf \ - --bindir="${EPREFIX}"/bin \ - $(use_enable nls) \ - $(use_enable pcre perl-regexp) -} diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild index 34e55974da37..1ceaf434310f 100644 --- a/sys-apps/grep/grep-3.4.ebuild +++ b/sys-apps/grep/grep-3.4.ebuild @@ -10,9 +10,9 @@ HOMEPAGE="https://www.gnu.org/software/grep/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz mirror://gentoo/${P}.tar.xz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls pcre static" LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild index a581969446e1..43c8ebe75f34 100644 --- a/sys-apps/grep/grep-3.5.ebuild +++ b/sys-apps/grep/grep-3.5.ebuild @@ -10,9 +10,9 @@ HOMEPAGE="https://www.gnu.org/software/grep/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz mirror://gentoo/${P}.tar.xz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls pcre static" LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" diff --git a/sys-apps/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild new file mode 100644 index 000000000000..2c6c26102d47 --- /dev/null +++ b/sys-apps/grep/grep-3.6.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="https://www.gnu.org/software/grep/" +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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls pcre static" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + nls? ( virtual/libintl ) + virtual/libiconv" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + sed -i \ + -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ + -e "s:@grep@:${EPREFIX}/bin/grep:" \ + src/egrep.sh || die #523898 + + default +} + +src_configure() { + use static && append-ldflags -static + # don't link against libsigsegv even when available + export ac_cv_libsigsegv=no + # Always use pkg-config to get lib info for pcre. + export ac_cv_search_pcre_compile=$( + usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' + ) + local myeconfargs=( + --bindir="${EPREFIX}"/bin + $(use_enable nls) + $(use_enable pcre perl-regexp) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest index 0ef7e5f8e3fd..f393df68f74b 100644 --- a/sys-apps/hdparm/Manifest +++ b/sys-apps/hdparm/Manifest @@ -1,8 +1,9 @@ AUX hdparm-9.51-build.patch 1210 BLAKE2B cb35c2fa451a0746ffc2f431ef3857b313f1e8c1e0cac7297deb5113944cb642a38734f1ba7d8538c1c1b4b0ec322827f87eb8e91520623712f3db67379c8aae SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a +AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e23b468a4fbc0f5ac545d8a1b214168769da94271242b2119d480e34dbcaa734b636231021c03e2a57f585426cc SHA512 d3f76575074806c7981aacdf7a5a4e1e97a2afbcd09e8821cf1c064f8960b397e2ccdd534fb95b91f43f35c481f94463fb1fe485189436bd5de8178823d7c9eb AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8 -DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea -EBUILD hdparm-9.56.ebuild 980 BLAKE2B 9810a7181ee3c0a55dd77ff5816f1c4b268692c006159a878cc9536a152dee8b5be5392376fe2e4d4ccb17064bffa9cc13c05d89c878057316777e0ce5f77371 SHA512 0456e15903ecf41f4e141e6f151cb798ecd7a58386fed4cc474608033743564f3b30cb044aaa6b90d7d0d7cbff6ca4dceeba115292b306e28ea78f2c45fbd498 +DIST hdparm-9.60.tar.gz 155220 BLAKE2B c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0 SHA512 e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed EBUILD hdparm-9.58.ebuild 980 BLAKE2B 9810a7181ee3c0a55dd77ff5816f1c4b268692c006159a878cc9536a152dee8b5be5392376fe2e4d4ccb17064bffa9cc13c05d89c878057316777e0ce5f77371 SHA512 0456e15903ecf41f4e141e6f151cb798ecd7a58386fed4cc474608033743564f3b30cb044aaa6b90d7d0d7cbff6ca4dceeba115292b306e28ea78f2c45fbd498 +EBUILD hdparm-9.60.ebuild 988 BLAKE2B ea610b08465de0b0788d96ac5f7271a2d01fbd8b845245401ccc38168184a42ddc65c1e206f006961dcd9ecb4b395ce92ccd92bee27b0f09f53e90c806559195 SHA512 bf97a9e3a65131058c88aec29d6675666eb68fb2c9fb1aa6343364d4536706aaa39eaed4da6dca47ea23835eb910ac9104acbf55b37879d268f9117fb8d788b6 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287 diff --git a/sys-apps/hdparm/files/hdparm-9.60-build.patch b/sys-apps/hdparm/files/hdparm-9.60-build.patch new file mode 100644 index 000000000000..3cc1a7564e35 --- /dev/null +++ b/sys-apps/hdparm/files/hdparm-9.60-build.patch @@ -0,0 +1,32 @@ +* drop hardcoded -O2 flag from CFLAGS +* fix hardcoded `make` and hardcoded -j4 flags +* respect CFLAGS when linking + +--- hdparm-9.60/Makefile ++++ hdparm-9.60/Makefile +@@ -13,7 +13,7 @@ + CC ?= gcc + STRIP ?= strip + +-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) ++CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs + + INSTALL = install + INSTALL_DATA = $(INSTALL) -m 644 +@@ -22,14 +22,13 @@ + + OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o apt.o + +-all: +- $(MAKE) -j4 hdparm ++all: hdparm + + static: + LDFLAGS=-static $(MAKE) + + hdparm: Makefile hdparm.h sgio.h $(OBJS) +- $(CC) $(LDFLAGS) -o hdparm $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS) + $(STRIP) hdparm + + hdparm.o: hdparm.h sgio.h diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild deleted file mode 100644 index acb642f6568a..000000000000 --- a/sys-apps/hdparm/hdparm-9.56.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="Utility to change hard drive performance parameters" -HOMEPAGE="https://sourceforge.net/projects/hdparm/" -SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz" - -LICENSE="BSD GPL-2" # GPL-2 only -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="static" - -PATCHES=( - "${FILESDIR}"/${PN}-9.51-build.patch -) - -src_prepare() { - default - use static && append-ldflags -static -} - -src_configure() { - tc-export CC - export STRIP=: -} - -src_install() { - into / - dosbin hdparm contrib/idectl - - newinitd "${FILESDIR}"/hdparm-init-8 hdparm - newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm - - doman hdparm.8 - dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig - docinto wiper - dodoc wiper/{README.txt,wiper.sh} - docompress -x /usr/share/doc/${PF}/wiper/wiper.sh -} diff --git a/sys-apps/hdparm/hdparm-9.60.ebuild b/sys-apps/hdparm/hdparm-9.60.ebuild new file mode 100644 index 000000000000..1bfffb80b2fa --- /dev/null +++ b/sys-apps/hdparm/hdparm-9.60.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Utility to change hard drive performance parameters" +HOMEPAGE="https://sourceforge.net/projects/hdparm/" +SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz" + +LICENSE="BSD GPL-2" # GPL-2 only +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="static" + +PATCHES=( + "${FILESDIR}"/${PN}-9.60-build.patch +) + +src_prepare() { + default + use static && append-ldflags -static +} + +src_configure() { + tc-export CC + export STRIP=: +} + +src_install() { + into / + dosbin hdparm contrib/idectl + + newinitd "${FILESDIR}"/hdparm-init-8 hdparm + newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm + + doman hdparm.8 + dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig + docinto wiper + dodoc wiper/{README.txt,wiper.sh} + docompress -x /usr/share/doc/${PF}/wiper/wiper.sh +} diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest index 39af96933190..fdf691c52763 100644 --- a/sys-apps/hw-probe/Manifest +++ b/sys-apps/hw-probe/Manifest @@ -1,7 +1,5 @@ AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326 AUX hw-probe-1.5-disable-automatic-upload.patch 1140 BLAKE2B 47ae86326941c5a86f9efd7614509a9af36261c51ef85f21ea1172ae91c3966c113aa51f8841a56005f75b0370b57dff6196fe49a77c766ce1efd9003ee0e249 SHA512 7cbe2dc17cb513086f85052b43349fb64bd12a0f3671bb37109a20d62cf565f8bc8d9e798a7d0a7e53896d187e8c575f850861e381885f2ac1f40d2c0c919063 -DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d -EBUILD hw-probe-1.5-r1.ebuild 2282 BLAKE2B 9992151a7b468d7138ec4a001f5575525489f546c58df29b5eefef9b3db5f6607f2f01f8289f8ad8474d20f21b6f57d1381c8b6c3a446188790912544cca5a54 SHA512 b539734e3a5cf0735c99ba8fdb6aca628e8e84d8d02739676c35c13d1880b891f50f4d8f209d3ca595859f8657e7618900ee39c461c5989580b62afc9b40dcb6 -EBUILD hw-probe-1.6_beta2-r1.ebuild 2449 BLAKE2B 20d24381c6a18034608f9d3fdd5c6075bbe10ec9672faa6dcb4ad3f5ba2b258c8e5cc8d0e9b9c596c64644686b5a65977ee918e537a98212f2c4190daec8e2ae SHA512 80b49c3fb7cc001f476619f47b535139765708ab4d07cc2e45134d4c1bcba1407cbe904f7494bee613b652c6461fb472e5146c12b4f6f0cd7b10267607282916 +EBUILD hw-probe-1.6_beta2-r1.ebuild 2447 BLAKE2B df0aa62976532b17319cf17259211cc493008be2478855574979eb73b3f8cb471eae04ee8b315c49a5eefc828a7be6896b6d2dbe8114a584be42c6b878bd6318 SHA512 43d9118e85be8fdf07b96c1e32c3cdaa27b5e3b2da9b9780fe133481b087be04b33b276618283ec596fc381ead99b7f1765175f89ca04793641065aefc496e0c MISC metadata.xml 646 BLAKE2B 1cc93bfb0e3544c4c746e80ff21675fa22d3103e14a040ffedfcfd24e73d8d968decc318e4523a03815e85de4ef85926ac20d4dfdf7cde5a3445ca29f11f6de7 SHA512 2ea8a211186b71ebc008c9999225edef063c8c8e0317d6e4c6149cc6ec6281a84065bef3dc93b4308f8567860fb75c19287aa91b5ab41e6a68229fcbf1c5a474 diff --git a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild deleted file mode 100644 index 3d73d2db78ad..000000000000 --- a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature readme.gentoo-r1 - -DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers" -HOMEPAGE="https://github.com/linuxhw/hw-probe/" -SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-lang/perl - dev-perl/Digest-SHA1 - net-misc/curl - sys-apps/dmidecode - sys-apps/edid-decode - sys-apps/hwinfo - sys-apps/pciutils - sys-apps/smartmontools - sys-apps/usbutils - virtual/perl-Data-Dumper -" - -PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" ) - -src_compile() { - :; -} - -src_install() { - default - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - optfeature "showing Machine Check Exceptions." app-admin/mcelog - optfeature "showing additional I/O statistics." app-admin/sysstat - optfeature "showing smart card (reader) information." dev-libs/opensc - optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools - optfeature "showing information of attached scanners." media-gfx/sane-backends - optfeature "showing GPU information provided by MESA." media-libs/mesa - optfeature "showing zeroconf statistics." net-dns/avahi - optfeature "showing HP printer statistics." net-print/hplip - optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill - optfeature "showing additional CPU capabilities." sys-apps/cpuid - optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm - optfeature "showing available I2C sensors." sys-apps/i2c-tools - optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi - optfeature "showing information about tested memory for faults." sys-apps/memtester - optfeature "showing 'Plug & Play' devices." sys-apps/pnputils - optfeature "showing systemd boot process information." sys-apps/systemd - optfeature "showing ACPI statistics and tables." sys-power/iasl - optfeature "showing information about NUMA." sys-process/numactl - optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs - optfeature "showing available Xinput devices." x11-apps/xinput -} diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild index 10f2227e5771..d10255310db4 100644 --- a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild +++ b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV_BETA}" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/perl diff --git a/sys-apps/hwdata-gentoo/Manifest b/sys-apps/hwdata-gentoo/Manifest index 00a85142276b..f46a109f2fbf 100644 --- a/sys-apps/hwdata-gentoo/Manifest +++ b/sys-apps/hwdata-gentoo/Manifest @@ -1,4 +1,4 @@ AUX 0.4-openchrome.patch 781 BLAKE2B 9df96192f6c6be5502d32d35acd1853e3de0c5660a0022c0ede0f14d6a7b0847a2ade3fa3501d6cc658a03312f764a07d4f56e06b70508020ca69c4dda1e924b SHA512 0fa8effbb7a9ee05780bab67583c9da7b11b38498eaf2b447b5be3190d1b9d924476e07b27bee51b2d6298579a8a07340fc90a2634a579f177f024be0029c9a6 DIST hwdata-gentoo-0.4.tar.bz2 149060 BLAKE2B 77534979aa9605836ce52906413b994a71d96636a3a39c65456a4899d839cb2f91ad101bfba884869c43795268c7fb13c7fa8ffab6f097f40dfd071712c4582b SHA512 dd62c51986c83ff5a9338fa20d98827cd44d86e808c9a2a52ff327dcdd941d0faed0ea4f85058485e8fc2f78e0c2fa18d3030e27fded8ed1777832ee789c189a EBUILD hwdata-gentoo-0.4.ebuild 850 BLAKE2B fbcf1affdc8cc8f8787118d11d5e4dae4397e55eb7bcc44baf061e229f3e513225e297016d1d12ef26914edf46965e7fe0edc4e0dbf61b494cfeb215c4ff3e1a SHA512 1adcc802837db000aebd3fa76739c5af52f1b8ff9963e5701c1a027dc1b6e475f01bc6f8f884c420bd64da91ba7b23d73649f0f7d821fb46213986c255fc18b9 -MISC metadata.xml 345 BLAKE2B 2492803d43b2d0669f2a6996c75f0f2053622f8a07d4a337e9e8cb9e81b661ba01990ea7f1b8dc130213251e5ab852c4abb637166693ac10e65f3ef18035fc0a SHA512 0d8a0b6099b83e5d54e235442a361a1eceaf6606522aee190382fc03a8b672c1c2559cdd585942b278e7c48acab7c3e9f7021e7faf9e2775e92eea32ecc2c223 +MISC metadata.xml 350 BLAKE2B fe6da0d849542f983c39e638cb95d62cf314b6dfc300292c65a8a59f30889cd764d9334357957da0cce221ca96c6b4d6a03081cd35b4854b4f6e416daa8acc5c SHA512 95a2cd965ddda7fd303b202db7bfdd372f59cdb199cf370ff5938975f61165c306c08240ab186b73f66884c89521625a9f5c3220f0631aa6c678abc5559ae00d diff --git a/sys-apps/hwdata-gentoo/metadata.xml b/sys-apps/hwdata-gentoo/metadata.xml index 467fca776d12..fef1da99f566 100644 --- a/sys-apps/hwdata-gentoo/metadata.xml +++ b/sys-apps/hwdata-gentoo/metadata.xml @@ -2,8 +2,8 @@ - livecd@gentoo.org - Gentoo LiveCD Project + releng@gentoo.org + Gentoo Release Engineering Adds support for ATI/NVIDIA binary diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index 2c317a684131..03e85cb94cc4 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -4,9 +4,11 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501 +DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c EBUILD hwloc-1.11.10.ebuild 2170 BLAKE2B 60cdea9ee071aa1610a48085e9b6dcb2f38a8cd473095df9d6db3d804f8d84a82e5d576d90687c09a224274999e652bff2e153b513c948bd83f4be11ad6512df SHA512 bf49f0c3c7d95de2ff4d707655e87f13b64848e19f5db9f46eaa0f015c13dd9272c357fad4bffb220eed964f439fd655b43a21e2ca731a49dd9ce7ed4b6988a4 EBUILD hwloc-1.11.13.ebuild 2143 BLAKE2B ae73d12b60c54e7160e789cb72e3cf939135dad7f22b17443e6093b58c6bc8dfe2f27df7bdcca4cbe70e58ff965c8d0860fea2a81461eaf485e1bff08e0a2240 SHA512 41bd54a082baf04b224abffaf420af5760da2d1eeea68968bc21715c70537ab67e9d1de937435e57e4d7f9bfd817a596377e888d0985949988d90e659e3479dc EBUILD hwloc-1.11.2-r1.ebuild 2115 BLAKE2B d79a58930fc0bc95065af6d3f2344ae2678f61e87d962668400a00f7118697e13e49d58c8a48215518af17dd477c282ea9551ad5d31d6f17e329e7006cb050d6 SHA512 775dc6c380f2bd41ef012abd1fb7efbe486f6e7489d08cdda3e79da3d640248950349120d699b19651d60eeb61dd05ca4a0a9a3e8c76535746a6390064eedc2b EBUILD hwloc-2.0.4.ebuild 2022 BLAKE2B 81e1daf91440f2cff13e3301915b0a2069396b98ff5ba33a06ea418d07ae606e0b6de85632e356a81b142978143d22e1fe11fb9d33343cf6da99d551d116d286 SHA512 bcbb4c5e522983c39ede9b6ee5723d359118a599a2b2c22351d80d59fbe67987a592a82d04513ac5e78e37847187dbc20bd903ddd94204c60bf0de8a9b733f77 EBUILD hwloc-2.1.0.ebuild 2399 BLAKE2B 962fac7338357c0a66e239f0ceb05f7906cdc2dddd459f48191cd998c2d79f2666a5f1356443fb4d13922e5448c7ebb70f2b498e98a80a30fb931ccda946d9dc SHA512 62575ccd7482649ac50f78b6bddfe19016d8f7387d8f3de603f374e7cdef29d7babc2066be26c5386c5f2f7b91fddae22ebaca17aca9c7758991dafd49192bb1 +EBUILD hwloc-2.3.0.ebuild 2924 BLAKE2B e3606ad4868f9efe244c7766c4a91ed373a51eebd37ceb97f4570796c38e9b5586341d9c3237030c77a1a7ac9ce31828084065bb58ff7e2c9368aa87f738a919 SHA512 78152bd3110ab168dcb067c875e8161001cdfc47825baa224fa6f3ba9dd5147d424bdc8e11dc14c3d9780577adaaff01573f2a171696330f645d626dc7becfea MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild b/sys-apps/hwloc/hwloc-2.3.0.ebuild new file mode 100644 index 000000000000..6167e28c6bfc --- /dev/null +++ b/sys-apps/hwloc/hwloc-2.3.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal + +MY_PV="v$(ver_cut 1-2)" + +DESCRIPTION="displays the hardware topology in convenient formats" +HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" +SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0/15" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cairo +cpuid cuda debug gl libudev netloc nvml +pci static-libs svg xml X" + +# opencl support dropped with x11-drivers/ati-drivers being removed (#582406). +# Anyone with hardware is welcome to step up and help test to get it re-added. + +RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] + + cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) + gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) + libudev? ( virtual/libudev ) + netloc? ( !sys-apps/netloc ) + nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) + pci? ( + >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] + >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] + ) + xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" + +# 2.69-r5 for --runstatedir +BDEPEND=" + >=sys-devel/autoconf-2.69-r5 + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) +DOCS=( AUTHORS NEWS README VERSION ) + +src_prepare() { + default + eautoreconf + + if use cuda ; then + append-cflags "-I${EPREFIX}/opt/cuda/include" + append-cppflags "-I${EPREFIX}/opt/cuda/include" + fi +} + +multilib_src_configure() { + export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467 + + if use cuda ; then + local -x LDFLAGS="${LDFLAGS}" + append-ldflags "-L${EPREFIX}/opt/cuda/$(get_libdir)" + fi + + local myconf=( + --disable-opencl + --disable-plugin-ltdl + --enable-plugins + --enable-shared + --runstatedir="${EPREFIX}/run" + $(multilib_native_use_enable cuda) + $(multilib_native_use_enable gl) + $(use_enable cairo) + $(use_enable cpuid) + $(use_enable debug) + $(use_enable libudev) + $(use_enable netloc) + $(use_enable nvml) + $(use_enable pci) + $(use_enable static-libs static) + $(use_enable xml libxml2) + $(use_with X x) + ) + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install_all() { + default + case ${ARCH} in + # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. + amd64|x86) + systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;; + esac + mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die + bashcomp_alias hwloc-annotate \ + hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} + bashcomp_alias hwloc-annotate lstopo{,-no-graphics} + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest index e9df0638b052..d4d349afd750 100644 --- a/sys-apps/hwsetup/Manifest +++ b/sys-apps/hwsetup/Manifest @@ -5,4 +5,4 @@ AUX 1.2-7-openchrome.patch 520 BLAKE2B ef6da2b6edfdb1c9abea047f08ecdeea259ea80bd AUX 1.2-strip.patch 209 BLAKE2B 0ddb29fcc59a841fef9bd08eb996cb84047a282ca7107636e222021d2da355b532f839b03eac6ee8cc3fdbcebdce30056eac049166f113e510197b9e92428c0d SHA512 93033d62d6328dab7bef0f42f6f41352c60081523d86388cd5823181483cf9245dd55c163d1e78ab51e20187cdca4017c815ae86f6de14394fb6cd2724dda98b DIST hwsetup_1.2-7.tar.gz 10706 BLAKE2B 2d0e005629f631aa3ef22f44122cf934d23929c89ee4ca7240dcdd9c2898e622a78e494a057b9eed96045e8b1a7b54252f402311360e84d57007876cd9a5f630 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e EBUILD hwsetup-1.2-r3.ebuild 1728 BLAKE2B 1bfee065d8b6ae15f3580760ba6e64c2015490e6064107e45e95b95ccd29f3cf535e3d05a3054667bb0d0d4bdd5b41dc30710fcff679155b7e1f48c6fe99a49b SHA512 ef67068f9189ae8bd925177d0f9a29555eeec274eef3ed4b3be092a05ba014fe6da32c16055763207d42533a6d917648190056b58cd2d6f15d242a695ac6f691 -MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c +MISC metadata.xml 256 BLAKE2B d02b5b33f7375594b6e77357966b74fd698579fcefce673bde9b7082e2a56a47b1b8824d5aa423ad7271113efc568997c476bc0106d147dbc1a198b201def869 SHA512 b301300f23bb631f440eef04dce17f16cfee618775d38013cfded6b0e8b806d772749578a39c43143104a1716d2cc6eefb3af7f6865d85da5b2cb6f1e78c7c68 diff --git a/sys-apps/hwsetup/metadata.xml b/sys-apps/hwsetup/metadata.xml index 767266dca141..06ddf117247b 100644 --- a/sys-apps/hwsetup/metadata.xml +++ b/sys-apps/hwsetup/metadata.xml @@ -2,7 +2,7 @@ - livecd@gentoo.org - Gentoo LiveCD Project + releng@gentoo.org + Gentoo Release Engineering diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest index 1d67c1e8ea78..b37823cfdea1 100644 --- a/sys-apps/i2c-tools/Manifest +++ b/sys-apps/i2c-tools/Manifest @@ -1,3 +1,5 @@ DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248 +DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096 EBUILD i2c-tools-4.1-r1.ebuild 1954 BLAKE2B 6dd8ba51d6948c9736c2ddd3e13efc7ef39a9d914a17d5ee7fc325639f6d734e95b4d6e12ed58f54b06cc3e140875b2de55756c77d228ca73c158661b2ac2850 SHA512 5d852e226406e78bb57ce21544b02dfc987cc64abea22cc22eb6f7558db2a79e6ee0134800082ddd549e30ae604d7c12892d9352655c3ba04100c71229248536 +EBUILD i2c-tools-4.2.ebuild 1716 BLAKE2B e143bf1c18b154b26d01601a3719881a2981fd8d8995c12dcec84b34936c2a4e639ede30ab27a3b34eeb4400b0a98cfb3433660c763213778ffbe50e2531c7ef SHA512 e9fc0d7af98f25c0494dee12a8cb20fc461478243cd20b6edc9a4b279b6d7f2fce1af3519c548e6349ab03823d326c920f558f5fdda9f3132b861e3d9559ece8 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild new file mode 100644 index 000000000000..f55d8d32a059 --- /dev/null +++ b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_7,3_8} ) +DISTUTILS_OPTIONAL="1" +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 flag-o-matic toolchain-funcs + +DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more" +HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools" +SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="perl python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +RDEPEND+=" + perl? ( dev-lang/perl )" + +src_prepare() { + default + use python && distutils-r1_src_prepare + + # Cut out the eeprom/ & stub/ dirs as only perl scripts live there. + if ! use perl ; then + sed -i '/^SRCDIRS/s: eeprom stub : :g' Makefile || die + fi +} + +src_configure() { + use python && distutils-r1_src_configure + + export BUILD_DYNAMIC_LIB=1 + export USE_STATIC_LIB=0 + export BUILD_STATIC_LIB=0 +} + +src_compile() { + emake AR="$(tc-getAR)" CC="$(tc-getCC)" all-lib # parallel make + emake CC="$(tc-getCC)" + emake -C eepromer CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + + if use python ; then + cd py-smbus || die + append-cppflags -I../include + distutils-r1_src_compile + fi +} + +src_install() { + emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install-lib install + dosbin eepromer/eeprom{,er} + dodoc CHANGES README + local d + for d in $(usex perl eeprom '') eepromer ; do + docinto "${d}" + dodoc "${d}"/README* + done + + if use python ; then + cd py-smbus || die + docinto py-smbus + dodoc README* + distutils-r1_src_install + fi +} diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest index 0e52159fe8a7..97aa830b66b0 100644 --- a/sys-apps/ibm-powerpc-utils/Manifest +++ b/sys-apps/ibm-powerpc-utils/Manifest @@ -1,9 +1,5 @@ AUX ibm-powerpc-utils-1.3.5-docdir.patch 265 BLAKE2B 2ec9b24404a6e6c78a75a8a29a002eba6b30180883a3cc0ebd3610d202188ec6aabfd2830eacf42f9e8c57c961f6aa097a12bcc92d04fd85ade63e3ef083257f SHA512 69a6545e1e29778d4ea31c7bc90be678b8f78c1d897f6bfa9a2f8ed3b223d4b5894663ffb10dc409c334754152c1f28a0c0d7a1991c65186488116a1cd983aa8 -DIST ibm-powerpc-utils-1.3.6.tar.gz 320582 BLAKE2B cce656ca7eefda3912f26c6df99112ceef831cac834af4edaf507c28c63d6bbca0d6ae0dd096474b7d3ac45daffb37dbc1068cb33b83f676922e4f27ca46ae2e SHA512 a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977 -DIST ibm-powerpc-utils-1.3.7.tar.gz 322707 BLAKE2B 5f8e9770e35cfd2d07640d228b8cff175fc71c49518d78c3582df30472a7fe2e3c520dae014d73e37992bca5f9dd13c3203e27e286f010ad0e4e95bfc5e6aa37 SHA512 e7ced7568d4a033131a4a543bf3128ffc1d5b1f5baf358b7bb73003e713145d3191dddee63b73d475dc0e257d54dd2470b02b15ba6ba9e49bb1d110091f2a541 DIST ibm-powerpc-utils-1.3.8.tar.gz 355931 BLAKE2B cb1756640962f55eead8556abb714f938a066d9c63e990ee6467ecdb032eac7058ce8715dc8b8d403e3c03efe98a7af0c7d560158258e7097300befbb04f8472 SHA512 7c9057131315d8fac6154c410562d9cd1807f76241bcc190566ece05b0ddd2ddbe1097749b7e644ccc9691641d40460a877368162e9b951fe790f53f638f635e -EBUILD ibm-powerpc-utils-1.3.6.ebuild 721 BLAKE2B f588de3dc66e5447732d36f5708bd734d4ee354c007c522f04031134258a5f680bc1d3a4c8306da9cc0d9656634f52d2bddfd3b89147a5d11bc8edd38ea16963 SHA512 23406ddb503be7fb8894772476f4a5501f03f51c7bc8476051fd9f0fe8dc8f31727962975949872e3e73a8c89928cd0aadfae8698cc06408a19f5b74400a6402 -EBUILD ibm-powerpc-utils-1.3.7.ebuild 723 BLAKE2B b06f37eaa4f0abf574780b267f0974a3f262741fede6fc869d5388572bcebabe58d6c98b5723330c465393939b57dc957623bc1c32fb3309e52c4e340a4e2343 SHA512 cff00db14b60565c4c1a54b7e581b9696d2159c2f5d6ab5db7beeaf51119e65e4bdb1dfa5d6280ee1bbad6d1ba79b401cb80939c16a67fc86177668f781a842b -EBUILD ibm-powerpc-utils-1.3.8.ebuild 713 BLAKE2B 0618c04748af322bad45da4433ed663fdbed39a88be52e942d77032d2450712936263e46094b5bd3e0abba47152468c2b8ebcb359bd618337ce5508393179ca2 SHA512 e76a2b5bd8f2dfab91fc474ed721503be370b0aae0ec0818c4fee24e34de116d9052ea44bfe026e5418d9818ea939b9940478b93060e7cac90ae6b49191e509f -EBUILD ibm-powerpc-utils-99999.ebuild 628 BLAKE2B 9133fb1428cfa3dbdbbb92e576397868da5c6e7ff3f7aef07815b12aa8107f285c0d760134c84f3e6a048e9a053c1d3b73c829176102fc3d0d96086b2e580092 SHA512 d6dd95777501746657027fb2e907e37fe398b2822beeb275bf6e3bb1645ad500d549a4a92b1329a8a28851fec4ee3cf746eb8debc9608ab0b1ac57b9f3130ee8 +EBUILD ibm-powerpc-utils-1.3.8-r1.ebuild 724 BLAKE2B 1c0cb5e5e4120b04494ac741f73ed4f77cbbc1c49efa130cab673d74eb11259e66e7ff629003093c713394b4f044185a758f6fae9eb5e7b49c4741f3c46ab9a2 SHA512 d6416c359d4bd3b4f8a95a916682b7179f7d1b59e6608caacb8b6b3ab789ad75b8aa6ae87f8603d74fb7e645c51cd5c50e41584c086e256f6c6240380d495f83 +EBUILD ibm-powerpc-utils-99999.ebuild 641 BLAKE2B feb6ca74ef399c2092506c29bda423e11e499f635c30f07d03ec575a0e8651d9c781b48b579ff68dd9283ba95e04c91577c860bd45b4054fa3f84ba094984f7d SHA512 6a35509dc65fd43f3a5af9b2e7b4826740e847b52b2d5d5e231767496e1257b3f1e3e57972ae4262d9f9572148752369efc07f717cca24680a0f848bb0eb650b MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3 diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild deleted file mode 100644 index eefb8e27e634..000000000000 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms" -HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils" -SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -IUSE="+rtas" - -S="${WORKDIR}/${P//ibm-}" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="ppc ppc64" - -DEPEND=" - sys-devel/bc -" -RDEPEND=" - ${DEPEND} - !sys-apps/powerpc-utils - rtas? ( >=sys-libs/librtas-2.0.2 ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.5-docdir.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with rtas librtas) -} diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild deleted file mode 100644 index 37767f844b18..000000000000 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.7.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms" -HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils" -SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -IUSE="+rtas" - -S="${WORKDIR}/${P//ibm-}" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~ppc ~ppc64" - -DEPEND=" - sys-devel/bc -" -RDEPEND=" - ${DEPEND} - !sys-apps/powerpc-utils - rtas? ( >=sys-libs/librtas-2.0.2 ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.5-docdir.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with rtas librtas) -} diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild new file mode 100644 index 000000000000..d828529d9685 --- /dev/null +++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms" +HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils" +SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +IUSE="+rtas" + +S="${WORKDIR}/${P//ibm-}" + +SLOT="0" +LICENSE="GPL-2+" +KEYWORDS="ppc ppc64" + +RDEPEND=" + !=sys-libs/librtas-2.0.2 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.5-docdir.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-werror \ + $(use_with rtas librtas) +} diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild deleted file mode 100644 index 2e5af45214eb..000000000000 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms" -HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils" -SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -IUSE="+rtas" - -S="${WORKDIR}/${P//ibm-}" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~ppc ~ppc64" - -RDEPEND=" - !sys-apps/powerpc-utils - rtas? ( >=sys-libs/librtas-2.0.2 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.5-docdir.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-werror \ - $(use_with rtas librtas) -} diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild index 4bac682b047b..b6e7ae3be805 100644 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild +++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2+" KEYWORDS="" RDEPEND=" - !sys-apps/powerpc-utils + !=sys-libs/librtas-2.0.2 ) " diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest index 3bed08581adf..eeb0416cffa5 100644 --- a/sys-apps/ipmicfg/Manifest +++ b/sys-apps/ipmicfg/Manifest @@ -1,3 +1,3 @@ -DIST IPMICFG_1.31.1_build.200623.zip 1755988 BLAKE2B d9f851d9f9aa2edd51427e4b03bc09e62cc848079507995aefc9c115fe72b6727747e1739a71a56f7909c67d66150d32d89d7163130b9e23c9bd8f9f07b24d70 SHA512 b138d05ad8d2441be6ee3aa97975a998c5d0863e4b8d46d7841693aaeddece058940327fe57a6407df22204ee838325a19b90caec247f7fe8231cb0ab4058474 -EBUILD ipmicfg-1.31.1.200623.ebuild 1060 BLAKE2B 57eb760774c9c09a4cc3aa8bf7e147cfbb5d3af67f24e5416a31cdd70e5f7498d114c8705da66e7cd93bd10d138e7d37ce5a398e9c1c9ce97ec387ac51ac3441 SHA512 9b724058ae4dca4bcc80a0b70d84eed416b59f538d2372536468c590052a2c3bc2578a2f847d8dcfc912df97094113da3fff8600bf603927f812e535729528bd +DIST IPMICFG_1.32.0_build.200820.zip 1821515 BLAKE2B a214d45f0a52ba16e85f4287780da1d7c3b236624139f71e32e0112914864a044a5b1756ee75525bbd9e8c475b39c608e80b3fc679388c3d07b4b2823a36d57d SHA512 c800f8fc3675718a7077cd717d0a810a516f17081c0a1d3a440af4b292f1f908b66e2450a1f8f5efcd34ebcaf9db56a2dc8b4c448d6d920fd36578356f7753dc +EBUILD ipmicfg-1.32.0.200820.ebuild 886 BLAKE2B 8199f948bc4871da882248b665ce459df0a7410ac0fb60b438572659ea9b1cc21cc25643cdaca75c148529836f7d28418eaa4cd6c917f579446d2bd992c83bcf SHA512 dafdd9010053066687ace49ea26dbe0251bd296067bb11901223177f215446177d8d6cabc42524df8edff471bed4fac8aa21d8bf6517994047fd4aad5ed7545f MISC metadata.xml 331 BLAKE2B 5f6297bfe1e48c20819f052322f825018f8ba39434a23fbb69e5f5630e92fafa43b3bb5e991175f69673baf79d8b4bcdeb95404502593faad8819c5a2c152871 SHA512 379175cdb1d7b9f18f80349817a8a46bcc75c4fd7d7cadd938b9630c341dec359328462072c4f72661af379c054a237a95d0dfb6937d49661cb8203108de0c80 diff --git a/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild b/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild deleted file mode 100644 index 15d16ef5e366..000000000000 --- a/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_DATE="$(ver_cut 4)" -MY_PN="${PN^^}" -MY_PV="$(ver_cut 1-3)" - -DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices" -HOMEPAGE="https://www.supermicro.com" -SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip" - -LICENSE="supermicro" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="uefi" - -BDEPEND="app-arch/unzip" - -RESTRICT="bindist fetch mirror" - -S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}" - -QA_PREBUILT="usr/bin/ipmicfg" - -pkg_nofetch() { - elog "Please download ${A} from" - elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI" - elog "and place it in your DISTDIR directory." -} - -src_install() { - newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg - - if use uefi; then - insinto /usr/share/ipmicfg - newins UEFI/IPMICFG.efi ipmicfg.efi - fi - - # Install docs - local DOCS=( - "IPMICFG_UserGuide.pdf" - "ReleaseNotes.txt" - ) - einstalldocs -} diff --git a/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild b/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild new file mode 100644 index 000000000000..642ff2b9341a --- /dev/null +++ b/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_DATE="$(ver_cut 4)" +MY_PN="${PN^^}" +MY_PV="$(ver_cut 1-3)" + +DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices" +HOMEPAGE="https://www.supermicro.com" +SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip" + +LICENSE="supermicro" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="uefi" + +BDEPEND="app-arch/unzip" + +RESTRICT="bindist mirror" + +S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}" + +QA_PREBUILT="usr/bin/ipmicfg" + +src_install() { + newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg + + if use uefi; then + insinto /usr/share/ipmicfg + newins UEFI/IPMICFG.efi ipmicfg.efi + fi + + # Install docs + local DOCS=( + "IPMICFG_UserGuide.pdf" + "ReleaseNotes.txt" + ) + einstalldocs +} diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest index ec54f2f54a2a..2ec3ca104e1d 100644 --- a/sys-apps/ipmitool/Manifest +++ b/sys-apps/ipmitool/Manifest @@ -1,8 +1,21 @@ +AUX exchange-bmc-os-info-1.8.18.initd 512 BLAKE2B 43307b959b3a2df518bc667e696f9e8a3dc113a572beb813c3c560f6c19db813195f26f22638261cf40f7f94599a62497e47edb30f24b9f7d6192be973d80795 SHA512 d9a9a2a984e5289e74af63660ef82b7f45e4cb60f4fefe4e1e3a1b9bac9ddc3adfcb177899b3cb1521f91b461cb807ab9edcbf4def96060287f50c9435ab1d29 +AUX ipmievd.service 158 BLAKE2B 5d02e8647670086bd46160417de32cd199ba1fe731386fce04c2b56183fe6d7885b59199f30a7bfdfc764d7eb021d82554154766fbd23407af950d4e274033ab SHA512 8e1c3ee301bc002d9fe8146d224b9e4d4d054503c118e713c48763eb6352b6e6efe947380d1ab9fa0205ef556683e29ead321360f00bf8e093eb2b48eaa5dfb9 AUX ipmitool-1.8.18-fno-common.patch 595 BLAKE2B 7134e86b3c5fb0381eeb1d413b72abf409b57a7f4cf7849b1e52e0c0a6b56a5f3c777186b5fbbb2df555c924974850e9af65a0a3a3a8e6e58b542318a18ab35b SHA512 4f51aab99809d3c64ed47e61c8de6b93b8a788c3cfa6e87faf17894cda85aa5b7293e1d29813dcf1335a3c5eb64dc1f8f1657ca09adb248cf3aaffe64f5d3cb5 +AUX ipmitool-1.8.18-ipmievd.confd 677 BLAKE2B 7656944c3a9e1f8c9ce2a5923da7dda420386020c14449fb182ce9247122564cf6e5179e97bf5396e81e3c5ded8a6791b2e5804327697149e6be097f82e105d6 SHA512 0e494de95d7a193293005b3d93e0ea0c7ada44e54f48259b197e1eb9846f78d986cefba59ebd70484c26e4ac5d3ae38abfc5a6cd1f74785cb3806c0ba35ee572 +AUX ipmitool-1.8.18-ipmievd.initd 898 BLAKE2B f768c90e913d0036113f39716a04b5c28052cb1be78b27221549f871b392df26e989edea20ff8eeffba38150d2b5687ca189d0e471b43e85ae2e4af3a7abb72c SHA512 2f46f3ad1f3d224a3f12fe1feaf7a2cee84dab6f93f788f4e9e82baf42ccbd3e22aa2b51c76646e1bd2a812bf8c673c780a48dfd2c5ec116f9fda944cb1d48cb AUX ipmitool-1.8.18-openssl-1.1.patch 3838 BLAKE2B 4664bdf8c5ec0f40389f9773043cec0821b5a6e031f7d5cd6be7cd5195f45e9bb5fff5ed9da1d01ca5b510601be8054763236f65b180891b65db8b7ffa68ff0a SHA512 361d52bb966a8dfaa3592d8ca2f0e7083030b81b1ed84667d5bb1c68671a810802e2d4e77808fa9d44e45a04f74998cc6c6ac5182a169f175adc328636073418 AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b25448c5a50780d4e70410c1fba4adcca81abfcd48ea1a5cf5a55006c59678bc112bb86422571b82a0fb8c517f3292f SHA512 6253f218b22fc98768d3a26aec60da8b80229f3f4e2137cf6b34cefb465a420400e451fb07e6f3f626d88904644e4e2bddd280e01bf6d6cacd06cf6b59f20fe4 AUX ipmitool-1.8.9-ipmievd.initd 584 BLAKE2B 6632466d88006f6623ae81722b2f2726ede5b99141f794829c1cff5808bbb2851e29858beb96b40061de019be08f8179d90f8008b74221cd058a34586b3f5680 SHA512 5d42774486a0edaf1dcece16fbad0cca531a91559ba8dd4259f05787e1964fbfec4d11c9427dbe8cb46ba0cc1a447120bfa82254aac4850d9acc632834daa669 +AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920fc6cefe6770231d67989d47f172e783416d12feb399e882e2fe74b26fdef162fafb85cd686ec83d414d01 SHA512 2d5b62ee5f694629e8f5c4c2d1fcdf7a3d42078f488e43cd1b34193619918ea7429da2bcb236b9216cfabaf94d8c5224b99194023a8db626884c4c766f15136a +DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3 DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d70f22fd17f11ba6147595b07ef52059ac8ab6775afa0ad956355eefbf3e2b0300cf87bb373d2f82b585de807412d SHA512 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab +DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433 DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef +DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45 +DIST ipmitool_1.8.18-9.debian.tar.xz 18508 BLAKE2B 09e37fd2f6fad8f847bae87aa51f44293e5640b4c8ebc05e52ebd751542d7865024835fe728c14e3a44f48d54fedff9e7693653bd2288db27d21a5bae16268b6 SHA512 af2b4aa855125e1beb62ffd2931b5d4c0aa8cc4edbde27ea1b4be172e6a4351f574c32b2437b354d11b7f1c739161d850c47839d7a7d9f522b52e24f47a9ea8d EBUILD ipmitool-1.8.18-r1.ebuild 2624 BLAKE2B 9baa3c566fe553602f3c5e53e165d1fa6a0adc93943cbb61a292e8ca5d6993b9f4f343105faebd126b8bc2808af0c9ac76b6ed992798908b68374f7b9fc767f4 SHA512 2b6f7dc4f51ba3a523a929481f4e6e72cc444687385a7588bcd59e22f39ba63ef79b9a33e39e96d8b89f129bc91a40a55673f9346e6cbeb0724da3c7eb6ea63c -MISC metadata.xml 570 BLAKE2B 2211290e4ac3a12d1a05528925d3c69534073c2624023244ed263aa312de28e5cfd76ff284870777508fd6818fcde18f9d740f9499cc5819078aaa84f46fd07a SHA512 16820cee9cff78b0137cbfcd179cdf78a503c583e8ca3e2ebf13094e21419770eb94205371b61c74c2e75f351d95ed74e6eaf060d748554c6602552ffa9151b8 +EBUILD ipmitool-1.8.18-r2.ebuild 2804 BLAKE2B 4101357ee54285291f2b0bfaf30317bf1703c13a81ef47a1f5b6c6d3bf3f843ca096018b8e54f50fb10ac0fd20df2e12ad8dc86e3fd5176579e4f59b097dbf16 SHA512 b11087e861933f61addc4291083483b9fc234df92b1741d427798b88fb851d172f1746ce49ede3b140cf1718debb74dd6f9f4cd5cfa8d6d62b370c972e4b6ee0 +EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4494 BLAKE2B 7710f593d7c8056c69ef695d3d3714b00666a777b4379333877ee8ed82cd7c588048dd8b29155d414ca8e533c67719761014fbb72ae81b68a0b041353694a157 SHA512 20c271cbeca471a720976d3d54087383c4cd817a0a748e657449c8e2f2c1077ed122990d2a778865af60d663d61b398443f370ae9ee33b108c62f844697d724b +EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6220 BLAKE2B 9608fa55683cdbcb0b0afabdc0044256be88ac8492a04b845ecfd1e2da0a8267c031cafba11b12d7815dc2611e41c14da2456f3be7e0348c498e70c7a689c875 SHA512 4858ff4eef24c6bdee3b24dbb1944cd6208fd3f08d495a97be5497a1d51107a7b3ad18d4fcd9953f642cc240d4a4d139d77be2be3056b32ee41bd59207aa54b8 +EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6312 BLAKE2B cfa1b6d13f738a9f2b2227e816f784ec89667db41cd134779a227158df77fa4ca5355dbcab2c3c42504af551e9ac899d63fb2b1c03602011988921d96ab505f7 SHA512 ec03196f6f4745aa7d37d3939e7877462dae6ef20bcef3639f1008c36b416f0a085b5b70c34c86aada78090819b79e44ff169f25abd2a600df6f42ee97daaf0c +MISC metadata.xml 633 BLAKE2B e7fd815396d39f0d1c4aac50925382df6c245fbf3499f67b8d3a7448821aed48894725e468d6c2b724ad7a706ee12b4126f0b6f7c4c32388de6e34e05333b782 SHA512 53ffd0f2970d1d128e9d12247b5ed502bac4b9550029d57b221f2c2fd84d316831bbb8ddb890a1344b171612f890170847a3de02d52857d75c75f1a593cdebb8 diff --git a/sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd b/sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd new file mode 100644 index 000000000000..9c63983f21f3 --- /dev/null +++ b/sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# /etc/init.d/exchange-bmc-os-info + +name="exchange-bmc-os-info" +description="Exchange Information between BMC and OS" +command=/usr/libexec/exchange-bmc-os-info +command_args="" +: "${DEVICENUM:=0}" # which BMC +required_files=/dev/ipmi${DEVICENUM} + +depend() { + use hostname modules + keyword -docker -lxc -prefix -systemd-nspawn +} + +start() { + "${command}" start +} +stop() { + "${command}" stop +} diff --git a/sys-apps/ipmitool/files/ipmievd.service b/sys-apps/ipmitool/files/ipmievd.service new file mode 100644 index 000000000000..fdae14f231ce --- /dev/null +++ b/sys-apps/ipmitool/files/ipmievd.service @@ -0,0 +1,10 @@ +[Unit] +Description=IPMI event daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/ipmievd open daemon + +[Install] +WantedBy=multi-user.target +Alias=ipmi.service diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd b/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd new file mode 100644 index 000000000000..b860c23c7f89 --- /dev/null +++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# /etc/conf.d/ipmievd + +# Interfaces: +# open Linux OpenIPMI Interface +# imb Intel IMB Interface +# bmc IPMI v2.0 BMC interface +# lan IPMI v1.5 LAN Interface +# lanplus IPMI v2.0 RMCP+ LAN Interface + +INTERFACE="open" + +# Commands: +# open Use OpenIPMI for asyncronous notification of events +# sel Poll SEL for notification of events +# +# 'pidfile=...' will be appended! +COMMAND="open daemon" + +# Options. + +OPTIONS="" + +# Device number: +# Used to target a specific BMC on a multi-node, multi-BMC system via the open interface +DEVICENUM=0 diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd b/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd new file mode 100644 index 000000000000..e8ef2c39d454 --- /dev/null +++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# /etc/init.d/ipmievd + +depend() { + use logger modules + keyword -docker -lxc -prefix -systemd-nspawn +} + +# TODO: ipmievd has a mode where it could be used to monitor multiple BMCs via +# DEVICENUM or remote systems, and it would be valid to run multiple instances. +# That is not supported by this init script at this time. + +description="IPMI event daemon for sending events to syslog LOCAL4" + +: "${DEVICENUM:=0}" +: "${INTERFACE:=open}" +: "${COMMAND:=open daemon}" +: "${OPTIONS:=}" + +daemon=ipmievd + +pidfile=/run/${daemon}.pid${DEVICENUM} # see manpage re suffix +command=/usr/sbin/${daemon} +cachefile=/run/${daemon}.${DEVICENUM}.sdr-cache +command_args="-d ${DEVICENUM} -S ${cachefile} -I ${INTERFACE} ${OPTIONS} ${COMMAND} pidfile=${pidfile}" +required_files=/dev/ipmi$DEVICENUM diff --git a/sys-apps/ipmitool/files/log_bmc-1.8.18.initd b/sys-apps/ipmitool/files/log_bmc-1.8.18.initd new file mode 100644 index 000000000000..4064edf3b84d --- /dev/null +++ b/sys-apps/ipmitool/files/log_bmc-1.8.18.initd @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name="log_bmc" +description="Add SEL entries to indicate OS Boot status" +command=/usr/libexec/log_bmc.sh +command_args="" +: "${DEVICENUM:=0}" # which BMC +required_files=/dev/ipmi${DEVICENUM} + +depend() { + use modules + after ipmievd # to capture our own log event + keyword -docker -lxc -prefix -systemd-nspawn +} + +start() { + # TODO: should this keep start so it only fires once per boot? + "${command}" os_boot +} + +stop() { + "${command}" os_shutdown +} diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild new file mode 100644 index 000000000000..eb3cdab7d446 --- /dev/null +++ b/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils + +DESCRIPTION="Utility for controlling IPMI enabled devices." +HOMEPAGE="http://ipmitool.sf.net/" +DEBIAN_PR="9.debian" +DEBIAN_PV="${PV/_p*}" +DEBIAN_P="${PN}_${DEBIAN_PV}" +DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}" +COMMIT_ID= +if [[ -n "${COMMIT_ID}" ]]; then + S="${WORKDIR}/${PN}-${COMMIT_ID}" + SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +fi +SRC_URI+=" + http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz" + # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz +#IUSE="freeipmi openipmi status" +IUSE="libressl openipmi static" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +LICENSE="BSD" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/readline:0=" +DEPEND="${RDEPEND} + openipmi? ( sys-libs/openipmi ) + virtual/os-headers" + #freeipmi? ( sys-libs/freeipmi ) +# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi ) +# but it doesn't actually need either. + +PATCHES=( + #"${FILESDIR}"/${P}-openssl-1.1.patch +) + +src_prepare() { + default + [ -d "${S}"/debian ] && mv "${S}"/debian{,.package} + ln -s "${WORKDIR}"/debian "${S}" + for p in $(grep -v "^#" debian/patches/series) ; do + eapply debian/patches/$p + done + + eautoreconf +} + +src_configure() { + # - LIPMI and BMC are the Solaris libs + # - OpenIPMI is unconditionally enabled in the configure as there is compat + # code that is used if the library itself is not available + # FreeIPMI does build now, but is disabled until the other arches keyword it + # `use_enable freeipmi intf-free` \ + # --enable-ipmievd is now unconditional + econf \ + $(use_enable static) \ + --enable-ipmishell \ + --enable-intf-lan \ + --enable-intf-lanplus \ + --enable-intf-open \ + --enable-intf-serial \ + --disable-intf-bmc \ + --disable-intf-dummy \ + --disable-intf-free \ + --disable-intf-imb \ + --disable-intf-lipmi \ + --disable-internal-md5 \ + --with-kerneldir=/usr --bindir=/usr/sbin + + # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't + # include the below file to define some things. + echo "#include " >>config.h +} + +src_install() { + emake DESTDIR="${D}" PACKAGE="${PF}" install + + into /usr + dosbin contrib/bmclanconf + rm -f "${D}"/usr/share/doc/${PF}/COPYING + docinto contrib + cd "${S}"/contrib + dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README + + newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd + newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd + # TODO: init script for contrib/bmc-snmp-proxy + # TODO: contrib/exchange-bmc-os-info +} diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild new file mode 100644 index 000000000000..aa2af512c5fa --- /dev/null +++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils + +DESCRIPTION="Utility for controlling IPMI enabled devices." +HOMEPAGE="http://ipmitool.sf.net/" +DEBIAN_PR="9.debian" +DEBIAN_PV="${PV/_p*}" +DEBIAN_P="${PN}_${DEBIAN_PV}" +DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}" +COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc +if [[ -n "${COMMIT_ID}" ]]; then + S="${WORKDIR}/${PN}-${COMMIT_ID}" + SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +fi +# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers +# is not available with version numbers or dates! +SRC_URI+=" + https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz + https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz + " + #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz + # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz +#IUSE="freeipmi openipmi status" +IUSE="libressl openbmc openipmi static" +SLOT="0" +KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86" +LICENSE="BSD" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + openbmc? ( sys-apps/systemd:0= ) + sys-libs/readline:0=" +DEPEND="${RDEPEND} + openipmi? ( sys-libs/openipmi ) + virtual/os-headers" + #freeipmi? ( sys-libs/freeipmi ) +# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi ) +# but it doesn't actually need either. + +PATCHES=( + #"${FILESDIR}"/${P}-openssl-1.1.patch +) + +# I hope all of this will get MUCH cleaner if upstream will just make a new +# release! - robbat2 2020/10/21 +src_prepare() { + default + if [ -d "${S}"/debian ] ; then + mv "${S}"/debian{,.package} + ln -s "${WORKDIR}"/debian "${S}" + eautoreconf + # Upstream commit includes SOME of the debian changes, but not all of them + sed -i \ + -e '/^#/d' \ + -e '/0120-openssl1.1.patch/d' \ + debian/patches/series + for p in $(cat debian/patches/series) ; do + echo $p + if ! nonfatal eapply -p1 debian/patches/$p ; then + echo "failed $p" + fail=1 + fi + done + [[ $fail -eq 1 ]] && die "fail" + fi + pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/ + PATCHES=( + #"${pd}"/0000.0120-openssl1.1.patch + "${pd}"/0001.0100-fix_buf_overflow.patch + "${pd}"/0002.0500-fix_CVE-2011-4339.patch + "${pd}"/0003.0600-manpage_longlines.patch + #"${pd}"/0004.0110-getpass-prototype.patch + #"${pd}"/0005.0115-typo.patch + "${pd}"/0006.0125-nvidia-iana.patch + "${pd}"/0007.0615-manpage_typo.patch + #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch + "${pd}"/0009.0005-gcc10.patch + #"${pd}"/0010.0010-utf8.patch + ) + for p in "${PATCHES[@]}" ; do + eapply -p1 $p || die "failed $p" + done + + eautoreconf + + # If this file is not present, then ipmitool will try to download it during make install! + cp -al \ + "${WORKDIR}/enterprise-numbers.2020-10-21" \ + "${S}"/enterprise-numbers \ + || die "Could not place IANA enterprise-numbers" +} + +src_configure() { + # - LIPMI and BMC are the Solaris libs + # - OpenIPMI is unconditionally enabled in the configure as there is compat + # code that is used if the library itself is not available + # FreeIPMI does build now, but is disabled until the other arches keyword it + # `use_enable freeipmi intf-free` \ + # --enable-ipmievd is now unconditional + WGET=/bin/true \ + CURL=/bin/true \ + econf \ + $(use_enable static) \ + --enable-ipmishell \ + --enable-intf-lan \ + --enable-intf-usb \ + $(use_enable openbmc intf-dbus) \ + --enable-intf-lanplus \ + --enable-intf-open \ + --enable-intf-serial \ + --disable-intf-bmc \ + --disable-intf-dummy \ + --disable-intf-free \ + --disable-intf-imb \ + --disable-intf-lipmi \ + --disable-internal-md5 \ + --with-kerneldir=/usr \ + --bindir=/usr/sbin + + # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't + # include the below file to define some things. + echo "#include " >>config.h +} + +src_install() { + emake DESTDIR="${D}" PACKAGE="${PF}" install + + into /usr + dosbin contrib/bmclanconf + rm -f "${D}"/usr/share/doc/${PF}/COPYING + docinto contrib + cd "${S}"/contrib + dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README + + newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd + newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd + # TODO: init script for contrib/bmc-snmp-proxy + # TODO: contrib/exchange-bmc-os-info +} diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild new file mode 100644 index 000000000000..d8df773c1c7a --- /dev/null +++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools eutils flag-o-matic systemd + +DESCRIPTION="Utility for controlling IPMI enabled devices." +HOMEPAGE="http://ipmitool.sf.net/" +DEBIAN_PR="9.debian" +DEBIAN_PV="${PV/_p*}" +DEBIAN_P="${PN}_${DEBIAN_PV}" +DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}" +COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc +if [[ -n "${COMMIT_ID}" ]]; then + S="${WORKDIR}/${PN}-${COMMIT_ID}" + SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +fi +# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers +# is not available with version numbers or dates! +SRC_URI+=" + https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz + https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz + " + #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz + # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz +#IUSE="freeipmi openipmi status" +IUSE="libressl openbmc openipmi static" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +LICENSE="BSD" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + openbmc? ( sys-apps/systemd:0= ) + sys-libs/readline:0=" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.69-r5 + openipmi? ( sys-libs/openipmi ) + virtual/os-headers" + #freeipmi? ( sys-libs/freeipmi ) +# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi ) +# but it doesn't actually need either. + +PATCHES=( + #"${FILESDIR}"/${P}-openssl-1.1.patch +) + +# I hope all of this will get MUCH cleaner if upstream will just make a new +# release! - robbat2 2020/10/21 +src_prepare() { + default + if [ -d "${S}"/debian ] ; then + mv "${S}"/debian{,.package} + ln -s "${WORKDIR}"/debian "${S}" + eautoreconf + # Upstream commit includes SOME of the debian changes, but not all of them + sed -i \ + -e '/^#/d' \ + -e '/0120-openssl1.1.patch/d' \ + debian/patches/series + for p in $(cat debian/patches/series) ; do + echo $p + if ! nonfatal eapply -p1 debian/patches/$p ; then + echo "failed $p" + fail=1 + fi + done + [[ $fail -eq 1 ]] && die "fail" + fi + pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/ + PATCHES=( + #"${pd}"/0000.0120-openssl1.1.patch + "${pd}"/0001.0100-fix_buf_overflow.patch + "${pd}"/0002.0500-fix_CVE-2011-4339.patch + "${pd}"/0003.0600-manpage_longlines.patch + #"${pd}"/0004.0110-getpass-prototype.patch + #"${pd}"/0005.0115-typo.patch + "${pd}"/0006.0125-nvidia-iana.patch + "${pd}"/0007.0615-manpage_typo.patch + #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch + "${pd}"/0009.0005-gcc10.patch + #"${pd}"/0010.0010-utf8.patch + ) + for p in "${PATCHES[@]}" ; do + eapply -p1 $p || die "failed $p" + done + + # Gentoo chooses to install ipmitool in /usr/sbin + # Where RedHat chooses /usr/bin + sed -i -e \ + 's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \ + "${S}"/contrib/* \ + || die "sed bindir failed" + + # Consistent RUNSTATEDIR + sed -i -e \ + 's,/var/run,/run,g' \ + "${S}/doc/ipmievd.8.in" \ + "${S}"/contrib/* \ + "${S}"/lib/helper.c \ + "${S}"/src/ipmievd.c \ + || die "sed /var/run failed" + + eautoreconf + + # If this file is not present, then ipmitool will try to download it during make install! + cp -al \ + "${WORKDIR}/enterprise-numbers.2020-10-21" \ + "${S}"/enterprise-numbers \ + || die "Could not place IANA enterprise-numbers" +} + +src_configure() { + # - LIPMI and BMC are the Solaris libs + # - OpenIPMI is unconditionally enabled in the configure as there is compat + # code that is used if the library itself is not available + # FreeIPMI does build now, but is disabled until the other arches keyword it + # `use_enable freeipmi intf-free` \ + # --enable-ipmievd is now unconditional + + # for pidfiles, runstatedir not respected in all parts of code + append-cppflags -D_PATH_VARRUN=/run/ + + # WGET & CURL are set to avoid network interaction, we manually inject the + # IANA enterprise-numbers file instead. + # + # DEFAULT_INTF=open # default to OpenIPMI, do not take external input + WGET=/bin/true \ + CURL=/bin/true \ + DEFAULT_INTF=open \ + econf \ + $(use_enable static) \ + --enable-ipmishell \ + --enable-intf-lan \ + --enable-intf-usb \ + $(use_enable openbmc intf-dbus) \ + --enable-intf-lanplus \ + --enable-intf-open \ + --enable-intf-serial \ + --disable-intf-bmc \ + --disable-intf-dummy \ + --disable-intf-free \ + --disable-intf-imb \ + --disable-intf-lipmi \ + --disable-internal-md5 \ + --with-kerneldir=/usr \ + --bindir=/usr/sbin \ + --runstatedir=/run \ + CFLAGS="${CFLAGS}" + + # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't + # include the below file to define some things. + echo "#include " >>config.h + +} + +src_install() { + emake DESTDIR="${D}" PACKAGE="${PF}" install + rm -f "${D}"/usr/share/doc/${PF}/COPYING + into /usr + + newinitd "${FILESDIR}"/${PN}-1.8.18-ipmievd.initd ipmievd + newconfd "${FILESDIR}"/${PN}-1.8.18-ipmievd.confd ipmievd + + # Everything past this point is installing contrib/ + dosbin contrib/bmclanconf + + exeinto /usr/libexec + doexe contrib/log_bmc.sh + newinitd "${FILESDIR}/log_bmc-1.8.18.initd" log_bmc + + # contrib/exchange-bmc-os-info.init.redhat + # contrib/exchange-bmc-os-info.service.redhat + # contrib/exchange-bmc-os-info.sysconf + exeinto /usr/libexec + newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info + insinto /etc/sysconfig + newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info + systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service + newinitd "${FILESDIR}/exchange-bmc-os-info-1.8.18.initd" exchange-bmc-os-info + + # contrib/bmc-snmp-proxy + # contrib/bmc-snmp-proxy.service + # contrib/bmc-snmp-proxy.sysconf + exeinto /usr/libexec + doexe contrib/bmc-snmp-proxy + insinto /etc/sysconfig + newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy + systemd_dounit contrib/bmc-snmp-proxy.service + # TODO: initd for bmc-snmp-proxy + + insinto /usr/share/${PN} + doins contrib/oem_ibm_sel_map + + docinto contrib + cd "${S}"/contrib + dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README +} diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild new file mode 100644 index 000000000000..c395dcf36941 --- /dev/null +++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools eutils flag-o-matic systemd + +DESCRIPTION="Utility for controlling IPMI enabled devices." +HOMEPAGE="http://ipmitool.sf.net/" +DEBIAN_PR="9.debian" +DEBIAN_PV="${PV/_p*}" +DEBIAN_P="${PN}_${DEBIAN_PV}" +DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}" +COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc +if [[ -n "${COMMIT_ID}" ]]; then + S="${WORKDIR}/${PN}-${COMMIT_ID}" + SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +fi +# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers +# is not available with version numbers or dates! +SRC_URI+=" + https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz + https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz + " + #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz + # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz +#IUSE="freeipmi openipmi status" +IUSE="libressl openbmc openipmi static" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +LICENSE="BSD" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + openbmc? ( sys-apps/systemd:0= ) + sys-libs/readline:0=" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.69-r5 + openipmi? ( sys-libs/openipmi ) + virtual/os-headers" + #freeipmi? ( sys-libs/freeipmi ) +# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi ) +# but it doesn't actually need either. + +PATCHES=( + #"${FILESDIR}"/${P}-openssl-1.1.patch +) + +# I hope all of this will get MUCH cleaner if upstream will just make a new +# release! - robbat2 2020/10/21 +src_prepare() { + default + if [ -d "${S}"/debian ] ; then + mv "${S}"/debian{,.package} + ln -s "${WORKDIR}"/debian "${S}" + eautoreconf + # Upstream commit includes SOME of the debian changes, but not all of them + sed -i \ + -e '/^#/d' \ + -e '/0120-openssl1.1.patch/d' \ + debian/patches/series + for p in $(cat debian/patches/series) ; do + echo $p + if ! nonfatal eapply -p1 debian/patches/$p ; then + echo "failed $p" + fail=1 + fi + done + [[ $fail -eq 1 ]] && die "fail" + fi + pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/ + PATCHES=( + #"${pd}"/0000.0120-openssl1.1.patch + "${pd}"/0001.0100-fix_buf_overflow.patch + "${pd}"/0002.0500-fix_CVE-2011-4339.patch + "${pd}"/0003.0600-manpage_longlines.patch + #"${pd}"/0004.0110-getpass-prototype.patch + #"${pd}"/0005.0115-typo.patch + "${pd}"/0006.0125-nvidia-iana.patch + "${pd}"/0007.0615-manpage_typo.patch + #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch + "${pd}"/0009.0005-gcc10.patch + #"${pd}"/0010.0010-utf8.patch + ) + for p in "${PATCHES[@]}" ; do + eapply -p1 $p || die "failed $p" + done + + # Gentoo chooses to install ipmitool in /usr/sbin + # Where RedHat chooses /usr/bin + sed -i -e \ + 's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \ + "${S}"/contrib/* \ + || die "sed bindir failed" + + # Consistent RUNSTATEDIR + sed -i -e \ + 's,/var/run,/run,g' \ + "${S}/doc/ipmievd.8.in" \ + "${S}"/contrib/* \ + "${S}"/lib/helper.c \ + "${S}"/src/ipmievd.c \ + || die "sed /var/run failed" + + eautoreconf + + # If this file is not present, then ipmitool will try to download it during make install! + cp -al \ + "${WORKDIR}/enterprise-numbers.2020-10-21" \ + "${S}"/enterprise-numbers \ + || die "Could not place IANA enterprise-numbers" +} + +src_configure() { + # - LIPMI and BMC are the Solaris libs + # - OpenIPMI is unconditionally enabled in the configure as there is compat + # code that is used if the library itself is not available + # FreeIPMI does build now, but is disabled until the other arches keyword it + # `use_enable freeipmi intf-free` \ + # --enable-ipmievd is now unconditional + + # for pidfiles, runstatedir not respected in all parts of code + append-cppflags -D_PATH_VARRUN=/run/ + + # WGET & CURL are set to avoid network interaction, we manually inject the + # IANA enterprise-numbers file instead. + # + # DEFAULT_INTF=open # default to OpenIPMI, do not take external input + WGET=/bin/true \ + CURL=/bin/true \ + DEFAULT_INTF=open \ + econf \ + $(use_enable static) \ + --enable-ipmishell \ + --enable-intf-lan \ + --enable-intf-usb \ + $(use_enable openbmc intf-dbus) \ + --enable-intf-lanplus \ + --enable-intf-open \ + --enable-intf-serial \ + --disable-intf-bmc \ + --disable-intf-dummy \ + --disable-intf-free \ + --disable-intf-imb \ + --disable-intf-lipmi \ + --disable-internal-md5 \ + --with-kerneldir=/usr \ + --bindir=/usr/sbin \ + --runstatedir=/run \ + CFLAGS="${CFLAGS}" + + # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't + # include the below file to define some things. + echo "#include " >>config.h + +} + +src_install() { + emake DESTDIR="${D}" PACKAGE="${PF}" install + rm -f "${D}"/usr/share/doc/${PF}/COPYING + into /usr + + newinitd "${FILESDIR}"/${PN}-1.8.18-ipmievd.initd ipmievd + newconfd "${FILESDIR}"/${PN}-1.8.18-ipmievd.confd ipmievd + # From debian, less configurable than OpenRC + systemd_dounit "${FILESDIR}"/ipmievd.service + + # Everything past this point is installing contrib/ + dosbin contrib/bmclanconf + + exeinto /usr/libexec + doexe contrib/log_bmc.sh + newinitd "${FILESDIR}/log_bmc-1.8.18.initd" log_bmc + + # contrib/exchange-bmc-os-info.init.redhat + # contrib/exchange-bmc-os-info.service.redhat + # contrib/exchange-bmc-os-info.sysconf + exeinto /usr/libexec + newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info + insinto /etc/sysconfig + newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info + systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service + newinitd "${FILESDIR}/exchange-bmc-os-info-1.8.18.initd" exchange-bmc-os-info + + # contrib/bmc-snmp-proxy + # contrib/bmc-snmp-proxy.service + # contrib/bmc-snmp-proxy.sysconf + exeinto /usr/libexec + doexe contrib/bmc-snmp-proxy + insinto /etc/sysconfig + newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy + systemd_dounit contrib/bmc-snmp-proxy.service + # TODO: initd for bmc-snmp-proxy + + insinto /usr/share/${PN} + doins contrib/oem_ibm_sel_map + + docinto contrib + cd "${S}"/contrib + dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README +} diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml index 741f1b487be9..619cebe5e320 100644 --- a/sys-apps/ipmitool/metadata.xml +++ b/sys-apps/ipmitool/metadata.xml @@ -6,6 +6,7 @@ Gentoo Sysadmin Project + Enable OpenBMC D-Bus interface Use the system OpenIPMI implementation. diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index ffb949c41b91..54c264d22e44 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -6,8 +6,10 @@ AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634 DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1 SHA512 f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 +DIST iproute2-5.9.0.tar.xz 786524 BLAKE2B 9d82cfb1b1353d2cc6c441269af234b05e1ccd190a58c67f890d74fb42b4266be91ce64277bd2b75a0b711977c0f9edc61d8655bf262d05aaebd8d73caecc0c7 SHA512 bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50 EBUILD iproute2-5.4.0.ebuild 4423 BLAKE2B a52726d1e562962789fe3f8ebfa2d8ae7e9c65a4355e45a0d8351a31cbf46e7361daa9dc103235052a9cd9754b815d12b924f5aeee96406bea4a41c8d164a5a6 SHA512 6814b86e90dab9cb3600ff58b1dbb43197f2696051802639cc4602245ca96db28b1e4e117935504a4acf1c52d6ca9a8599162dfdebe5799b1a6930a95a0039ea EBUILD iproute2-5.7.0.ebuild 4486 BLAKE2B de60a586079783870193445e86e0d5d11724a29aa625389040a4abf1b05f873ac6fa0ea132c3bb10605930916aa6ba09c1967e290dfd3564cbc18412ec911fe8 SHA512 8b10ac24ac7e694af34833a9436ddbd3ca9a02beb57a90cefa1a139180aa5b88bdbcd07a4dd5daff39947244f39d615be7fc7d5e629ef40f2d9b9dbb9bc24efa EBUILD iproute2-5.8.0.ebuild 4495 BLAKE2B a6924b4ba1fc0323026a130d820b5dccc9d81aafaedf20154b320a744327bd3e273431b8e5a95d30e5cd34d7708cb3e2dbf0e0181bde0c9d1e9bc01328c3f426 SHA512 e4c9a3b718cdbe1893749a8669e119e2e1e4a68612cf657fb00c3778e53598cdf150497651eb77e13d8eade420413f0e5f663156f70a03dd6af4513a27e4c75b +EBUILD iproute2-5.9.0.ebuild 4714 BLAKE2B 396c4c256f6dfaac4cedcd152cdfc217ed9ccbb1c53ab80a306a0a4bddfa8de77eaa976b1a189e74a354de2b51afad969d4ec1c9745cb050f31535e7bd9a5591 SHA512 70eb51d70e8a3c66171a0c385618a1d39b21cd2b4cb3896da7ad9f8562967642714b25d3f38770ae2b1215823a499ca34516f5b6977904a1eb81e11b1f4e8b82 EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2 diff --git a/sys-apps/iproute2/iproute2-5.9.0.ebuild b/sys-apps/iproute2/iproute2-5.9.0.ebuild new file mode 100644 index 000000000000..6bccbe4b7ea6 --- /dev/null +++ b/sys-apps/iproute2/iproute2-5.9.0.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2020 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 + elog "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/isapnptools/Manifest b/sys-apps/isapnptools/Manifest index 25a28c729a6c..fc07d348bb04 100644 --- a/sys-apps/isapnptools/Manifest +++ b/sys-apps/isapnptools/Manifest @@ -1,5 +1,6 @@ AUX isapnp.rc 545 BLAKE2B 45a2d468943fce175e1c2ff2a6666b31844493cf9dd00df8fc0b2c28d83f3e8cbe59984ae6c66853bce8b6ea1e84534e8db7ba28abef9a166b0add174bd67266 SHA512 9844f1d7a959e96750a8adb906f9c85d7ab693421d7ac51af08380ed6690c017d3f9a74694f2c5d7c7a3da8266f18f1f574095435aa6e9ec2ab9f7604ea470a7 +AUX isapnptools-1.27-fno-common.patch 578 BLAKE2B aaa06b450b6698d3b0caa10dd2c50a150bff069ee231f46b0e74a1129cf64329ec828d9f7b33205bc409da119d37062f9cc8e96f115e46c6d1eb7feed61a2094 SHA512 202f955c3e4701b7af49ba99b117d1ac8f5dca2bf710fa5d7dc9b73d2988e22a8283900d87b85a500d6b20a4736cf78d5e751e0a9447574dd8d142d8e5f0feec AUX isapnptools-1.27-include.patch 241 BLAKE2B 838759903a4bf42b48da7dbd900f9fa360e3916068cfcc67d7803111d1c50358ec9bb1c9a20916064ecb05e347e026be5e97a8400bd6021a30bbc00e55d0b085 SHA512 8533282a59f4860fd16e9f76a2d7e55db0629ce754e94a17c9339e08b777253e936a4fe242db5d38f99283e474969c03726560b0f27243c898fd4881ad1920b7 DIST isapnptools-1.27.tgz 499639 BLAKE2B 9da8968abeaf1fe2f39e3003cad32aecb546016d72489a9b4c84b8427acee7a54c2580d6536e2c39aa06a44cf363705af06968b71100c51663e928ffdbfa7353 SHA512 ccd1c8f7b66ba7f26d50fcfa64d0397dd1a09866c7c74226acbcb4e08be77717aaa4dde7eabcad5bac4e5f92774c40bca48dbf97069c62cc71355b768eca4d34 -EBUILD isapnptools-1.27.ebuild 592 BLAKE2B d8cd80fcb77e3f1502e26246ceb267147cabad79e6488138499934d1507158df7a46f9f860d6f9beacac0124e7d941089f4654bd101382b265a2503b9acae416 SHA512 3d5271332b39ccdc4bc356cc1ec2cfe62f0e4d5220af69d053e9678a48ac9754e17c0af49a81bb67a9a6d9361db6805444c407193bf59e77d76e58a717c3f0b6 +EBUILD isapnptools-1.27.ebuild 617 BLAKE2B 94f1138e597d4aa1f8a0a90274b0bdff452f161219656b4e76e7f3faffacf63dc842710999e5cb63addd2e5b5f98294118a14556eff4d525cbb2e4c4ebce0488 SHA512 c6c9de1ef886b48a8994c38a1075299e35c4a75bad7e00063e2f7214db5967c3cb974b3c26ba48cf159f3ecd4ff7fc8a67a8d8406c22188342939cdb6cf8b380 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch b/sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch new file mode 100644 index 000000000000..54da41cdd602 --- /dev/null +++ b/sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch @@ -0,0 +1,22 @@ +--- a/src/isapnp_main.c ++++ b/src/isapnp_main.c +@@ -1153,7 +1153,7 @@ + return 0; + } + +-unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; ++extern unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; + static char *boardid[NUM_CARDS+1]; + static unsigned long serno[NUM_CARDS+1]; + +--- a/src/isapnp_main.l ++++ b/src/isapnp_main.l +@@ -363,7 +363,7 @@ + return 0; + } + +-unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; ++extern unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; + static char *boardid[NUM_CARDS+1]; + static unsigned long serno[NUM_CARDS+1]; + diff --git a/sys-apps/isapnptools/isapnptools-1.27.ebuild b/sys-apps/isapnptools/isapnptools-1.27.ebuild index c95092405332..cdcbf0fbdb96 100644 --- a/sys-apps/isapnptools/isapnptools-1.27.ebuild +++ b/sys-apps/isapnptools/isapnptools-1.27.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Tools for configuring ISA PnP devices" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -10,15 +10,17 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* amd64 x86" -IUSE="" -PATCHES=( "${FILESDIR}"/${P}-include.patch ) +PATCHES=( + "${FILESDIR}"/${P}-include.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_install() { default dodir /sbin - mv "${ED%/}"/{usr/sbin/isapnp,sbin/} || die + mv "${ED}"/{usr/sbin/isapnp,sbin/} || die docinto txt dodoc doc/{README*,*.txt} test/*.txt diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index b41382cb1f3d..d5ed15fb65d3 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -4,6 +4,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c EBUILD kmod-26-r5.ebuild 5144 BLAKE2B d9e4f661d521e39d4d47376713c771b4f14f29138d4b4647d8b8bf47696911b9944f284634a575dac08029229e4924b2e7510a54b895848f53bf699fbab98adb SHA512 00a1c056e0736558c4f7d8469634582dd888869fa8afc6905abb8915a32f34da0b15ad91855f9925249de89bccd64de8e80479048807d34c82e05430ae4a6458 -EBUILD kmod-27-r2.ebuild 5266 BLAKE2B afde54209310e0bde96c8ce879722e362b5619457f701a9672d633184fad61ee96c4fb7580951b66e67f5d8775b1740746d87408cb9d4a15cb5c9cb7de08be8d SHA512 198282b58d2acc5021539f44004fa32043ef8c07f48759fe3e75609dd55598187665ae4d7b8a3ae26829ae1ae98d42735ad3bcda60da82dcc3642e753874ae8c -EBUILD kmod-9999.ebuild 5199 BLAKE2B f9d18e2edf1ed8d921491e2f2ecbaea508c91b48598911677156ca31de9c595c4b8f91e8502a5e6549e866dcf968e6bc4d9114e475a11656bf428bf27f37d8c5 SHA512 04ae79bbe8a3de6e9dcfac81e9f09a5263d001adfaecf89911bd5d99c5fc0eabf817533bc792ca4bf244fd51b2b344cb83fc3dfff11cba51e309c30da40ee781 +EBUILD kmod-27-r2.ebuild 5268 BLAKE2B c2f171bee8116149fe57fc28d5b816a50ab3f4661b61736158daa84a1fbb9c7abe861cfe7350564d12e2686becbb396c8a37327ef9db822808f4c0c18341dbba SHA512 291260c0c7f871eab37dd6603a0de78e68bd1af75b6e33c6bee8c0c45de1b7b50922fecec17d8e332001d37cede84f15d7bd61e19152e5e4a8cba1b8e06de129 +EBUILD kmod-9999.ebuild 5201 BLAKE2B aac231cb1b5e3ef35ee66d0cf3b2a61bca0ebbe8548404642539cde4803d6d7c15ffb7fb86561972d86306e4e308182884542d4f623fe6f33319ae60dfcdeae0 SHA512 a1b26b0cb6ab8bfc5a723bc238d1860d3ca0174991736a0fd330bbf698165649a4c424964c89ae64b7c21e1281c1add1a64ae7149d78b800d5e6c2423c9ea4d2 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 25f444735245..8eb51ecede21 100644 --- a/sys-apps/kmod/kmod-27-r2.ebuild +++ b/sys-apps/kmod/kmod-27-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit autotools bash-completion-r1 multilib python-r1 diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 7a4f75e4ee5f..a7e386f475ad 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit autotools bash-completion-r1 multilib python-r1 diff --git a/sys-apps/lcdtest/Manifest b/sys-apps/lcdtest/Manifest deleted file mode 100644 index 4c669298d2c3..000000000000 --- a/sys-apps/lcdtest/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 1.18-build-system.patch 2038 BLAKE2B 01045cd3a607a68d22c39f338adb5111dcb157e3828c7734f5fc77c17415c4624a7782ff23270c9aedaeb2b1c11f42e798c0bf5a8c2233a675c0828d98141a1c SHA512 0901537de977ad940c61ebc175e4faa6d934750fe12f066abf8a2d0881fd62aecf0f5cfaca6b0ee55453814de0a160d75f1e8960ef98f630eaa9994e6f1a9d8f -DIST lcdtest-1.18.tar.gz 26886 BLAKE2B e5ee71c49c65df04d380cbb922a067653bbfb787a6e9376ec8989fee27466895e569813c06c1eb561cf7e3aec48b89920adace2dd3230dda158a7c5bd7badda7 SHA512 74b0739c5dcc5ff9307ca526b4a6bbd92d6e58a83ceeed5a37a4064e3e4ed0cbdfe7a2a70cd56ba1a7305c3fd72510e10a02098aab11828062a3999cac944ab7 -EBUILD lcdtest-1.18.ebuild 1102 BLAKE2B 60e9abebbb5ae2e53f014a08d9c6e01dfc9595614a7001f365156c2dd478731318489d8401ba652b3c870f8b5bad6c44020722885890d56ebf731092718bd268 SHA512 14e5a071eb45dbc0289ecad05bce6ccf7d1590437e58d1180bee11cdb76f5aaf513eaea21897199793df91e5a18c4f0770f56718b17a5ef87eb1fe06f5ffd555 -MISC metadata.xml 330 BLAKE2B 30259c749509242f02c31dd55057f4ab4ba7e13cdda877ef28e5a66c6d4da5b12684bbb6a2e144cae18cb6dc9bbc1b5c1fb14b1bfcf17474151a6624a1041036 SHA512 a7b0f31767ddd2a38acc2af4700f6129e6a78553f6bee63827d7706064570dccd5e5bf48b407b9e534bef4bbc6b384c326a79121079e68d25e3494601b3b0e1b diff --git a/sys-apps/lcdtest/files/1.18-build-system.patch b/sys-apps/lcdtest/files/1.18-build-system.patch deleted file mode 100644 index 429067259c54..000000000000 --- a/sys-apps/lcdtest/files/1.18-build-system.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -uNr lcdtest-1.18.ORIG/SConstruct lcdtest-1.18/SConstruct ---- lcdtest-1.18.ORIG/SConstruct 2013-04-17 14:32:37.735358663 +0100 -+++ lcdtest-1.18/SConstruct 2013-04-17 14:33:52.706359788 +0100 -@@ -119,10 +119,10 @@ - # code - #----------------------------------------------------------------------------- - --build_dir = 'build/' -+variant_dir = 'build/' - - SConscript ('src/SConscript', -- build_dir = build_dir, -+ variant_dir = variant_dir, - duplicate = 0, - exports = {'env' : env}) - -@@ -137,7 +137,7 @@ - #----------------------------------------------------------------------------- - - SConscript ('desktop/SConscript', -- build_dir = build_dir + '/desktop', -+ variant_dir = variant_dir + '/desktop', - duplicate = 0) - - #----------------------------------------------------------------------------- -diff -uNr lcdtest-1.18.ORIG/src/SConscript lcdtest-1.18/src/SConscript ---- lcdtest-1.18.ORIG/src/SConscript 2013-04-17 14:32:37.734358663 +0100 -+++ lcdtest-1.18/src/SConscript 2013-04-17 14:32:54.194358910 +0100 -@@ -17,6 +17,7 @@ - # along with this program. If not, see see . - - import os -+import SCons.Util - - Import('env') - -@@ -29,13 +30,18 @@ - - objs = [env.Object(src) for src in srcs] - --# respect the environment CFLAGS if given --if 'CFLAGS' in ARGUMENTS: -- env.MergeFlags (ARGUMENTS ['CFLAGS']) --elif 'CFLAGS' in os.environ: -- env.MergeFlags (os.environ ['CFLAGS']) --else: -- env.Append (CCFLAGS = ['-g', '-Wall', '-Wextra']) -+# respect the environments flags if given -+ -+if os.environ.has_key('CC'): -+ env['CC'] = os.environ['CC'] -+if os.environ.has_key('CFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+if os.environ.has_key('CXX'): -+ env['CXX'] = os.environ['CXX'] -+if os.environ.has_key('CXXFLAGS'): -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -+if os.environ.has_key('LDFLAGS'): -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - - env.Append (LIBS = ['SDL', 'SDL_image', 'SDL_ttf']); - diff --git a/sys-apps/lcdtest/lcdtest-1.18.ebuild b/sys-apps/lcdtest/lcdtest-1.18.ebuild deleted file mode 100644 index 4b5876b1bab5..000000000000 --- a/sys-apps/lcdtest/lcdtest-1.18.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit scons-utils eutils toolchain-funcs gnome2-utils - -DESCRIPTION="Displays test patterns to spot dead/hot pixels on LCD screens" -HOMEPAGE="http://www.brouhaha.com/~eric/software/lcdtest/" -SRC_URI="http://www.brouhaha.com/~eric/software/lcdtest/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - >=media-libs/libsdl-1.2.7-r2[X,video] - >=media-libs/sdl-image-1.2.3-r1 - >=media-libs/sdl-ttf-2.0.9 -" -RDEPEND="${DEPEND} - media-fonts/liberation-fonts -" - -src_prepare() { - epatch "${FILESDIR}/${PV}-build-system.patch" - epatch_user - sed -i -e \ - "s|/usr/share/fonts/liberation/|/usr/share/fonts/liberation-fonts/|" \ - src/lcdtest.c || die -} - -src_configure() { - tc-export CC - myesconsargs=( - --prefix="${EPREFIX}/usr" - ) -} - -src_compile() { - escons -} - -src_install() { - escons --buildroot="${D}" install - dodoc README -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/lcdtest/metadata.xml b/sys-apps/lcdtest/metadata.xml deleted file mode 100644 index f35b285c1eee..000000000000 --- a/sys-apps/lcdtest/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - chainsaw@gentoo.org - - - base-system@gentoo.org - Gentoo Base System - - diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index b2549fca9a3a..04e859b7c6e5 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,9 +1,5 @@ AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 -AUX lesspipe.sh 8058 BLAKE2B d4ead282e5a57891970283e26b82cbf38979612857ce9dadda6a37ef82a879731ec64b30d02c3b99bba98d9791fa3ea6b7df965c7ad43c6de30d7a4835b11dc8 SHA512 6ac05bd89eaced691c47427eb1fa350a25dc3a7e716b41d08ec9d7a7fa9b8aabce9f5e3f073faddecb00a87dd46d8edc5f7856842b8c553fb50a450d6c9669cf -DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585 -DIST less-562.tar.gz 335444 BLAKE2B 4830673d17594aea7424ee88b82bc2e073275a77ed39c067c032a0b79b0d15f8c0d97f98381a57192e985054cd04b3a824ef6c3e6ef796885a9677681a4cb109 SHA512 c9a0f43da0fcdb515e5d4f56a666fa7c8b12d52fd5a1cd4f6cc5f79133376400b0ef24a206c0cf5fd3558fba9a8055f219038bad8c3dadf0504ea96c419c4573 +AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535 -EBUILD less-551.ebuild 1392 BLAKE2B a81cb5c09b972404d6893a020f18c6f6ed592d28423d7ddb691dfdda3b7f241bb520a420e45e6557c374695cad57ab52c3193f9098c4a9a4b67e80911c3dbf35 SHA512 68e995a4a03c032ee2d1a183326050610e56f081cf7a7f2e71921caa149449f2f1eaafc3319dbd9ca71a0e22f589101c8bbcb9aa317c928c5457e3ae86514d46 -EBUILD less-562.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878 -EBUILD less-563.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878 +EBUILD less-563-r1.ebuild 1395 BLAKE2B 0a0cb41f1cfff3e75056fa08e693d487dea13f003ce6fd99d8bcb27846bcaebc38253347d726d712f4e5cf4504280513c55ccb165c22021d1b70a8c574565395 SHA512 f23da9f98d004f6285d8c0ebd09165d15b112a4b43223de3ffcef528429521097a7a32d1f58f1c3febd731bf71dd60ecfb6d17d887cdc8e024b5588c02871c47 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95 diff --git a/sys-apps/less/files/lesspipe-r1.sh b/sys-apps/less/files/lesspipe-r1.sh new file mode 100644 index 000000000000..9dcfea1d6399 --- /dev/null +++ b/sys-apps/less/files/lesspipe-r1.sh @@ -0,0 +1,287 @@ +#!/bin/bash +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Preprocessor for 'less'. Used when this environment variable is set: +# LESSOPEN="|lesspipe %s" + +# TODO: handle compressed files better + +[[ -n ${LESSDEBUG+set} ]] && set -x + +trap 'exit 0' PIPE + +guesscompress() { + case "$1" in + *.gz|*.z) echo "gunzip -c" ;; + *.bz2|*.bz) echo "bunzip2 -c" ;; + *.lz) echo "lzip -dc" ;; + *.lzma) echo "unlzma -c" ;; + *.lzo) echo "lzop -dc" ;; + *.xz) echo "xzdec" ;; + *.zst) echo "zstdcat" ;; + *) echo "cat" ;; + esac +} + +lesspipe_file() { + local out=$(file -L -- "$1") + local suffix + case ${out} in + *" 7-zip archive"*) suffix="7z";; + *" ar archive"*) suffix="a";; + *" CAB-Installer"*) suffix="cab";; + *" cpio archive"*) suffix="cpio";; + *" ELF "*) suffix="elf";; + *" LHa"*archive*) suffix="lha";; + *" troff "*) suffix="man";; + *" script text"*) suffix="sh";; + *" shared object"*) suffix="so";; + *" tar archive"*) suffix="tar";; + *" Zip archive"*) suffix="zip";; + *": data") hexdump -C -- "$1"; return 0;; + *) return 1;; + esac + lesspipe "$1" ".${suffix}" + return 0 +} + +lesspipe() { + local match=$2 + [[ -z ${match} ]] && match=$1 + + local DECOMPRESSOR=$(guesscompress "${match}") + + # User filters + if [[ -x ~/.lessfilter ]] ; then + ~/.lessfilter "$1" && exit 0 + fi + + local ignore + for ignore in ${LESSIGNORE} ; do + [[ ${match} == *.${ignore} ]] && exit 0 + done + + # Handle non-regular file types. + if [[ -d $1 ]] ; then + ls -alF -- "$1" + return + elif [[ ! -f $1 ]] ; then + # Only return if the stat passes. This is needed to handle pseudo + # arguments like URIs. + stat -- "$1" && return + fi + + case "${match}" in + + ### Doc files ### + *.[0-9n]|*.man|\ + *.[0-9n].bz2|*.man.bz2|\ + *.[0-9n].gz|*.man.gz|\ + *.[0-9n].lzma|*.man.lzma|\ + *.[0-9n].xz|*.man.xz|\ + *.[0-9n].zst|*.man.zst|\ + *.[0-9][a-z].gz|*.[0-9][a-z].gz) + local out=$(${DECOMPRESSOR} -- "$1" | file -) + case ${out} in + *troff*) + # Need to make sure we pass path to man or it will try + # to locate "$1" in the man search paths + if [[ $1 == /* ]] ; then + man -- "$1" + else + man -- "./$1" + fi + ;; + *text*) + ${DECOMPRESSOR} -- "$1" + ;; + *) + # We could have matched a library (libc.so.6), so let + # `file` figure out what the hell this thing is + lesspipe_file "$1" + ;; + esac + ;; + *.dvi) dvi2tty "$1" ;; + *.ps) ps2ascii "$1" || pstotext "$1" ;; + *.pdf) pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;; + *.doc) antiword "$1" || catdoc "$1" ;; + *.rtf) unrtf --nopict --text "$1" ;; + *.conf|*.txt|*.log) ;; # force less to work on these directly #150256 + *.json) python -mjson.tool "$1" ;; + + ### URLs ### + ftp://*|http://*|https://|*.htm|*.html) + for b in elinks links2 links lynx ; do + ${b} -dump "$1" && exit 0 + done + html2text -style pretty "$1" + ;; + + ### Tar files ### + *.tar|\ + *.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|*.tar.zst|\ + *.tar.lz|*.tar.tlz|\ + *.tar.lzma|*.tar.xz) + ${DECOMPRESSOR} -- "$1" | tar tvvf -;; + *.tbz2|*.tbz|*.tgz|*.tlz|*.txz) + lesspipe "$1" "$1.tar.${1##*.t}" ;; + + ### Misc archives ### + *.bz2|\ + *.gz|*.z|\ + *.zst|\ + *.lz|\ + *.lzma|*.xz) ${DECOMPRESSOR} -- "$1" ;; + *.rpm) rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;; + *.cpi|*.cpio) cpio -itv < "$1" ;; + *.ace) unace l "$1" ;; + *.arc) arc v "$1" ;; + *.arj) arj l -- "$1" || unarj l "$1" ;; + *.cab) cabextract -l -- "$1" ;; + *.lha|*.lzh) lha v "$1" ;; + *.zoo) zoo -list "$1" || unzoo -l "$1" ;; + *.7z|*.exe) 7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;; + *.a) ar tv "$1" ;; + *.elf) readelf -a -W -- "$1" ;; + *.so) readelf -h -d -s -W -- "$1" ;; + *.mo|*.gmo) msgunfmt -- "$1" ;; + + *.rar|.r[0-9][0-9]) unrar l -- "$1" ;; + + *.jar|*.war|*.ear|*.xpi|*.zip) + unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1" + ;; + + *.deb|*.udeb) + if type -P dpkg > /dev/null ; then + dpkg --info "$1" + dpkg --contents "$1" + else + ar tv "$1" + ar p "$1" data.tar.gz | tar tzvvf - + fi + ;; + + ### Filesystems ### + *.squashfs) unsquashfs -s "$1" && unsquashfs -ll "$1" ;; + + ### Media ### + *.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp) + identify -verbose -- "$1" || file -L -- "$1" + ;; + *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) + midentify "$1" || file -L -- "$1" + ;; + *.mp3) mp3info "$1" || id3info "$1" ;; + *.ogg) ogginfo "$1" ;; + *.flac) metaflac --list "$1" ;; + *.torrent) torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;; + *.bin|*.cue|*.raw) + # not all .bin/.raw files are cd images #285507 + # fall back to lesspipe_file if .cue doesn't exist, or if + # cd-info failed to parse things sanely + [[ -e ${1%.*}.cue ]] \ + && cd-info --no-header --no-device-info "$1" \ + || lesspipe_file "$1" + ;; + *.iso) + iso_info=$(isoinfo -d -i "$1") + echo "${iso_info}" + # Joliet output overrides Rock Ridge, so prefer the better Rock + case ${iso_info} in + *$'\n'"Rock Ridge"*) iso_opts="-R";; + *$'\n'"Joliet"*) iso_opts="-J";; + *) iso_opts="";; + esac + isoinfo -l ${iso_opts} -i "$1" + ;; + + ### Encryption stuff ### + *.crl) openssl crl -hash -text -noout -in "$1" ;; + *.csr) openssl req -text -noout -in "$1" ;; + *.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;; + +# May not be such a good idea :) +# ### Device nodes ### +# /dev/[hs]d[a-z]*) +# fdisk -l "${1:0:8}" +# [[ $1 == *hd* ]] && hdparm -I "${1:0:8}" +# ;; + + ### Everything else ### + *) + case $(( recur++ )) in + # Maybe we didn't match due to case issues ... + 0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;; + + # Maybe we didn't match because the file is named weird ... + 1) lesspipe_file "$1" ;; + esac + + # So no matches from above ... finally fall back to an external + # coloring package. No matching here so we don't have to worry + # about keeping in sync with random packages. Any coloring tool + # you use should not output errors about unsupported files to + # stdout. If it does, it's your problem. + + # Allow people to flip color off if they dont want it + case ${LESSCOLOR} in + always) LESSCOLOR=2;; + [yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;; + [nN][oO]|[nN]|0|false) LESSCOLOR=0;; + *) LESSCOLOR=0;; # default to no color #188835 + esac + if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then + # 2: Only colorize if user forces it ... + # 1: ... or we know less will handle raw codes -- this will + # not detect -seiRM, so set LESSCOLORIZER yourself + if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then + LESSQUIET=true ${LESSCOLORIZER} "$1" + fi + fi + + # Nothing left to do but let less deal + exit 0 + ;; + esac +} + +if [[ $# -eq 0 ]] ; then + echo "Usage: lesspipe " +elif [[ $1 == "-V" || $1 == "--version" ]] ; then + cat <<-EOF + lesspipe (git) + Copyright 1999-2019 Gentoo Authors + Mike Frysinger + (with plenty of ideas stolen from other projects/distros) + + EOF + less -V +elif [[ $1 == "-h" || $1 == "--help" ]] ; then + cat <<-EOF + lesspipe: preprocess files before sending them to less + + Usage: lesspipe + + lesspipe specific settings: + LESSCOLOR env - toggle colorizing of output (no/yes/always; default: no) + LESSCOLORIZER env - program used to colorize output (default: code2color) + LESSIGNORE - list of extensions to ignore (don't do anything fancy) + + You can create per-user filters as well by creating the executable file: + ~/.lessfilter + One argument is passed to it: the file to display. The script should exit 0 + to indicate it handled the file, or non-zero to tell lesspipe to handle it. + + To use lesspipe, simply add to your environment: + export LESSOPEN="|lesspipe %s" + + Run 'less --help' or 'man less' for more info. + EOF +else + recur=0 + [[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null + lesspipe "$1" +fi diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh deleted file mode 100644 index a393de07ec7b..000000000000 --- a/sys-apps/less/files/lesspipe.sh +++ /dev/null @@ -1,284 +0,0 @@ -#!/bin/bash -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Preprocessor for 'less'. Used when this environment variable is set: -# LESSOPEN="|lesspipe %s" - -# TODO: handle compressed files better - -[[ -n ${LESSDEBUG+set} ]] && set -x - -trap 'exit 0' PIPE - -guesscompress() { - case "$1" in - *.gz|*.z) echo "gunzip -c" ;; - *.bz2|*.bz) echo "bunzip2 -c" ;; - *.lz) echo "lzip -dc" ;; - *.lzma) echo "unlzma -c" ;; - *.lzo) echo "lzop -dc" ;; - *.xz) echo "xzdec" ;; - *) echo "cat" ;; - esac -} - -lesspipe_file() { - local out=$(file -L -- "$1") - local suffix - case ${out} in - *" 7-zip archive"*) suffix="7z";; - *" ar archive"*) suffix="a";; - *" CAB-Installer"*) suffix="cab";; - *" cpio archive"*) suffix="cpio";; - *" ELF "*) suffix="elf";; - *" LHa"*archive*) suffix="lha";; - *" troff "*) suffix="man";; - *" script text"*) suffix="sh";; - *" shared object"*) suffix="so";; - *" tar archive"*) suffix="tar";; - *" Zip archive"*) suffix="zip";; - *": data") hexdump -C -- "$1"; return 0;; - *) return 1;; - esac - lesspipe "$1" ".${suffix}" - return 0 -} - -lesspipe() { - local match=$2 - [[ -z ${match} ]] && match=$1 - - local DECOMPRESSOR=$(guesscompress "${match}") - - # User filters - if [[ -x ~/.lessfilter ]] ; then - ~/.lessfilter "$1" && exit 0 - fi - - local ignore - for ignore in ${LESSIGNORE} ; do - [[ ${match} == *.${ignore} ]] && exit 0 - done - - # Handle non-regular file types. - if [[ -d $1 ]] ; then - ls -alF -- "$1" - return - elif [[ ! -f $1 ]] ; then - # Only return if the stat passes. This is needed to handle pseudo - # arguments like URIs. - stat -- "$1" && return - fi - - case "${match}" in - - ### Doc files ### - *.[0-9n]|*.man|\ - *.[0-9n].bz2|*.man.bz2|\ - *.[0-9n].gz|*.man.gz|\ - *.[0-9n].lzma|*.man.lzma|\ - *.[0-9n].xz|*.man.xz|\ - *.[0-9][a-z].gz|*.[0-9][a-z].gz) - local out=$(${DECOMPRESSOR} -- "$1" | file -) - case ${out} in - *troff*) - # Need to make sure we pass path to man or it will try - # to locate "$1" in the man search paths - if [[ $1 == /* ]] ; then - man -- "$1" - else - man -- "./$1" - fi - ;; - *text*) - ${DECOMPRESSOR} -- "$1" - ;; - *) - # We could have matched a library (libc.so.6), so let - # `file` figure out what the hell this thing is - lesspipe_file "$1" - ;; - esac - ;; - *.dvi) dvi2tty "$1" ;; - *.ps) ps2ascii "$1" || pstotext "$1" ;; - *.pdf) pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;; - *.doc) antiword "$1" || catdoc "$1" ;; - *.rtf) unrtf --nopict --text "$1" ;; - *.conf|*.txt|*.log) ;; # force less to work on these directly #150256 - *.json) python -mjson.tool "$1" ;; - - ### URLs ### - ftp://*|http://*|https://|*.htm|*.html) - for b in elinks links2 links lynx ; do - ${b} -dump "$1" && exit 0 - done - html2text -style pretty "$1" - ;; - - ### Tar files ### - *.tar|\ - *.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|\ - *.tar.lz|*.tar.tlz|\ - *.tar.lzma|*.tar.xz) - ${DECOMPRESSOR} -- "$1" | tar tvvf -;; - *.tbz2|*.tbz|*.tgz|*.tlz|*.txz) - lesspipe "$1" "$1.tar.${1##*.t}" ;; - - ### Misc archives ### - *.bz2|\ - *.gz|*.z|\ - *.lz|\ - *.lzma|*.xz) ${DECOMPRESSOR} -- "$1" ;; - *.rpm) rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;; - *.cpi|*.cpio) cpio -itv < "$1" ;; - *.ace) unace l "$1" ;; - *.arc) arc v "$1" ;; - *.arj) arj l -- "$1" || unarj l "$1" ;; - *.cab) cabextract -l -- "$1" ;; - *.lha|*.lzh) lha v "$1" ;; - *.zoo) zoo -list "$1" || unzoo -l "$1" ;; - *.7z|*.exe) 7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;; - *.a) ar tv "$1" ;; - *.elf) readelf -a -W -- "$1" ;; - *.so) readelf -h -d -s -W -- "$1" ;; - *.mo|*.gmo) msgunfmt -- "$1" ;; - - *.rar|.r[0-9][0-9]) unrar l -- "$1" ;; - - *.jar|*.war|*.ear|*.xpi|*.zip) - unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1" - ;; - - *.deb|*.udeb) - if type -P dpkg > /dev/null ; then - dpkg --info "$1" - dpkg --contents "$1" - else - ar tv "$1" - ar p "$1" data.tar.gz | tar tzvvf - - fi - ;; - - ### Filesystems ### - *.squashfs) unsquashfs -s "$1" && unsquashfs -ll "$1" ;; - - ### Media ### - *.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp) - identify -verbose -- "$1" || file -L -- "$1" - ;; - *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) - midentify "$1" || file -L -- "$1" - ;; - *.mp3) mp3info "$1" || id3info "$1" ;; - *.ogg) ogginfo "$1" ;; - *.flac) metaflac --list "$1" ;; - *.torrent) torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;; - *.bin|*.cue|*.raw) - # not all .bin/.raw files are cd images #285507 - # fall back to lesspipe_file if .cue doesn't exist, or if - # cd-info failed to parse things sanely - [[ -e ${1%.*}.cue ]] \ - && cd-info --no-header --no-device-info "$1" \ - || lesspipe_file "$1" - ;; - *.iso) - iso_info=$(isoinfo -d -i "$1") - echo "${iso_info}" - # Joliet output overrides Rock Ridge, so prefer the better Rock - case ${iso_info} in - *$'\n'"Rock Ridge"*) iso_opts="-R";; - *$'\n'"Joliet"*) iso_opts="-J";; - *) iso_opts="";; - esac - isoinfo -l ${iso_opts} -i "$1" - ;; - - ### Encryption stuff ### - *.crl) openssl crl -hash -text -noout -in "$1" ;; - *.csr) openssl req -text -noout -in "$1" ;; - *.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;; - -# May not be such a good idea :) -# ### Device nodes ### -# /dev/[hs]d[a-z]*) -# fdisk -l "${1:0:8}" -# [[ $1 == *hd* ]] && hdparm -I "${1:0:8}" -# ;; - - ### Everything else ### - *) - case $(( recur++ )) in - # Maybe we didn't match due to case issues ... - 0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;; - - # Maybe we didn't match because the file is named weird ... - 1) lesspipe_file "$1" ;; - esac - - # So no matches from above ... finally fall back to an external - # coloring package. No matching here so we don't have to worry - # about keeping in sync with random packages. Any coloring tool - # you use should not output errors about unsupported files to - # stdout. If it does, it's your problem. - - # Allow people to flip color off if they dont want it - case ${LESSCOLOR} in - always) LESSCOLOR=2;; - [yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;; - [nN][oO]|[nN]|0|false) LESSCOLOR=0;; - *) LESSCOLOR=0;; # default to no color #188835 - esac - if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then - # 2: Only colorize if user forces it ... - # 1: ... or we know less will handle raw codes -- this will - # not detect -seiRM, so set LESSCOLORIZER yourself - if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then - LESSQUIET=true ${LESSCOLORIZER} "$1" - fi - fi - - # Nothing left to do but let less deal - exit 0 - ;; - esac -} - -if [[ $# -eq 0 ]] ; then - echo "Usage: lesspipe " -elif [[ $1 == "-V" || $1 == "--version" ]] ; then - cat <<-EOF - lesspipe (git) - Copyright 1999-2019 Gentoo Authors - Mike Frysinger - (with plenty of ideas stolen from other projects/distros) - - EOF - less -V -elif [[ $1 == "-h" || $1 == "--help" ]] ; then - cat <<-EOF - lesspipe: preprocess files before sending them to less - - Usage: lesspipe - - lesspipe specific settings: - LESSCOLOR env - toggle colorizing of output (no/yes/always; default: no) - LESSCOLORIZER env - program used to colorize output (default: code2color) - LESSIGNORE - list of extensions to ignore (don't do anything fancy) - - You can create per-user filters as well by creating the executable file: - ~/.lessfilter - One argument is passed to it: the file to display. The script should exit 0 - to indicate it handled the file, or non-zero to tell lesspipe to handle it. - - To use lesspipe, simply add to your environment: - export LESSOPEN="|lesspipe %s" - - Run 'less --help' or 'man less' for more info. - EOF -else - recur=0 - [[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null - lesspipe "$1" -fi diff --git a/sys-apps/less/less-551.ebuild b/sys-apps/less/less-551.ebuild deleted file mode 100644 index cfc0e10bf5e8..000000000000 --- a/sys-apps/less/less-551.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.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-562.ebuild b/sys-apps/less/less-562.ebuild deleted file mode 100644 index 375e2585ca5b..000000000000 --- a/sys-apps/less/less-562.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.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-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild new file mode 100644 index 000000000000..1bd6c54437a8 --- /dev/null +++ b/sys-apps/less/less-563-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-563.ebuild b/sys-apps/less/less-563.ebuild deleted file mode 100644 index 375e2585ca5b..000000000000 --- a/sys-apps/less/less-563.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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.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/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest index eb440a9c7d7c..6cc52553dad7 100644 --- a/sys-apps/lm-sensors/Manifest +++ b/sys-apps/lm-sensors/Manifest @@ -13,5 +13,5 @@ DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf EBUILD lm-sensors-3.5.0.ebuild 6481 BLAKE2B a28ee881c1e8fe7de8b68e68023e580b2958cd155b36221cfc6095e7229bda353fa0bed2d42b65fe1b609abd492bac0b06d08569b7f9b9839e2851f0fcc8e806 SHA512 a462ecf888eaaafbedbd1c79b35a5c0b9c2c1038a22abf980e2998f813853ad76545ea5d3351daec64366eae801f619435b197fcd59ede44f44ec369f8c66ffb EBUILD lm-sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B eb3ab6b35813340445e4331395e385dd2fe0c69b42de7b43eea71d6df90ad38042a0b9256c352c11f25ed0d0c174291e6e5ab149164f55bef27855c60e761137 SHA512 fdc1508af3da4697989db7c00ea9abe21cc91e7ca79d8a3fa761c4602c026359d72e1f342a34332bb951b0ab8e331f555fc7bc05fb637a3df54de510b5367fdc -EBUILD lm-sensors-3.6.0.ebuild 6438 BLAKE2B 38e60f1727acc1bc94724ed30a81dcc41ac00bd42e232e322db6b9945bec4b4e668c828deef2968bba5939c7d8904e46ba64b33f8ba2dd01f3f80ed5e4d2d07c SHA512 fcfffa1f4f21a04d92f1680f7a669b48937eb7df8401dc12bbc553287524e582678369ef6124a98deaaca20025508d8e941dcf762b1c9bf18b94c05b058e9ab1 +EBUILD lm-sensors-3.6.0.ebuild 6437 BLAKE2B 881c07726a43b51e3d252b7d04fd8ad36ee649d351b9b174fe6a466ee990f1b44ff0840db4085b6d2768116299fe1313cad48611af32593afcd6e4973ee46481 SHA512 d605df45e8d36ea70e99fb84b67cb0b967c025b3e2cdf890f5563915090f534362d236f62c7d79b41fc6763b355fb5f647f3f790e8531c1b03b151da695a3930 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8 diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild index 2d6758b9f09a..71acc46a09f3 100644 --- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild +++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild @@ -22,7 +22,7 @@ LICENSE="GPL-2+ LGPL-2.1" # SUBSLOT based on SONAME of libsensors.so SLOT="0/5.0.0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="contrib sensord static-libs" COMMON_DEPS=" diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest index 4f4c9d5dd583..3ffdff9bfd16 100644 --- a/sys-apps/man-pages-posix/Manifest +++ b/sys-apps/man-pages-posix/Manifest @@ -1,3 +1,5 @@ DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 +DIST man-pages-posix-2017-a.tar.xz 935196 BLAKE2B 45d732c712f8d6b18f151c7383130a367d5774ec9d814cf9e61accb01e9d91ad3e9b49bc4f1b993f28688e9c39cf1fbea91b86b00c05968b0bc0a5665211defb SHA512 dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d EBUILD man-pages-posix-2013a.ebuild 770 BLAKE2B fd5869a95bd863317b8a814fd9ae2f4505e0040b6ce7a8a4f6b8f0a3b8b47f5737fcce1341bcdca91fbc2cafaaede95d9994631289a0d730543935c788b68fd6 SHA512 12a86ed005441958436723e7324efc0e3d0542cac9c9298428932dd6dde06116c2116f6513d347b11a4f251b3bdccdf87385c759b8f61dfecdf409c563ee5b34 +EBUILD man-pages-posix-2017a.ebuild 751 BLAKE2B d9ddb51234ddbafd274307426d5f9143c5c41218500fb59cf66305109f4baa95c4e181ffd77212d03358c39950c5925ca5ef9934fa3aad58f4cddd5d26cc7801 SHA512 0d3a4e260969c8a3abdecd83ce5dbb60fb3fce83e99f935c749ad2d7d9239b7c7944244cbd8b076fb140df6ab2f11abfd6480ff6de72b748f52e73fd936fd9ab MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild new file mode 100644 index 000000000000..71be95f7a7ba --- /dev/null +++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-${PV:0:4}-${PV:0-1}" +DESCRIPTION="POSIX man-pages (0p, 1p, 3p)" +HOMEPAGE="https://www.kernel.org/doc/man-pages/" +SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz" + +LICENSE="man-pages-posix-2013" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="" +RESTRICT="binchecks" + +RDEPEND="virtual/man ! conf-cc || die + echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die +} + +src_install() { + dosbin memtester + doman memtester.8 + dodoc BUGS CHANGELOG README README.tests +} diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest index 9ea431acc408..7d7d1cf402ff 100644 --- a/sys-apps/moreutils/Manifest +++ b/sys-apps/moreutils/Manifest @@ -3,5 +3,5 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee9 DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a -EBUILD moreutils-0.64.ebuild 1675 BLAKE2B 46a101760eef9ec2e51907f10c4665fc1ebd3505ccdd84693b3eac869e395b8c0fd325ff9d58664ab41c5e62ab51df9205220d56de8d52fc5ca93464e65d3c86 SHA512 1a31463fe27cd40da4b222ec02586c24e72f35c7278e1e1b71b7bcfa50bca3875c506827addb0572f61eac873ac9d72407989ca55787e31542b775b79a293e3e +EBUILD moreutils-0.64.ebuild 1670 BLAKE2B 74f5df891e9f5e25124741c506375ab99eee21f76c7fe43521982c75a1c77c592a121155e12f5525528998364798fece7af90e1c05dc16f544a8274a07d3e3b6 SHA512 83bcf0e5f1127a94dd99174b77307ead201eaf6db85ca96c1bee3f7084f2f8215460a1bb923b2f14fe30ac29e70fc9451972e109170318a5a4141a257b2744e7 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild index ad2f9c8167d9..dced88e9895e 100644 --- a/sys-apps/moreutils/moreutils-0.64.ebuild +++ b/sys-apps/moreutils/moreutils-0.64.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux" IUSE="+doc +perl" RDEPEND=" diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest index 308fc317bd21..6bfb8c5068dc 100644 --- a/sys-apps/netkit-base/Manifest +++ b/sys-apps/netkit-base/Manifest @@ -3,5 +3,5 @@ AUX 004_all_netkit-base-0.17-misc-fixes.patch 1601 BLAKE2B 64cdad3fcb0ef6fb8bb7e AUX 005_all_netkit-base-0.17-no-rpc.patch 522 BLAKE2B 8935847c79c032dee03f0f99edf6fd879ba224b96a90b144305351e5cedf51e705e2c881bdcd16174ab32fa88eeaf01cc6c9bd326043b7274090b090a6373c11 SHA512 0dff7bb005c1d480444b8ff61f53626ed0a5748730c2a1ff489a277a1bbd61e08bd9c46261acc040f5030d7048a291fa5f22cb7b1a58bb468d8264d4b6272d0b AUX inetd.rc6 470 BLAKE2B 5f6fe30c6a3d07162194f9fb756bcd3748470200819733b291ca59612bdb9f2125bc2003b6c82ec5ed459bea43a29c5a69c20ceadcc90679f151759af2643cba SHA512 525f4f948721553f051a929d5c6b7c49208256170c423ac10ad49427cc89fdc19dbadf81e7a3d8eed07c54c5a266e73cb0ac24c8f95f60f731fab571ccbbd5d2 DIST netkit-base-0.17.tar.gz 56473 BLAKE2B a84289eb56762c702ffe52bec634df1b36dee382dc46d2356886f0fe0039d8f7c393ac0a22f137d1d220222ff55429b25fb4da666c7e6d7f857dbb7dec54e2be SHA512 2faae6471251647ea0d499c96d13faf72bc9aa4ab408f9f7f4c9fc41b1e1e2ce0bcad626ca027135b5a20f311362e90af57c7197885d02a0839beea5b4fdb821 -EBUILD netkit-base-0.17-r9.ebuild 1009 BLAKE2B 4e08c085f4e4bf1c1535d3ff817388420acc143aed9ce8cfc3bad711bc3c462ee6e02962b7fae576552e861884cb1114a06625f75e81cc6bb9cf4e4c49b4b127 SHA512 587c35ef67f12a2fb10c31c85b382980b24e7567d5bb28db2137eb3b4b8b580279668e26cf1b0019007a5813f6492be13935a694199b7949bf9904275094b063 +EBUILD netkit-base-0.17-r9.ebuild 1128 BLAKE2B 638a37da800bff835fd54349a97a90c71816fd75de82e6f7fabedbbdf45544cc7480c69b7c15fc1e469ec86058885744b63a2b6d97ec489d35ad0909fb184fd5 SHA512 f7fdc4185411fb29734a817f3f8b08e680333c5f3dd50e4266f23f8a0521f4f34bfe6ed844024110f3721501400058158b19a98a319779dd249a96bdb388cb21 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild index 7a4209222bcf..256e04387e20 100644 --- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild +++ b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Old-style inetd" HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" @@ -12,14 +12,16 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="" -src_prepare() { - epatch "${FILESDIR}"/*.patch -} +PATCHES=( + "${FILESDIR}"/003_all_netkit-base-0.17-gcc4.patch + "${FILESDIR}"/004_all_netkit-base-0.17-misc-fixes.patch + "${FILESDIR}"/005_all_netkit-base-0.17-no-rpc.patch +) src_configure() { tc-export CC + ./configure || die sed -i \ -e "/^CFLAGS=/s:=.*:=${CFLAGS} -Wall -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline:" \ @@ -30,7 +32,7 @@ src_configure() { src_install() { sed -i \ -e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \ - etc.sample/inetd.conf + etc.sample/inetd.conf || die dosbin inetd/inetd doman inetd/inetd.8 @@ -38,5 +40,5 @@ src_install() { dodoc BUGS ChangeLog README docinto samples - dodoc etc.sample/* + dodoc -r etc.sample/. } diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest index b1a52cab9fc4..09394ee0be86 100644 --- a/sys-apps/opal-utils/Manifest +++ b/sys-apps/opal-utils/Manifest @@ -3,8 +3,8 @@ AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f8246 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27 -DIST opal-utils-6.6.3.tar.gz 2121842 BLAKE2B 06ecd73dea54cd8455da32fdd88163c283554e49b380c371705fdba4fef169a1e3022ed4845f33594c0188e11e60f49af1ee0d5062a2e483f0b874e62a567245 SHA512 94af7a389e05627b26a3f79ebdeb55a6bf9e99f530667724c3112df25bc113c9520944a1d8e3847fe7210efa9eed0b8facab95f1f16757ff92038aa7812ce79e -EBUILD opal-utils-6.5.2.ebuild 2104 BLAKE2B d8def5a718bdf95bc54c85d3535302c94719cd9792d86264d5aef38964a54d4dd0d3fb01799bc12636d9afcf4098ce1e56c19025fc3569d7df2418e7a537a23b SHA512 ba5ecba2487789b97898a502bc6c4236c683a13c2b4bdc5b3d76a6c1c0e2f35328344a5e1df61d7554606889b4d0314c49bbb1b01b1c2704a16a9401fbbbd5f5 -EBUILD opal-utils-6.6.2.ebuild 2474 BLAKE2B 7d2955ba22d6cd0e9379fdb60d0974e5871f36075b3d64ac37b0f65dcf5b46497c61db105b34ae0a74303798c5fe2eadf8651d2f3179e5c25228ee8d3d849ea3 SHA512 e0481207daf609c9634ca83bba0455ee30b8a70319f62a83ce095273038265ff700da1381b75efa97b4ec52be22d590cc20688ca0bb9179736e9b32cbad6b3aa -EBUILD opal-utils-6.6.3.ebuild 2475 BLAKE2B 1005100e0c402e42e8c3c866f6284790e2b8a57093f3059b57a6447c0a66b2f6d0673db1cf1e70dd08d51d1d51258620ff29d9500761d69515de3ea916d24cd7 SHA512 98027c446f9537a87a6dbc60f2ef4a5a4f98706f5a89eb8dd25d20b4ec43c90bc5b32733e1bc7dfae11b15365c75509a95ad277bcc9c0b28977bafb2af3bf6a1 +DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3 +EBUILD opal-utils-6.5.2.ebuild 2445 BLAKE2B 20e09470fc0dc469ccfb06b3b620141279cdfc61876978b5ddf0b5ea2c0204392dc814ca2bc23be6e90f8439ff456b488f551cdc13349806a85804c70dc44fad SHA512 4c143e7311020e7c908b393665c283e36e4cb6c5d06bd082fb95209a7e5385ab3bdec1d21ff2a2d6b52965e83e294574208bbc46508713c5bce518deeac598cf +EBUILD opal-utils-6.6.2.ebuild 2815 BLAKE2B 1d8e59b670f9ccc280ac0b0364fe3a9dea1ef1b965d4f7e8560578042f4bb9c0bdb32cb0b88d79df670d57e96ecfe874e68d65114d9dd77da5ef6e6d608f2791 SHA512 f296e23759af240529158ae714604499945d42303ebd1b674b890d19cc137fdbbafbabcb16dc519f537f99399bba629c151ccc34ae33c144479da4183c61489e +EBUILD opal-utils-6.7.ebuild 2476 BLAKE2B 31186be829b62c2f49520382e8fc4a4093185ee1e558ef139aa8df987b4149ac03c33e27cb1f9f93a153fc1c0507e03d2383548a04b463bbddadf5d8cb4b16c1 SHA512 d977bda473e459f38f81d5f5049c7c2d432a04c5a4be1509cfff41c15800f14b7e86486471ae33a5bc6cad4a4fd8df6d9ca78020b5db12b5148d59709cdd53c7 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666 diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild index 9479de387f7e..805fc46be850 100644 --- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild +++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild @@ -78,3 +78,14 @@ src_install() { fi einstalldocs } + +pkg_postinst() { + if systemd_is_booted || has_version sys-apps/systemd; then + echo + ewarn "With systemd opal-prd.service will fail to start" + ewarn "with 'mmap failed: Operation not permitted' error" + ewarn "if /dev filesystem is mounted with 'noexec' option" + ewarn "see https://github.com/open-power/skiboot/issues/258" + echo + fi +} diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild index 22d57ef7a346..c683ec843d82 100644 --- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild +++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild @@ -90,3 +90,14 @@ src_test() { emake V=1 -C external/pflash check emake V=1 -C external/ffspart check } + +pkg_postinst() { + if systemd_is_booted || has_version sys-apps/systemd; then + echo + ewarn "With systemd opal-prd.service will fail to start" + ewarn "with 'mmap failed: Operation not permitted' error" + ewarn "if /dev filesystem is mounted with 'noexec' option" + ewarn "see https://github.com/open-power/skiboot/issues/258" + echo + fi +} diff --git a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild deleted file mode 100644 index 823783f6fa37..000000000000 --- a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit linux-info python-any-r1 systemd toolchain-funcs - -DESCRIPTION="OPAL firmware utilities" -HOMEPAGE="https://github.com/open-power/skiboot" -SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2+" -SLOT="0" -KEYWORDS="~ppc64" -IUSE="doc" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/recommonmark[${PYTHON_USEDEP}] - ') -)" - -CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS" -ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard" -ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon" -ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" - -S="${WORKDIR}/skiboot-${PV}" - -PATCHES=( "${FILESDIR}/flags.patch" ) - -python_check_deps() { - has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - linux-info_pkg_setup - use doc && python-any-r1_pkg_setup -} - -src_configure() { - tc-export CC LD - export OPAL_PRD_VERSION="${PV}" - export GARD_VERSION="${PV}" - export PFLASH_VERSION="${PV}" - export XSCOM_VERSION="${PV}" - export FFSPART_VERSION="${PV}" -} - -src_compile() { - emake V=1 -C external/opal-prd - emake V=1 -C external/gard - emake V=1 -C external/pflash - emake V=1 -C external/xscom-utils - emake V=1 -C external/ffspart - - use doc && emake V=1 -C doc html -} - -src_install() { - emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install - emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install - emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install - emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install - dosbin external/ffspart/ffspart - - newinitd "${FILESDIR}"/opal-prd.initd opal-prd - newconfd "${FILESDIR}"/opal-prd.confd opal-prd - - systemd_dounit external/opal-prd/opal-prd.service - - if use doc; then - rm -r doc/_build/html/_sources || die - local HTML_DOCS=( doc/_build/html/. ) - fi - einstalldocs -} - -src_test() { - emake V=1 -C external/opal-prd test - emake V=1 -C external/gard check - # this test is fragile and fails because of filename path - rm external/pflash/test/tests/01-info || die - emake V=1 -C external/pflash check - emake V=1 -C external/ffspart check -} diff --git a/sys-apps/opal-utils/opal-utils-6.7.ebuild b/sys-apps/opal-utils/opal-utils-6.7.ebuild new file mode 100644 index 000000000000..52c2ae8fcedf --- /dev/null +++ b/sys-apps/opal-utils/opal-utils-6.7.ebuild @@ -0,0 +1,94 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit linux-info python-any-r1 systemd toolchain-funcs + +DESCRIPTION="OPAL firmware utilities" +HOMEPAGE="https://github.com/open-power/skiboot" +SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2+" +SLOT="0" +KEYWORDS="~ppc64" +IUSE="doc" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + ') +)" + +CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS" +ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard" +ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon" +ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils" + +S="${WORKDIR}/skiboot-${PV}" + +PATCHES=( + "${FILESDIR}/flags.patch" +) + +python_check_deps() { + has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + linux-info_pkg_setup + use doc && python-any-r1_pkg_setup +} + +src_configure() { + tc-export CC LD + export OPAL_PRD_VERSION="${PV}" + export GARD_VERSION="${PV}" + export PFLASH_VERSION="${PV}" + export XSCOM_VERSION="${PV}" + export FFSPART_VERSION="${PV}" +} + +src_compile() { + emake V=1 -C external/opal-prd + emake V=1 -C external/gard + emake V=1 -C external/pflash + emake V=1 -C external/xscom-utils + emake V=1 -C external/ffspart + + use doc && emake V=1 -C doc html +} + +src_install() { + emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install + emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dosbin external/ffspart/ffspart + + newinitd "${FILESDIR}"/opal-prd.initd opal-prd + newconfd "${FILESDIR}"/opal-prd.confd opal-prd + + systemd_dounit external/opal-prd/opal-prd.service + + if use doc; then + rm -r doc/_build/html/_sources || die + local HTML_DOCS=( doc/_build/html/. ) + fi + einstalldocs +} + +src_test() { + emake V=1 -C external/opal-prd test + emake V=1 -C external/gard check + # this test is fragile and fails because of filename path + rm external/pflash/test/tests/01-info || die + emake V=1 -C external/pflash check + emake V=1 -C external/ffspart check +} diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest index dcf19299fcd8..2b6a1bcd926c 100644 --- a/sys-apps/opentmpfiles/Manifest +++ b/sys-apps/opentmpfiles/Manifest @@ -2,10 +2,12 @@ DIST opentmpfiles-0.1.1.tar.gz 5626 BLAKE2B 2b2d21bae0c8280f31ea1ad35cd857a94b3d DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d94187a2600b3196314bef8de235fe7a640bb2b7f78f51727f94c18556fc27e7996ffccef71ff94e006b9f9a63810 SHA512 d86ba71e5fe96d7a8e1999e14b0b99c78e850c42fbfefd203916edca593d0269feaf2252aa01cc35a838906fc2909015430f72cde8370e2d5b1d478a11fe456d DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121 DIST opentmpfiles-0.2.tar.gz 5711 BLAKE2B e1ee7820b2d184d18e63e7e9d93227bb301eb82be8c2b6021c7a1092f55a4ca2bb5dfb7494ff00c3b6debace1963f6c89011ff557f665f0a93c907bd759a4c6f SHA512 bc384cc9156ba6c54d3308ddad4d26b1877f020aa8558e82df2ed49ffa65e0fed5a49eaa11b27193bfe2ad11a4d7368f7cdbc225b820b309af3b299327ddb07b +DIST opentmpfiles-0.3.1.tar.gz 6843 BLAKE2B 20cb40b34fd8db37da5797dc25912000f7d1feb38952b99c044220666cb21871eb40d3853074cb33ee8bcce8dc4858d102aeccb5730ce28df47e99a7edb50f2d SHA512 1e0985403013ac10c0fe50a7ba61a250357b1ea7ea426f9dc92d7071e97eb0e5209448550cf427734b917599defa5123254044d5352b9dcaa22e562e5ca6821f EBUILD opentmpfiles-0.1.1.ebuild 1018 BLAKE2B 59d81bbe686ada0f7e85fe30c3a22d029c7139065feec893fb28e17ca78aa5cb4005f7209a05f962e700c0007433f2ff02b909a082147674dc236f3d08f58c7d SHA512 d4876aa7581160971a545aaa2469b2bec3d54fff5e538904b9fbd0fe30defd7332fb3f2cb00e4e1315f385f4a7a745fda651d21c72083041045571cdd8c6c4a4 EBUILD opentmpfiles-0.1.2.ebuild 1115 BLAKE2B 015d7932a02633e2b1b01d87e48a2e1d6c674fed500c0647e02e83e2b7110797c58245e21576965b0d37edf60616d9a9fc0ba2dd2d493a8268fa9c6744235627 SHA512 d4d36bbdccffd0bdf611fff46d8f25dce49a9a4941906f782eb820bd1ddb845c6b7cb23e0ba2199b095a1ed32313664727fb1889349a0b6704fe9b2cc45e98bb EBUILD opentmpfiles-0.1.3-r1.ebuild 1258 BLAKE2B aefc898a4e5839475cd4fc253c6598f2542f5d64566fa02b30e659647f9a93cb07e9f2bcfc4daabcf509a9e63dca726e25c4101874a4a8a51d9888ccf3eee1ff SHA512 eaf74899b6e924a95376b2f944cc75a330100ad358de698d5655acfae0f61c68192e9e82e8696df2afd631f559847f566ddc9afbb830178e525c4af5da6eb442 EBUILD opentmpfiles-0.1.3.ebuild 1114 BLAKE2B 50b2351d9239ae96ce9c9f563d95c48abeead8a243f5dd830a4bd6b2aaa69c070ad488273e437e47ce973b1bd779233483cf170095c9ec60c9a39f6a141c39af SHA512 5848c60335494717d4c7ffd0d3ff329a238a3653fbd9f9e1a4678a502e8d2840a5131a875206890f8b2e98b8fba6a2f53c79a0f8dfb5c937dd827c22834c0233 EBUILD opentmpfiles-0.2.ebuild 1393 BLAKE2B 9918fccad67f9d34924505a3d303f9380c1fe677fcc4d2610fb3c09cc32e3fdff5252125ca92e83a71cebdda27d7a6a190958b91db975344de323175f83aa4b0 SHA512 7f94f5fa96a3105b7e5ab1ac17c4d6ea48e6c0d6fd4d36ea0d40f4c5ae701447f5e4cc6c8ecfc4a0306187dcf9e089b82c0d7e38a5ee6abadf6ec2df5decdfff -EBUILD opentmpfiles-9999.ebuild 1304 BLAKE2B 6a3d9f1531be076ac5cce725eca1c552eb09a3fdbb8f1eac884436d7bb566670d4021991d8eb648f6c30fc01f7631f552d00a52af78989b97898fc1a8e374259 SHA512 b804a5aa9b9def1f10541d10ffb9227112538310a2b7170fb585a122d03e05ece940ccb3c1647b99e288d153c9e91e9df876e797b618528be2c853f64e9c84cc +EBUILD opentmpfiles-0.3.1.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c +EBUILD opentmpfiles-9999.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33 diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild new file mode 100644 index 000000000000..77eba6b9687b --- /dev/null +++ b/sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit prefix + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openrc/${PN}" +else + SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz -> + ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files" +HOMEPAGE="https://github.com/openrc/opentmpfiles" + +LICENSE="BSD-2" +SLOT="0" +IUSE="selinux" + +RDEPEND="! +Date: Thu, 5 Nov 2020 07:20:18 -0700 +Subject: [PATCH] data/xml-schema: update metadata.xsd + +--- + data/xml-schema/metadata.xsd | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd +index 8b8ac0b5..db243abb 100644 +--- a/data/xml-schema/metadata.xsd ++++ b/data/xml-schema/metadata.xsd +@@ -272,6 +272,7 @@ + + + ++ + + + +-- +2.29.2 + diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild new file mode 100644 index 000000000000..a83f747b80ae --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6..9} ) +DISTUTILS_IN_SOURCE_BUILD=1 +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="a framework for package management" +HOMEPAGE="https://github.com/pkgcore/pkgcore" + +LICENSE="BSD MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" +if [[ ${PV} == *9999 ]]; then + RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]" +fi +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +PATCHES=( + "${FILESDIR}/${P}-metadata-xsd.patch" +) + +python_test() { + esetup.py test +} + +python_install_all() { + local DOCS=( AUTHORS NEWS.rst ) + [[ ${PV} == *9999 ]] || doman man/* + distutils-r1_python_install_all +} diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild deleted file mode 100644 index 185be89d3ad1..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6..9} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="a framework for package management" -HOMEPAGE="https://github.com/pkgcore/pkgcore" - -LICENSE="BSD MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" -if [[ ${PV} == *9999 ]]; then - RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]" -fi -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -python_test() { - esetup.py test -} - -python_install_all() { - local DOCS=( AUTHORS NEWS.rst ) - [[ ${PV} == *9999 ]] || doman man/* - distutils-r1_python_install_all -} diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild index 4d3887960e30..92b8f06a6e33 100644 --- a/sys-apps/pkgcore/pkgcore-9999.ebuild +++ b/sys-apps/pkgcore/pkgcore-9999.ebuild @@ -41,7 +41,7 @@ python_test() { } python_install_all() { - local DOCS=( AUTHORS NEWS.rst ) + local DOCS=( NEWS.rst ) [[ ${PV} == *9999 ]] || doman man/* distutils-r1_python_install_all } diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest index f794144b32f8..fb7cebb1dd74 100644 --- a/sys-apps/pmount/Manifest +++ b/sys-apps/pmount/Manifest @@ -4,5 +4,5 @@ AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9 EBUILD pmount-0.9.99_alpha-r5.ebuild 2012 BLAKE2B ed8abd0d3019487ad93411c907372fba7b7c6379d8fd51903cb5286ce5fa44a494085e07dc04da9fd83176ad7d831fb5c0c6abc2fc09676a553ebcef9b64d85d SHA512 cae67f0708ee111a1cf10df16a4cb65ebeaf4cd678508f0cf18988114088bceda11655311e7c302409cf81bbd7784e5fcbbba9d3f27612c7cdad3f7d6c3c8d18 -EBUILD pmount-0.9.99_alpha-r6.ebuild 2060 BLAKE2B c600dc42adc54ef9717ad647be529e08006c7583c9db4f826e2cb8f1b6d2a994a819c8d09cddf781768e509123783b98186bea9faca6028fca13b65888f0c633 SHA512 790b86b7699b0c74ce73a9f284b9fb3dd7ef4250662e951fe402088a81963c7fb183d930d3cb440c61b2f284af59a2b890068a1c0481b0da0149db2f92b07d19 +EBUILD pmount-0.9.99_alpha-r6.ebuild 2054 BLAKE2B fe6a7d513e2996b21d0a8ba7ee8e0c671164e372622a72b4f033bd4057102ac8c3432966dfe039ded07eb7c3b9bde71211f40f1d4a67d2d315d8ee0ac0e0aefd SHA512 ceb5ded109e96f0aff3bf20ace23b06a5c75acdb351083c6eb7d34c9ebadb1651cdaad72ee231a0f4b220d46dabd368ad67d21c545844687505f0d0464409d32 MISC metadata.xml 434 BLAKE2B 4e7b5746a0ec1a037eb91e0fe55a2fdd14e70320bf2b30ac8640e77f4c005cc533cee3a50ef2907a4e863987bcbf9aedca9e8be51210cffd2ddcf570a05a7714 SHA512 a11a466c6b52b576d55120fd5a142918ed4fc942656f13c923c210ee19dda00867cf66e9e4a6074caac4e1f7683ecdbbae5a72ebe4035300af8bcd41dc4e4f93 diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild index 8336e554d75d..b719f9260ef2 100644 --- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild +++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild @@ -11,7 +11,7 @@ S=${WORKDIR}/${P/_/-} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ppc64 sparc x86" IUSE="crypt" RDEPEND=" diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index 7d25ad91e5e5..53d72d7a1b64 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -7,6 +7,6 @@ DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f EBUILD policycoreutils-2.9.ebuild 4875 BLAKE2B 2b97a2f7563e4e3474898b77ea0bac1c301ce1f6cddb3841e863e9f9fca6ed566221b012c53099e7b035c0d705a8f1fe67cbee88201c30aff7bc6f126aaa6899 SHA512 d967b6d20255f0983cbebead02302e14b4a7f8dfab70a079d82d38a3d8255b673ba56583a211d3cc60c2674d8d6a9c275d34a9572b1f6595e14fd0de19ad75a5 EBUILD policycoreutils-3.0.ebuild 4753 BLAKE2B 3238ceb29eec9166041462b3dd6ea8d91c54d130733033fa5d4a7f1e53a903645f25399d359e31ef1b4e713e5fa68b5ddf07f83cf57a4de7a32d122958891d7d SHA512 60a11fe6afae58bcaecc640671bd3adc55bcb100b463c0931e91d387236320692b8b878a685e413f9728308f5de903aec44a6548db6283740854461e5d700a67 -EBUILD policycoreutils-3.1.ebuild 4755 BLAKE2B 249fe33cbfe8c76107a84503c6b56853fa2e5f3f48224abf30d4b4363b178d01963cf4308cad05ee28d741de56bb97ff2995b56f9e379fb521db7e02aa45be53 SHA512 74d1dcff0f59dad3f692b380e4ef98b3396cf7e12482a1465b4ccf9df24cf7c5da51b52d16c0d7e6c4a29e4948ac4acc24a5d08fd132ef30dd9f1d21989c3428 -EBUILD policycoreutils-9999.ebuild 4755 BLAKE2B 249fe33cbfe8c76107a84503c6b56853fa2e5f3f48224abf30d4b4363b178d01963cf4308cad05ee28d741de56bb97ff2995b56f9e379fb521db7e02aa45be53 SHA512 74d1dcff0f59dad3f692b380e4ef98b3396cf7e12482a1465b4ccf9df24cf7c5da51b52d16c0d7e6c4a29e4948ac4acc24a5d08fd132ef30dd9f1d21989c3428 +EBUILD policycoreutils-3.1.ebuild 4855 BLAKE2B 55a1687ae733cda69f5c3589fef3abf3fa00cf80102036cbc976fcf06635ed9caf83232ffa53a89014b1e95fcac946c1a4bc32bcb1e8a99f1df38284a91e553c SHA512 69c740d15913531bf59c3785c09e34878d19de5990892967711f02ae90c07b079ce0b0cdd7ed18a3155ecc798a5f7b7a07eb72c82851bb61c454ccc0f244185e +EBUILD policycoreutils-9999.ebuild 4855 BLAKE2B 55a1687ae733cda69f5c3589fef3abf3fa00cf80102036cbc976fcf06635ed9caf83232ffa53a89014b1e95fcac946c1a4bc32bcb1e8a99f1df38284a91e553c SHA512 69c740d15913531bf59c3785c09e34878d19de5990892967711f02ae90c07b079ce0b0cdd7ed18a3155ecc798a5f7b7a07eb72c82851bb61c454ccc0f244185e MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5 diff --git a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild index 569dc07cfcf9..742b9fca0890 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.1.ebuild @@ -46,7 +46,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] sys-libs/libcap-ng:= >=sys-libs/libsepol-${SEPOL_VER}:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - sys-devel/gettext dev-python/ipy[${PYTHON_USEDEP}] dbus? ( sys-apps/dbus @@ -56,6 +55,10 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] pam? ( sys-libs/pam:= ) ${PYTHON_DEPS}" +# Avoid dependency loop in the cross-compile case, bug #755173 +# (Still exists in native) +BDEPEND="sys-devel/gettext" + ### libcgroup -> seunshare ### dbus -> restorecond diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 569dc07cfcf9..742b9fca0890 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -46,7 +46,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] sys-libs/libcap-ng:= >=sys-libs/libsepol-${SEPOL_VER}:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] - sys-devel/gettext dev-python/ipy[${PYTHON_USEDEP}] dbus? ( sys-apps/dbus @@ -56,6 +55,10 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}] pam? ( sys-libs/pam:= ) ${PYTHON_DEPS}" +# Avoid dependency loop in the cross-compile case, bug #755173 +# (Still exists in native) +BDEPEND="sys-devel/gettext" + ### libcgroup -> seunshare ### dbus -> restorecond diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 970db73ec183..da2eea57f58f 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -2,10 +2,14 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a7 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5 +DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77 SHA512 d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85 +DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd SHA512 01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d +EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1 -EBUILD portage-3.0.8.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d +EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850 +EBUILD portage-3.0.9.ebuild 8378 BLAKE2B 6d286cf9502773ffe070393836d1bb524e1e7ab5ae23106f1bebd4b1e407ff674387681bc9134e03439f8ef0b6d95fe5fff4855d4df07227eb60e19d522eba62 SHA512 0274d6dabbc5d1cc25bee61483a53d6e5088a432984a8961f3631f010aada1e55082d766f180eeb5acf251c3d5f834957e24120c62bd19e2ceee328ab40818f2 EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a diff --git a/sys-apps/portage/portage-3.0.10-r1.ebuild b/sys-apps/portage/portage-3.0.10-r1.ebuild new file mode 100644 index 000000000000..671587b66362 --- /dev/null +++ b/sys-apps/portage/portage-3.0.10-r1.ebuild @@ -0,0 +1,272 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( pypy3 python3_{6..9} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 linux-info tmpfiles prefix + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx + dev-python/sphinx-epytext + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=app-crypt/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage-ext-modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f ! -name etc-update -print0) + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/portage/portage-3.0.8.ebuild b/sys-apps/portage/portage-3.0.8.ebuild index 28cd3d04cca0..fdd4768a458d 100644 --- a/sys-apps/portage/portage-3.0.8.ebuild +++ b/sys-apps/portage/portage-3.0.8.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -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" SLOT="0" IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" RESTRICT="!test? ( test )" diff --git a/sys-apps/portage/portage-3.0.9.ebuild b/sys-apps/portage/portage-3.0.9.ebuild new file mode 100644 index 000000000000..7625b8e90651 --- /dev/null +++ b/sys-apps/portage/portage-3.0.9.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( pypy3 python3_{6..9} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 linux-info tmpfiles prefix + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx + dev-python/sphinx-epytext + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=app-crypt/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage-ext-modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f ! -name etc-update -print0) + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/powerpc-utils/Manifest b/sys-apps/powerpc-utils/Manifest index 1a7ecdb79819..2b50abaede7f 100644 --- a/sys-apps/powerpc-utils/Manifest +++ b/sys-apps/powerpc-utils/Manifest @@ -1,5 +1,5 @@ DIST powerpc-utils-cleanup.patch.bz2 7255 BLAKE2B 9a82fccd717072ff2065e0257df66f9f151dea6968fa9ae8c8d70686246b890d53cd36f7280caf333f4c0d0dc4afde280304822bb050c23f0c0009398a48e908 SHA512 7ed3202f0ce1c78f9fe37f1a37add40f9a54b287318312fa50874e5d6cd14e0feb53c8f802fe821e62cecd9cafe292b0bcd05ac6e7eb3df7bbad5f0053763154 DIST powerpc-utils_1.1.3-18.diff.gz 27252 BLAKE2B f9302fc7f01086746b008f92fab1773f22edc43d2665c42d194e14a8d3e16e5947f72507d20e0d1f1e1360a5f3b74e0af11e9a176ba9eda8c28a7ed61653cd98 SHA512 b9995113f98e5660464c89b2a0e4893433deb58055a286137a199eb25bec579eb14ae251b70ac35e8b7656c4471492611645f5640061be923cb528e6e57e9824 DIST powerpc-utils_1.1.3.orig.tar.gz 25104 BLAKE2B 0402d6bc0e9641dc5c74bdc6174af3b7c6e6f964cb7f4fdff81a59d904d07faeea2721c098723f3cde77f6c96d61b74dc06e28e7a1bb05619df2426ce8dcc58e SHA512 56b704f3371fa65150e25a5e0a54f3e23331f8f8ee9cd1e5cd3b482814394e6e131f42c262c45ca2ee684fa0ec67b5726a63b85fe2fe83117156b6627028ffbb -EBUILD powerpc-utils-1.1.3.18-r3.ebuild 1414 BLAKE2B 2da169d9dbb460e017f9aac397bfc5f60c6843ffe555bd4c04033edc0b3298f3f2c6acad1f4e6fc8b6fa42de40266a4e4cd3fb13ed949b21bc224ded4895ad9b SHA512 9bc32b82f275ef0c8684b039bf26d69245bd07e87c168a1a3b09053be4dd9cf316161c659f56f60e19ce49846511b7c75d57588d037c7aaa5be05550a2df9262 +EBUILD powerpc-utils-1.1.3.18-r4.ebuild 1408 BLAKE2B 7d71583ebe83b3bd0d10feb9efec0b06f8621d6152f1464ba9729678695d0fdf993efac5f385ac0dc660863388e11023eb94da83c3bd34564047bb0a257f72d1 SHA512 9f05599829afd7353297a9ef4781902f37d6edef230dc5648a5ced5ca49a315618f0801979cebb6686948895bc5c4c6a1222194e624905b5cfac456e764acf13 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538 diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild deleted file mode 100644 index 09eeef791f37..000000000000 --- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -BASEVER=$(ver_cut 1-3) -DEBREV=$(ver_cut 4) - -DESCRIPTION="PowerPC utilities including nvsetenv, and additional OldWorld apps" -SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}.orig.tar.gz - http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}-${DEBREV}.diff.gz - mirror://gentoo/${PN}-cleanup.patch.bz2" - -HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/" -KEYWORDS="-* ppc ppc64" -IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" -SLOT="0" -LICENSE="GPL-2" - -S="${WORKDIR}/pmac-utils" - -PATCHES=( - "${WORKDIR}"/${PN}_${BASEVER}-${DEBREV}.diff - "${WORKDIR}"/${PN}-cleanup.patch -) - -src_prepare() { - default - - # use users CFLAGS, LDFLAGS and CC, bug 280400 - sed -i -e "/LDFLAGS =/d" -e "/CC\t=/d" -e "s/CFLAGS\t=/CFLAGS +=/" \ - -e "s/-g -O2/-Wstrict-prototypes/" Makefile || die "sed failed" -} - -src_compile() { - tc-export CC - emake -} - -src_install() { - into /usr - dosbin autoboot backlight bootsched clock fblevel fdeject fnset - dosbin macos mousemode nvsetenv nvsetvol nvvideo sndvolmix trackpad - - doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8 - doman mousemode.8 nvsetenv.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8 - - ewarn "The lsprop utility has been moved into the ibm-powerpc-utils package." -} diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild new file mode 100644 index 000000000000..fc1157cb0996 --- /dev/null +++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +BASEVER=$(ver_cut 1-3) +DEBREV=$(ver_cut 4) + +DESCRIPTION="PowerPC utilities and additional OldWorld apps" +SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}.orig.tar.gz + http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${PN}_${BASEVER}-${DEBREV}.diff.gz + mirror://gentoo/${PN}-cleanup.patch.bz2" + +HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/" +KEYWORDS="-* ppc ppc64" +IUSE="" +DEPEND="" +RDEPEND="${DEPEND}" +SLOT="0" +LICENSE="GPL-2" + +S="${WORKDIR}/pmac-utils" + +PATCHES=( + "${WORKDIR}"/${PN}_${BASEVER}-${DEBREV}.diff + "${WORKDIR}"/${PN}-cleanup.patch +) + +src_prepare() { + default + + # use users CFLAGS, LDFLAGS and CC, bug 280400 + sed -i -e "/LDFLAGS =/d" -e "/CC\t=/d" -e "s/CFLAGS\t=/CFLAGS +=/" \ + -e "s/-g -O2/-Wstrict-prototypes/" Makefile || die "sed failed" +} + +src_compile() { + tc-export CC + emake +} + +src_install() { + into /usr + dosbin autoboot backlight bootsched clock fblevel fdeject fnset + dosbin macos mousemode nvsetvol nvvideo sndvolmix trackpad + + doman autoboot.8 bootsched.8 clock.8 fblevel.8 fdeject.8 macos.8 + doman mousemode.8 nvsetvol.8 nvvideo.8 sndvolmix.8 trackpad.8 + + ewarn "The lsprop and nvsetenv utilities have been moved into the" + ewarn "sys-apps/ibm-powerpc-utils package." +} diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest index 37f59d5fcc93..b906767765d5 100644 --- a/sys-apps/pv/Manifest +++ b/sys-apps/pv/Manifest @@ -1,5 +1,5 @@ DIST pv-1.6.0.tar.bz2 107723 BLAKE2B 95118fc6406f73e800e99468457ba00f0b8f0345eef58f7ff7f4e10b90419cb36b37af094dbe5bd84b7832dfcc96e536dfb845a061f99a0b118192e90821fdc1 SHA512 bd405901812ca50b910adbcf1d2c540dc0b8612f03687866734a79cfa5b5b8100024c18a1d1413c6613e1f2085989cbb77907da89bec7eda37cdeaa7597129d5 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26 EBUILD pv-1.6.0-r1.ebuild 1367 BLAKE2B 4152a39c7a7ca730c4cdb03e114902246a48f80062fc01a91009aab84741da212ba3b7be37b71c1c6f9e2d7cef22bb009a35bc4a86fcd411ec92c626604ed8a1 SHA512 7f1943b4b4ccff9e4cbcabc6bdf7491f52726903cb0f9a3edf00a2da2260f56bbffd037c70bc4c446b7a39713f6415b739b980d8fbe8f6dcf45b41d305c154b5 -EBUILD pv-1.6.6.ebuild 1394 BLAKE2B 7459925a0f3b591d5d39281f59e3da7079c1b58583a5dd30287f51aaf2675731c63f2fb9220e70d1db3f070062a30dd140dd68f19645c00e254b926b3b76153d SHA512 8aeb28bf335c7e83060e59bbbd3b14885d469c01f56d2df7754fbabc348a566933a4cb19c8996538d06da6e10842f27fe50ac707a849d16808233d6770d4bf99 -MISC metadata.xml 334 BLAKE2B f38b13fd2aa1e836db200a4f9867a5cbc50caa54372977003b4dfd52f92dc2a165d121de1bcd86e7b489911c31c64bff30af3364930ac708dc8f26f7dab6fa14 SHA512 ae252c205325a4937f8ab6c60c8be5a032ff8f11087b7a1fe737ed9c4fa6325b34dbcab9bc16467096de93baa330cec51909f72686cc4152d653fd1456333fb3 +EBUILD pv-1.6.6.ebuild 1389 BLAKE2B b5d2c27af211570e641219a347778000bb9bf13644de5f68eaca0d136ae4d711d6229dec535b23f865e112ca2c80fa159070773fe403b1a918e564604caa2afb SHA512 94c11b3dc498c0710044c480e5051e724c95493c85ae1185d1d6fcedcafa67b5890b6b2d7fee9bb8d9606c0ea35b1a5c9f99066d24c0b1f5206c5253551bf479 +MISC metadata.xml 431 BLAKE2B 85d1be89636b3cc4a7910ad00aa9d7837bf6a4ad155785157fa08742c46b9479a4148a432bb62ad073cd2615689c07b28a24be7f7525c173fded9d7d76337bf9 SHA512 cb9a5ceb4164154107dc4be74388fdaba757e9dbe1ac3e3b308fa81e97297464aa1b4d2cf6d163cb9a212a5423dbeb9f1303093d784c0d16b80d3cc2878e0dfd diff --git a/sys-apps/pv/metadata.xml b/sys-apps/pv/metadata.xml index b9de93a595ea..b4f3c77ea7aa 100644 --- a/sys-apps/pv/metadata.xml +++ b/sys-apps/pv/metadata.xml @@ -1,11 +1,15 @@ - - jer@gentoo.org - Jeroen Roovers - - - pipeviewer - + + gyakovlev@gentoo.org + Georgy Yakovlev + + + sam@gentoo.org + Sam James + + + pipeviewer + diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild index ed93606f5ae5..cd49f262aed1 100644 --- a/sys-apps/pv/pv-1.6.6.ebuild +++ b/sys-apps/pv/pv-1.6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris" IUSE="debug nls" PV_LINGUAS=( de fr pl pt ) diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest index ee7c4d4476b8..db0d204d9dce 100644 --- a/sys-apps/qingy/Manifest +++ b/sys-apps/qingy/Manifest @@ -2,9 +2,8 @@ AUX 50qingy-gentoo.el 241 BLAKE2B 951d9c06cb1b31be819cf687f6bd02fca29fcb35d482cf AUX qingy-1.0.0-tinfo.patch 1581 BLAKE2B 4e1dc1328a322b8c2a2b9e7abc05eaad4ba6ba8b208dda28a7648908c6670864fd23f2a7d0472b42ea79521b532e21dc92449ef47c9f7d788342c21ba0fd8001 SHA512 f9ac5d0dba7473de113a360f02f7eeefbb5af70db2c282741697316ddcc81ecc01e2341436e6a6fcb9f43170a4297b2b12aeec352a271ce12b97e6aaf593bac1 AUX qingy-logrotate 75 BLAKE2B 2c61e97469a1911a3c711321a202b5276a41bf607e4361ef2acf2f2225e6f5752f33d9e8130f5fef682fb0a19f04bb2e2b056904cb24a9daca8f199a921c2850 SHA512 3b22cac09fc7394a4a4aa5a786309378cd769c351eed1e2813b84230c6ec74f7c30bfec9c6a03682b2ad5063a30bbdaac679f9e07bab2cee75ec73dd137aca01 AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c6eba34ebaa6c3dc9bc5b6f943234c2220dfef8c16fa2bb498ab929ca1c712ecf653664d7372ade7de SHA512 bbbfaea129f8b0ff89a66873f3d2ee2b774ce6f59adfb5efdd7bbaaf7d602a6933e888b68b73bf378864799088bf7f4e645785cbc16c51621bf2fed11a4cc55a -DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1bcbe7741adb94e8486b81ccb4f9289f6aca7c33081b950f282e6aa0a68b2d23e6235918931faaf05666a4226666600f6b19d3d SHA512 e69743173ea0ff27265dca789f4203b58c271ec6acfeac1ffd87738a3a693f1393778ca70be5d0c8a3e461edfa350047cef3941d8e85679f7c930f3b63c1eeb1 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd -EBUILD qingy-1.0.0-r4.ebuild 4044 BLAKE2B 63ece0686d4cba32ce9772d5370c5e847cd6bf866a3bacdd51e941c6617ff5b6aad1a4b1e2423ddf5b26e3f17fa02345dd8f471673aaa52fc1c51cf40e8cbbe4 SHA512 8865f6a30c5bad554ae5399c58d0e18f5a0716583c9b2e40c501525200f1f56b405716b3d9058739f1f1e978359b1b8a252690f634ccf2f3095249abb88e4bf6 -MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485 +EBUILD qingy-1.0.0-r4.ebuild 3778 BLAKE2B bf32ab97caf57825efcdcbff9cdf48948d6b56bddd4a4d893377fe86cc6ecf1061795db0f212ef611981da915e647210d4385f0ea1115e3a2dbc01b544a9edf5 SHA512 4d1e326896a4717d0b097ddc8e8c42060eefd144a084cc00c7bc6a92a311e738fccef140fd04bc3e0c0b0738588bd60f4827f8d7ab1c9c8d2807d515a9b4d185 +MISC metadata.xml 455 BLAKE2B 1f5c9e9578a79b34f81001fe4123f9027bd1c08f669359992ec7f046ecbdefc0da541d0c72091c2ae51c1ff4e920f7d7f2c32bc6d7d9feef1c7d587fb3f18e20 SHA512 4f6eed8a90fb3b6dd96a3e7036aeead5b9bb550b92f5b3d519461775a6d1c710e0a3434b31b9e371392c2219e952419a38c1b90edb1f4ddc450281b165a0934b diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml index a5a65bc91a7e..6d78e724dd63 100644 --- a/sys-apps/qingy/metadata.xml +++ b/sys-apps/qingy/metadata.xml @@ -6,7 +6,6 @@ Gentoo Base System - Enable native consolekit support Encrypt communications between qingy and its GUI using dev-libs/openssl diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild index 5bdb362f4cc5..2aae7adf571d 100644 --- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild +++ b/sys-apps/qingy/qingy-1.0.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,13 +10,12 @@ DESCRIPTION="A DirectFB getty replacement" HOMEPAGE="http://qingy.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2 - https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz - https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz" + https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="consolekit crypt emacs gpm opensslcrypt pam static X" +IUSE="crypt emacs gpm opensslcrypt pam static X" RDEPEND=" >=sys-libs/ncurses-5.7-r7:= @@ -34,9 +33,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " RDEPEND="${RDEPEND} - consolekit? ( - sys-auth/consolekit - sys-apps/dbus ) pam? ( sys-auth/pambase ) " @@ -46,8 +42,6 @@ src_prepare() { eapply "${FILESDIR}"/${P}-tinfo.patch # bug #359637 and bug #462634 - fixes from upstream epatch "${DISTDIR}"/${P}-screensavers.patch.gz - # bug #372675 - fix from upstream - epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz default mv configure.in configure.ac || die eautoreconf @@ -72,7 +66,6 @@ src_configure() { --disable-optimizations \ --disable-static \ --disable-DirectFB-support \ - $(use_enable consolekit) \ $(use_enable pam) \ $(use_enable static static-build) \ $(use_enable gpm gpm-lock) \ diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index e5aeb31d3a81..97cdeb9d6325 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -18,7 +18,8 @@ DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62 DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b EBUILD rng-tools-5-r2.ebuild 1146 BLAKE2B 0fb06c8208399d1f4fee01b53ab112af78c6b4214b2c9caebd5f22c94d3de062cbc869ea207bc47bee48a11a4892ce94543972274042e5ce1f2b1cb153b33ef1 SHA512 7eb055a3cee18b56c845eb05f0a66666a8d108fc059fb0c4e2139251f9fa5f3625f25bf133cf13bcc07cb666b07d29d1b83809825c8fa664df3ea90b571c3fb5 -EBUILD rng-tools-6.10.ebuild 1801 BLAKE2B 80237cc93253b761e5cc1ffd51e7db2f5278716808c5f9a7e3663c5e8c9103dc09d29488d926feace950f90dd67636b735a4970bba8b2a59a96671c5d894c72b SHA512 89bcf0177b784ec633547946c0210651220a4067c542191e7ad09df4d1bb7e1486a379804e99067ec1395c2ddab08c79fb2dea2e95326978dd906a55107ee4ec +EBUILD rng-tools-6.10-r1.ebuild 1865 BLAKE2B 92f720914b63025ed130e34842969f157ec3bbaca426cab4d2c10d7a014deed5ab506e4b18bff6069340b709b1c2a62b3ae71a513cc594085fad8c6c30c585e9 SHA512 ba191cce816313ff9d3165ec51b93154164427b405cfab269c7c3d386a0c1335f606e14050670aea8c67c8ccc75b98f93096781505699273340d07fc5d8d75ed +EBUILD rng-tools-6.10.ebuild 1799 BLAKE2B 493516f958d5245cd0bd47edbdf00062cc0e0041160bc10c94e0bde46f91e6056d0afb3f7630e886ff86b3133e3a11a5893a80eb0d88fa1d0c8986af6955f7ff SHA512 541717d5a08d03bccb57dd8bfcd4e83e9117b567494df36f1f51ebbc0736762d981884b12cf0e700618fcd9cad911b9473e85ec2b8826b9199ab854ae691d7cc EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286 EBUILD rng-tools-6.7-r2.ebuild 2173 BLAKE2B 01fb210ba3b0ed8b5f40ceb061b7e31c4f14de6ffef6af18d4c25519646776bdc66cab8c376b91cd057588a64e5b1377a0fca52d033174bbc6f77f59edac7e49 SHA512 cf9e07fc1ee37c37cd5de5b08e62aab692f83593ceeca0131edafa621a4acf61f9661851c230c5a7ded13796b99266fedeca97827c4e35ba26c301602e8d4a1d diff --git a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild new file mode 100644 index 000000000000..d5f8c40bc124 --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Daemon to use hardware random number generators" +HOMEPAGE="https://github.com/nhorman/rng-tools" +SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="jitterentropy libressl nistbeacon pkcs11 selinux" + +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-fs/sysfsutils + jitterentropy? ( + app-crypt/jitterentropy:= + ) + nistbeacon? ( + dev-libs/jansson + dev-libs/libxml2:2= + net-misc/curl[ssl] + ) + pkcs11? ( + dev-libs/libp11:= + ) + elibc_musl? ( sys-libs/argp-standalone ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-rngd )" +BDEPEND=" + virtual/pkgconfig +" + +src_prepare() { + echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die + + default + + mv README.md README || die + + eautoreconf + + sed -i '/^AR /d' Makefile.in || die + tc-export AR +} + +src_configure() { + local myeconfargs=( + $(use_enable jitterentropy) + $(use_with nistbeacon) + $(use_with pkcs11) + --without-rtlsdr # no librtlsdr in the tree + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd + newconfd "${FILESDIR}"/rngd-confd-6.7 rngd + systemd_dounit "${FILESDIR}"/rngd.service + + if use pkcs11; then + local DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS=" +The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc') +to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in: + '${EROOT}/etc/conf.d/rngd' +reflects the correct PKCS11 engine path to be used by rngd. +" + readme.gentoo_create_doc + fi + +} + +pkg_postinst() { + use pkcs11 && readme.gentoo_print_elog +} diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild index 18d6153431a1..52e0489c3fc3 100644 --- a/sys-apps/rng-tools/rng-tools-6.10.ebuild +++ b/sys-apps/rng-tools/rng-tools-6.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86" IUSE="jitterentropy nistbeacon pkcs11 selinux" DEPEND=" diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest index 93a2a210a531..024cebf694ec 100644 --- a/sys-apps/s6-linux-init/Manifest +++ b/sys-apps/s6-linux-init/Manifest @@ -2,8 +2,10 @@ DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44 DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843 DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242 +DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b +EBUILD s6-linux-init-1.0.4.2.ebuild 1684 BLAKE2B 87a4f9184c55aff9b1390c22bc72abbcf71b38451fda08c503c479800d89eabb8c5afc9663bf931800f1c92cdd3cc0e61ae0f0f9abce6114b2723a5c8cda79f1 SHA512 ab6701ff5a1f1f53d48f93c300aaf7f449149e53a0966afd77921ead2f58a3d2b3359f25ccb3b4d86d504afff518e60b5f069fd2f0a70045a6e421401914c465 MISC metadata.xml 496 BLAKE2B e80d42ffadfc225ac5c6e6bc7470e136057a25c73effd1e0510740631bebec02a5df7b405977aa6be9a9a23cf2af7d5c03c74ca2882164e2394585f01dd6498f SHA512 98e0969469c67f17e91add2fdc82ecc31316e93a597e748119ce44340b81efca9548f3845f8abe9888855d711e2e573e5c8f97ee566ec0ded81a033e410a1d83 diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild new file mode 100644 index 000000000000..fac1fd9f99a1 --- /dev/null +++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Generates an init binary for s6-based init systems" +HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static static-libs +sysv-utils" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND=">=dev-lang/execline-2.6.1.0:=[static-libs?] + >=dev-libs/skalibs-2.9.2.1:=[static-libs?] + >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] + sysv-utils? ( + !sys-apps/systemd[sysv-utils] + !sys-apps/sysvinit + ) +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector + sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ + configure || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --dynlibdir=/usr/$(get_libdir) \ + --skeldir=/etc/s6-linux-init/skel \ + --libdir=/usr/$(get_libdir)/${PN} \ + --with-dynlib=/usr/$(get_libdir) \ + --with-lib=/usr/$(get_libdir)/s6 \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + --enable-shared \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) \ + $(use_enable static-libs static) +} + +src_install() { + default + + if use sysv-utils ; then + "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die + into / + dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit} + fi +} + +pkg_postinst() { + einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html" + einfo "for usage instructions." +} diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest index 372a7b1c20e7..2c5ec77b61d4 100644 --- a/sys-apps/s6-linux-utils/Manifest +++ b/sys-apps/s6-linux-utils/Manifest @@ -2,8 +2,10 @@ DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4 DIST s6-linux-utils-2.5.0.0.tar.gz 34976 BLAKE2B ccbe5a24c39d32a6d3e9c1ba09c76c278ed33e831ba9d124e30615204f4084823efd13500b2b2a0efa0ddd703996ec3a47ea66a2b5c1f832d8003cffccf6b773 SHA512 0433fd7863135629d2ab849db34c77f0cbc146f7a84833fcb9263d49ed8366f370f0513bb055990e40a17dff69a1b83a741b1bac2fc8d159d866b45a6b81bdc9 DIST s6-linux-utils-2.5.0.1.tar.gz 35273 BLAKE2B 61ba3a8ee1fce5357d4c3e71b442ade2277adf6b0560646b78cab3b922183ff15478190a3c4b3a7cce88f13d3836711b81f2c37bc7e545012708ee25f7b036cb SHA512 bc4693486299d1027b6ce908684fe2c66b8173b17baad3bb35a660f1d42f00e48ae56c762c17d162c7be978f7246a9ac5218a5c93c0b93f24b5dc881782329d5 DIST s6-linux-utils-2.5.1.1.tar.gz 35513 BLAKE2B 7b5e613b3ec7a8104cd53ce2a6db921994ded9d890baee022d16f98f461a71804d16122f303ae66f32d3766325d566c80e04e27fda60a61d1f624eb5a65ae178 SHA512 59c58c4d8e13b7a6e0215f21978f8ac2ac54fc3685884204ea1f011f2a882b9381a9686cbb24c9e566e322c14174dda40368c308e37e9c44f6a1687231d108a2 +DIST s6-linux-utils-2.5.1.3.tar.gz 35549 BLAKE2B e39dcf141839e6fc4554ba10fc89daaa7b9600ffa4360c80d3278d49224c88f124588ec988a2386a3243923002a16d9829d4828c829fda18745356fa6774175d SHA512 73c887e67251c162677b2151d37a1cdbb9cee6f50bd52c5eefd4750f9bf77452a023e0484891e384312fb169dfbe02af3d4cfecb17d34f1668cc0acb8d7a9181 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69 EBUILD s6-linux-utils-2.5.1.1.ebuild 1006 BLAKE2B 9cf302ee56e750aecc9c11b1b5bc0a8c47ea3f1fa5b97c7c2ded615f5eea59bd2793aebca3f58cee10a5cf16fbc5d8a507cce344c9cc32e71980d2d38d0cd020 SHA512 11ce68e1a66e0b13d47c0403c428c0885813ed2004ec3bd7d0520069caed21888106f8b52a826daf2e3253775b67e359320f31fb284b90db4b26a0f93ec07363 +EBUILD s6-linux-utils-2.5.1.3.ebuild 1006 BLAKE2B 775838d0b17dacddba4a208cd0d1c1d37e5f47f822fadd4fbca5ee3b83e1d040900782367969020593d32d1ac96cadb3dbcda84733273ec56d8d9eb5bec0b374 SHA512 919375509aaf59f8050622b6a90245fd319fca97b58045dfb1b7bcb689d49c707596b9253852f1d2424040d9e98b4d3c177529938e7b247391d3447240987ec9 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406 diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild new file mode 100644 index 000000000000..21a3aee0c4af --- /dev/null +++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Set of tiny linux utilities" +HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static" + +RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )" +DEPEND="${RDEPEND} + static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] ) +" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector + sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ + configure || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --dynlibdir=/usr/$(get_libdir) \ + --libdir=/usr/$(get_libdir)/${PN} \ + --with-dynlib=/usr/$(get_libdir) \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) +} diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest index 5f6e138e85a3..e0f2a6d34855 100644 --- a/sys-apps/s6-portable-utils/Manifest +++ b/sys-apps/s6-portable-utils/Manifest @@ -2,8 +2,10 @@ DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a DIST s6-portable-utils-2.2.1.2.tar.gz 47446 BLAKE2B 31093828bbff8d7ebd68e9b9024abff802511d6def436b6c4a42e127fc8ee84544a3e590db2e59d76f2ab407b29edbd462725d8f6c8b4923b999809c58126c8f SHA512 697356a1bea6a0d9ca2dc995667fb2c3ab0e0ec72f9cba9f64a3b745e17ff85793be4b9a3bfcb8137938b732195fdabd2ffba5cef26f86f3ad2705907c6a8ab4 DIST s6-portable-utils-2.2.1.3.tar.gz 47619 BLAKE2B fc9c7a77f42bb64bdd1cd1cfd23d9e0aa0a208451d28d7b76b67a91aa93eebc75148604877af16f102b27581d81549c1fd6e9bf8ff6f62ad3bb9e344191c3886 SHA512 6640027e65a19417461e1e9c778d276d6ceb3f95ea5c720dd21b0d1755bb8f1a218cd9f42effd6ab6034889cc415ab935b4583b6696c2a96351417d9a8f4d7b0 DIST s6-portable-utils-2.2.2.1.tar.gz 47874 BLAKE2B e1a9677c304d256f8a890da9c35716b513971d506e705db847e71355f7e10a49c3b4a3cdec220513964429db2faaecce5dd3c09d94fc71d19fada6f83f7619d9 SHA512 2e74befec59ae6d3f27cb5f2bb92db23af484043e4d5e53e4816d75927059af6698614a4c3ce7ed7e380a88d5bbe88e41dcbc97eb607a10d7a3e46b8a36744ed +DIST s6-portable-utils-2.2.3.0.tar.gz 49239 BLAKE2B 3be6d6f7b92eea4fb67e3e52ced4409d2bc04c7bb23fea146d778b3739b4682f10dcd2f58cc37a7760368a645d0fa50c887445e6006a563d290c739e72634e9f SHA512 17cb58a49494bba323f031aa07db134505a0884827745ea48e4e93d1ea70b9d4dd141d065b126abb40d5c7625cbb03ba71090e66fd0adb0c54ab49478e929837 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3 EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a EBUILD s6-portable-utils-2.2.2.1.ebuild 1017 BLAKE2B c8bf282a83274cd985fbcd41b530fa42d619a4021602a438d4b08daa23bc840cd8054b720a66cca29254e65cadd768925a2e187ddd14e5ac16a83403ff411d2b SHA512 3708099d6318515bc2746b738ed3dbbc8314ba58a7f81e5548f3bffc8cce18c16b6933199a6b64cc6c8fdf0de740a5aeefa924a864e4b8018d93d7ed4fdf38d9 +EBUILD s6-portable-utils-2.2.3.0.ebuild 1017 BLAKE2B 284b5576cf3ac0dff133e3fc70d6c8ec27aad7a820252564f7e8e0a903609e579ade7aa46d794b9710cc11273cbbbe021d9c8d72d453a53de5d17792eb26d7a3 SHA512 9a0a24a5a57eec4271a59bcccdb917ac30175e5191ee5fc2106d161f0446ba4c1dff553e516d3cd0a942658106f52b7bac329d1e9ec7ceb460b49441b009808d MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406 diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild new file mode 100644 index 000000000000..f7e0efbb5a78 --- /dev/null +++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Set of tiny portable unix utilities" +HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static" + +RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )" +DEPEND="${RDEPEND} + static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] ) +" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector + sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ + configure || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --dynlibdir=/usr/$(get_libdir) \ + --libdir=/usr/$(get_libdir)/${PN} \ + --with-dynlib=/usr/$(get_libdir) \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) +} diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest index 723b38afdfc8..476048deccc4 100644 --- a/sys-apps/s6-rc/Manifest +++ b/sys-apps/s6-rc/Manifest @@ -4,10 +4,12 @@ DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded4 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92 DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7 SHA512 3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18 DIST s6-rc-0.5.1.1.tar.gz 97648 BLAKE2B 9c5363fafe19b970e61d5b6bdef1880b1085f4fea67c55485b6dc5c12ce857dd8828cdedd6880808fdb6d664af63ccac1884262f337b12f2a2ea4b2392016aea SHA512 88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772 +DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8 SHA512 663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035 EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2 EBUILD s6-rc-0.5.1.1.ebuild 1496 BLAKE2B 55776ae5839593d33b77504e5f78bceac60c007647dee1124532360173cbaf23220c8071012b5da755bca90752226f6ae2c32449104cf7c9c45ebfd8eafbcf41 SHA512 d1fcc1adcfb715d48cbb79db91d6b76114d7e150a4fc5e5e1d80ae64ef4c329f5b25da60590925daaf730393b791fc7081ae8e8037c525d71fae55ac7193caa8 +EBUILD s6-rc-0.5.2.0.ebuild 1505 BLAKE2B c58ece484908002d3d05fb1d7a6cbe28a4afb4dfc64be42978fc9c9fcd79b77c4c40a0ad1d4f0dafb75b446cc48cd53f38b31df39a84d0a5af6cde7434a3867c SHA512 c737b7a4dcb1cf5889143034d405a50d9e8718d6c0f4f687c50bf81ddb8d6464828868e193149501c9cee7d026352332809c5ca93635111ac6b53cfd0510a927 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406 diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild new file mode 100644 index 000000000000..6f0a3d47a42a --- /dev/null +++ b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Service manager for the s6 supervision suite" +HOMEPAGE="https://www.skarnet.org/software/s6-rc/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?] + >=dev-libs/skalibs-2.9.3.0:=[static-libs?] + >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector + sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ + configure || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --dynlibdir=/usr/$(get_libdir) \ + --libdir=/usr/$(get_libdir)/${PN} \ + --with-dynlib=/usr/$(get_libdir) \ + --with-lib=/usr/$(get_libdir)/execline \ + --with-lib=/usr/$(get_libdir)/s6 \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + --enable-shared \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) \ + $(use_enable static-libs static) +} + +pkg_postinst() { + ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" + ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html" + ewarn "and the documentation for the s6-rc-format-upgrade utility." +} diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest index b38c56fa03f5..9970b910bc53 100644 --- a/sys-apps/s6/Manifest +++ b/sys-apps/s6/Manifest @@ -5,6 +5,7 @@ DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff +DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3 @@ -12,4 +13,5 @@ EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08 EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066ccb25af78fa70ad0ed1d624378cfd9769c54439f096f6606ca6edacb9c4955b7f021656f47f24bab0a9ca7 SHA512 33afe19eac96603b5c5a856a437b7c15fa86cec7dc074749e69e4f7e93c32a49ba03f810ab2e14335f7ccb4d5d0fde7c241be3c6b21b0751a8ed34a347ff74a8 EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912 EBUILD s6-2.9.0.1.ebuild 1184 BLAKE2B 2efc249add48ac861e56017ce27eba5cfe5d3bb11a5b345c677269ae73e8a1f0d6090ec1bc39e2a0eafe2518bd838c66a95e6b595439a3929badbc19aa51977b SHA512 299f09ccc8be432fe0c71ff3ca900f0ff05345911bed83040fb8c03a1c0a2596274eb5b2fa45947a40181b567a8e92f3045b1f7b2d9bb065119262d1683e769c -MISC metadata.xml 523 BLAKE2B c4ea2993837db7521d17e1147bc02d366b75fe182bcf62502b90f91abb559ca53eaf8ed81b899b6bc3b6abc5211852919379e2adca996649d168d2ec6574343f SHA512 abc0bd7482be8f1ec719ac7c9dd0a8f754a8d6a4fede9107497cdcf6db3d4b1b57b5b6f38a32c41dbb7db98dd43a10846202ab084dad06dee0fa36d713dd2e17 +EBUILD s6-2.9.2.0.ebuild 1254 BLAKE2B 4f83b4f35ccb8b9f469a987f3966af0599b9dec91d268f342588a3aa070e62b4c505bb72ad8fe9d6422f2d1308c8bdd88c88b8796cb2e2656925f5228a549712 SHA512 9637e4a55844f31e270b66860cbe3138904e8c6ea35a9997241dff026eb57075b66ea59a31ca8245bbc3b93288d061ac6f38f8a5ac1d768d8bc20b0cea488806 +MISC metadata.xml 617 BLAKE2B 54bf4abe6178471732a42ac78f017567932bcfa1579d0815f4b2a365486cbe9ff3a0bee00bd6aa5b1b4a6b27182885790f5d80c099c7f404a28c4fb604a2091e SHA512 644271e7fc3b6bdaf85470bbb908df5a82f3988378a7a001db46d957974e3518664580ba55844917a70fa3f2d1b0480a90e8b7b56e0769209b70240093a84e91 diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml index 1b7eef43c733..1718e243ff88 100644 --- a/sys-apps/s6/metadata.xml +++ b/sys-apps/s6/metadata.xml @@ -13,4 +13,7 @@ S6 is a small suite of programs for UNIX designed to allow service supervision similar to daemontools or runit. + + enable support for dev-lang/execline + diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild new file mode 100644 index 000000000000..f3a95ba0a93b --- /dev/null +++ b/sys-apps/s6/s6-2.9.2.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="skarnet.org's small and secure supervision software suite" +HOMEPAGE="https://www.skarnet.org/software/s6/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+execline static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND="execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] ) + >=dev-libs/skalibs-2.9.2.1:=[static-libs?] +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector + sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ + configure || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --dynlibdir=/usr/$(get_libdir) \ + --libdir=/usr/$(get_libdir)/${PN} \ + --with-dynlib=/usr/$(get_libdir) \ + --with-lib=/usr/$(get_libdir)/execline \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + $(usex execline '' '--disable-execline' ) \ + --enable-shared \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) \ + $(use_enable static-libs static) +} diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 68856aa55093..8ed3d38bb130 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,16 +1,6 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a -DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9 -DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf -DIST sandbox-2.14.tar.xz 426992 BLAKE2B a30984f613b773cb5e53b2b0297ada32d11797699418aebf3014e11f3ec2b69a1c4b4e22ce96c28b1df022617cab6787cfe61f84b37ed61e966ac425eae1c7eb SHA512 b84584cffc54678646798bc58d8b60cdc10a0a58c9f1a49276dcac205a06dd7a2e664d2a9c40c78b48eae8ac36e3ac498ba35674f10e6e06c3c2bab777e05ced -DIST sandbox-2.15.tar.xz 426948 BLAKE2B e40bb728192ef3793a9129bc88a63878516b0977a19effd5b02ded644ec6fe1627fab34786b22024957d96725fc5c53f488f7b09119be7b7ca91692dcee985dc SHA512 7249b594864267311ce8e2c04275df49c6d8e8e811dde5780f7f676cb43928728b9abed77beb8f5ee32061efcdb03753cce44d5bf1827bd519d6be8fa54912e6 -DIST sandbox-2.17.tar.xz 431700 BLAKE2B 461404f5b98ac83d9e5bc63fc7251cdfbb04a0ccedb340a7a5b8595b68ab34034a56c0a0cfa8478961c9282f6450de89ef5b512b13d427a7f63c17a4141cbcbf SHA512 b5d7a76d894471f6610b41aa05f007d257c69ae5c90f8db455d626e0d1209b9d276678c36e90d2e4214d15074512be182b4f5f905ed2b7e236ff714cbf51958f DIST sandbox-2.18.tar.xz 427760 BLAKE2B 26199ff8f919dcecdfdb74d508e0802e2e929a003ff1caddc54c1ea0f7887938c4f69065e585d61f7e96b29be26a34a1cdb62b397309e993511097ecaebe0620 SHA512 1775d4d6f80d414ab94eafae73966c12c4dd80857e21f0849703a3230ddb80501d8e574b14296e554932766cd71aa7b48a802fc388aaab43ba882ee7d005a60d DIST sandbox-2.20.tar.xz 428400 BLAKE2B 11761631ce8e2e495adb41508f308bce875d416ec978e3eb3cb491d3d3a464d7653b8b81d4dcc7e5cd31e8a55069aafa263b85008651ee1d7318f32407fa4615 SHA512 06db36fc85bacf9a3a094c434b73277d8cdde986f2fad7676c42e8f84b3b8b653a1f4b1ec4af9fa1ff5484177419e18f5621275f56a8fbf3973ece524dd6d208 -EBUILD sandbox-2.12.ebuild 1920 BLAKE2B a534856a86127a1e0ecdce10336db7d075ace4e9d410a2e0aba81fec762526c49c77555775c2bb9f21e4694d36e4c51ed61a72134580036c82bc3eb20a9fe555 SHA512 abdc9fde72bf47ff334a450dca9cb2e30f212e8aeffbd96596435f81b309484dc6523a424dbcdbc51d56c88b6ae2a7cd4134d3f7ec703a1f848015603ae0b489 -EBUILD sandbox-2.13.ebuild 1919 BLAKE2B ff46af1821181445d07942d9a81455d688c35ba32d394fccbc2389e7fa7c00d1d11366cc633af73654201c0d59e63ee52abc35944d51f22170ed8c03b6b27f04 SHA512 1c8bff5d1fc55df638e7862d8756191972a958e074951c60f4cfbe960dc3f8ee9d6320cd983a7c7da0d85b6b970a83e024821de77f729ee0f35381d7a7a7ab7a -EBUILD sandbox-2.14.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74 -EBUILD sandbox-2.15.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74 -EBUILD sandbox-2.17.ebuild 1834 BLAKE2B e486e836e8f9d90c55f4ab48d500d8f93d813cf7eb123ffaac678b112a16b13703d5ca92bf48f700942a26f7f983033d705fd42d996eab4d6cbb7e393ea6e112 SHA512 d9d772320c17221627e73c689a2f6acb6a064c7d8a5b69727755e7910753e22359284abc78d414a75539d4fd3d95b2d5db5b8ada642492d3abb3ab8a55528a4d EBUILD sandbox-2.18.ebuild 1908 BLAKE2B 5dd4a0ec6662dc5704d630c2b769801d619979b48525b90718edd9b5564e912c881db4002d6e61f6d2a99bd3eb70877139112297c043c3e3798c9000dbea4e0e SHA512 1a0e7ff6ce6e87fffdcf7b1e581fda7fec4e6d7a9e7548b292d642446a8722d8413e804d3db4658245564b6e3aa3867039fa637bfad41a67e42951714ed5c8b9 -EBUILD sandbox-2.20.ebuild 1895 BLAKE2B 2dfe78648105da59a1a5db165a4451b4f7c17c83b2bd94935c86abf85077f8284ed242d84c5055b1e98951022f89af0230aac7181c085a61ff6dfc4816ed2409 SHA512 7d3efcbfb9d14d4d7de162175de9eb9f99ab6519e0c471ab9dfdc39fcbe51070c74e6ed5138ac8c26b49fb1a5512743b9fed5ff2dd41332a6e3fb84c2772390e +EBUILD sandbox-2.20.ebuild 1887 BLAKE2B 3f49ba2d60c4d9b05fc84ec2c27d59e0e6e00a48ed433a23d2b25f4bd6dca2e42f3bd9f351a1c6eed96b575fa366def6ebf958cb13444f168948087b930aed16 SHA512 b3c3368f897736f2c3e9b25c4089d5c29bb5fdf979d534df0bddb67f379908e6f84496a31a3ad6ef0988487c1d455ce737d8448f30078a2ce159c5b0b5fd91de MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9 diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild deleted file mode 100644 index 2f8334010de0..000000000000 --- a/sys-apps/sandbox/sandbox-2.12.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" -} - -multilib_src_configure() { - filter-lfs-flags #90228 - - local myconf=() - host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 - - ECONF_SOURCE="${S}" \ - econf "${myconf[@]}" -} - -multilib_src_test() { - # Default sandbox build will run with --jobs set to # cpus. - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" -} - -multilib_src_install_all() { - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete - fi - fi - done -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 - fi - done -} diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild deleted file mode 100644 index 412c0702e5f9..000000000000 --- a/sys-apps/sandbox/sandbox-2.13.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" -} - -multilib_src_configure() { - filter-lfs-flags #90228 - - local myconf=() - host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 - - ECONF_SOURCE="${S}" \ - econf "${myconf[@]}" -} - -multilib_src_test() { - # Default sandbox build will run with --jobs set to # cpus. - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" -} - -multilib_src_install_all() { - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete - fi - fi - done -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 - fi - done -} diff --git a/sys-apps/sandbox/sandbox-2.14.ebuild b/sys-apps/sandbox/sandbox-2.14.ebuild deleted file mode 100644 index fbb175e58321..000000000000 --- a/sys-apps/sandbox/sandbox-2.14.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" -} - -multilib_src_configure() { - filter-lfs-flags #90228 - - local myconf=() - host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 - - ECONF_SOURCE="${S}" \ - econf "${myconf[@]}" -} - -multilib_src_test() { - # Default sandbox build will run with --jobs set to # cpus. - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" -} - -multilib_src_install_all() { - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete - fi - fi - done -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 - fi - done -} diff --git a/sys-apps/sandbox/sandbox-2.15.ebuild b/sys-apps/sandbox/sandbox-2.15.ebuild deleted file mode 100644 index fbb175e58321..000000000000 --- a/sys-apps/sandbox/sandbox-2.15.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" -} - -multilib_src_configure() { - filter-lfs-flags #90228 - - local myconf=() - host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 - - ECONF_SOURCE="${S}" \ - econf "${myconf[@]}" -} - -multilib_src_test() { - # Default sandbox build will run with --jobs set to # cpus. - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" -} - -multilib_src_install_all() { - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete - fi - fi - done -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 - fi - done -} diff --git a/sys-apps/sandbox/sandbox-2.17.ebuild b/sys-apps/sandbox/sandbox-2.17.ebuild deleted file mode 100644 index 4374f137b714..000000000000 --- a/sys-apps/sandbox/sandbox-2.17.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" -SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" -} - -multilib_src_configure() { - filter-lfs-flags #90228 - - ECONF_SOURCE="${S}" econf -} - -multilib_src_test() { - # Default sandbox build will run with --jobs set to # cpus. - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" -} - -multilib_src_install_all() { - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete - fi - fi - done -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.* ]] ; then - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 - fi - done -} diff --git a/sys-apps/sandbox/sandbox-2.20.ebuild b/sys-apps/sandbox/sandbox-2.20.ebuild index ce7ae03aa90f..658a9208a0f4 100644 --- a/sys-apps/sandbox/sandbox-2.20.ebuild +++ b/sys-apps/sandbox/sandbox-2.20.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" 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="" DEPEND="app-arch/xz-utils diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest index 70f2343a1565..9904de74f117 100644 --- a/sys-apps/selinux-python/Manifest +++ b/sys-apps/selinux-python/Manifest @@ -3,6 +3,7 @@ DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067d DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49 EBUILD selinux-python-2.9.ebuild 2552 BLAKE2B c3a46c9b484dd134426ee1cfecdcd0caedefa0d02cb1071789ca62c7a2ad860c12f770bd8130ed25f660b70e352ca2c65b062ee6bf9ac2b185e651ccfd44e861 SHA512 2d896bb07f08d2def9eceebfaf0aad8fa27e3041ca44e04c3e936502d9323b48a0d8c89c5611ea9885c90d90a9c0823f3c8786bec5520857b20ad4f18461fe61 EBUILD selinux-python-3.0.ebuild 2558 BLAKE2B c390f92149cd44b5443867439f64d0e71b75c9614e7d3115008b57b04d0307dfc36fa4c4a43ca725a9b5a723c12091c9496257dc0f4c31908a52c922a943c348 SHA512 5c4533c9bf0545c13881c7b2f4281c4e3e14498f4e5def1285843b0464d232e6f6bdaaf49cbd9b3ffd3b72e07f03659d56405e2431b5f195dd27f592c42aff61 +EBUILD selinux-python-3.1-r1.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9 EBUILD selinux-python-3.1.ebuild 2542 BLAKE2B 617dde2527956f09f532fc118ef84962fc384a78c647aeec98f2f6e2f40da23f562aae4afd2c6c90ab66a19e1ea10d1af03cf7c8265b59519898d86f276b95b2 SHA512 f2e98e15ed3c1b91498d829b7938473bf73b780cff4bd6d2a559b8b12b4e63de88cc19e8208ad94a7260c0ea316ca16299ff6bedb618651ae0fff2bc0c4a6461 -EBUILD selinux-python-9999.ebuild 2542 BLAKE2B 617dde2527956f09f532fc118ef84962fc384a78c647aeec98f2f6e2f40da23f562aae4afd2c6c90ab66a19e1ea10d1af03cf7c8265b59519898d86f276b95b2 SHA512 f2e98e15ed3c1b91498d829b7938473bf73b780cff4bd6d2a559b8b12b4e63de88cc19e8208ad94a7260c0ea316ca16299ff6bedb618651ae0fff2bc0c4a6461 +EBUILD selinux-python-9999.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe diff --git a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild new file mode 100644 index 000000000000..e3fe4738a86b --- /dev/null +++ b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_REQ_USE="xml" + +inherit python-r1 toolchain-funcs + +MY_P="${P//_/-}" + +MY_RELEASEDATE="20200710" +SEPOL_VER="${PV}" +SELNX_VER="${PV}" +SEMNG_VER="${PV}" + +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DESCRIPTION="SELinux core utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${MY_P}/${PN#selinux-}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python] + >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)] + >=sys-libs/libsepol-${SEPOL_VER}:= + >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] + dev-python/ipy[${PYTHON_USEDEP}] + >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] + ${PYTHON_DEPS}" + +RDEPEND="${DEPEND}" + +src_prepare() { + default + sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" + + python_copy_sources +} + +src_compile() { + building() { + emake -C "${BUILD_DIR}" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" + } + python_foreach_impl building +} + +src_install() { + installation() { + emake -C "${BUILD_DIR}" \ + DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + install + python_optimize + } + python_foreach_impl installation + + # Set version-specific scripts + for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do + python_replicate_script "${ED}/usr/bin/${pyscript}" + done + for pyscript in semanage; do + python_replicate_script "${ED}/usr/sbin/${pyscript}" + done + + # Create sepolgen.conf with different devel location definition + if [[ -f /etc/selinux/config ]]; + then + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; + else + local selinuxtype="${POLICY_TYPES%% *}"; + if [[ -n "${selinuxtype}" ]]; + then + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; + else + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; + fi + fi +} diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild index d890afd5e440..e3fe4738a86b 100644 --- a/sys-apps/selinux-python/selinux-python-9999.ebuild +++ b/sys-apps/selinux-python/selinux-python-9999.ebuild @@ -38,6 +38,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python] >=sys-libs/libsepol-${SEPOL_VER}:= >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] dev-python/ipy[${PYTHON_USEDEP}] + >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ${PYTHON_DEPS}" RDEPEND="${DEPEND}" diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest index c96fdf83be24..0783d32cad5c 100644 --- a/sys-apps/servicelog/Manifest +++ b/sys-apps/servicelog/Manifest @@ -1,3 +1,5 @@ DIST servicelog-1.1.14.tar.gz 361289 BLAKE2B 297c03c7d97295567c988eb2080554dfabb3becc159be4cf21a4c431698baa9e50f2af063b274341ec9b9cfd2664defa0aadb7169a518a4cb62b059c0f051cdd SHA512 d7b5e4089f258d69a7a07a46e43f1083fad701a917c150af8b68542db26348c0160dbca6c0d94aa68eb7a4b77139a763780c1af8422b785009567489a5e587cb +DIST servicelog-1.1.15.tar.gz 29097 BLAKE2B a2ae131305ce466999536fca6734c006eafe70d8be16c5a8465f6ceb7ffb53cd06d82fe7229275f4e71ffddf7a572a214591aed59a6345f81c3f65dbe205cd1e SHA512 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6 EBUILD servicelog-1.1.14.ebuild 432 BLAKE2B df52a6e6512b6b9e8f117e101a16b8073ff7fc05fc89c5ead73e819e518fba638a84dac8f67207995a12c76c400485b9c5ab1f2466686541b62b2558e86d4075 SHA512 420aabd7282cef8b0e91b567e16b8c8a8c817dee196c131d7eb9b31a6740afd30fdc41bc8f7b14c6e9ad9d1c221d3cfebadbc52fc392a1767de9fe473f3d2d54 +EBUILD servicelog-1.1.15.ebuild 522 BLAKE2B 63faf3b30905d27ded12e172fb70603afc675242cdb51b1e2a162dfe54de6fbd20d2ed4b9ca1037da6b7346effcbdacd4348704fddeecc41aceaf58363a7c895 SHA512 837f3c1afce0db6fdd07c0c4c90d07ff3f068943fdc8a65bb29a570e549af4934ef5066931319cdf236b656d3f7389aab7280eb6a1bae5347273f9bdf202a967 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710 diff --git a/sys-apps/servicelog/servicelog-1.1.15.ebuild b/sys-apps/servicelog/servicelog-1.1.15.ebuild new file mode 100644 index 000000000000..5ca983636efe --- /dev/null +++ b/sys-apps/servicelog/servicelog-1.1.15.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Provides utilities for logging service-related events" +HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/" +SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~ppc ~ppc64" + +DEPEND=" + sys-libs/libservicelog +" +RDEPEND=" + ${DEPEND} + virtual/logger +" +DOCS="ChangeLog" + +src_prepare() { + default + eautoreconf +} diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 711b957234e9..1ddc5466e766 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -2,6 +2,6 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295 -EBUILD smartmontools-7.1.ebuild 4043 BLAKE2B aa6843fd2cd9786c924dea796f049d0a42f48ce729edc0943ec14e8423324b9e4e47c1bc7466eabb1229b4549986d5095eb9bd86e8c312abb759413205941ac5 SHA512 832a7a4c357a1cf035692bc86f5f4ddf16b86f4c218fa02edc49aa2c62020c7a2709329e81ccdd67dc84c430d286a5a53c02ced25bc021864fec806cb0f83718 +EBUILD smartmontools-7.1.ebuild 4042 BLAKE2B 26d0154010e29e986f8c08953b1c9b6bd949957bb1011ba0f473b63270f29dd2682263a8d1919eec423c0af3496e87127774566f155da3f90ca080e53422a7cc SHA512 e7f302e6564a4f3f16bb0d29900c1f37f22811b38f13a144bdfbb42360aa777321c2ee64c529d7793de68f494f48ee28bc26b92b0226c4a1a2859f98132a263a EBUILD smartmontools-9999.ebuild 4050 BLAKE2B a8ce8d55bcf3dda65d4e31f71feedc4f867a985e74dccdb4da9aff8e7cbfc80db1bbd7aeacb3809f154507ac4aa05b40fde8e865182169733cdb6dd1fc3dd058 SHA512 b84bddbec5e896f9fa60600d5a60c142ec6b23482fbf8239bb74297eab20c231850aa2c63cfd6b2a3be29db7f278417d7eed72e0f43cf4556628a53d1051220f MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6 diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild index bca8212f62bd..0b1811bc1f8c 100644 --- a/sys-apps/smartmontools/smartmontools-7.1.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit subversion else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest index 2a3a5ade55c9..198a839682c6 100644 --- a/sys-apps/smc-sum/Manifest +++ b/sys-apps/smc-sum/Manifest @@ -1,3 +1,3 @@ -DIST sum_2.4.0_Linux_x86_64_20191206.tar.gz 9732263 BLAKE2B 4c0c25ab5d3a8b533487287676efe38df164ab80327016172da76539081b90bb4a1de5a043609f35800a82651335f862ea08aeaa867270a7e21b309372facc81 SHA512 7b320590391434518e74491dbe093689c4dcee2763d361203be2d468fcfb20e508fba489291d4bd08fd97d93d72309def1737c69a34a9dcfefb06cb4b45806b5 -EBUILD smc-sum-2.4.0.20191206.ebuild 938 BLAKE2B 7dfab4976702112788ff228cd6576b896684aacc6b1e1b2877fa0b4a23c666bdeda5690c0d2ce7cc4c0f72137d38487ab2800143a3cadd07c77e3bef2ee7baa4 SHA512 f7ea58623162c521a6f20c33cb1a6e513b00bc4d65c97f65bb33f1c67f083597496a190bf7e1eab61f631b2ccc1e94580924d3cc45ec85feb5e8af5165d7c504 +DIST sum_2.5.0_Linux_x86_64_20200722.tar.gz 11280455 BLAKE2B 5c25c2b35b6d82b1d3c856e97f1669e92ecb3406188398ee29cca44e44bb30e651fe9db7a39c93a78375b3021d5836e8d92b680b07ead0892f588f6ec9a03454 SHA512 af99c3fef1436d1ef97fbd03c619d0f4e1eea9afd00d03c905cf92a5ec826b1a5aec1ae2a2f69fa406eee91d5bed4bd2fcd3935243dc6dbae4efe04e0dcdff21 +EBUILD smc-sum-2.5.0.20200722.ebuild 938 BLAKE2B 7dfab4976702112788ff228cd6576b896684aacc6b1e1b2877fa0b4a23c666bdeda5690c0d2ce7cc4c0f72137d38487ab2800143a3cadd07c77e3bef2ee7baa4 SHA512 f7ea58623162c521a6f20c33cb1a6e513b00bc4d65c97f65bb33f1c67f083597496a190bf7e1eab61f631b2ccc1e94580924d3cc45ec85feb5e8af5165d7c504 MISC metadata.xml 1097 BLAKE2B 2614ed1fd32c33675e1e78fc069670ec2b156efc376beecead2ebc2d7212e918f0fdf923d90f9d6db61a1c672f565701c2fff812e801a6ed955d299506653cf6 SHA512 cebd02c5e048668caf78a5bfc19114ebef9fd55ae9c25adb8c61275b847d7311ae38ab1825b029770bc191b65b334eafcddcbf1c50825c234542e1454b78e730 diff --git a/sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild b/sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild deleted file mode 100644 index 07ffd44db9d6..000000000000 --- a/sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_DATE="$(ver_cut 4)" -MY_PN="${PN/smc-/}" -MY_PV="$(ver_cut 1-3)" - -DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards" -HOMEPAGE="https://www.supermicro.com" -SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz" - -LICENSE="supermicro" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="module" - -RDEPEND="module? ( sys-apps/smc-sum-driver )" - -RESTRICT="bindist fetch mirror" - -S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64" - -DOCS=( "ReleaseNote.txt" "SUM_UserGuide.pdf" "sumrc.sample" "ExternalData/SMCIPID.txt" "ExternalData/VENID.txt" ) - -QA_PREBUILT="usr/bin/smc-sum" - -pkg_nofetch() { - elog "Please download ${A} from" - elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM" - elog "and place it in your DISTDIR directory." -} - -src_install() { - newbin sum smc-sum - - einstalldocs -} diff --git a/sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild b/sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild new file mode 100644 index 000000000000..07ffd44db9d6 --- /dev/null +++ b/sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_DATE="$(ver_cut 4)" +MY_PN="${PN/smc-/}" +MY_PV="$(ver_cut 1-3)" + +DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards" +HOMEPAGE="https://www.supermicro.com" +SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz" + +LICENSE="supermicro" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="module" + +RDEPEND="module? ( sys-apps/smc-sum-driver )" + +RESTRICT="bindist fetch mirror" + +S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64" + +DOCS=( "ReleaseNote.txt" "SUM_UserGuide.pdf" "sumrc.sample" "ExternalData/SMCIPID.txt" "ExternalData/VENID.txt" ) + +QA_PREBUILT="usr/bin/smc-sum" + +pkg_nofetch() { + elog "Please download ${A} from" + elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM" + elog "and place it in your DISTDIR directory." +} + +src_install() { + newbin sum smc-sum + + einstalldocs +} diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest index fc60f16446c1..f030d7eb0296 100644 --- a/sys-apps/smcipmitool/Manifest +++ b/sys-apps/smcipmitool/Manifest @@ -1,8 +1,5 @@ AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7 -DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux.tar.gz 122153416 BLAKE2B 2d4224a76588fa4da41a8080bde5833ce3a7da01a11e45fc48069084077fe2e1e48f5e92ec266b10a390b3a40cfbc66f2b674c9ef59f8b3b11d42cb20eb992bb SHA512 e655e14751906d392f0f528c6d5afe83298f398025c5808d2efed142a3cdf9b56d06964feeed63fef58f2fe793d7de06c3eeb909e4467ce774317bb7971792d1 -DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz 119034481 BLAKE2B 032bbae5a3e608f6f51ae955df875d18a7b260fc0d49d6371af910cc1186c47b3db2b012dccd2837b598d5e405fde01390cfb44a5526297691c9bb99029c2dbd SHA512 9d721b8409510f75dbe36e8b5e3fdfb89f42f85365406f2c53890c1f5a6620f6abe00325017443b9af26bc60aeae7392065eb451d1a318de9898783562b43933 DIST SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz 78810880 BLAKE2B fa4d0c7ed8cd7fb8b03847b30d22b4c70d74402be50ef217b237a0ba786e264a0832533476db5523cf3ce9a88c2191cbc9ff32d54911dfca54ff8835268f0efd SHA512 7770a1ec468934e1ac89612e77092f83ce91822326279afedcc5da9b5cdd84193e8077b87441c79253e366bde6f1ef3756ff35ff7fce8bc1759bb889ab8b082b -EBUILD smcipmitool-2.21.0.181029.ebuild 2209 BLAKE2B 0cb30302e5cd7bbf9d0205dba7605d5a124ad5a54b538580b878c9111d24f61d9805011c8513a292525163ababc8f522507a484bafce3a2d26cc38a772bee1ea SHA512 a73f9d575679c44ad14092356ad53e4825690b4a3fbb32b5678cd7441e64d8bf80823d7e04939e1a9008c170f597f59483b758ebd3fcff3c3fc9a2628ff8ddc0 -EBUILD smcipmitool-2.23.0.191216.ebuild 2013 BLAKE2B a7b9c5ad65b954f16a8d5e40059bddf85796629a8090c63783ba69539cbd1e738d16b49348cc9d1906a627d299aee1ac9a4c1cd0028fb5eed33411493049d1ba SHA512 f8d284a8dd6e85a6acbfad95942bdbcf43091574fd5e3c76716192615b2f30956da4a747e7fa70f4814485045c4a3ff7e2b1aba1920fe88d3cc72c29226417e7 +EBUILD smcipmitool-2.23.0.191216.ebuild 1839 BLAKE2B 132b8c51469f0a37bc4ca4aa5170510f2741e2aa9121f056493964ed28941bed8e8fc5d0b8341c7b1b5ce7cf605e3b90260e3dd17d0394fae7b5b7414230dee7 SHA512 31347e3b5f314f2034f13f9f7f77496fb5baeb228cbf05a46872d9401ee64cbaf55d0b86040ca36a6132a6986f51b7fc68af6361f88a7907fefaab4c226fa44e MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca diff --git a/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild b/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild deleted file mode 100644 index bd287818fb34..000000000000 --- a/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver java-pkg-2 prefix - -MY_DATE="$(ver_cut 4)" -MY_PN="SMCIPMITool" -MY_PN_SRC_URI="SMCIPMItool" -MY_PV="$(ver_cut 1-3)" - -DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI" -HOMEPAGE="https://www.supermicro.com/" -SRC_URI=" - amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz ) - x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz ) -" - -LICENSE="supermicro" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -RDEPEND=" - net-misc/stunnel - sys-libs/ncurses-compat:5 - virtual/jre:1.8 -" - -RESTRICT="bindist fetch mirror" - -DIR="/usr/share/${PN}" -QA_PREBUILT="usr/lib*" - -pkg_nofetch() { - elog "Please download ${A} from" - elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI" - elog "and place it in your DISTDIR directory." -} - -src_unpack() { - unpack ${A} - mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die -} - -src_prepare() { - default - - # Don't use their scary launchers - rm -v lax.jar || die -} - -src_compile() { - : -} - -src_install() { - java-pkg_dojar *.jar - java-pkg_doso libjcurses.so $(usex amd64 '*64.so' '*32.so') - - local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash) - java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}" - java-pkg_dolauncher smcipmitool-jviewersmc --jar JViewerSMC.jar -pre "${pre}" - java-pkg_dolauncher smcipmitool-jviewerx9 --jar JViewerX9.jar -pre "${pre}" - java-pkg_dolauncher smcipmitool --jar SMCIPMITool.jar -pre "${pre}" - - exeinto "${DIR}"/jre/bin - newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java - - insinto "${DIR}"/lib/BMCSecurity - doins BMCSecurity/*.{crt,key,pem,txt} - - insinto "${DIR}"/lib/BMCSecurity/linux - doins BMCSecurity/linux/stunnel.conf - - dosym ../../../../../bin/stunnel "${DIR}"/lib/BMCSecurity/linux/stunnel32 - dosym ../../../../../bin/stunnel "${DIR}"/lib/BMCSecurity/linux/stunnel64 - - local DOCS=( - "jcurses.README" - "ReleaseNotes.txt" - "SMCIPMITool_User_Guide.pdf" - ) - einstalldocs -} diff --git a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild index c0b818a212c6..279c66adc7f2 100644 --- a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild +++ b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild @@ -12,7 +12,7 @@ MY_PV="$(ver_cut 1-3)" DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI" HOMEPAGE="https://www.supermicro.com/" -SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz" +SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz" LICENSE="supermicro" SLOT="0" @@ -24,17 +24,11 @@ RDEPEND=" virtual/jre:1.8 " -RESTRICT="bindist fetch mirror" +RESTRICT="bindist mirror" DIR="/usr/share/${PN}" QA_PREBUILT="usr/lib*" -pkg_nofetch() { - elog "Please download ${A} from" - elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI" - elog "and place it in your DISTDIR directory." -} - src_unpack() { unpack ${A} mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64 ${P} || die diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest new file mode 100644 index 000000000000..dceb3e6dc611 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/Manifest @@ -0,0 +1,7 @@ +AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475 +AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd +AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40 +DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f +DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7 +EBUILD systemd-tmpfiles-246.ebuild 4485 BLAKE2B 23af3c77dec65abe104e3b3a6c094194181dde0121b7ffb86b23085bab5cd1c1fd16b7ccf6facfb20ad149a11e7235e85d20fc8b7e89572da0815a1e5bdcc353 SHA512 53197d3537a783ecd136ebf482886596ffc00f6daf36b11395be9ef6c097b7be649f4fdd8608cc1814b90b34fe8b4b8990246f79beac09a9de8e7a5df539aa0b +MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9 diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd b/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd new file mode 100644 index 000000000000..0952ef12cc2c --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Released under the 2-clause BSD license. + +description="Set up tmpfiles.d entries for /dev" + +depend() +{ + provide stmpfiles-dev stmpfiles.dev tmpfiles-dev tmpfiles.dev + use dev-mount + before dev + keyword -prefix -vserver +} + +start() +{ + ebegin "Setting up tmpfiles.d entries for /dev" + /bin/systemd-tmpfiles --prefix=/dev --create --boot ${stmpfiles_opts} + eend $? +} diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd b/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd new file mode 100644 index 000000000000..a55163d3fd65 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Released under the 2-clause BSD license. + +description="Set up tmpfiles.d entries" + +depend() +{ + provide stmpfiles-setup stmpfiles.setup tmpfiles-setup tmpfiles.setup + need localmount +} + +start() +{ + ebegin "Setting up tmpfiles.d entries" + /bin/systemd-tmpfiles --exclude-prefix=/dev --create --remove --boot \ + ${stmpfiles_opts} + eend $? +} diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles.confd b/sys-apps/systemd-tmpfiles/files/stmpfiles.confd new file mode 100644 index 000000000000..2ec4b5f0d8b8 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/stmpfiles.confd @@ -0,0 +1,2 @@ +# Extra options to pass to stmpfiles +#stmpfiles_opts="" diff --git a/sys-apps/systemd-tmpfiles/metadata.xml b/sys-apps/systemd-tmpfiles/metadata.xml new file mode 100644 index 000000000000..efcd58fe0b9b --- /dev/null +++ b/sys-apps/systemd-tmpfiles/metadata.xml @@ -0,0 +1,8 @@ + + + + + gyakovlev@gentoo.org + Georgy Yakovlev + + diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild new file mode 100644 index 000000000000..1aa64e928f2b --- /dev/null +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild @@ -0,0 +1,209 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MINKV="3.11" +PYTHON_COMPAT=( python3_{7..9} ) +inherit meson python-any-r1 + +DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz + elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/${P}-musl.tar.xz )" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-apps/acl:0= + >=sys-apps/util-linux-2.30:0= + >=sys-kernel/linux-headers-${MINKV} + sys-libs/libcap:0= +" +RDEPEND="${DEPEND} + !sys-apps/opentmpfiles + !sys-apps/systemd +" + +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + >=dev-util/meson-0.46 + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + sys-devel/m4 + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" + +S="${WORKDIR}/systemd-${PV}" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # musl patchset from: + # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd + use elibc_musl && eapply "${WORKDIR}/${P}-musl" + default +} + +src_configure() { + # disable everything until configure says "enabled features: ACL, tmpfiles" + local systemd_disable_options=( + adm-group + analyze + apparmor + audit + backlight + binfmt + blkid + bzip2 + coredump + dbus + efi + elfutils + environment-d + fdisk + gcrypt + glib + gshadow + gnutls + hibernate + hostnamed + hwdb + idn + ima + initrd + firstboot + kernel-install + kmod + ldconfig + libcryptsetup + libcurl + libfido2 + libidn + libidn2 + libiptc + link-networkd-shared + link-systemctl-shared + link-timesyncd-shared + link-udev-shared + localed + logind + lz4 + machined + microhttpd + networkd + nss-myhostname + nss-resolve + nss-systemd + openssl + p11kit + pam + pcre2 + polkit + portabled + pstore + pwquality + randomseed + resolve + rfkill + seccomp + selinux + smack + sysusers + timedated + timesyncd + tpm + qrencode + quotacheck + userdb + utmp + vconsole + wheel-group + xdg-autostart + xkbcommon + xz + zlib + zstd + ) + + # prepend -D and append =false, e.g. zstd becomes -Dzstd=false + systemd_disable_options=( ${systemd_disable_options[@]/#/-D} ) + systemd_disable_options=( ${systemd_disable_options[@]/%/=false} ) + + local emesonargs=( + -Dacl=true + -Dtmpfiles=true + -Dstandalone-binaries=true # this and below option does the magic + -Dstatic-libsystemd=true + -Dsysvinit-path='' + ${systemd_disable_options[@]} + ) + meson_src_configure +} + +src_compile() { + # tmpfiles and sysusers can be built as standalone, link systemd-shared in statically. + # https://github.com/systemd/systemd/pull/16061 original implementation + # we just need to pass -Dstandalone-binaries=true and + # use .standalone target below. + # check meson.build for if have_standalone_binaries condition per target. + local mytargets=( + systemd-tmpfiles.standalone + man/tmpfiles.d.5 + man/systemd-tmpfiles.8 + ) + meson_src_compile "${mytargets[@]}" +} + +src_install() { + # lean and mean installation, single binary and man-pages + pushd "${BUILD_DIR}" > /dev/null || die + into / + newbin systemd-tmpfiles.standalone systemd-tmpfiles + + doman man/{systemd-tmpfiles.8,tmpfiles.d.5} + + popd > /dev/null || die + + # service files adapter from opentmpfiles + newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev + newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup + + # same content, but install as different file + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup +} + +src_test() { + # 'meson test' will compile full systemd, but we can still outsmart it + python_fix_shebang src/test/test-systemd-tmpfiles.py + "${EPYTHON}" src/test/test-systemd-tmpfiles.py \ + "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed" +} + +# adapted from opentmpfiles ebuild +add_service() { + local initd=$1 + local runlevel=$2 + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + mkdir -p "${EROOT}/etc/runlevels/${runlevel}" + ln -snf "${EROOT}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" +} + +pkg_postinst() { + if [[ -z $REPLACING_VERSIONS ]]; then + add_service stmpfiles-dev sysinit + add_service stmpfiles-setup boot + fi +} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index eaa5372c8b2b..55d97a083965 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,13 +1,14 @@ -AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 -AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad +AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0 +AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610dba624e3f168a7bd7a54f83eb2e208b9d596645819e4e4d977876d032c5b98d392c846736b7be3e758aa53cf7b724eeda8d02c19ce5 SHA512 043a7bba0fac81a4a5eb1217cdfdd90cbdc7b2f01327d96b6f2cc12f3e8be4976e55e40a1dfbcc94d8ec35230c7e02a10e85e593a6faa355e675e202073991b3 -AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f -DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1 SHA512 306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449 -EBUILD systemd-245.7-r1.ebuild 15134 BLAKE2B fba59139460f4ed9f099f2024cd9c7a16d888b746716897979a39118fcd474f1ca75542b743c076403aa65a55e914b4a5d9a929934d31530e2c19fd4fd256f6e SHA512 f1ab5ba4a327ac0edfbe592d11c9fc258aa5b62f46ca300d50843c9c43bed2e7f2b25faf9e894f061e968e66db036b7e7275e9e9956ed3ea3cf48750aa0fa134 -EBUILD systemd-246-r1.ebuild 15134 BLAKE2B 2213b51018a8381c04fcf1e6bd77b781db9f2e9fd3aef60aed0eda2e30bbef9e8bfdebad93a651f8ffec6c85cb6ef1bc9b2ab50d527876dac2df1b3439421efb SHA512 37f28b95615ab0425760ae39610c6084d54ec2e44b32380e568ba3568871fc7424f4d84569155ebcdd3174c96fe2e8eb39ec765f0202129bee03b78a4a4cb7f0 -EBUILD systemd-9999.ebuild 15141 BLAKE2B 838868efa4e6978443e71703408c82b4d9356515c5d9eb1e8ae60062fb62c91a34f197605080fef8460be39c9e15e74cfd637306f6fa0cb30b0a6645df4ad76e SHA512 c03d81855fc53e344c0698dbcacbee7b8d32f890a981c4b00b931171b531c41270544b762d452cc1bd31f1385797194271b9fc55d85d60940b83941c620367e1 +DIST systemd-247-rc2.tar.gz 9865122 BLAKE2B ddc12d733fa81cedcea974d05980e3b6731c48229c6ba30dbdeab1a17f32ab7f17f140b6609a542482cf972dc447d797a400a4b7dc30961c1dfdb9d79f0973e2 SHA512 01fb347f3edb08efdf97b54339b381e4747377af08528f7267e6de6e85215025f81da13f822fcd9b449891b925aa163c6755dea86e6727b626ea27c19e5f391b +DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9 +EBUILD systemd-246-r2.ebuild 15224 BLAKE2B 7b1108222a77b92640c21d46c09bca1d40247cc0711913341dae37740d8b38c70741be0471360d4ba602e4823628a9cbb0f26e8535b3c223bfbb29bc494dfef7 SHA512 cb7f79c8cf8bc638c1104f141345043a7a041d3729a514debc62a1e726467c387ed11bd6160fc02e9993a56dede7958aa1b664dec0a62c603254842708f1d59b +EBUILD systemd-246.6.ebuild 15260 BLAKE2B c4f0800e64d042ca74626e88bb34072ea4b84931a27192362ba096a3aeea73350cd4d49fe0d614a66d774a8166d1929b7664a227ae750bd5ccd15bdb4da70aaf SHA512 eff22df11fb3ff8d5707b8d122b6caeafb29b04194f3e70439028c64f57f4a5eceee6ff2aeca9643cbcdb8a42daed18bd9ce3f771d6fd18e3729b045c4263a67 +EBUILD systemd-247_rc2.ebuild 15267 BLAKE2B 687764f5cf5bdaf407b37441f9ddf3efa231f7630ef04483018342d34f56aef303a03031909fec3fc6db9a673a4ea6d09f2efe2e238edd571ad2df40d6414a25 SHA512 a09666aa382d6882fb64c15e0b9fa3bab7dad25ff5ef6b5a32855701a428cf277cee3d9ad21e2887332a57fdcc510a676b2cb6799f3c4c1aa652ab0169a9fcda +EBUILD systemd-9999.ebuild 15267 BLAKE2B 687764f5cf5bdaf407b37441f9ddf3efa231f7630ef04483018342d34f56aef303a03031909fec3fc6db9a673a4ea6d09f2efe2e238edd571ad2df40d6414a25 SHA512 a09666aa382d6882fb64c15e0b9fa3bab7dad25ff5ef6b5a32855701a428cf277cee3d9ad21e2887332a57fdcc510a676b2cb6799f3c4c1aa652ab0169a9fcda MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696 diff --git a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch deleted file mode 100644 index f44b4be85d50..000000000000 --- a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Martin Pitt -Date: Sun, 28 Dec 2014 12:49:35 +0100 -Subject: Don't enable audit by default - -It causes flooding of dmesg and syslog, suppressing actually important -messages. - -Don't enable it for now, until a better solution is found: -http://lists.freedesktop.org/archives/systemd-devel/2014-December/026591.html - -Bug-Debian: https://bugs.debian.org/773528 ---- - src/journal/journald-audit.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index 69742fa..25ef743 100644 ---- a/src/journal/journald-audit.c -+++ b/src/journal/journald-audit.c -@@ -542,10 +542,5 @@ int server_open_audit(Server *s) { - if (r < 0) - return log_error_errno(r, "Failed to add audit fd to event loop: %m"); - -- /* We are listening now, try to enable audit */ -- r = enable_audit(s->audit_fd, true); -- if (r < 0) -- log_warning_errno(r, "Failed to issue audit enable call: %m"); -- - return 0; - } diff --git a/sys-apps/systemd/files/gentoo-generator-path-r1.patch b/sys-apps/systemd/files/gentoo-generator-path-r1.patch deleted file mode 100644 index 459be9d99edb..000000000000 --- a/sys-apps/systemd/files/gentoo-generator-path-r1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3c7918deafa34313b935851171279d8fdb5cfadb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Tue, 25 Dec 2018 22:52:50 -0500 -Subject: [PATCH] path-lookup: look for generators in - {,/usr}/lib/systemd/system-generators - -Bug: https://bugs.gentoo.org/625402 ---- - src/shared/path-lookup.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 442fde7b2d..6814164504 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -888,6 +888,8 @@ char **generator_binary_paths(UnitFileScope scope) { - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", -+ "/usr/lib/systemd/system-generators", -+ "/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH); - - case UNIT_FILE_GLOBAL: --- -2.20.1 - diff --git a/sys-apps/systemd/files/gentoo-pam.patch b/sys-apps/systemd/files/gentoo-pam.patch new file mode 100644 index 000000000000..4d022b508ba6 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-pam.patch @@ -0,0 +1,33 @@ +From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 3 Nov 2020 10:42:51 -0500 +Subject: [PATCH] pam: include system-auth for systemd --user + +--- + src/login/systemd-user.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 +index f6313f79fe..bcf84b4c64 100644 +--- a/src/login/systemd-user.m4 ++++ b/src/login/systemd-user.m4 +@@ -5,7 +5,7 @@ + m4_ifdef(`ENABLE_HOMED', + -account sufficient pam_systemd_home.so + )m4_dnl +-account sufficient pam_unix.so ++account include system-auth + account required pam_permit.so + + m4_ifdef(`HAVE_SELINUX', +@@ -13,6 +13,7 @@ session required pam_selinux.so close + session required pam_selinux.so nottys open + )m4_dnl + session required pam_loginuid.so ++session include system-auth + session optional pam_keyinit.so force revoke + m4_ifdef(`ENABLE_HOMED', + -session optional pam_systemd_home.so +-- +2.29.0 + diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch new file mode 100644 index 000000000000..a9d40be4ab77 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch @@ -0,0 +1,25 @@ +From d9059d2ef1b0d6034267cc8ff44871d0f82f840f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 8 Nov 2020 12:34:11 -0500 +Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts + +--- + src/systemctl/systemctl-sysv-compat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c +index 2dca9e480f..5dcf13ba17 100644 +--- a/src/systemctl/systemctl-sysv-compat.c ++++ b/src/systemctl/systemctl-sysv-compat.c +@@ -111,7 +111,7 @@ int parse_shutdown_time_spec(const char *t, usec_t *ret) { + int enable_sysv_units(const char *verb, char **args) { + int r = 0; + +-#if HAVE_SYSV_COMPAT ++#if 0 + _cleanup_(lookup_paths_free) LookupPaths paths = {}; + unsigned f = 0; + +-- +2.29.0 + diff --git a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch deleted file mode 100644 index eb2223e52f27..000000000000 --- a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/login/systemd-user.m4 -+++ b/src/login/systemd-user.m4 -@@ -2,11 +2,7 @@ - # - # Used by systemd --user instances. - --account required pam_unix.so --m4_ifdef(`HAVE_SELINUX', --session required pam_selinux.so close --session required pam_selinux.so nottys open --)m4_dnl --session required pam_loginuid.so -+account include system-auth -+session include system-auth - session optional pam_keyinit.so force revoke - session optional pam_systemd.so diff --git a/sys-apps/systemd/systemd-245.7-r1.ebuild b/sys-apps/systemd/systemd-245.7-r1.ebuild deleted file mode 100644 index 31c8fb40c649..000000000000 --- a/sys-apps/systemd/systemd-245.7-r1.ebuild +++ /dev/null @@ -1,527 +0,0 @@ -# Copyright 2011-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - MY_PV=${PV/_/-} - MY_P=${MY_PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -fi - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" - -REQUIRED_USE=" - homed? ( cryptsetup ) - importd? ( curl gcrypt lzma ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) - curl? ( net-misc/curl:0= ) - dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - homed? ( ${OPENSSL_DEP} ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] - >=net-libs/gnutls-3.1.4:0= - ) - idn? ( net-dns/libidn2:= ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) - pkcs11? ( app-crypt/p11-kit:0= ) - pcre? ( dev-libs/libpcre2 ) - pwquality? ( dev-libs/libpwquality:0= ) - qrcode? ( media-gfx/qrencode:0= ) - repart? ( ${OPENSSL_DEP} ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) -" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - acct-group/adm - acct-group/wheel - acct-group/kmem - acct-group/tty - acct-group/utmp - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/input - acct-group/kvm - acct-group/render - acct-group/tape - acct-group/video - acct-group/systemd-journal - acct-user/systemd-journal-remote - acct-user/systemd-coredump - acct-user/systemd-network - acct-user/systemd-resolve - acct-user/systemd-timesync - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev -" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( >=sys-apps/hwids-20150417[udev] ) - >=sys-fs/udev-init-scripts-25 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -BDEPEND=" - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/meson-0.46 - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - sys-devel/m4 - virtual/pkgconfig - test? ( sys-apps/dbus ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if use test && has pid-sandbox ${FEATURES}; then - ewarn "Tests are known to fail with PID sandboxing enabled." - ewarn "See https://bugs.gentoo.org/674458." - fi - - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # Do NOT add patches here - local PATCHES=() - - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - # Add local patches here - PATCHES+=( - ) - - if ! use vanilla; then - PATCHES+=( - "${FILESDIR}/gentoo-generator-path-r1.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" - "${FILESDIR}/gentoo-journald-audit.patch" - ) - fi - - default -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - python_setup - - multilib-minimal_src_configure -} - -meson_use() { - usex "$1" true false -} - -meson_multilib() { - if multilib_is_native_abi; then - echo true - else - echo false - fi -} - -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1"; then - echo true - else - echo false - fi -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - -Dsupport-url="https://gentoo.org/support/" - -Dpamlibdir="$(getpam_mod_dir)" - # avoid bash-completion dep - -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH - -Dsplit-usr=$(usex split-usr true false) - -Dsplit-bin=true - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - # Avoid infinite exec recursion, bug 642724 - -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" - # no deps - -Dima=true - -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) - # Optional components/dependencies - -Dacl=$(meson_multilib_native_use acl) - -Dapparmor=$(meson_multilib_native_use apparmor) - -Daudit=$(meson_multilib_native_use audit) - -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) - -Dlibcurl=$(meson_multilib_native_use curl) - -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) - -Delfutils=$(meson_multilib_native_use elfutils) - -Dgcrypt=$(meson_use gcrypt) - -Dgnu-efi=$(meson_multilib_native_use gnuefi) - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" - -Dhomed=$(meson_multilib_native_use homed) - -Dhwdb=$(meson_multilib_native_use hwdb) - -Dmicrohttpd=$(meson_multilib_native_use http) - -Didn=$(meson_multilib_native_use idn) - -Dimportd=$(meson_multilib_native_use importd) - -Dbzip2=$(meson_multilib_native_use importd) - -Dzlib=$(meson_multilib_native_use importd) - -Dkmod=$(meson_multilib_native_use kmod) - -Dlz4=$(meson_use lz4) - -Dxz=$(meson_use lzma) - -Dlibiptc=$(meson_multilib_native_use nat) - -Dpam=$(meson_use pam) - -Dp11kit=$(meson_multilib_native_use pkcs11) - -Dpcre2=$(meson_multilib_native_use pcre) - -Dpolkit=$(meson_multilib_native_use policykit) - -Dpwquality=$(meson_multilib_native_use pwquality) - -Dqrencode=$(meson_multilib_native_use qrcode) - -Drepart=$(meson_multilib_native_use repart) - -Dseccomp=$(meson_multilib_native_use seccomp) - -Dselinux=$(meson_multilib_native_use selinux) - -Ddbus=$(meson_multilib_native_use test) - -Dxkbcommon=$(meson_multilib_native_use xkb) - -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - # Breaks screen, tmux, etc. - -Ddefault-kill-user-processes=false - -Dcreate-log-dirs=false - - # multilib options - -Dbacklight=$(meson_multilib) - -Dbinfmt=$(meson_multilib) - -Dcoredump=$(meson_multilib) - -Denvironment-d=$(meson_multilib) - -Dfirstboot=$(meson_multilib) - -Dhibernate=$(meson_multilib) - -Dhostnamed=$(meson_multilib) - -Dldconfig=$(meson_multilib) - -Dlocaled=$(meson_multilib) - -Dman=$(meson_multilib) - -Dnetworkd=$(meson_multilib) - -Dquotacheck=$(meson_multilib) - -Drandomseed=$(meson_multilib) - -Drfkill=$(meson_multilib) - -Dsysusers=$(meson_multilib) - -Dtimedated=$(meson_multilib) - -Dtimesyncd=$(meson_multilib) - -Dtmpfiles=$(meson_multilib) - -Dvconsole=$(meson_multilib) - - # static-libs - -Dstatic-libsystemd=$(usex static-libs true false) - -Dstatic-libudev=$(usex static-libs true false) - ) - - meson_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - eninja -} - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR - meson_src_test -} - -multilib_src_install() { - DESTDIR="${D}" eninja install -} - -multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - - # meson doesn't know about docdir - mv "${ED}"/usr/share/doc/{systemd,${PF}} || die - - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die - fi - - rm "${ED}"/etc/init.d/README || die - rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die - - if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rm "${ED}"/usr/share/man/man1/init.1 || die - rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die - fi - - if ! use resolvconf && ! use sysv-utils; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/kernel/install.d - keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/rules.d - - if use hwdb; then - keepdir /etc/udev/hwdb.d - fi - - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} - keepdir /usr/lib/{binfmt.d,modules-load.d} - keepdir /usr/lib/systemd/user-generators - keepdir /var/lib/systemd - keepdir /var/log/journal - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - if use hwdb; then - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die - fi - - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - gen_usr_ldscript -a systemd udev -} - -migrate_locale() { - local envd_locale_def="${EROOT}/etc/env.d/02locale" - local envd_locale=( "${EROOT}"/etc/env.d/??locale ) - local locale_conf="${EROOT}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -save_enabled_units() { - ENABLED_UNITS=() - type systemctl &>/dev/null || return - for x; do - if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then - ENABLED_UNITS+=( "${x}" ) - fi - done -} - -pkg_preinst() { - save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service - - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi -} - -pkg_postinst() { - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${EROOT}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${ENABLED_UNITS[@]} ]]; then - systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if type systemctl &>/dev/null; then - systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 - fi - elog "To enable a useful set of services, run the following:" - elog " systemctl preset-all --preset-mode=enable-only" - fi - - if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then - rm "${EROOT}/var/lib/systemd/timesync" - fi - - if [[ -z ${ROOT} && -d /run/systemd/system ]]; then - ebegin "Reexecuting system manager" - systemctl daemon-reexec - eend $? - fi - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-246-r1.ebuild b/sys-apps/systemd/systemd-246-r1.ebuild deleted file mode 100644 index 757d69867be3..000000000000 --- a/sys-apps/systemd/systemd-246-r1.ebuild +++ /dev/null @@ -1,527 +0,0 @@ -# Copyright 2011-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]]; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - MY_PV=${PV/_/-} - MY_P=${MY_PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -fi - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" - -REQUIRED_USE=" - homed? ( cryptsetup ) - importd? ( curl gcrypt lzma ) -" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) - curl? ( net-misc/curl:0= ) - dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - homed? ( ${OPENSSL_DEP} ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] - >=net-libs/gnutls-3.1.4:0= - ) - idn? ( net-dns/libidn2:= ) - importd? ( - app-arch/bzip2:0= - sys-libs/zlib:0= - ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - nat? ( net-firewall/iptables:0= ) - pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) - pkcs11? ( app-crypt/p11-kit:0= ) - pcre? ( dev-libs/libpcre2 ) - pwquality? ( dev-libs/libpwquality:0= ) - qrcode? ( media-gfx/qrencode:0= ) - repart? ( ${OPENSSL_DEP} ) - seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) - selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) -" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - acct-group/adm - acct-group/wheel - acct-group/kmem - acct-group/tty - acct-group/utmp - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/input - acct-group/kvm - acct-group/render - acct-group/tape - acct-group/video - acct-group/systemd-journal - acct-user/systemd-journal-remote - acct-user/systemd-coredump - acct-user/systemd-network - acct-user/systemd-resolve - acct-user/systemd-timesync - >=sys-apps/baselayout-2.2 - selinux? ( sec-policy/selinux-base-policy[systemd] ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) - resolvconf? ( !net-dns/openresolv ) - !build? ( || ( - sys-apps/util-linux[kill(-)] - sys-process/procps[kill(+)] - sys-apps/coreutils[kill(-)] - ) ) - !sys-auth/nss-myhostname - !sys-fs/eudev - !sys-fs/udev -" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( >=sys-apps/hwids-20150417[udev] ) - >=sys-fs/udev-init-scripts-34 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -BDEPEND=" - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/meson-0.46 - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - sys-devel/m4 - virtual/pkgconfig - test? ( sys-apps/dbus ) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if use test && has pid-sandbox ${FEATURES}; then - ewarn "Tests are known to fail with PID sandboxing enabled." - ewarn "See https://bugs.gentoo.org/674458." - fi - - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS - ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE - ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS - ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - if linux_chkconfig_present X86; then - CONFIG_CHECK+=" ~DMIID" - fi - fi - - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - check_extra_config - fi -} - -pkg_setup() { - : -} - -src_unpack() { - default - [[ ${PV} != 9999 ]] || git-r3_src_unpack -} - -src_prepare() { - # Do NOT add patches here - local PATCHES=() - - [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - # Add local patches here - PATCHES+=( - ) - - if ! use vanilla; then - PATCHES+=( - "${FILESDIR}/gentoo-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" - "${FILESDIR}/gentoo-journald-audit.patch" - ) - fi - - default -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - - python_setup - - multilib-minimal_src_configure -} - -meson_use() { - usex "$1" true false -} - -meson_multilib() { - if multilib_is_native_abi; then - echo true - else - echo false - fi -} - -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1"; then - echo true - else - echo false - fi -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - -Dsupport-url="https://gentoo.org/support/" - -Dpamlibdir="$(getpam_mod_dir)" - # avoid bash-completion dep - -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH - -Dsplit-usr=$(usex split-usr true false) - -Dsplit-bin=true - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - # Avoid infinite exec recursion, bug 642724 - -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" - # no deps - -Dima=true - -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) - # Optional components/dependencies - -Dacl=$(meson_multilib_native_use acl) - -Dapparmor=$(meson_multilib_native_use apparmor) - -Daudit=$(meson_multilib_native_use audit) - -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) - -Dlibcurl=$(meson_multilib_native_use curl) - -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) - -Delfutils=$(meson_multilib_native_use elfutils) - -Dgcrypt=$(meson_use gcrypt) - -Dgnu-efi=$(meson_multilib_native_use gnuefi) - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" - -Dhomed=$(meson_multilib_native_use homed) - -Dhwdb=$(meson_multilib_native_use hwdb) - -Dmicrohttpd=$(meson_multilib_native_use http) - -Didn=$(meson_multilib_native_use idn) - -Dimportd=$(meson_multilib_native_use importd) - -Dbzip2=$(meson_multilib_native_use importd) - -Dzlib=$(meson_multilib_native_use importd) - -Dkmod=$(meson_multilib_native_use kmod) - -Dlz4=$(meson_use lz4) - -Dxz=$(meson_use lzma) - -Dlibiptc=$(meson_multilib_native_use nat) - -Dpam=$(meson_use pam) - -Dp11kit=$(meson_multilib_native_use pkcs11) - -Dpcre2=$(meson_multilib_native_use pcre) - -Dpolkit=$(meson_multilib_native_use policykit) - -Dpwquality=$(meson_multilib_native_use pwquality) - -Dqrencode=$(meson_multilib_native_use qrcode) - -Drepart=$(meson_multilib_native_use repart) - -Dseccomp=$(meson_multilib_native_use seccomp) - -Dselinux=$(meson_multilib_native_use selinux) - -Ddbus=$(meson_multilib_native_use test) - -Dxkbcommon=$(meson_multilib_native_use xkb) - -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - # Breaks screen, tmux, etc. - -Ddefault-kill-user-processes=false - -Dcreate-log-dirs=false - - # multilib options - -Dbacklight=$(meson_multilib) - -Dbinfmt=$(meson_multilib) - -Dcoredump=$(meson_multilib) - -Denvironment-d=$(meson_multilib) - -Dfirstboot=$(meson_multilib) - -Dhibernate=$(meson_multilib) - -Dhostnamed=$(meson_multilib) - -Dldconfig=$(meson_multilib) - -Dlocaled=$(meson_multilib) - -Dman=$(meson_multilib) - -Dnetworkd=$(meson_multilib) - -Dquotacheck=$(meson_multilib) - -Drandomseed=$(meson_multilib) - -Drfkill=$(meson_multilib) - -Dsysusers=$(meson_multilib) - -Dtimedated=$(meson_multilib) - -Dtimesyncd=$(meson_multilib) - -Dtmpfiles=$(meson_multilib) - -Dvconsole=$(meson_multilib) - - # static-libs - -Dstatic-libsystemd=$(usex static-libs true false) - -Dstatic-libudev=$(usex static-libs true false) - ) - - meson_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - eninja -} - -multilib_src_test() { - unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR - meson_src_test -} - -multilib_src_install() { - DESTDIR="${D}" eninja install -} - -multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - - # meson doesn't know about docdir - mv "${ED}"/usr/share/doc/{systemd,${PF}} || die - - einstalldocs - dodoc "${FILESDIR}"/nsswitch.conf - - if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die - fi - - rm "${ED}"/etc/init.d/README || die - rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die - - if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rm "${ED}"/usr/share/man/man1/init.1 || die - rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die - fi - - if ! use resolvconf && ! use sysv-utils; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/kernel/install.d - keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/rules.d - - if use hwdb; then - keepdir /etc/udev/hwdb.d - fi - - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} - keepdir /usr/lib/{binfmt.d,modules-load.d} - keepdir /usr/lib/systemd/user-generators - keepdir /var/lib/systemd - keepdir /var/log/journal - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - if use hwdb; then - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die - fi - - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - gen_usr_ldscript -a systemd udev -} - -migrate_locale() { - local envd_locale_def="${EROOT}/etc/env.d/02locale" - local envd_locale=( "${EROOT}"/etc/env.d/??locale ) - local locale_conf="${EROOT}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -save_enabled_units() { - ENABLED_UNITS=() - type systemctl &>/dev/null || return - for x; do - if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then - ENABLED_UNITS+=( "${x}" ) - fi - done -} - -pkg_preinst() { - save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service - - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi -} - -pkg_postinst() { - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${EROOT}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${ENABLED_UNITS[@]} ]]; then - systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if type systemctl &>/dev/null; then - systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 - fi - elog "To enable a useful set of services, run the following:" - elog " systemctl preset-all --preset-mode=enable-only" - fi - - if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then - rm "${EROOT}/var/lib/systemd/timesync" - fi - - if [[ -z ${ROOT} && -d /run/systemd/system ]]; then - ebegin "Reexecuting system manager" - systemctl daemon-reexec - eend $? - fi - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-246-r2.ebuild b/sys-apps/systemd/systemd-246-r2.ebuild new file mode 100644 index 000000000000..18454dd4d574 --- /dev/null +++ b/sys-apps/systemd/systemd-246-r2.ebuild @@ -0,0 +1,530 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + MY_PV=${PV/_/-} + MY_P=${MY_PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +fi + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd" + +REQUIRED_USE=" + homed? ( cryptsetup ) + importd? ( curl gcrypt lzma ) +" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) + curl? ( net-misc/curl:0= ) + dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + homed? ( ${OPENSSL_DEP} ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] + >=net-libs/gnutls-3.1.4:0= + ) + idn? ( net-dns/libidn2:= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) + pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) + qrcode? ( media-gfx/qrencode:0= ) + repart? ( ${OPENSSL_DEP} ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) +" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + acct-group/adm + acct-group/wheel + acct-group/kmem + acct-group/tty + acct-group/utmp + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/render + acct-group/tape + acct-group/video + acct-group/systemd-journal + acct-user/systemd-journal-remote + acct-user/systemd-coredump + acct-user/systemd-network + acct-user/systemd-resolve + acct-user/systemd-timesync + >=sys-apps/baselayout-2.2 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + !sys-fs/eudev + !sys-fs/udev +" + +# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) +PDEPEND=">=sys-apps/dbus-1.9.8[systemd] + hwdb? ( >=sys-apps/hwids-20150417[udev] ) + >=sys-fs/udev-init-scripts-34 + policykit? ( sys-auth/polkit ) + !vanilla? ( sys-apps/gentoo-systemd-integration )" + +BDEPEND=" + app-arch/xz-utils:0 + dev-util/gperf + >=dev-util/meson-0.46 + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + sys-devel/m4 + virtual/pkgconfig + test? ( sys-apps/dbus ) + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') +" + +python_check_deps() { + has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if use test && has pid-sandbox ${FEATURES}; then + ewarn "Tests are known to fail with PID sandboxing enabled." + ewarn "See https://bugs.gentoo.org/674458." + fi + + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS + ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE + ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS + ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS + ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH + ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED + ~!SYSFS_DEPRECATED_V2" + + use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" + use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" + kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" + kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" + kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + if linux_chkconfig_present X86; then + CONFIG_CHECK+=" ~DMIID" + fi + fi + + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + : +} + +src_unpack() { + default + [[ ${PV} != 9999 ]] || git-r3_src_unpack +} + +src_prepare() { + # Do NOT add patches here + local PATCHES=() + + [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + # Add local patches here + PATCHES+=( + ) + + if ! use vanilla; then + PATCHES+=( + "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" + "${FILESDIR}/gentoo-journald-audit.patch" + ) + fi + + default +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + + python_setup + + multilib-minimal_src_configure +} + +meson_use() { + usex "$1" true false +} + +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local myconf=( + --localstatedir="${EPREFIX}/var" + -Dsupport-url="https://gentoo.org/support/" + -Dpamlibdir="$(getpam_mod_dir)" + # avoid bash-completion dep + -Dbashcompletiondir="$(get_bashcompdir)" + # make sure we get /bin:/sbin in PATH + -Dsplit-usr=$(usex split-usr true false) + -Dsplit-bin=true + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + # Avoid infinite exec recursion, bug 642724 + -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" + # no deps + -Dima=true + -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) + # Optional components/dependencies + -Dacl=$(meson_multilib_native_use acl) + -Dapparmor=$(meson_multilib_native_use apparmor) + -Daudit=$(meson_multilib_native_use audit) + -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) + -Dlibcurl=$(meson_multilib_native_use curl) + -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) + -Delfutils=$(meson_multilib_native_use elfutils) + -Dgcrypt=$(meson_use gcrypt) + -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + -Dhomed=$(meson_multilib_native_use homed) + -Dhwdb=$(meson_multilib_native_use hwdb) + -Dmicrohttpd=$(meson_multilib_native_use http) + -Didn=$(meson_multilib_native_use idn) + -Dimportd=$(meson_multilib_native_use importd) + -Dbzip2=$(meson_multilib_native_use importd) + -Dzlib=$(meson_multilib_native_use importd) + -Dkmod=$(meson_multilib_native_use kmod) + -Dlz4=$(meson_use lz4) + -Dxz=$(meson_use lzma) + -Dzstd=$(meson_use zstd) + -Dlibiptc=$(meson_multilib_native_use nat) + -Dpam=$(meson_use pam) + -Dp11kit=$(meson_multilib_native_use pkcs11) + -Dpcre2=$(meson_multilib_native_use pcre) + -Dpolkit=$(meson_multilib_native_use policykit) + -Dpwquality=$(meson_multilib_native_use pwquality) + -Dqrencode=$(meson_multilib_native_use qrcode) + -Drepart=$(meson_multilib_native_use repart) + -Dseccomp=$(meson_multilib_native_use seccomp) + -Dselinux=$(meson_multilib_native_use selinux) + -Ddbus=$(meson_multilib_native_use test) + -Dxkbcommon=$(meson_multilib_native_use xkb) + -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + # Breaks screen, tmux, etc. + -Ddefault-kill-user-processes=false + -Dcreate-log-dirs=false + + # multilib options + -Dbacklight=$(meson_multilib) + -Dbinfmt=$(meson_multilib) + -Dcoredump=$(meson_multilib) + -Denvironment-d=$(meson_multilib) + -Dfirstboot=$(meson_multilib) + -Dhibernate=$(meson_multilib) + -Dhostnamed=$(meson_multilib) + -Dldconfig=$(meson_multilib) + -Dlocaled=$(meson_multilib) + -Dman=$(meson_multilib) + -Dnetworkd=$(meson_multilib) + -Dquotacheck=$(meson_multilib) + -Drandomseed=$(meson_multilib) + -Drfkill=$(meson_multilib) + -Dsysusers=$(meson_multilib) + -Dtimedated=$(meson_multilib) + -Dtimesyncd=$(meson_multilib) + -Dtmpfiles=$(meson_multilib) + -Dvconsole=$(meson_multilib) + + # static-libs + -Dstatic-libsystemd=$(usex static-libs true false) + -Dstatic-libudev=$(usex static-libs true false) + ) + + meson_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + eninja +} + +multilib_src_test() { + unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR + meson_src_test +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} + +multilib_src_install_all() { + local rootprefix=$(usex split-usr '' /usr) + + # meson doesn't know about docdir + mv "${ED}"/usr/share/doc/{systemd,${PF}} || die + + einstalldocs + dodoc "${FILESDIR}"/nsswitch.conf + + if ! use resolvconf; then + rm -f "${ED}${rootprefix}"/sbin/resolvconf || die + fi + + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + + if ! use sysv-utils; then + rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rm "${ED}"/usr/share/man/man1/init.1 || die + rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die + fi + + if ! use resolvconf && ! use sysv-utils; then + rmdir "${ED}${rootprefix}"/sbin || die + fi + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} + keepdir /etc/kernel/install.d + keepdir /etc/systemd/{network,system,user} + keepdir /etc/udev/rules.d + + if use hwdb; then + keepdir /etc/udev/hwdb.d + fi + + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/{binfmt.d,modules-load.d} + keepdir /usr/lib/systemd/user-generators + keepdir /var/lib/systemd + keepdir /var/log/journal + + # Symlink /etc/sysctl.conf for easy migration. + dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + if use hwdb; then + rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + fi + + if use split-usr; then + # Avoid breaking boot/reboot + dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd + dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown + fi + + gen_usr_ldscript -a systemd udev +} + +migrate_locale() { + local envd_locale_def="${EROOT}/etc/env.d/02locale" + local envd_locale=( "${EROOT}"/etc/env.d/??locale ) + local locale_conf="${EROOT}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +save_enabled_units() { + ENABLED_UNITS=() + type systemctl &>/dev/null || return + for x; do + if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then + ENABLED_UNITS+=( "${x}" ) + fi + done +} + +pkg_preinst() { + save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service + + if ! use split-usr; then + local dir + for dir in bin sbin lib; do + if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then + eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." + eerror "One of them should be a symbolic link to the other one." + FAIL=1 + fi + done + if [[ ${FAIL} ]]; then + eerror "Migration to system layout with merged directories must be performed before" + eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." + die "System layout with split directories still used" + fi + fi +} + +pkg_postinst() { + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ ${ENABLED_UNITS[@]} ]]; then + systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + if type systemctl &>/dev/null; then + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 + fi + elog "To enable a useful set of services, run the following:" + elog " systemctl preset-all --preset-mode=enable-only" + fi + + if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then + rm "${EROOT}/var/lib/systemd/timesync" + fi + + if [[ -z ${ROOT} && -d /run/systemd/system ]]; then + ebegin "Reexecuting system manager" + systemctl daemon-reexec + eend $? + fi + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild new file mode 100644 index 000000000000..081914a1233f --- /dev/null +++ b/sys-apps/systemd/systemd-246.6.ebuild @@ -0,0 +1,531 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + MY_PV=${PV/_/-} + MY_P=${MY_PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" +fi + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd" + +REQUIRED_USE=" + homed? ( cryptsetup ) + importd? ( curl gcrypt lzma ) +" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) + curl? ( net-misc/curl:0= ) + dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + homed? ( ${OPENSSL_DEP} ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] + >=net-libs/gnutls-3.1.4:0= + ) + idn? ( net-dns/libidn2:= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) + pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) + qrcode? ( media-gfx/qrencode:0= ) + repart? ( ${OPENSSL_DEP} ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) +" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + acct-group/adm + acct-group/wheel + acct-group/kmem + acct-group/tty + acct-group/utmp + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/render + acct-group/tape + acct-group/video + acct-group/systemd-journal + acct-user/systemd-journal-remote + acct-user/systemd-coredump + acct-user/systemd-network + acct-user/systemd-resolve + acct-user/systemd-timesync + >=sys-apps/baselayout-2.2 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + !sys-fs/eudev + !sys-fs/udev +" + +# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) +PDEPEND=">=sys-apps/dbus-1.9.8[systemd] + hwdb? ( >=sys-apps/hwids-20150417[udev] ) + >=sys-fs/udev-init-scripts-34 + policykit? ( sys-auth/polkit ) + !vanilla? ( sys-apps/gentoo-systemd-integration )" + +BDEPEND=" + app-arch/xz-utils:0 + dev-util/gperf + >=dev-util/meson-0.46 + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + sys-devel/m4 + virtual/pkgconfig + test? ( sys-apps/dbus ) + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') +" + +python_check_deps() { + has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if use test && has pid-sandbox ${FEATURES}; then + ewarn "Tests are known to fail with PID sandboxing enabled." + ewarn "See https://bugs.gentoo.org/674458." + fi + + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS + ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE + ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS + ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS + ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH + ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED + ~!SYSFS_DEPRECATED_V2" + + use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" + use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" + kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" + kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" + kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + if linux_chkconfig_present X86; then + CONFIG_CHECK+=" ~DMIID" + fi + fi + + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + : +} + +src_unpack() { + default + [[ ${PV} != 9999 ]] || git-r3_src_unpack +} + +src_prepare() { + # Do NOT add patches here + local PATCHES=() + + [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + # Add local patches here + PATCHES+=( + ) + + if ! use vanilla; then + PATCHES+=( + "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" + "${FILESDIR}/gentoo-journald-audit.patch" + "${FILESDIR}/gentoo-pam.patch" + ) + fi + + default +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + + python_setup + + multilib-minimal_src_configure +} + +meson_use() { + usex "$1" true false +} + +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local myconf=( + --localstatedir="${EPREFIX}/var" + -Dsupport-url="https://gentoo.org/support/" + -Dpamlibdir="$(getpam_mod_dir)" + # avoid bash-completion dep + -Dbashcompletiondir="$(get_bashcompdir)" + # make sure we get /bin:/sbin in PATH + -Dsplit-usr=$(usex split-usr true false) + -Dsplit-bin=true + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + # Avoid infinite exec recursion, bug 642724 + -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" + # no deps + -Dima=true + -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) + # Optional components/dependencies + -Dacl=$(meson_multilib_native_use acl) + -Dapparmor=$(meson_multilib_native_use apparmor) + -Daudit=$(meson_multilib_native_use audit) + -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) + -Dlibcurl=$(meson_multilib_native_use curl) + -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) + -Delfutils=$(meson_multilib_native_use elfutils) + -Dgcrypt=$(meson_use gcrypt) + -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + -Dhomed=$(meson_multilib_native_use homed) + -Dhwdb=$(meson_multilib_native_use hwdb) + -Dmicrohttpd=$(meson_multilib_native_use http) + -Didn=$(meson_multilib_native_use idn) + -Dimportd=$(meson_multilib_native_use importd) + -Dbzip2=$(meson_multilib_native_use importd) + -Dzlib=$(meson_multilib_native_use importd) + -Dkmod=$(meson_multilib_native_use kmod) + -Dlz4=$(meson_use lz4) + -Dxz=$(meson_use lzma) + -Dzstd=$(meson_use zstd) + -Dlibiptc=$(meson_multilib_native_use nat) + -Dpam=$(meson_use pam) + -Dp11kit=$(meson_multilib_native_use pkcs11) + -Dpcre2=$(meson_multilib_native_use pcre) + -Dpolkit=$(meson_multilib_native_use policykit) + -Dpwquality=$(meson_multilib_native_use pwquality) + -Dqrencode=$(meson_multilib_native_use qrcode) + -Drepart=$(meson_multilib_native_use repart) + -Dseccomp=$(meson_multilib_native_use seccomp) + -Dselinux=$(meson_multilib_native_use selinux) + -Ddbus=$(meson_multilib_native_use test) + -Dxkbcommon=$(meson_multilib_native_use xkb) + -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + # Breaks screen, tmux, etc. + -Ddefault-kill-user-processes=false + -Dcreate-log-dirs=false + + # multilib options + -Dbacklight=$(meson_multilib) + -Dbinfmt=$(meson_multilib) + -Dcoredump=$(meson_multilib) + -Denvironment-d=$(meson_multilib) + -Dfirstboot=$(meson_multilib) + -Dhibernate=$(meson_multilib) + -Dhostnamed=$(meson_multilib) + -Dldconfig=$(meson_multilib) + -Dlocaled=$(meson_multilib) + -Dman=$(meson_multilib) + -Dnetworkd=$(meson_multilib) + -Dquotacheck=$(meson_multilib) + -Drandomseed=$(meson_multilib) + -Drfkill=$(meson_multilib) + -Dsysusers=$(meson_multilib) + -Dtimedated=$(meson_multilib) + -Dtimesyncd=$(meson_multilib) + -Dtmpfiles=$(meson_multilib) + -Dvconsole=$(meson_multilib) + + # static-libs + -Dstatic-libsystemd=$(usex static-libs true false) + -Dstatic-libudev=$(usex static-libs true false) + ) + + meson_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + eninja +} + +multilib_src_test() { + unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR + meson_src_test +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} + +multilib_src_install_all() { + local rootprefix=$(usex split-usr '' /usr) + + # meson doesn't know about docdir + mv "${ED}"/usr/share/doc/{systemd,${PF}} || die + + einstalldocs + dodoc "${FILESDIR}"/nsswitch.conf + + if ! use resolvconf; then + rm -f "${ED}${rootprefix}"/sbin/resolvconf || die + fi + + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + + if ! use sysv-utils; then + rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rm "${ED}"/usr/share/man/man1/init.1 || die + rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die + fi + + if ! use resolvconf && ! use sysv-utils; then + rmdir "${ED}${rootprefix}"/sbin || die + fi + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} + keepdir /etc/kernel/install.d + keepdir /etc/systemd/{network,system,user} + keepdir /etc/udev/rules.d + + if use hwdb; then + keepdir /etc/udev/hwdb.d + fi + + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/{binfmt.d,modules-load.d} + keepdir /usr/lib/systemd/user-generators + keepdir /var/lib/systemd + keepdir /var/log/journal + + # Symlink /etc/sysctl.conf for easy migration. + dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + if use hwdb; then + rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + fi + + if use split-usr; then + # Avoid breaking boot/reboot + dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd + dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown + fi + + gen_usr_ldscript -a systemd udev +} + +migrate_locale() { + local envd_locale_def="${EROOT}/etc/env.d/02locale" + local envd_locale=( "${EROOT}"/etc/env.d/??locale ) + local locale_conf="${EROOT}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +save_enabled_units() { + ENABLED_UNITS=() + type systemctl &>/dev/null || return + for x; do + if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then + ENABLED_UNITS+=( "${x}" ) + fi + done +} + +pkg_preinst() { + save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service + + if ! use split-usr; then + local dir + for dir in bin sbin lib; do + if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then + eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." + eerror "One of them should be a symbolic link to the other one." + FAIL=1 + fi + done + if [[ ${FAIL} ]]; then + eerror "Migration to system layout with merged directories must be performed before" + eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." + die "System layout with split directories still used" + fi + fi +} + +pkg_postinst() { + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ ${ENABLED_UNITS[@]} ]]; then + systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + if type systemctl &>/dev/null; then + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 + fi + elog "To enable a useful set of services, run the following:" + elog " systemctl preset-all --preset-mode=enable-only" + fi + + if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then + rm "${EROOT}/var/lib/systemd/timesync" + fi + + if [[ -z ${ROOT} && -d /run/systemd/system ]]; then + ebegin "Reexecuting system manager" + systemctl daemon-reexec + eend $? + fi + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-247_rc2.ebuild b/sys-apps/systemd/systemd-247_rc2.ebuild new file mode 100644 index 000000000000..cb5298ddc67f --- /dev/null +++ b/sys-apps/systemd/systemd-247_rc2.ebuild @@ -0,0 +1,531 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + if [[ ${PV} == *.* ]]; then + MY_PN=systemd-stable + else + MY_PN=systemd + fi + MY_PV=${PV/_/-} + MY_P=${MY_PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd" + +REQUIRED_USE=" + homed? ( cryptsetup ) + importd? ( curl gcrypt lzma ) +" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) + curl? ( net-misc/curl:0= ) + dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + homed? ( ${OPENSSL_DEP} ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] + >=net-libs/gnutls-3.1.4:0= + ) + idn? ( net-dns/libidn2:= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) + pkcs11? ( app-crypt/p11-kit:0= ) + pcre? ( dev-libs/libpcre2 ) + pwquality? ( dev-libs/libpwquality:0= ) + qrcode? ( media-gfx/qrencode:0= ) + repart? ( ${OPENSSL_DEP} ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) +" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + acct-group/adm + acct-group/wheel + acct-group/kmem + acct-group/tty + acct-group/utmp + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/render + acct-group/tape + acct-group/video + acct-group/systemd-journal + acct-user/systemd-journal-remote + acct-user/systemd-coredump + acct-user/systemd-network + acct-user/systemd-resolve + acct-user/systemd-timesync + >=sys-apps/baselayout-2.2 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + !sys-fs/eudev + !sys-fs/udev +" + +# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) +PDEPEND=">=sys-apps/dbus-1.9.8[systemd] + hwdb? ( >=sys-apps/hwids-20150417[udev] ) + >=sys-fs/udev-init-scripts-34 + policykit? ( sys-auth/polkit ) + !vanilla? ( sys-apps/gentoo-systemd-integration )" + +BDEPEND=" + app-arch/xz-utils:0 + dev-util/gperf + >=dev-util/meson-0.46 + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + sys-devel/m4 + virtual/pkgconfig + test? ( sys-apps/dbus ) + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') +" + +python_check_deps() { + has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if use test && has pid-sandbox ${FEATURES}; then + ewarn "Tests are known to fail with PID sandboxing enabled." + ewarn "See https://bugs.gentoo.org/674458." + fi + + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS + ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE + ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS + ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS + ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH + ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED + ~!SYSFS_DEPRECATED_V2" + + use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" + use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER" + kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" + kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" + kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF" + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + if linux_chkconfig_present X86; then + CONFIG_CHECK+=" ~DMIID" + fi + fi + + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + : +} + +src_unpack() { + default + [[ ${PV} != 9999 ]] || git-r3_src_unpack +} + +src_prepare() { + # Do NOT add patches here + local PATCHES=() + + [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + # Add local patches here + PATCHES+=( + ) + + if ! use vanilla; then + PATCHES+=( + "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" + "${FILESDIR}/gentoo-journald-audit.patch" + "${FILESDIR}/gentoo-pam.patch" + ) + fi + + default +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + + python_setup + + multilib-minimal_src_configure +} + +meson_use() { + usex "$1" true false +} + +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local myconf=( + --localstatedir="${EPREFIX}/var" + -Dsupport-url="https://gentoo.org/support/" + -Dpamlibdir="$(getpam_mod_dir)" + # avoid bash-completion dep + -Dbashcompletiondir="$(get_bashcompdir)" + # make sure we get /bin:/sbin in PATH + -Dsplit-usr=$(usex split-usr true false) + -Dsplit-bin=true + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + # Avoid infinite exec recursion, bug 642724 + -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" + # no deps + -Dima=true + -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) + # Optional components/dependencies + -Dacl=$(meson_multilib_native_use acl) + -Dapparmor=$(meson_multilib_native_use apparmor) + -Daudit=$(meson_multilib_native_use audit) + -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) + -Dlibcurl=$(meson_multilib_native_use curl) + -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) + -Delfutils=$(meson_multilib_native_use elfutils) + -Dgcrypt=$(meson_use gcrypt) + -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + -Dhomed=$(meson_multilib_native_use homed) + -Dhwdb=$(meson_multilib_native_use hwdb) + -Dmicrohttpd=$(meson_multilib_native_use http) + -Didn=$(meson_multilib_native_use idn) + -Dimportd=$(meson_multilib_native_use importd) + -Dbzip2=$(meson_multilib_native_use importd) + -Dzlib=$(meson_multilib_native_use importd) + -Dkmod=$(meson_multilib_native_use kmod) + -Dlz4=$(meson_use lz4) + -Dxz=$(meson_use lzma) + -Dzstd=$(meson_use zstd) + -Dlibiptc=$(meson_multilib_native_use nat) + -Dpam=$(meson_use pam) + -Dp11kit=$(meson_multilib_native_use pkcs11) + -Dpcre2=$(meson_multilib_native_use pcre) + -Dpolkit=$(meson_multilib_native_use policykit) + -Dpwquality=$(meson_multilib_native_use pwquality) + -Dqrencode=$(meson_multilib_native_use qrcode) + -Drepart=$(meson_multilib_native_use repart) + -Dseccomp=$(meson_multilib_native_use seccomp) + -Dselinux=$(meson_multilib_native_use selinux) + -Ddbus=$(meson_multilib_native_use test) + -Dxkbcommon=$(meson_multilib_native_use xkb) + -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + # Breaks screen, tmux, etc. + -Ddefault-kill-user-processes=false + -Dcreate-log-dirs=false + + # multilib options + -Dbacklight=$(meson_multilib) + -Dbinfmt=$(meson_multilib) + -Dcoredump=$(meson_multilib) + -Denvironment-d=$(meson_multilib) + -Dfirstboot=$(meson_multilib) + -Dhibernate=$(meson_multilib) + -Dhostnamed=$(meson_multilib) + -Dldconfig=$(meson_multilib) + -Dlocaled=$(meson_multilib) + -Dman=$(meson_multilib) + -Dnetworkd=$(meson_multilib) + -Dquotacheck=$(meson_multilib) + -Drandomseed=$(meson_multilib) + -Drfkill=$(meson_multilib) + -Dsysusers=$(meson_multilib) + -Dtimedated=$(meson_multilib) + -Dtimesyncd=$(meson_multilib) + -Dtmpfiles=$(meson_multilib) + -Dvconsole=$(meson_multilib) + + # static-libs + -Dstatic-libsystemd=$(usex static-libs true false) + -Dstatic-libudev=$(usex static-libs true false) + ) + + meson_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + eninja +} + +multilib_src_test() { + unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR + meson_src_test +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} + +multilib_src_install_all() { + local rootprefix=$(usex split-usr '' /usr) + + # meson doesn't know about docdir + mv "${ED}"/usr/share/doc/{systemd,${PF}} || die + + einstalldocs + dodoc "${FILESDIR}"/nsswitch.conf + + if ! use resolvconf; then + rm -f "${ED}${rootprefix}"/sbin/resolvconf || die + fi + + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + + if ! use sysv-utils; then + rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rm "${ED}"/usr/share/man/man1/init.1 || die + rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die + fi + + if ! use resolvconf && ! use sysv-utils; then + rmdir "${ED}${rootprefix}"/sbin || die + fi + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} + keepdir /etc/kernel/install.d + keepdir /etc/systemd/{network,system,user} + keepdir /etc/udev/rules.d + + if use hwdb; then + keepdir /etc/udev/hwdb.d + fi + + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/{binfmt.d,modules-load.d} + keepdir /usr/lib/systemd/user-generators + keepdir /var/lib/systemd + keepdir /var/log/journal + + # Symlink /etc/sysctl.conf for easy migration. + dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + if use hwdb; then + rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + fi + + if use split-usr; then + # Avoid breaking boot/reboot + dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd + dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown + fi + + gen_usr_ldscript -a systemd udev +} + +migrate_locale() { + local envd_locale_def="${EROOT}/etc/env.d/02locale" + local envd_locale=( "${EROOT}"/etc/env.d/??locale ) + local locale_conf="${EROOT}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +save_enabled_units() { + ENABLED_UNITS=() + type systemctl &>/dev/null || return + for x; do + if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then + ENABLED_UNITS+=( "${x}" ) + fi + done +} + +pkg_preinst() { + save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service + + if ! use split-usr; then + local dir + for dir in bin sbin lib; do + if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then + eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." + eerror "One of them should be a symbolic link to the other one." + FAIL=1 + fi + done + if [[ ${FAIL} ]]; then + eerror "Migration to system layout with merged directories must be performed before" + eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." + die "System layout with split directories still used" + fi + fi +} + +pkg_postinst() { + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ ${ENABLED_UNITS[@]} ]]; then + systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + if type systemctl &>/dev/null; then + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 + fi + elog "To enable a useful set of services, run the following:" + elog " systemctl preset-all --preset-mode=enable-only" + fi + + if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then + rm "${EROOT}/var/lib/systemd/timesync" + fi + + if [[ -z ${ROOT} && -d /run/systemd/system ]]; then + ebegin "Reexecuting system manager" + systemctl daemon-reexec + eend $? + fi + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index e762aa1e4009..cb5298ddc67f 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -19,7 +19,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript @@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd" REQUIRED_USE=" homed? ( cryptsetup ) @@ -72,7 +72,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] repart? ( ${OPENSSL_DEP} ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) - xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] ) +" # Newer linux-headers needed by ia64, bug #480218 DEPEND="${COMMON_DEPEND} @@ -206,8 +208,9 @@ src_prepare() { if ! use vanilla; then PATCHES+=( "${FILESDIR}/gentoo-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" "${FILESDIR}/gentoo-journald-audit.patch" + "${FILESDIR}/gentoo-pam.patch" ) fi @@ -281,6 +284,7 @@ multilib_src_configure() { -Dkmod=$(meson_multilib_native_use kmod) -Dlz4=$(meson_use lz4) -Dxz=$(meson_use lzma) + -Dzstd=$(meson_use zstd) -Dlibiptc=$(meson_multilib_native_use nat) -Dpam=$(meson_use pam) -Dp11kit=$(meson_multilib_native_use pkcs11) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index ffe53bbc423f..fb11dee25841 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -2,6 +2,7 @@ AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdac AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77 AUX inittab-2.91 1981 BLAKE2B 4917bad0474c3ab7aa02d481697ed0ce207b3c4c0f54beac794af07e76ad7d98420da77d7a08a32cbec32199196f630c92f67b9d57fedda23f49c97be113aa81 SHA512 2020a37686c3800335693b0ad977b4fcb5d6ee5abb09b5e683369ff0ab943e17c15a9a7cae02ca96d11ee310d7b8ad2814562f5a56fb82abedb3d60e2a7d2aef AUX inittab-2.95 1978 BLAKE2B b6fb1e0c6eaa68fb5d451d8065d1b1b5a53b15339f46a03f1c1ae410d03b40d102fe27e377750c1059377a4c741b30641c7f5e0f6f38c9d36180c43e25cac0ed SHA512 cae9909916b23c1bb6573b4b9bfc14ffb9d0b98e7c1546851713269528443b29417656c420f95810619fb0ae67f309bbe51804238825e938f53b75a0c4d76b81 +AUX inittab-2.98 2044 BLAKE2B 4045fb0aaaaafdc70688d94e55b886736b232a338c09827358c60d783222c0e3ad7888a3bea98761f573cc3f6928be424f3555544bd447651d68839d6fff0bde SHA512 874b4e67ffe529f828b156d1ed769b12a1c3791ef089c2e34a41079ed4f3e953878bb9985d9be16e0f051ea933f6034f7ccf2744c9ad7fa81737161c26289fe3 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575 AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9f6d828b5477d7b80668b279b29d036a292584965191bc204054fa71b1d53b3e9d83475ba8a1c09b92152fd9fcb29c40c0d1c6 SHA512 52d172aab471a0e2e8057292bfc401eade032da8c5058e22f35015e58635b8fe45ee8425c2a6cd7466942acd168f28c53c8c34f3b781a5c8c6c8b5714096439e @@ -10,7 +11,9 @@ AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90 +DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ededab93feaecd166d9be9f91f0f5e97fcfe3e5893d9db963ba638e66e1f6670a94f6e2328fbfdb92325563a129c SHA512 37bc3279b58ce3d808abb78eb6aa8c18a55f991343cc66316ad5b8c2fbb8dce95b83dd995cdab1df8c82a5ab155d0ad65bc3cee3860e4ba4ba4f8c2ac865c3f7 EBUILD sysvinit-2.93.ebuild 3565 BLAKE2B b299bb15ec4a6525f033f74b1a853d351545fe34807bf1b17716e92736582adb023ef0e4c5b8f745d37699a51067c1577e8b06cdd11e3f50b2f7eea445001f6d SHA512 e390b9560cf58f6f25ab9586dc5203ee8232eba0073348cda085f091216675458e4f5c0203013ffc93a8641697bf8827ffbdf382cc3243f118e081e84a43e974 -EBUILD sysvinit-2.96.ebuild 3836 BLAKE2B 98170deb30dd93b9d371f0e83270c7a7b6b6841edc8df2285741dcff0685b764fea116c9f6b04cc184b9052ef33276b1a04cb74db48e008132f79ee795a03759 SHA512 2ed847ab673652cd4471c9bb68f0ca74f78450ae4ecbac89c00bc1afcff867cc5fad460bdf80a33ac11ef025e5b50db56930c9708222a2cced55fd9463f51931 -EBUILD sysvinit-2.97.ebuild 3966 BLAKE2B b67700ccaf3eb933e9c5c7e9789a4ef2a9870a6d2cfd45dc674a1f1f94776389f7649b2eb2f9d2a9b3038fd4ab570a029283315d59f534a6af0d8f5eb28419af SHA512 9663f286473cf9b9bb8779d82ab8ebee48aca39dd6e2158468ee574751ab55fa4be862ab0da06425fd7c2cf13c469692b38732accb1e8723f35f1bb39722b4cf +EBUILD sysvinit-2.96.ebuild 3834 BLAKE2B 8b33ac1730e961d1c6a2a07c5489f8393471616b94ca1ec6a401a92786e6adf28a1ecf4870e3f54c9d95f22925a5c8c4671f07d582e87b0119eadef68b33a6fe SHA512 62685deab0a931693dcfbb4ca58a73cf71538cd56ea97dbcaec81807b23011c5bec01c4ebd86a597b7d6c6d1c3870456a4542febd9a4fcb28f135769dbf910b4 +EBUILD sysvinit-2.97.ebuild 3955 BLAKE2B e8c55bd2b99b1bd32dd298911a4e6a83e36c5589e1af29f7c55314428dce9fbd335dcc2919f6401cc4e55adefbe12e02f5fc7d7d4db39247844e86f307271761 SHA512 045dfb3b3f01db57781b87fe2ba6561fd78a713e7b9636dfdbf9193b1eae5a1414158ade0969b426737e2c8d45c4c9ea8921c5bf4f60b756191be4eea895cf29 +EBUILD sysvinit-2.98.ebuild 3969 BLAKE2B 1633252f3fd5655e6db87c4afd6ca0ff53a4901e63fe0ab9bd2f23f123bf69d6d062ce6d587baae0062d6bae86e4b41b15bda1d8e1567f3573f7f5c81e62cc2d SHA512 f3da1dde0027a1ff82d0c8674d3e6ce35bb04a5d87e34c0948806a6dfd72e1c7c176987b8e35dacaad06772a5f6f1ac8f25cc24d730bc5c144824305aa5232fd MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f diff --git a/sys-apps/sysvinit/files/inittab-2.98 b/sys-apps/sysvinit/files/inittab-2.98 new file mode 100644 index 000000000000..15a6f2241723 --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.98 @@ -0,0 +1,62 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# Modified by: William Hubbs, +# Modified by: Lars Wendler, +# + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/openrc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/openrc boot + +l0u:0:wait:/sbin/telinit u +l0:0:wait:/sbin/openrc shutdown +l0s:0:wait:/sbin/halt.sh +l1:1:wait:/sbin/openrc single +l2:2:wait:/sbin/openrc nonetwork +l3:3:wait:/sbin/openrc default +l4:4:wait:/sbin/openrc default +l5:5:wait:/sbin/openrc default +l6u:6:wait:/sbin/telinit u +l6:6:wait:/sbin/openrc reboot +l6r:6:wait:/sbin/reboot -dkn +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/openrc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +#x1:12345:respawn:/sbin/agetty 38400 console linux +c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh diff --git a/sys-apps/sysvinit/sysvinit-2.96.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild index adf3f15ec1e7..b82c9e06198e 100644 --- a/sys-apps/sysvinit/sysvinit-2.96.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.96.ebuild @@ -121,7 +121,7 @@ pkg_postinst() { # Reload init to fix unmounting problems of / on next reboot. # This is really needed, as without the new version of init cause init # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then + if [[ -z ${ROOT} ]] ; then if [[ -e /dev/initctl && ! -e /run/initctl ]]; then ln -s /dev/initctl /run/initctl fi diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild index 4dd4d992de92..9a08cbac04aa 100644 --- a/sys-apps/sysvinit/sysvinit-2.97.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *beta* ]] || \ -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="selinux ibm static kernel_FreeBSD" CDEPEND=" @@ -125,7 +125,7 @@ pkg_postinst() { # Reload init to fix unmounting problems of / on next reboot. # This is really needed, as without the new version of init cause init # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then + if [[ -z ${ROOT} ]] ; then if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then ln -s /dev/initctl /run/initctl \ || ewarn "Failed to set /run/initctl symlink!" diff --git a/sys-apps/sysvinit/sysvinit-2.98.ebuild b/sys-apps/sysvinit/sysvinit-2.98.ebuild new file mode 100644 index 000000000000..b2d86e1da2d6 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.98.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" +SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +[[ "${PV}" == *beta* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="selinux ibm static kernel_FreeBSD" + +CDEPEND=" + selinux? ( + >=sys-libs/libselinux-1.28 + )" +DEPEND="${CDEPEND} + virtual/os-headers" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-shutdown ) + !::g' \ + -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + src/Makefile || die + + # pidof has moved to >=procps-3.3.9 + sed -i -r \ + -e '/\/bin\/pidof/d' \ + -e '/^MAN8/s:\::g' \ + src/Makefile || die + + # logsave is already in e2fsprogs + sed -i -r \ + -e '/^(USR)?S?BIN/s:\::g' \ + -e '/^MAN8/s:\::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" || die + cp "${FILESDIR}"/inittab-2.98 inittab || die "cp inittab" + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) + use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) + use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) + use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) + if use ibm ; then + insert+=( + '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' + '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' + ) + fi + (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use kernel_FreeBSD ; then + sed -i \ + -e 's/linux/cons25/g' \ + -e 's/ttyS0/cuaa0/g' \ + -e 's/ttyS1/cuaa1/g' \ + inittab #121786 + fi + if use x86 || use amd64 ; then + sed -i \ + -e '/ttyS[01]/s:9600:115200:' \ + inittab + fi + if [[ ${#insert[@]} -gt 0 ]] ; then + printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab + fi +} + +src_compile() { + tc-export CC + append-lfs-flags + export DISTRO= #381311 + export VERSION="${PV}" + use static && append-ldflags -static + emake -C src $(usex selinux 'WITH_SELINUX=yes' '') +} + +src_install() { + emake -C src install ROOT="${D}" + dodoc README doc/* + + insinto /etc + doins "${WORKDIR}"/inittab + + newinitd "${FILESDIR}"/bootlogd.initd bootlogd + into / + dosbin "${FILESDIR}"/halt.sh + + keepdir /etc/inittab.d + + # dead symlink + find "${ED}" -xtype l -delete || die + + find "${ED}" -type d -empty -delete || die +} + +pkg_postinst() { + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ -z ${ROOT} ]] ; then + if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then + ln -s /dev/initctl /run/initctl \ + || ewarn "Failed to set /run/initctl symlink!" + fi + # Do not return an error if this fails + /sbin/telinit U &>/dev/null + fi + + elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" + elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." + + # Required for new bootlogd service + if [[ ! -e "${EROOT}/var/log/boot" ]] ; then + touch "${EROOT}/var/log/boot" + fi +} diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest index f607f1552b8d..a35331eb95f6 100644 --- a/sys-apps/tas/Manifest +++ b/sys-apps/tas/Manifest @@ -2,5 +2,5 @@ AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0b AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3 -EBUILD tas-1.6.0.200601.ebuild 1736 BLAKE2B 23465f2a38b3cb4922e94255416a43ca0a44ac5a4e053723f8242314635a3ed9a34a9a3e3d77678704ed6830a85078c79cb91fc12adb61fd91829e7b16dd86b7 SHA512 38c05b38236c5efc4118ac8949001f0e1eaba88ee334e3d97a569fd1860b95b430b6aed0e789b2eb3ec2c6907edd3e9e1d5a2d2ccf5537953c3ebfeb05768322 +EBUILD tas-1.6.0.200601.ebuild 1605 BLAKE2B 09c5ed5740c8fb70ce83c4e4b4ffa14ae343a20daeafc2641e5bee84daf6f20833022a29bb270b6b7d799dc974c204ff8cbee4508dde28f5089a8506145d54a2 SHA512 f98300064d58d2a0e612fb5ff3db26b274c0465f96652788b9a2365a7727e670231983b8d6dbee2d41282e647d73a190f0ee7cb4aff72c4733ce21f91be5fc05 MISC metadata.xml 871 BLAKE2B c8666715b4e9c7704f8f5464c95a9a3411cb4f97fe6631eccb4bb2a1ae70c987e858a4d32d3f6eef3ddc77d4ff1d8e441877da198e17f47fa65bec7bd915a565 SHA512 6b9b63a492af33946ac54c3a46fb6c27a48e8bd65472e10ab79510722a5a7bcdbd6cbded8f8182773e7fbd478e99d2a520a968e080996aa567289aa14ffe01ed diff --git a/sys-apps/tas/tas-1.6.0.200601.ebuild b/sys-apps/tas/tas-1.6.0.200601.ebuild index a2146bbbec85..6301047a3e21 100644 --- a/sys-apps/tas/tas-1.6.0.200601.ebuild +++ b/sys-apps/tas/tas-1.6.0.200601.ebuild @@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)" DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI" HOMEPAGE="https://www.supermicro.com" -SRC_URI="${MY_PN}_${MY_PV}_build.${MY_DATE}.zip" +SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip" KEYWORDS="-* ~amd64 ~x86" LICENSE="BSD supermicro" @@ -29,7 +29,7 @@ RDEPEND=" BDEPEND="app-arch/unzip" -RESTRICT="bindist fetch mirror" +RESTRICT="bindist mirror" S="${WORKDIR}" @@ -44,12 +44,6 @@ DOCS=( CONFIG_CHECK="~IPMI_DEVICE_INTERFACE ~IPMI_HANDLER ~IPMI_SI" -pkg_nofetch() { - elog "Please download ${A} from" - elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=TAS" - elog "and place it in your DISTDIR directory." -} - src_unpack() { unpack ${A} unpack "${S}"/${MY_PN}_${MY_PV}_build.${MY_DATE}_Linux.tar.gz diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest index e43153d55c67..a808c22f33be 100644 --- a/sys-apps/ucspi-ssl/Manifest +++ b/sys-apps/ucspi-ssl/Manifest @@ -7,5 +7,5 @@ EBUILD ucspi-ssl-0.94-r1.ebuild 1216 BLAKE2B 16f75a1835b7ccb6a5726b9125f6fba24a7 EBUILD ucspi-ssl-0.97.ebuild 1284 BLAKE2B 909f26fb66bda9f2b963d7d125496eb29d15ad6a50cc50713ff5a171c1cc8ce6a7adeb8902ab4307dae07e7eb4a42b142907a05c2fbb7400efbdb8eea6b43395 SHA512 473dbba22b26f7167e97ffb91773a85f5bceb3545dd9648d365a758543d7d1afa0e128bd3bb67a5489dc1d8cbccec18664fa39cde4afa5f264bfc6d442938d36 EBUILD ucspi-ssl-0.98b.ebuild 1254 BLAKE2B 343c3a29a1034913840a1e73427a71bf589afd22625fe5b4f9407a0625e92c66cd189c3b1ef866c3601e943734653b91487daa5ae76ea7a74490aedd5f3bff4c SHA512 5a05bdbec11af831d8e921722425a757acbd944877b474bcb5f7f62351efa60988bc84130ab41c63a3ff707b9b0d30dd32a26b9a6da312d6e65a0f4ddb73aa3a EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B fb0dc76802a85bf458c05104f2c7550bc57fff52db5edd82862866864e8705f93f237419820a9016714118bb32bd9bc445e672b273b264ebf6b4b5064e8a8c7f SHA512 efda666c5a18c291cabc933e2e59b396775d957a30a5249472d7ca21902a06437c198fde858679722e3d5cc559aabc88756c5b1e509e05be245bc95d0098fc9d -EBUILD ucspi-ssl-0.99e.ebuild 1549 BLAKE2B dc61f2fffffd151c6c4c248ab2d3464341ecba67cf26abf0660d55c7c44f685d20997e8597537c6674824f5be3c71c47b3211ee588e7f4cb4812504fefe2d3aa SHA512 6b99d130f259e9a6ff046cbb5afcafa1bec42bdd1d3db2c604de40a9dbd80c476cfb18d12964425f9075f5e04ecfce25049a5d5d01e9fb2ef67316fc32680ffa +EBUILD ucspi-ssl-0.99e.ebuild 1556 BLAKE2B 8946a652660166d40841da036ecad9b668f26b30f7f8b04dd20f28340f80ba7668f92daddcaacab0d9d8242665cd18ec10a9dc94dbc79c63ab4e22b94329f2b7 SHA512 becfdf659f4d82252cd13739fe52911f17c56f5863934e91dc8d1f143a29dc2fefae0712b3b9a98317b7109cfa0243bde51d6ba0f2bd68c9ea3b21b9aee73d87 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6 diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild index ddb3b08ee588..5651e04b6333 100644 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild +++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86" IUSE="bindist perl libressl" DEPEND="libressl? ( dev-libs/libressl:0= ) diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest index e4316c4d6cd9..2a42b8bde39b 100644 --- a/sys-apps/ucspi-tcp/Manifest +++ b/sys-apps/ucspi-tcp/Manifest @@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7 -EBUILD ucspi-tcp-0.88-r18.ebuild 2091 BLAKE2B 3dd566fd5a8d3d82fde9fdc1080e8bad38f589dcde7cc31f0922ba0f18e5717ee860b18164456274bc3e107e7fb71fd72621397613db1522d7652c768b5df119 SHA512 788f9e2c05fd559ab024bc6f726d7dbfd349c6e3fb69df678986619dc75632feddc69a3e009f3b6522d5377e28e625219b823cfce7984f51dddbfbcdcc224e96 +EBUILD ucspi-tcp-0.88-r18.ebuild 2098 BLAKE2B fb68904f5604a9a2494a6748fdd1d598ca89d17674b73291ec9272cf7a58aa592d4c51f7ca23608766a91b03fe5aca33c3163a6a56cfb4ce13a89da67a333e54 SHA512 fee980d242815660e66fea7a371c775c182752095152cd7dd7f168cf3516fcbedbf061b7b5e24fc5ae88875b3a2ee77b811cfa0e5b1629b1583c8aa6bc8bd884 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild index 55e72e8ade08..e46bb72f140a 100644 --- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild +++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="ipv6 qmail-spp selinux" RESTRICT="test" diff --git a/sys-apps/unscd/Manifest b/sys-apps/unscd/Manifest index 0cd5af965542..fc063a00ae0e 100644 --- a/sys-apps/unscd/Manifest +++ b/sys-apps/unscd/Manifest @@ -1,6 +1,6 @@ AUX unscd-tmpfiles.conf 29 BLAKE2B e899d228b801b5c86b9bca3eb500acf9f07bf2f46d54e6370b5f5a595614eefe879937e679cfa1df4aa471138d78f56c310142807d94fbaef718262cb95909c7 SHA512 2f5d67300493e32ba1efd31fbfd8483f42aff9e15950361b640e18451e76e0fc7a0ad08f547485ab5b1ed544407c8758b53c9b22a61d75bfe2f80b893dce0e77 AUX unscd.initd-r1 321 BLAKE2B dd36cd5c9e5d677655204048b3d43d8e5fe8b2f5d9c69c862a230257ab73350a5d27c3c6b8a107f2541d617e4e6cbbb421d1e06c83270de3100ed3101715137f SHA512 41def8b588f818b7e6e42809b37ab9d794d7d30c4be7dca047f64cdded55a401fa00cee962066125efe69a8efb9080fa2588c0941f4fc915243f1e111ac169c7 AUX unscd.service 513 BLAKE2B 443b97c41978967d2ce0d9ef021dd271e1fc292cec082f060109f28e96f83bc8c53937f63a4c38bc1e04cb5b72af9f80ddcf55b8537938e10fc8f8eca040ca38 SHA512 3a03be4807c06506caea41aa163bb036c2600566e7a73267e08ef0aebb3a288d37eb12e448740942277baee365654c6118102915479be882cb65dfefaf53917b -DIST nscd-0.53.c 73206 BLAKE2B ce3b8e02ce8879664bde7ee7362ee0d920ad9e9cd24da08b02e83d49b2e0bef7fb1b3c6635bc4e8a26d901170943a78bae608903459e4447edf004e5ef716468 SHA512 d14362d21282d0ea919af3b353f7838d1514c293b49df084bc8df424392b4121dba3443a07118f4c8c1cfdca0cbf8ebddde24cf73459b06349e9d1a68801403c -EBUILD unscd-0.53.ebuild 718 BLAKE2B ac7705f4af247b6da44dcda6c1ae9067b92886ec5c23f03cffd9a7cd698758b97dabebba10297ef2208b753b83dc3bc09fdf3931c3c3e392465d264ab50048a3 SHA512 2fd72cf7aa2645a3ece10be2d8dd32e456122a93e2b4025b812197d95cf3932701e95a61f6b1c2c11b0f79f49571673f959fab2824faaa4531947e2dc8095d69 -MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d +DIST nscd-0.54-r1.c 73304 BLAKE2B 5c35fec2f4f3447c5d6500a7fc50c97347923d62d084134ced5c412307e8db6079e01302b16ac3e1940ee9194a31ebec464e3bd838fd8b6a650b8c0bdc66349d SHA512 88f40a10ff9ba0f46ef6f266a8ab610bf54c1d322d11df47e616e3cc007edaebdf673ec71a314b7c672d2aa7a2eac799abb0bdf87aaebd71fb8d2f7ef4e33ab6 +EBUILD unscd-0.54-r1.ebuild 740 BLAKE2B b42587fd7e7043311bcb517162135b2c9a3de0dfebc09c92a261ca62e50159fcb8f8a1862899c1089919b4fb81c941a2e0ac2fc88919d49f77705e81806929e8 SHA512 e278a50db49be1f1b4bd80e2497f635dd9c4ffe9d50f0c0cfff7b955a755336cc0d82feb333585d939665638fc586832b41c91e7ced6c330a207086aa20a23f3 +MISC metadata.xml 464 BLAKE2B a35add2ef5141e6d23e0410b727bde1a1a09817d1498b0f962b6c315a204ccd17bd962826c9c0b0bb1a765d07cd105c77641a6504073369ac53c6e41ce8bac63 SHA512 d5869f42886829dee06a1eed99b398182e252d3935d84cd3e88432edfa8a56ad4b9aa461efa60dc70c4217a993f37a193a76c05be472fb19587fe2f0efe38b8c diff --git a/sys-apps/unscd/metadata.xml b/sys-apps/unscd/metadata.xml index 3a840c8dcd05..1c0546f7b8fa 100644 --- a/sys-apps/unscd/metadata.xml +++ b/sys-apps/unscd/metadata.xml @@ -5,4 +5,11 @@ toolchain@gentoo.org Gentoo Toolchain Project + + + vda.linux@googlemail.com + Denys Vlasenko + + mailto:vda.linux@googlemail.com + diff --git a/sys-apps/unscd/unscd-0.53.ebuild b/sys-apps/unscd/unscd-0.53.ebuild deleted file mode 100644 index f3e81790194e..000000000000 --- a/sys-apps/unscd/unscd-0.53.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd toolchain-funcs - -DESCRIPTION="simple & stable nscd replacement" -HOMEPAGE="https://busybox.net/~vda/unscd/README" -SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="sys-libs/glibc[nscd(+)]" -DEPEND="${RDEPEND}" - -S=${WORKDIR} - -src_unpack() { - cp "${DISTDIR}"/nscd-${PV}.c ${PN}.c || die -} - -src_compile() { - tc-export CC - emake unscd -} - -src_install() { - newinitd "${FILESDIR}"/unscd.initd-r1 unscd - systemd_newtmpfilesd "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf - systemd_dounit "${FILESDIR}"/unscd.service - dosbin unscd -} diff --git a/sys-apps/unscd/unscd-0.54-r1.ebuild b/sys-apps/unscd/unscd-0.54-r1.ebuild new file mode 100644 index 000000000000..93f6096726f3 --- /dev/null +++ b/sys-apps/unscd/unscd-0.54-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +DESCRIPTION="simple & stable nscd replacement" +HOMEPAGE="https://busybox.net/~vda/unscd/README" +SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c -> nscd-${PV}-r1.c" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="sys-libs/glibc[nscd(+)]" +DEPEND="${RDEPEND}" + +S=${WORKDIR} + +src_unpack() { + cp "${DISTDIR}"/nscd-${PV}-r1.c unscd.c || die +} + +src_compile() { + tc-export CC + emake unscd +} + +src_install() { + newinitd "${FILESDIR}"/unscd.initd-r1 unscd + systemd_newtmpfilesd "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf + systemd_dounit "${FILESDIR}"/unscd.service + dosbin unscd +} diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest index f564b55a4a33..588f71c15736 100644 --- a/sys-apps/usbutils/Manifest +++ b/sys-apps/usbutils/Manifest @@ -1,3 +1,5 @@ DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66 +DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54 EBUILD usbutils-012.ebuild 1198 BLAKE2B f0952377a3e94cde2e205ad0d47c78459ec7a623230233fd6c8d49f3925e9a4c163892e798008879cb51a8b0df99957bd58e94f8ee5518715879011e419e1d27 SHA512 f55e68020504640468567e54cf41fe8c526135f73c16f6c8b6dcb214a550c8f76412035739ddd2f1d62d5bece2d8ef25cfa5ddecb20e3f3aedfb8a79cfe69dbb +EBUILD usbutils-013.ebuild 1209 BLAKE2B e405cc0d7447a33f58b19258f20e5679e09dd46f9695a7cc0f41cc5e0ecaa0a045e0a305a5208f5642794b80c932bfbe1a12f59486a51f590a7e4c8577285659 SHA512 64fcf736021b6bd90c08049d49f1515c1c0954b9c7dac638b399da83fd7da287011db38fb8b206d600af6f54a87ea0a907e0371f13a3866651cad99b6e5c8b65 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild new file mode 100644 index 000000000000..60aebb858601 --- /dev/null +++ b/sys-apps/usbutils/usbutils-013.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit autotools python-single-r1 + +DESCRIPTION="USB enumeration utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/ + https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" +SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="virtual/libusb:1= + virtual/libudev:=" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig" +RDEPEND="${DEPEND} + sys-apps/hwids + python? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf + use python && python_fix_shebang lsusb.py.in +} + +src_configure() { + local myeconfargs=( + --datarootdir="${EPREFIX}/usr/share" + --datadir="${EPREFIX}/usr/share/misc" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newdoc usbhid-dump/NEWS NEWS.usbhid-dump + + use python || rm -f "${ED}"/usr/bin/lsusb.py +} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 8f1e2a6a0706..1c9455846d4c 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,17 +2,16 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f31680 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a AUX util-linux-2.35.1-cleanup-pidfd-include.patch 1117 BLAKE2B a207824f36b2167f721b4420b5de47462cdc3f12187316ee0ba37bebd1561aee0c591a522cb9cf7f24986322e1954f1fab1e6fe1751dfebc116aec12f70cc81e SHA512 315b5aabad68d3363f1a06034c22347d755ead4b974fd7879ce41b29953b41be510705a4806577710bb8e9d32a8034002f6868fea287a214640c80324754ea00 -AUX util-linux-2.35.1-hwclock-glibc-2.31.patch 7779 BLAKE2B ba277632152ce2c628c959d31b76cd513fe1a52d8dfc362d357c58b6468293c5b1349cc5751323040892ce25a3a5c7e8c5fcb489e1fe823bf94667307a945cc7 SHA512 8de03a955cb9c90ebb4c08294054ce2d578bfc3d6910f1e7628832baa2fcbba4d80cc6368c4068ba8e14bdd359846923c6dd0493ab9cdd546e16136b9ea4e06e -AUX util-linux-2.35.1-include_sys_types-header.patch 1774 BLAKE2B 813067f05881846cc0a3f7a06595900aae05e53a18de8d9660c9254326f1736dab701bb16185a2906d75372503d0bf1ac275456a0b213d0545e29ad752fc16cf SHA512 e02c1d4ed4c719c35eb8413c8cdf1868f571937ecaca13e3d5db4f82b690376ae92b4f75c25538e28fbc9d4cf5a1699e34e820d0a2b3e26d3354e916e3524f73 +AUX util-linux-2.36.1-libmount_dont_use_symfollow.patch 1576 BLAKE2B 9248b3a7646881c6cf3b4d53f1e28cf19d4f1444a881310c6569fb87063b5458063b53083872fe316318cd2ad4fd2164792fdfdc506e7371bb8b424f62b79f56 SHA512 fd310fdb8547b86dafd84564b3fb68167c02f25defc9cea1a5b2afc9af9e82f0b108a900b5073dd7394815d4c5bc894ebebe989b2c9a30ebecea7afc4083669f DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7 -DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2 +DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc1ceaae4e46fa6550ad0f2f152c52e4aaf2c8bc5fdf4f27b522037a870ff2554382abac0eaa50a6791d8b8016e3d74c SHA512 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857 -EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6 EBUILD util-linux-2.35.2.ebuild 8893 BLAKE2B 7e815f2d65257a1165a5a4f9e60c3338754a5300e800bae1872786e7e4c8be549668565dcb861856f4cce63e20e5f103120d77f0cf7498723f271a95f7ce9d78 SHA512 d0a4c98fb3049508a6a5a8ed0fbe5e1dd73cab5a343cb7d6f4d9a959232618868647c149766b8cd5c73e8ffd7fa4b5a56fb2359e34bd578f51fae60b81cd4415 -EBUILD util-linux-2.36.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368 -EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b +EBUILD util-linux-2.36.1-r1.ebuild 8904 BLAKE2B 3db44617352ed3acc74500ea6698e2baa41ce85d0260410cf5dfd9cec4f462254264a4481f89f1d21a8240a089928c2780395074a9413c4b4be6ffdfd4aa8d92 SHA512 f8f052242bf3262e30dac8053c373ad2ade653432d3e2a9ceb3801873ccbe6a134dff3dd368e4832389ed623bc61dd5808771682d9c62aa6a7dd0f8789243484 +EBUILD util-linux-2.36.ebuild 8829 BLAKE2B 65c336d5168454eefa2441d274921fe68df7fc273f593240ea063eaa34c4d1b97c8589849d8a0bc89dcdfee4984c08501847d068aff9e17f6f5d0296d98a6a73 SHA512 b7cc930e138a4763a57468ce2028e78ac4fee20b3748c5a946b5b8f89ba9410b9d2324fd95ccc81f3770ecbd9a127690497476d992f459f3f506462506e14108 +EBUILD util-linux-9999.ebuild 8764 BLAKE2B c9273cc668518f91dbff6ccb5edcbe4f9ba30f580240ec840f91ed66c68e69de682471390a0c9604d0f60926d6667d0265ebe8bc48aa8926cd6e1320b284ffec SHA512 950550197233fa9cafa404e04a69abcaaceeaaff8408cb1dd850efb7ae7a3ed57754210f2802dd81fe37f331ccb0ae58c0c141e192b0943ad99e050502a813eb MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4 diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch b/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch deleted file mode 100644 index c8b5cf76a23c..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch +++ /dev/null @@ -1,165 +0,0 @@ -From cd781c405be82540484da3bfe3d3f17a39b8eb5c Mon Sep 17 00:00:00 2001 -From: J William Piggott -Date: Fri, 21 Feb 2020 20:03:47 -0500 -Subject: hwclock: make glibc 2.31 compatible - -______________________________________________________ -GNU C Library NEWS -- history of user-visible changes. -Version 2.31 -Deprecated and removed features, and other changes affecting compatibility: - -* The settimeofday function can still be used to set a system-wide time - zone when the operating system supports it. This is because the Linux - kernel reused the API, on some architectures, to describe a system-wide - time-zone-like offset between the software clock maintained by the kernel, - and the "RTC" clock that keeps time when the system is shut down. - - However, to reduce the odds of this offset being set by accident, - settimeofday can no longer be used to set the time and the offset - simultaneously. If both of its two arguments are non-null, the call - will fail (setting errno to EINVAL). - - Callers attempting to set this offset should also be prepared for the call - to fail and set errno to ENOSYS; this already happens on the Hurd and on - some Linux architectures. The Linux kernel maintainers are discussing a - more principled replacement for the reused API. After a replacement - becomes available, we will change settimeofday to fail with ENOSYS on all - platforms when its 'tzp' argument is not a null pointer. - - settimeofday itself is obsolescent according to POSIX. Programs that set - the system time should use clock_settime and/or the adjtime family of - functions instead. We may cease to make settimeofday available to newly - linked binaries after there is a replacement for Linux's time-zone-like - offset API. -______________________________________________________ - -hwclock(8) had one settimeofday(2) call where both args were set for ---hctosys when the RTC was ticking UTC. This allowed setting the system -time, timezone, and locking the warp_clock function with a single call. -That operation now takes 3 calls of settimeofday(2). - -Although this common operation now takes three calls, the overall logic -for the set_system_clock() function was simplified. - -Co-Author: Karel Zak -Signed-off-by: J William Piggott ---- - sys-utils/hwclock.c | 71 ++++++++++++++++++++++++++++------------------------- - 1 file changed, 37 insertions(+), 34 deletions(-) - -diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c -index e736da717..1191a8571 100644 ---- a/sys-utils/hwclock.c -+++ b/sys-utils/hwclock.c -@@ -643,28 +643,28 @@ display_time(struct timeval hwctime) - * tz.tz_minuteswest argument and sets PCIL (see below). At boot settimeofday(2) - * has one-shot access to this function as shown in the table below. - * -- * +-------------------------------------------------------------------+ -- * | settimeofday(tv, tz) | -- * |-------------------------------------------------------------------| -- * | Arguments | System Time | PCIL | | warp_clock | -- * | tv | tz | set | warped | set | firsttime | locked | -- * |---------|---------|---------------|------|-----------|------------| -- * | pointer | NULL | yes | no | no | 1 | no | -- * | pointer | pointer | yes | no | no | 0 | yes | -- * | NULL | ptr2utc | no | no | no | 0 | yes | -- * | NULL | pointer | no | yes | yes | 0 | yes | -- * +-------------------------------------------------------------------+ -+ * +-------------------------------------------------------------------------+ -+ * | settimeofday(tv, tz) | -+ * |-------------------------------------------------------------------------| -+ * | Arguments | System Time | TZ | PCIL | | warp_clock | -+ * | tv | tz | set | warped | set | set | firsttime | locked | -+ * |---------|---------|---------------|-----|------|-----------|------------| -+ * | pointer | NULL | yes | no | no | no | 1 | no | -+ * | NULL | ptr2utc | no | no | yes | no | 0 | yes | -+ * | NULL | pointer | no | yes | yes | yes | 0 | yes | -+ * +-------------------------------------------------------------------------+ - * ptr2utc: tz.tz_minuteswest is zero (UTC). - * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale. - * firsttime: locks the warp_clock function (initialized to 1 at boot). -+ * Since glibc v2.31 settimeofday() will fail if both args are non NULL - * - * +---------------------------------------------------------------------------+ - * | op | RTC scale | settimeofday calls | - * |---------|-----------|-----------------------------------------------------| - * | systz | Local | 1) warps system time*, sets PCIL* and kernel tz | - * | systz | UTC | 1st) locks warp_clock* 2nd) sets kernel tz | -- * | hctosys | Local | 1st) sets PCIL* 2nd) sets system time and kernel tz | -- * | hctosys | UTC | 1) sets system time and kernel tz | -+ * | hctosys | Local | 1st) sets PCIL* & kernel tz 2nd) sets system time | -+ * | hctosys | UTC | 1st) locks warp* 2nd) sets tz 3rd) sets system time | - * +---------------------------------------------------------------------------+ - * * only on first call after boot - */ -@@ -675,42 +675,45 @@ set_system_clock(const struct hwclock_control *ctl, - struct tm broken; - int minuteswest; - int rc = 0; -- const struct timezone tz_utc = { 0 }; - - localtime_r(&newtime.tv_sec, &broken); - minuteswest = -get_gmtoff(&broken) / 60; - - if (ctl->verbose) { -- if (ctl->hctosys && !ctl->universal) -- printf(_("Calling settimeofday(NULL, %d) to set " -- "persistent_clock_is_local.\n"), minuteswest); -- if (ctl->systz && ctl->universal) -+ if (ctl->universal) { - puts(_("Calling settimeofday(NULL, 0) " -- "to lock the warp function.")); -+ "to lock the warp_clock function.")); -+ if (!( ctl->universal && !minuteswest )) -+ printf(_("Calling settimeofday(NULL, %d) " -+ "to set the kernel timezone.\n"), -+ minuteswest); -+ } else -+ printf(_("Calling settimeofday(NULL, %d) to warp " -+ "System time, set PCIL and the kernel tz.\n"), -+ minuteswest); -+ - if (ctl->hctosys) -- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), -- newtime.tv_sec, newtime.tv_usec, minuteswest); -- else { -- printf(_("Calling settimeofday(NULL, %d) "), minuteswest); -- if (ctl->universal) -- puts(_("to set the kernel timezone.")); -- else -- puts(_("to warp System time.")); -- } -+ printf(_("Calling settimeofday(%ld.%06ld, NULL) " -+ "to set the System time.\n"), -+ newtime.tv_sec, newtime.tv_usec); - } - - if (!ctl->testing) { -+ const struct timezone tz_utc = { 0 }; - const struct timezone tz = { minuteswest }; - -- if (ctl->hctosys && !ctl->universal) /* set PCIL */ -- rc = settimeofday(NULL, &tz); -- if (ctl->systz && ctl->universal) /* lock warp_clock */ -+ /* If UTC RTC: lock warp_clock and PCIL */ -+ if (ctl->universal) - rc = settimeofday(NULL, &tz_utc); -- if (!rc && ctl->hctosys) -- rc = settimeofday(&newtime, &tz); -- else if (!rc) -+ -+ /* Set kernel tz; if localtime RTC: warp_clock and set PCIL */ -+ if (!rc && !( ctl->universal && !minuteswest )) - rc = settimeofday(NULL, &tz); - -+ /* Set the System Clock */ -+ if ((!rc || errno == ENOSYS) && ctl->hctosys) -+ rc = settimeofday(&newtime, NULL); -+ - if (rc) { - warn(_("settimeofday() failed")); - return EXIT_FAILURE; --- -cgit 1.2-0.3.lf.el7 - diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch b/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch deleted file mode 100644 index 8c646ee73a9d..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001 -From: Sami Kerola -Date: Sat, 15 Feb 2020 21:12:50 +0000 -Subject: [PATCH] kill: include sys/types.h before checking - SYS_pidfd_send_signal - -Including sys/types.h must happen before SYS_pidfd_send_signal is checked, -because that header defines variable in normal conditions. When sys/types.h -does not have SYS_pidfd_send_signal then fallback is defined in config.h -that is included by default, and has therefore worked fine before and after -this change. - -Signed-off-by: Sami Kerola ---- - include/pidfd-utils.h | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index 593346576..0baedd2c9 100644 ---- a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -1,26 +1,28 @@ - #ifndef UTIL_LINUX_PIDFD_UTILS - #define UTIL_LINUX_PIDFD_UTILS - --#if defined(__linux__) && defined(SYS_pidfd_send_signal) --# include -+#if defined(__linux__) - # include -+# if defined(SYS_pidfd_send_signal) -+# include - --# ifndef HAVE_PIDFD_OPEN -+# ifndef HAVE_PIDFD_OPEN - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) - { - return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags); - } --# endif -+# endif - --# ifndef HAVE_PIDFD_SEND_SIGNAL -+# ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_open(pid_t pid, unsigned int flags) - { - return syscall(SYS_pidfd_open, pid, flags); - } --# endif -+# endif - --# define UL_HAVE_PIDFD 1 -+# define UL_HAVE_PIDFD 1 - --#endif /* __linux__ && SYS_pidfd_send_signal */ -+# endif /* SYS_pidfd_send_signal */ -+#endif /* __linux__ */ - #endif /* UTIL_LINUX_PIDFD_UTILS */ diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch new file mode 100644 index 000000000000..7c0b73f49d78 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch @@ -0,0 +1,40 @@ +From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 19 Nov 2020 09:49:16 +0100 +Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts + +Addresses: https://github.com/karelzak/util-linux/issues/1193 +Signed-off-by: Karel Zak +--- + libmount/src/context_mount.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c +index 8c394c1ff..dd1786176 100644 +--- a/libmount/src/context_mount.c ++++ b/libmount/src/context_mount.c +@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) + * string, because there is nothing like MS_EXEC (we only have + * MS_NOEXEC in mount flags and we don't care about the original + * mount string in libmount for VFS options). ++ * ++ * This use-case makes sense for MS_SECURE flags only (see ++ * mnt_optstr_get_flags() and mnt_context_merge_mflags()). + */ + if (!(cxt->mountflags & MS_NOEXEC)) + mnt_optstr_append_option(optstr, "exec", NULL); +@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) + mnt_optstr_append_option(optstr, "suid", NULL); + if (!(cxt->mountflags & MS_NODEV)) + mnt_optstr_append_option(optstr, "dev", NULL); +- if (!(cxt->mountflags & MS_NOSYMFOLLOW)) +- mnt_optstr_append_option(optstr, "symfollow", NULL); + } + +- + if (cxt->flags & MNT_FL_SAVED_USER) + rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user); + if (rc) +-- +2.29.2 + diff --git a/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild deleted file mode 100644 index 293433d1724c..000000000000 --- a/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ - pam python-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" - SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" - -LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND=" - virtual/libcrypt:= - audit? ( >=sys-process/audit-2.6:= ) - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( sys-fs/cryptsetup ) - hardlink? ( dev-libs/libpcre2:= ) - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) - pam? ( sys-libs/pam ) - ppc? ( sys-libs/librtas ) - ppc64? ( sys-libs/librtas ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) -" -DEPEND=" - ${RDEPEND} - virtual/os-headers -" -RDEPEND+=" - hardlink? ( !app-arch/hardlink ) - logger? ( !>=app-admin/sysklogd-2.0[logger] ) - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - su? ( - !=sys-apps/shadow-4.7-r2[su] - ) - !net-wireless/rfkill - ! "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -python_configure() { - local myeconfargs=( - "${commonargs[@]}" - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - --with-python - ) - if use userland_GNU; then - myeconfargs+=( - --enable-libblkid - --enable-libmount - --enable-pylibmount - ) - fi - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - popd >/dev/null || die -} - -multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - - # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 - export NCURSES6_CONFIG=false NCURSES5_CONFIG=false - export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false - - # configure args shared by python and non-python builds - local commonargs=( - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - ) - - local myeconfargs=( - "${commonargs[@]}" - --with-bashcompletiondir="$(get_bashcompdir)" - --without-python - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(multilib_native_use_with audit) - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with ncurses tinfo) - $(use_with selinux) - ) - # build programs only on GNU, on *BSD we want libraries only - if multilib_is_native_abi && use userland_GNU; then - myeconfargs+=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-pylibmount - --enable-agetty - --enable-bash-completion - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable caps setpriv) - $(use_enable cramfs) - $(use_enable fdformat) - $(use_enable hardlink) - $(use_enable kill) - $(use_enable logger) - $(use_enable ncurses pg) - $(use_enable su) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_with cryptsetup) - ) - else - myeconfargs+=( - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - # build libraries - --enable-libuuid - --enable-libblkid - --enable-libsmartcols - --enable-libfdisk - ) - if use userland_GNU; then - # those libraries don't work on *BSD - myeconfargs+=( - --enable-libmount - ) - fi - fi - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi && use python; then - python_foreach_impl python_configure - fi -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - emake all - popd >/dev/null || die -} - -multilib_src_compile() { - emake all - - if multilib_is_native_abi && use python; then - python_foreach_impl python_compile - fi -} - -python_test() { - pushd "${BUILD_DIR}" >/dev/null || die - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - popd >/dev/null || die -} - -multilib_src_test() { - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - if multilib_is_native_abi && use python; then - python_foreach_impl python_test - fi -} - -python_install() { - pushd "${BUILD_DIR}" >/dev/null || die - emake DESTDIR="${D}" install - python_optimize - popd >/dev/null || die -} - -multilib_src_install() { - if multilib_is_native_abi && use python; then - python_foreach_impl python_install - fi - - # This needs to be called AFTER python_install call (#689190) - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use userland_GNU; then - # need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die - - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if ! use userland_GNU; then - # manpage collisions - # TODO: figure out a good way to keep them - rm "${ED}"/usr/share/man/man3/uuid* || die - fi - - if use pam; then - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - fi - - # Note: - # Bash completion for "runuser" command is provided by same file which - # would also provide bash completion for "su" command. However, we don't - # use "su" command from this package. - # This triggers a known QA warning which we ignore for now to magically - # keep bash completion for "su" command which shadow package does not - # provide. -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild new file mode 100644 index 000000000000..f7acbfdb1510 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" + +LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND=" + virtual/libcrypt:= + audit? ( >=sys-process/audit-2.6:= ) + caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib:= ) + cryptsetup? ( sys-fs/cryptsetup ) + hardlink? ( dev-libs/libpcre2:= ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + ppc? ( sys-libs/librtas ) + ppc64? ( sys-libs/librtas ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" + hardlink? ( !app-arch/hardlink ) + logger? ( !>=app-admin/sysklogd-2.0[logger] ) + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + su? ( + !=sys-apps/shadow-4.7-r2[su] + ) + !net-wireless/rfkill + ! "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +python_configure() { + local myeconfargs=( + "${commonargs[@]}" + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + ) + if use userland_GNU; then + myeconfargs+=( + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + fi + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + + # configure args shared by python and non-python builds + local commonargs=( + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + ) + + local myeconfargs=( + "${commonargs[@]}" + --with-bashcompletiondir="$(get_bashcompdir)" + --without-python + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(multilib_native_use_with audit) + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + $(use_enable unicode widechar) + $(use_enable static-libs static) + $(use_with ncurses tinfo) + $(use_with selinux) + ) + # build programs only on GNU, on *BSD we want libraries only + if multilib_is_native_abi && use userland_GNU; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-pylibmount + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable hardlink) + $(use_enable kill) + $(use_enable logger) + $(use_enable ncurses pg) + $(use_enable su) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_with cryptsetup) + ) + else + myeconfargs+=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + ) + if use userland_GNU; then + # those libraries don't work on *BSD + myeconfargs+=( + --enable-libmount + ) + fi + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python; then + python_foreach_impl python_configure + fi +} + +python_compile() { + pushd "${BUILD_DIR}" >/dev/null || die + emake all + popd >/dev/null || die +} + +multilib_src_compile() { + emake all + + if multilib_is_native_abi && use python; then + python_foreach_impl python_compile + fi +} + +python_test() { + pushd "${BUILD_DIR}" >/dev/null || die + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + popd >/dev/null || die +} + +multilib_src_test() { + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + if multilib_is_native_abi && use python; then + python_foreach_impl python_test + fi +} + +python_install() { + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + python_optimize + popd >/dev/null || die +} + +multilib_src_install() { + if multilib_is_native_abi && use python; then + python_foreach_impl python_install + fi + + # This needs to be called AFTER python_install call (#689190) + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use userland_GNU; then + # need the libs in / + gen_usr_ldscript -a blkid fdisk mount smartcols uuid + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if ! use userland_GNU; then + # manpage collisions + # TODO: figure out a good way to keep them + rm "${ED}"/usr/share/man/man3/uuid* || die + fi + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi + + # Note: + # Bash completion for "runuser" command is provided by same file which + # would also provide bash completion for "su" command. However, we don't + # use "su" command from this package. + # This triggers a known QA warning which we ignore for now to magically + # keep bash completion for "su" command which shadow package does not + # provide. +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-2.36.ebuild b/sys-apps/util-linux/util-linux-2.36.ebuild index 904c2e473118..902e36ad068a 100644 --- a/sys-apps/util-linux/util-linux-2.36.ebuild +++ b/sys-apps/util-linux/util-linux-2.36.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 345734beabba..d2570255b88c 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd @@ -277,7 +277,6 @@ multilib_src_install() { multilib_src_install_all() { dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die # e2fsprogs-libs didnt install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest index 81645b2a3fbb..769e1c28aea3 100644 --- a/sys-apps/x86info/Manifest +++ b/sys-apps/x86info/Manifest @@ -2,5 +2,5 @@ AUX x86info-1.30-makefile.patch 1939 BLAKE2B aadfe68d30fb12a71435e4ceb708cc69280 AUX x86info-1.30-pic.patch 512 BLAKE2B 968b592289df73700785d37b607693f1e43fbae18da878a9888ed02ba68f370b799d92dca1dc00c3c2fc1c2d1faeb9ee9278bc6c1b5ac5fc1f4ddfe5c7a4ca49 SHA512 578dfae0ea84e3836c73840981f9c95594acbeff264c914015be43ad30e3bbf6bbb268373de7871e1a10288749dba466f8511a452a76028cead53571dac8b1a4 AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6 -EBUILD x86info-1.30_p20190617.ebuild 1779 BLAKE2B 79d83ac17a9d7c5d98b363bc6e941a334560b2b9ecc167dabf062b470528ac203dd0a2a4706403a5fe54234cfef4438dfbe6a075baf029e65b47b13f35ea7075 SHA512 07c9d015cb4232c433724f161b2b2455a7040692a4e0926962cc3eb792680957432e4260e2e7f5d46d609a51d468ebac2a57f0447d80e63613214e3f4feb709d +EBUILD x86info-1.30_p20190617.ebuild 1778 BLAKE2B 6da37a1e0a77a0db811bdfe8a42140b56d54cc31250b961ad8b3eb48483b0278086691e0f71cd5a390715bf07d1c822ac40164b96c7c57937c15e8000e2277bf SHA512 469d8b2da88a6e9ee3616267755571f666bd756ee22af320876e547ed71199646d5a09b42c1e28720c41de6ed20c8010f9b3822e533189cbe1354f88955ec248 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4 diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild index e19af2dd09ea..4a42d0c845f6 100644 --- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild +++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${ LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* ~amd64 x86" RDEPEND="sys-apps/pciutils:=" DEPEND="${RDEPEND}" diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest index 65bb84a76928..d996a18f175f 100644 --- a/sys-apps/xdg-dbus-proxy/Manifest +++ b/sys-apps/xdg-dbus-proxy/Manifest @@ -1,3 +1,3 @@ DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e -EBUILD xdg-dbus-proxy-0.1.2.ebuild 555 BLAKE2B 44ed6c07dd72ae4c63b880d82e7cbfba794e306da059a395c25856bac59586af801aa01818737f243799d12888985908e3f0b1806e0b00060121071b2f688e8e SHA512 258fb79e5b526a58508f5af912bd986eaa751f1f1484e9101098de86b2c6b4ba106c6600506618d7a8710bb37e012825b3f285d1c1897893de3fd0b5f988e6c7 +EBUILD xdg-dbus-proxy-0.1.2.ebuild 558 BLAKE2B ac4db5377d7832aaa98a0c2cfde0f2d27637c0e18f6b102633f91915d08c0418895c3d9a24276065e171e5b4530796193c06d50aded45dcd934d7d8c86b42cb9 SHA512 f0de023eddc0c64810a17cc98d6a4ec9369fcc767327666bb88e2f88cc0dfbd4d39eeb3532fdb1edf1f2c2ecbb9d60d32c788613d1bcb6a56c6eab9cbe16f1f6 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild index 6b57ded1cb6a..c7971f014d42 100644 --- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild +++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" IUSE="" RDEPEND=" diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest index 00eacc253567..c20987742ee0 100644 --- a/sys-apps/xdg-desktop-portal-gtk/Manifest +++ b/sys-apps/xdg-desktop-portal-gtk/Manifest @@ -1,3 +1,3 @@ -DIST xdg-desktop-portal-gtk-1.7.1.tar.xz 369932 BLAKE2B 510652a0025fc27d447a0482552a0ae9c8e08f0471166466356043c026c922b1b0779053bcc7902f041f93ccd71e2e71882594eee7f4dda8cea295e419192941 SHA512 2a2326559a4ed7e44ffddc1a6881c25f14822465f5660bc806e7d8a120d66268e2987329f4bc9f7821329eea41ee96b15a39c5f7ac805a1e04d0604a88b31c08 -EBUILD xdg-desktop-portal-gtk-1.7.1_pre.ebuild 954 BLAKE2B 585d0c8aab3bd3da4367ef1a16a6f7fef458ae48197725a08e6984d3920159c0939a4a26aa3d6490e6bd78e44e6baaa073c748d639baac87cea7ecca0fcdfa7e SHA512 e1f4505340f25307ec7e4ac1ff572aba38df46e51580b738b9ed0c76a4758b2d75ab804f77a924d7cf3396d91302d0682997f90b95335943917aa243deda6a73 +DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b +EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 989 BLAKE2B 444acfed3ba0d08f524d9988d3b282ead88d81562b231b02ad221ee0e06922a11d938f2ccde1d953f30f334dfb11dccdea14cbcc296a4918c3253bce3722d6d8 SHA512 2406afcafce75ca6fc1e415e8beec73ced194f43ffaa91edc17ba24a6a2899fcea9b8b8cf9420c501218f162758d9e0c73c595735abc77a23f6e6fdb439d2e66 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild deleted file mode 100644 index ed07582361da..000000000000 --- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -MY_PV="${PV//_pre*}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="portal backend implementation that is using GTK+ and various pieces of GNOME" -HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk" -SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="wayland X" - -BDEPEND=" - dev-util/gdbus-codegen - sys-devel/gettext - virtual/pkgconfig -" - -DEPEND=" - dev-libs/glib:2 - gnome-base/gnome-desktop:3= - media-libs/fontconfig - sys-apps/dbus - >=sys-apps/xdg-desktop-portal-1.7 - x11-libs/cairo[X?] - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[wayland?,X?] -" - -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myeconfargs=( - --with-systemduserunitdir="$(systemd_get_userunitdir)" - ) - - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild new file mode 100644 index 000000000000..27f6469c046d --- /dev/null +++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +MY_PV="${PV//_pre*}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="portal backend implementation that is using GTK+ and various pieces of GNOME" +HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk" +SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="wayland X" + +BDEPEND=" + dev-util/gdbus-codegen + sys-devel/gettext + virtual/pkgconfig +" + +DEPEND=" + dev-libs/glib:2 + gnome-base/gnome-desktop:3= + media-libs/fontconfig + sys-apps/dbus + >=sys-apps/xdg-desktop-portal-1.7 + x11-libs/cairo[X?] + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[wayland?,X?] +" + +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local myeconfargs=( + --with-systemduserunitdir="$(systemd_get_userunitdir)" + ) + + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest index 7a7a6c2509b1..22d10375529b 100644 --- a/sys-apps/xdg-desktop-portal/Manifest +++ b/sys-apps/xdg-desktop-portal/Manifest @@ -1,7 +1,5 @@ DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce -DIST xdg-desktop-portal-1.7.2.tar.xz 468140 BLAKE2B 6f2e92f79424f79e778db9c1bf94555332f1f88ef42f84e477c8784be74ce8e2cf924f34da5e17d78359bd493370dcee62aec77f60c9df5cf3475d745f3e4d8e SHA512 fac64281e89d8bf17c6f1b3751c159d9ca6c2896b71bb83622411bf2dc9b7813974d19902c81c3576b325c98edf4dae22ccc3fe290e32f717730b6aa3afbdc12 DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4 EBUILD xdg-desktop-portal-1.6.0-r2.ebuild 1058 BLAKE2B cc38d747768e44535808c0b0b3305299a978eb73a62ab1864f967d80a38edd3ead4ee340a36345b955b1f1ff77a1f037c563c6ddc6c2eb5bd61eaecb065eaeec SHA512 fcabc1a7d2da0d0ddadd790156439d806608b0b8d917bb531c78e54ffdef745d20e7e7c61c61f606e1df6888ea17652c55afbc303b77cba3ec8c6ff2be849f49 -EBUILD xdg-desktop-portal-1.7.2.ebuild 1020 BLAKE2B d3f2a4342dec9eda78075f9f883256a89ee8a528dc767aab1cc69f2bff64cf59fad5f2c4dea30a4d0cfe24deeb7dfb6bd87a360fb68e3d923c3b875f53fd5837 SHA512 96249acb7fac64ac9f95d9ac280cab1beee6f7ce6abe5b2cce96ab9ae06dbaa3d98456c030cdec79d07b4aa60a13f14f8e06e563feb249e5bd4ef9c82ba5048e -EBUILD xdg-desktop-portal-1.8.0.ebuild 1020 BLAKE2B d3f2a4342dec9eda78075f9f883256a89ee8a528dc767aab1cc69f2bff64cf59fad5f2c4dea30a4d0cfe24deeb7dfb6bd87a360fb68e3d923c3b875f53fd5837 SHA512 96249acb7fac64ac9f95d9ac280cab1beee6f7ce6abe5b2cce96ab9ae06dbaa3d98456c030cdec79d07b4aa60a13f14f8e06e563feb249e5bd4ef9c82ba5048e +EBUILD xdg-desktop-portal-1.8.0.ebuild 1017 BLAKE2B aebe178b476eb447327553bf9514a0e51e98cdc02265162d6c5f98b34aa1ff7501b490b7b2a12a100125a02e07ba7eb0846ebc61e5ea4025703d4379ee70eb5b SHA512 b313f6c0de8618f1dad47c6fc048466a312ea9e974802357a70d6ed5a98a08d07d3867ef503f9c01291d035225b0bdfb146134a330e6cfe3eaa28d45bc9f8ed4 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22 diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild deleted file mode 100644 index e217ed6874fe..000000000000 --- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="Desktop integration portal" -HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal" -SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="geolocation screencast" - -BDEPEND=" - dev-util/gdbus-codegen - sys-devel/gettext - virtual/pkgconfig -" -DEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - media-libs/fontconfig - sys-fs/fuse:0 - geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) - screencast? ( >=media-video/pipewire-0.3:= ) -" -RDEPEND="${DEPEND} - sys-apps/dbus -" - -src_configure() { - local myeconfargs=( - --with-systemduserunitdir="$(systemd_get_userunitdir)" - $(use_enable geolocation geoclue) - $(use_enable screencast pipewire) - --disable-docbook-docs # flatpak not packaged - --disable-libportal # not packaged - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild index e217ed6874fe..f272c6ac76b5 100644 --- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild +++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" IUSE="geolocation screencast" BDEPEND=" diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest index 4619a5baebf2..b581857af729 100644 --- a/sys-apps/yarn/Manifest +++ b/sys-apps/yarn/Manifest @@ -1,5 +1,7 @@ +DIST yarn-v1.22.10.tar.gz 1244965 BLAKE2B 6a9471a6905d89481665c099f00a985daacc8c7953327ee12b3d70f3f42dc304ceca01446281964d1af7a005ecae4a12ca55df637732e52821b4ecb9cdce6418 SHA512 d75dccd318f280abcbfd8d78b63546e11e7a8459c5dd737d0c8da2742cd5d7e3d7a5e668ce680234b0c09e71d128787777061d24c6e3ae4b6626086461e3ce25 DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18 DIST yarn-v1.22.5.tar.gz 1244837 BLAKE2B cf5054893c8937ceb6788c27f23005386449664b36dc31c6c0c3548438f1fdc5c5ec4b1b1642786c4d8732faf46ab58d2784d3768e12233f241b9b1c6f173734 SHA512 c33c040ed57eb05c04905b8996db31a34099f0c18dbf1818959c5592514abc99f1180592561ec5d3e760c084dbcf2dcdf3ebb4fe8918f082b6aa089cf10921bb +EBUILD yarn-1.22.10.ebuild 1070 BLAKE2B 049c5a5cdbb20425ba71385b41725ae5bbb7965eec3db80394ffbfb57ec506be22cf712324ba638d486297fce65d004c0b51ea0fad387f012884d1da04ec82e8 SHA512 b092d1a53a5b6c6f1586a75bca7581a13c8c2a420bd84e33b46b82f8a7b9c6f65429401c2a6b093d4e44bdb59573752227c478d5a4dda7a707e226f061b9b4c1 EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b EBUILD yarn-1.22.5.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4 MISC metadata.xml 654 BLAKE2B 4554ddbe2ccaaf07ae2324740b9776f7473ee6a10638b8b91dd75a4451c4030a0bc0cc41dc3fe91e392cdfe07ce6bbd55e9b04f2cd31b9c4021456c70e219237 SHA512 42ea44ef45e4c756ec6b04a657ae184380fe34829b3d770e125762bfa22e4d950a537d82e90e08ff6786dc46927212d0b5ab44e788070d0d7e05072c28440a5b diff --git a/sys-apps/yarn/yarn-1.22.10.ebuild b/sys-apps/yarn/yarn-1.22.10.ebuild new file mode 100644 index 000000000000..f320aff0f830 --- /dev/null +++ b/sys-apps/yarn/yarn-1.22.10.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-v${PV}" + +DESCRIPTION="Fast, reliable, and secure node dependency management" +HOMEPAGE="https://yarnpkg.com" +SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="" + +RDEPEND="!dev-util/cmdtest + net-libs/nodejs" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die +} + +src_install() { + local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang + insinto "${install_dir}" + doins -r . + dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn" + dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg" + + while read -r -d '' path; do + read -r shebang < "${ED}${path}" || die + [[ "${shebang}" == \#\!* ]] || continue + fperms +x "${path}" + done < <(find "${ED}" -type f -printf '/%P\0' || die) +} -- cgit v1.2.3