From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- sys-apps/Manifest.gz | Bin 50374 -> 50322 bytes sys-apps/ack/Manifest | 11 +- sys-apps/ack/ack-2.18-r1.ebuild | 27 -- sys-apps/ack/ack-2.22.ebuild | 27 -- sys-apps/ack/ack-2.24.ebuild | 27 -- sys-apps/ack/ack-2.28.ebuild | 27 -- sys-apps/ack/ack-3.0.0.ebuild | 1 + sys-apps/ack/files/ack-2.14-gentoo.patch | 22 - sys-apps/apparmor-utils/Manifest | 5 +- .../apparmor-utils/apparmor-utils-2.13.2-r1.ebuild | 85 ---- .../apparmor-utils/apparmor-utils-2.13.2.ebuild | 82 ---- .../apparmor-utils/apparmor-utils-2.13.3.ebuild | 85 ++++ sys-apps/apparmor/Manifest | 4 +- sys-apps/apparmor/apparmor-2.13.2.ebuild | 67 --- sys-apps/apparmor/apparmor-2.13.3.ebuild | 67 +++ sys-apps/apparmor/files/apparmor_load.sh | 0 sys-apps/apparmor/files/apparmor_unload.sh | 0 sys-apps/baobab/Manifest | 2 +- sys-apps/baobab/baobab-3.30.0.ebuild | 2 +- sys-apps/busybox/Manifest | 2 +- sys-apps/busybox/busybox-1.30.1.ebuild | 2 +- sys-apps/checkpolicy/Manifest | 6 +- sys-apps/checkpolicy/checkpolicy-2.7.ebuild | 58 --- sys-apps/checkpolicy/checkpolicy-2.9.ebuild | 2 +- sys-apps/checkpolicy/checkpolicy-2.9_rc1.ebuild | 57 --- sys-apps/dbus-broker/Manifest | 11 +- sys-apps/dbus-broker/dbus-broker-21.ebuild | 76 ++++ sys-apps/dbus-broker/dbus-broker-9999.ebuild | 50 +-- sys-apps/dbus/Manifest | 2 +- sys-apps/dbus/dbus-1.12.16.ebuild | 7 +- sys-apps/dstat/Manifest | 2 +- sys-apps/dstat/metadata.xml | 3 - sys-apps/etckeeper/Manifest | 2 +- sys-apps/etckeeper/metadata.xml | 9 +- sys-apps/fd/Manifest | 2 +- sys-apps/fd/fd-7.3.0.ebuild | 2 +- sys-apps/firejail-lts/Manifest | 6 +- .../firejail-lts-fix-compressed-manpages.patch | 17 + .../firejail-lts/firejail-lts-0.9.56.2-r1.ebuild | 49 +++ sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild | 47 ++ sys-apps/firejail-lts/metadata.xml | 27 +- sys-apps/firejail/Manifest | 10 +- sys-apps/firejail/files/0.9.56-contrib-fix.patch | 36 -- .../files/firejail-compressed-manpages.patch | 17 + sys-apps/firejail/firejail-0.9.56-r1.ebuild | 47 -- sys-apps/firejail/firejail-0.9.56.ebuild | 48 -- sys-apps/firejail/firejail-0.9.60-r1.ebuild | 65 +++ sys-apps/firejail/firejail-0.9.60.ebuild | 51 --- sys-apps/firejail/firejail-9999.ebuild | 75 ++++ sys-apps/firejail/metadata.xml | 2 +- sys-apps/help2man/Manifest | 8 +- sys-apps/help2man/help2man-1.47.10.ebuild | 2 +- sys-apps/help2man/help2man-1.47.11.ebuild | 41 ++ sys-apps/help2man/help2man-1.47.8.ebuild | 39 -- sys-apps/help2man/help2man-1.47.9.ebuild | 39 -- sys-apps/hponcfg/Manifest | 4 +- sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild | 37 -- sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild | 37 ++ sys-apps/ibm-powerpc-utils/Manifest | 5 +- .../ibm-powerpc-utils-1.3.5-r1.ebuild | 37 -- .../ibm-powerpc-utils-1.3.5.ebuild | 35 -- .../ibm-powerpc-utils-1.3.6.ebuild | 2 +- sys-apps/iproute2/Manifest | 1 - .../files/iproute2-4.14.1-fix-tc-actions.patch | 222 ---------- sys-apps/kbd/Manifest | 3 +- ...bd-2.2.0-kbdfile-dont_stop_on_first_error.patch | 31 ++ sys-apps/kbd/kbd-2.2.0-r1.ebuild | 76 ---- sys-apps/kbd/kbd-2.2.0-r2.ebuild | 77 ++++ sys-apps/keyutils/Manifest | 3 + .../files/keyutils-1.6.1-silence-rpm-check.patch | 20 + sys-apps/keyutils/keyutils-1.6.1.ebuild | 121 ++++++ sys-apps/kmscon/Manifest | 2 +- sys-apps/kmscon/kmscon-8.ebuild | 1 + sys-apps/logwatch/Manifest | 2 + sys-apps/logwatch/logwatch-7.5.2.ebuild | 95 ++++ sys-apps/lsadb/Manifest | 3 +- sys-apps/lsadb/files/lsadb-makefile.patch | 6 +- sys-apps/lsadb/lsadb-0.1.3-r1.ebuild | 27 ++ sys-apps/lsd/Manifest | 19 + sys-apps/lsd/lsd-0.16.0.ebuild | 79 ++++ sys-apps/man-db/Manifest | 7 +- .../files/man-db-2.8.4-berkdb_build_fix.patch | 27 -- sys-apps/man-db/man-db-2.8.4.ebuild | 124 ------ sys-apps/man-db/man-db-2.8.6.1.ebuild | 127 ++++++ sys-apps/man-db/man-db-9999.ebuild | 16 +- sys-apps/man-pages/Manifest | 6 +- sys-apps/man-pages/man-pages-5.00.ebuild | 53 --- sys-apps/man-pages/man-pages-5.01.ebuild | 2 +- sys-apps/man-pages/man-pages-5.02.ebuild | 53 +++ sys-apps/mcstrans/Manifest | 6 +- sys-apps/mcstrans/mcstrans-2.7.ebuild | 57 --- sys-apps/mcstrans/mcstrans-2.9.ebuild | 2 +- sys-apps/mcstrans/mcstrans-2.9_rc1.ebuild | 54 --- sys-apps/most/Manifest | 2 + sys-apps/most/most-5.1.0.ebuild | 37 ++ sys-apps/nix/Manifest | 4 +- sys-apps/nix/nix-2.1.3.ebuild | 2 +- sys-apps/nix/nix-2.2.2.ebuild | 2 +- sys-apps/openrc/Manifest | 2 +- sys-apps/openrc/openrc-9999.ebuild | 10 +- sys-apps/policycoreutils/Manifest | 9 +- .../policycoreutils/policycoreutils-2.7.ebuild | 181 -------- .../policycoreutils/policycoreutils-2.8-r1.ebuild | 4 +- .../policycoreutils/policycoreutils-2.8.ebuild | 178 -------- .../policycoreutils/policycoreutils-2.9.ebuild | 2 +- .../policycoreutils/policycoreutils-2.9_rc1.ebuild | 178 -------- sys-apps/portage/Manifest | 4 +- sys-apps/portage/portage-2.3.70.ebuild | 260 ----------- sys-apps/portage/portage-2.3.71.ebuild | 260 +++++++++++ sys-apps/restorecond/Manifest | 6 +- sys-apps/restorecond/restorecond-2.7.ebuild | 58 --- sys-apps/restorecond/restorecond-2.9.ebuild | 2 +- sys-apps/restorecond/restorecond-2.9_rc1.ebuild | 55 --- sys-apps/rng-tools/Manifest | 2 +- sys-apps/rng-tools/rng-tools-6.7-r1.ebuild | 2 +- sys-apps/secilc/Manifest | 6 +- sys-apps/secilc/secilc-2.7.ebuild | 44 -- sys-apps/secilc/secilc-2.9.ebuild | 2 +- sys-apps/secilc/secilc-2.9_rc1.ebuild | 44 -- sys-apps/selinux-python/Manifest | 11 +- sys-apps/selinux-python/metadata.xml | 3 - sys-apps/selinux-python/selinux-python-2.7.ebuild | 97 ----- .../selinux-python/selinux-python-2.8-r1.ebuild | 4 +- sys-apps/selinux-python/selinux-python-2.8.ebuild | 95 ---- sys-apps/selinux-python/selinux-python-2.9.ebuild | 2 +- .../selinux-python/selinux-python-2.9_rc1.ebuild | 95 ---- sys-apps/semodule-utils/Manifest | 6 +- sys-apps/semodule-utils/semodule-utils-2.7.ebuild | 53 --- sys-apps/semodule-utils/semodule-utils-2.9.ebuild | 2 +- .../semodule-utils/semodule-utils-2.9_rc1.ebuild | 49 --- sys-apps/servicelog/Manifest | 4 +- sys-apps/servicelog/servicelog-1.0.1.ebuild | 33 -- sys-apps/servicelog/servicelog-1.1.14.ebuild | 4 +- sys-apps/smc-sum/Manifest | 4 +- sys-apps/smc-sum/metadata.xml | 3 + sys-apps/smc-sum/smc-sum-2.2.0.20190220-r1.ebuild | 39 ++ sys-apps/smc-sum/smc-sum-2.2.0.20190220.ebuild | 38 -- sys-apps/systemd/Manifest | 14 +- sys-apps/systemd/files/241-version-dep.patch | 111 ----- .../systemd/files/241-wrapper-msan-unpoinson.patch | 76 ---- sys-apps/systemd/files/243-rc1-cryptsetup.patch | 148 +++++++ ...243-rc1-revert-logind-remove-unused-check.patch | 31 ++ .../systemd/files/243-rc1-udev-properties.patch | 53 +++ sys-apps/systemd/files/gentoo-uucp-group-r1.patch | 11 - sys-apps/systemd/metadata.xml | 1 + sys-apps/systemd/systemd-242-r6.ebuild | 8 + sys-apps/systemd/systemd-243_rc1-r2.ebuild | 483 +++++++++++++++++++++ sys-apps/systemd/systemd-243_rc1.ebuild | 471 -------------------- sys-apps/systemd/systemd-9999.ebuild | 13 +- sys-apps/sysvinit/Manifest | 3 + sys-apps/sysvinit/files/halt.sh | 6 + sys-apps/sysvinit/files/inittab-2.95 | 61 +++ sys-apps/sysvinit/sysvinit-2.95-r1.ebuild | 139 ++++++ sys-apps/tcp-wrappers/Manifest | 2 + sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild | 93 ++++ sys-apps/tuned/Manifest | 4 +- sys-apps/tuned/tuned-2.10.0.ebuild | 3 +- sys-apps/tuned/tuned-2.7.1-r3.ebuild | 3 +- sys-apps/util-linux/Manifest | 4 +- sys-apps/util-linux/util-linux-2.33-r1.ebuild | 3 +- sys-apps/util-linux/util-linux-2.33.1.ebuild | 3 +- sys-apps/xdg-desktop-portal/Manifest | 4 +- .../xdg-desktop-portal-1.2.0.ebuild | 48 -- .../xdg-desktop-portal-1.4.2.ebuild | 4 +- sys-apps/yarn/Manifest | 2 + sys-apps/yarn/yarn-1.17.3.ebuild | 39 ++ 166 files changed, 2822 insertions(+), 3856 deletions(-) delete mode 100644 sys-apps/ack/ack-2.18-r1.ebuild delete mode 100644 sys-apps/ack/ack-2.22.ebuild delete mode 100644 sys-apps/ack/ack-2.24.ebuild delete mode 100644 sys-apps/ack/ack-2.28.ebuild delete mode 100644 sys-apps/ack/files/ack-2.14-gentoo.patch delete mode 100644 sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild delete mode 100644 sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild create mode 100644 sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild delete mode 100644 sys-apps/apparmor/apparmor-2.13.2.ebuild create mode 100644 sys-apps/apparmor/apparmor-2.13.3.ebuild mode change 100755 => 100644 sys-apps/apparmor/files/apparmor_load.sh mode change 100755 => 100644 sys-apps/apparmor/files/apparmor_unload.sh delete mode 100644 sys-apps/checkpolicy/checkpolicy-2.7.ebuild delete mode 100644 sys-apps/checkpolicy/checkpolicy-2.9_rc1.ebuild create mode 100644 sys-apps/dbus-broker/dbus-broker-21.ebuild create mode 100644 sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch create mode 100644 sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild create mode 100644 sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild delete mode 100644 sys-apps/firejail/files/0.9.56-contrib-fix.patch create mode 100644 sys-apps/firejail/files/firejail-compressed-manpages.patch delete mode 100644 sys-apps/firejail/firejail-0.9.56-r1.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.56.ebuild create mode 100644 sys-apps/firejail/firejail-0.9.60-r1.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.60.ebuild create mode 100644 sys-apps/firejail/firejail-9999.ebuild create mode 100644 sys-apps/help2man/help2man-1.47.11.ebuild delete mode 100644 sys-apps/help2man/help2man-1.47.8.ebuild delete mode 100644 sys-apps/help2man/help2man-1.47.9.ebuild delete mode 100644 sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild create mode 100644 sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild delete mode 100644 sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5-r1.ebuild delete mode 100644 sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild delete mode 100644 sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch create mode 100644 sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch delete mode 100644 sys-apps/kbd/kbd-2.2.0-r1.ebuild create mode 100644 sys-apps/kbd/kbd-2.2.0-r2.ebuild create mode 100644 sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch create mode 100644 sys-apps/keyutils/keyutils-1.6.1.ebuild create mode 100644 sys-apps/logwatch/logwatch-7.5.2.ebuild create mode 100644 sys-apps/lsadb/lsadb-0.1.3-r1.ebuild create mode 100644 sys-apps/lsd/lsd-0.16.0.ebuild delete mode 100644 sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch delete mode 100644 sys-apps/man-db/man-db-2.8.4.ebuild create mode 100644 sys-apps/man-db/man-db-2.8.6.1.ebuild delete mode 100644 sys-apps/man-pages/man-pages-5.00.ebuild create mode 100644 sys-apps/man-pages/man-pages-5.02.ebuild delete mode 100644 sys-apps/mcstrans/mcstrans-2.7.ebuild delete mode 100644 sys-apps/mcstrans/mcstrans-2.9_rc1.ebuild create mode 100644 sys-apps/most/most-5.1.0.ebuild delete mode 100644 sys-apps/policycoreutils/policycoreutils-2.7.ebuild delete mode 100644 sys-apps/policycoreutils/policycoreutils-2.8.ebuild delete mode 100644 sys-apps/policycoreutils/policycoreutils-2.9_rc1.ebuild delete mode 100644 sys-apps/portage/portage-2.3.70.ebuild create mode 100644 sys-apps/portage/portage-2.3.71.ebuild delete mode 100644 sys-apps/restorecond/restorecond-2.7.ebuild delete mode 100644 sys-apps/restorecond/restorecond-2.9_rc1.ebuild delete mode 100644 sys-apps/secilc/secilc-2.7.ebuild delete mode 100644 sys-apps/secilc/secilc-2.9_rc1.ebuild delete mode 100644 sys-apps/selinux-python/selinux-python-2.7.ebuild delete mode 100644 sys-apps/selinux-python/selinux-python-2.8.ebuild delete mode 100644 sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild delete mode 100644 sys-apps/semodule-utils/semodule-utils-2.7.ebuild delete mode 100644 sys-apps/semodule-utils/semodule-utils-2.9_rc1.ebuild delete mode 100644 sys-apps/servicelog/servicelog-1.0.1.ebuild create mode 100644 sys-apps/smc-sum/smc-sum-2.2.0.20190220-r1.ebuild delete mode 100644 sys-apps/smc-sum/smc-sum-2.2.0.20190220.ebuild delete mode 100644 sys-apps/systemd/files/241-version-dep.patch delete mode 100644 sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch create mode 100644 sys-apps/systemd/files/243-rc1-cryptsetup.patch create mode 100644 sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch create mode 100644 sys-apps/systemd/files/243-rc1-udev-properties.patch delete mode 100644 sys-apps/systemd/files/gentoo-uucp-group-r1.patch create mode 100644 sys-apps/systemd/systemd-243_rc1-r2.ebuild delete mode 100644 sys-apps/systemd/systemd-243_rc1.ebuild create mode 100644 sys-apps/sysvinit/files/halt.sh create mode 100644 sys-apps/sysvinit/files/inittab-2.95 create mode 100644 sys-apps/sysvinit/sysvinit-2.95-r1.ebuild create mode 100644 sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild delete mode 100644 sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild create mode 100644 sys-apps/yarn/yarn-1.17.3.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 615d2e1aef8e..b12f6d8b63c8 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest index 785da07dfc9a..fe054cf06c5c 100644 --- a/sys-apps/ack/Manifest +++ b/sys-apps/ack/Manifest @@ -1,13 +1,4 @@ -AUX ack-2.14-gentoo.patch 431 BLAKE2B 61a7313811afc88f3289609998902d03de0b11b0b01c95e5be5a656995909584f46fd844d4e3befdad22ac83f16d66a04b1f8e53abb92a75ab3e185c8013bcd4 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b AUX ack-3.0.0-gentoo.patch 428 BLAKE2B 331f35f3ee7ab8140110bd48f499894e344bdac8ea592b0da4f8b7a5ba3d911bc28158346f94ed062cea3a1fc5bed7140fd246d6d637b70bc2eb8d73b66d0780 SHA512 a88cec8b7b4c53bb6f176e5ff6d88ff3a7888ad23e025b527a98adf649df9ac205c14686bf1565555743bf84f46db3ecfd6bb42ef6f44d817698818d79eef938 -DIST ack-2.18.tar.gz 232279 BLAKE2B dc7c347eee2be367a2b1bd4839719661f1c0de68bd3fcb3512c68cb5c42e09e8208712e7e3c57b418a00c961a933574a0c09c7f107fe43a4f96efeae21fbc8d8 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5 -DIST ack-2.22.tar.gz 250275 BLAKE2B 52cafe63b6f4aa50feb3a8d68141662fbbec7a73d31b2f06d3d63c7efb9ba681214ac20fbfd299f680d4e3758eaed8b4b9b3cd697f38977f2e0657a90dc0478a SHA512 d0073c424d861f2cfdc2ce8c0dfa149620803b4c30adb6c6f4f8896277ac89bb6d97d3e8e9bdfd1202f95808bd387b2e3a8353a3e7d204cdd61eb9cafde48303 -DIST ack-2.24.tar.gz 261289 BLAKE2B 0ec1e280abbcd2319bcc9f0cd83c73f97decd6698928fd1b8be310fe9a81839e02390bf4baabef402cb8603eceb5c005c4c8a1f71a60273cef21e3366efff11c SHA512 3778c1d70ae08852eff9d8dd75688713bbb8dd15d4e72c07a3829cf362c7bfeba1175275e66cfe99265ba28777b6833734ebd6debb4ec4ec79df06ac46a79c24 -DIST ack-2.28.tar.gz 263072 BLAKE2B 5bb5c41165dff9140959d7680a79def77b8d95106ee3b70b842579f082c8bf4ca978d05d1128722bd22456be94703ea1e44de1a87071317c46a4fb80d0cab6cb SHA512 04ad599b644ff2cb07abe687f99286f14ddd0628458ac88dea0124d8487792824af470a60718c21be5930083830b463385e13927cc4a680ff34be133256c0f8a DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a6e36c5265d11492d84990a67b34af0e42041280b9a9ab6c57d951a2c73ba5b6fe07c9ac8774bac445c10fd SHA512 2bf4e9719d8a5ec56c9d31acbcff647aece7b52ff7ffaacbfec56e59e30efb9ca7397fa379e13a9113a27abe47053261b9adb641b995d3e8579d459c0483fb45 -EBUILD ack-2.18-r1.ebuild 772 BLAKE2B 12100785921ef1fec21cfa89e065c0172942a1d5d0c86bbaa1a06e2d02e8691b83d0c142e5e69ce20a53d6aa091f2f7599929ba050e9386e98e317dcf695639a SHA512 3451e624eca1eaa393923f7a15a2519d89f7d7a0f01a9cc848d5da611bc05edd61201dcbeda7713251fa91716332ddd80ce6458f5d966397d2932e1b8d51bc04 -EBUILD ack-2.22.ebuild 774 BLAKE2B 4c3eed595671a3b8e9293cbbf64ddbaff4e4cf2fb9ebb8dcc75568a5efb89b541e5a8e5229751ac01db67df14d2b70cf46ade7787a008d14723efb77b1aaaa79 SHA512 996ee903ecf0b54879b05c64b5a5d0bf37c93db78a1ba2c01234a46456ba31b3f4fc72ea7a27547f73040e95f836181c903742b0430ec1e0dc9c8a07d57a5c9e -EBUILD ack-2.24.ebuild 774 BLAKE2B 7211436088eb1b529fc33f77a4c93674b1121e1f8b77740afa0d5a940157f2be862985d255de9eb2fad75059133fdf442e7a6a18230ab90141b63aa69a675880 SHA512 1103c9d90347a9c17e4aa24123748f2167b0aa2a392870cea5ff82627c84d673013650b2abb0cd0ae9d7014c7aa7bd5914e89576986d9458c688f12aec4d74b1 -EBUILD ack-2.28.ebuild 774 BLAKE2B 4c3eed595671a3b8e9293cbbf64ddbaff4e4cf2fb9ebb8dcc75568a5efb89b541e5a8e5229751ac01db67df14d2b70cf46ade7787a008d14723efb77b1aaaa79 SHA512 996ee903ecf0b54879b05c64b5a5d0bf37c93db78a1ba2c01234a46456ba31b3f4fc72ea7a27547f73040e95f836181c903742b0430ec1e0dc9c8a07d57a5c9e -EBUILD ack-3.0.0.ebuild 795 BLAKE2B 18591b2ae8817f74c4064a40fd033b04a85ceaed4d902beda0b4d6d19083fa80f324a48d0388cf5d6105bf044ecb5f12eddeaa9b68c16f94106bb97e7ce5355d SHA512 5b7970e9a40c9f56d3d971872086e4bbca47c070535eaa69b12da8c420ee3e18d953ef018fa055ca65d28616c58d7dc8e05cec280479d2202c5b140b24e57ff4 +EBUILD ack-3.0.0.ebuild 822 BLAKE2B ae76fcc3f35cb95b1691ac5f729d9236d301365ec43af62e6835e93d3c8ded7166951983772e58282052ea24054c3ae30de5f73b3739d4c6c60462886a36c2b8 SHA512 2bd89a2584f7b92826ee5b22f9de920a751391897775f2c49ae503e5ac33a0111d4a8063f11995f4768d14ff9cfb5d199dac61ffac9f85edfdd5c2955f5abc15 MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f diff --git a/sys-apps/ack/ack-2.18-r1.ebuild b/sys-apps/ack/ack-2.18-r1.ebuild deleted file mode 100644 index bc165b550e4d..000000000000 --- a/sys-apps/ack/ack-2.18-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DIST_AUTHOR=PETDANCE -inherit perl-module - -DESCRIPTION="ack is a tool like grep, optimized for programmers" -HOMEPAGE="https://beyondgrep.com" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" - -RDEPEND=">=dev-perl/File-Next-1.160.0" -DEPEND="${RDEPEND} - test? ( dev-perl/IO-Tty )" - -PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch ) - -src_test() { - # Tests fail when run in parallel and if dev-perl/IO-Tty is installed - # which enables interactive tests that need to read from stdin. If IO-Tty - # is not installed the related tests are skipped. - MAKEOPTS+=" -j1" perl-module_src_test -} diff --git a/sys-apps/ack/ack-2.22.ebuild b/sys-apps/ack/ack-2.22.ebuild deleted file mode 100644 index dbff5491f6a4..000000000000 --- a/sys-apps/ack/ack-2.22.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DIST_AUTHOR=PETDANCE -inherit perl-module - -DESCRIPTION="ack is a tool like grep, optimized for programmers" -HOMEPAGE="https://beyondgrep.com" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" - -RDEPEND=">=dev-perl/File-Next-1.160.0" -DEPEND="${RDEPEND} - test? ( dev-perl/IO-Tty )" - -PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch ) - -src_test() { - # Tests fail when run in parallel and if dev-perl/IO-Tty is installed - # which enables interactive tests that need to read from stdin. If IO-Tty - # is not installed the related tests are skipped. - MAKEOPTS+=" -j1" perl-module_src_test -} diff --git a/sys-apps/ack/ack-2.24.ebuild b/sys-apps/ack/ack-2.24.ebuild deleted file mode 100644 index 227a80911ad7..000000000000 --- a/sys-apps/ack/ack-2.24.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DIST_AUTHOR=PETDANCE -inherit perl-module - -DESCRIPTION="ack is a tool like grep, optimized for programmers" -HOMEPAGE="https://beyondgrep.com" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" - -RDEPEND=">=dev-perl/File-Next-1.160.0" -DEPEND="${RDEPEND} - test? ( dev-perl/IO-Tty )" - -PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch ) - -src_test() { - # Tests fail when run in parallel and if dev-perl/IO-Tty is installed - # which enables interactive tests that need to read from stdin. If IO-Tty - # is not installed the related tests are skipped. - MAKEOPTS+=" -j1" perl-module_src_test -} diff --git a/sys-apps/ack/ack-2.28.ebuild b/sys-apps/ack/ack-2.28.ebuild deleted file mode 100644 index dbff5491f6a4..000000000000 --- a/sys-apps/ack/ack-2.28.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DIST_AUTHOR=PETDANCE -inherit perl-module - -DESCRIPTION="ack is a tool like grep, optimized for programmers" -HOMEPAGE="https://beyondgrep.com" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" - -RDEPEND=">=dev-perl/File-Next-1.160.0" -DEPEND="${RDEPEND} - test? ( dev-perl/IO-Tty )" - -PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch ) - -src_test() { - # Tests fail when run in parallel and if dev-perl/IO-Tty is installed - # which enables interactive tests that need to read from stdin. If IO-Tty - # is not installed the related tests are skipped. - MAKEOPTS+=" -j1" perl-module_src_test -} diff --git a/sys-apps/ack/ack-3.0.0.ebuild b/sys-apps/ack/ack-3.0.0.ebuild index ab06b7d94bef..5b422d73a710 100644 --- a/sys-apps/ack/ack-3.0.0.ebuild +++ b/sys-apps/ack/ack-3.0.0.ebuild @@ -13,6 +13,7 @@ LICENSE="Artistic-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=">=dev-perl/File-Next-1.160.0" DEPEND="${RDEPEND} diff --git a/sys-apps/ack/files/ack-2.14-gentoo.patch b/sys-apps/ack/files/ack-2.14-gentoo.patch deleted file mode 100644 index 80f0747deef9..000000000000 --- a/sys-apps/ack/files/ack-2.14-gentoo.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ack-2.14/ConfigDefault.pm -+++ ack-2.14/ConfigDefault.pm -@@ -252,6 +252,9 @@ - # http://en.wikipedia.org/wiki/Fortran - --type-add=fortran:ext:f,f77,f90,f95,f03,for,ftn,fpp - -+# Gentoo http://www.gentoo.org/ -+--type-add=gentoo:ext:ebuild,eclass -+ - # Go - # http://golang.org/ - --type-add=go:ext:go ---- ack-2.14/t/ack-filetypes.t -+++ ack-2.14/t/ack-filetypes.t -@@ -26,6 +26,7 @@ - elisp - erlang - fortran -+gentoo - go - groovy - haskell diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index d88a51669b55..dd22f53c42f2 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,6 +1,5 @@ DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7 -DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f +DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141 EBUILD apparmor-utils-2.13.1.ebuild 2005 BLAKE2B 8720ce38ccd2a2cc79e5d44b6c7702ae458e0cac065d4b051a999f15310a8b2348c8a00cf841deaa3005740fb824aaff56e2c7251a7f2839bcaecc8f91858df1 SHA512 41dddd15eb3a096e383c4e581db78c416baa1a8b3fbd3b50eabcd6a1d1e1304676e0c6fffdd6a0187f9fad38c50d06240149a5808c0ecd7d310bcb7c417acc35 -EBUILD apparmor-utils-2.13.2-r1.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3 -EBUILD apparmor-utils-2.13.2.ebuild 2065 BLAKE2B 825ae1b508723e7bb43ae74a537676383375240534d05940fff86781a5db01892ae12a4055821b0bde19eb6848edf508543e8baa9bdf0b5f394dd147ab3d020f SHA512 ca3b9532991e691d29ad557d3d966642c070a841655f0bd09b0edb191cd000c7ebc755e225b81e6f0705fae0e55611a32ae8c0f8517e15eb147471ca3ce07872 +EBUILD apparmor-utils-2.13.3.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild deleted file mode 100644 index 4ce56c968e57..000000000000 --- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.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 - -PYTHON_COMPAT=( python3_{5,6} ) -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}/${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] - ~sys-apps/apparmor-${PV} - dev-perl/Locale-gettext - dev-perl/RPC-XML - dev-perl/TermReadKey - 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() { - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --version="${PV}" - } - - python_foreach_impl install_python - python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \ - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,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-utils/apparmor-utils-2.13.2.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild deleted file mode 100644 index 7cde6f4759f8..000000000000 --- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -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}/${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] - ~sys-apps/apparmor-${PV} - dev-perl/Locale-gettext - dev-perl/RPC-XML - dev-perl/TermReadKey - 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 -} - -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() { - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --version="${PV}" - } - - python_foreach_impl install_python - python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \ - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,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-utils/apparmor-utils-2.13.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild new file mode 100644 index 000000000000..4ce56c968e57 --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,6} ) +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}/${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] + ~sys-apps/apparmor-${PV} + dev-perl/Locale-gettext + dev-perl/RPC-XML + dev-perl/TermReadKey + 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() { + "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ + --root="${D}" --version="${PV}" + } + + python_foreach_impl install_python + python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \ + "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,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 b0a8559e3d88..8eca13e3e25d 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -6,7 +6,7 @@ AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7 -DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f +DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141 EBUILD apparmor-2.13.1-r1.ebuild 1486 BLAKE2B 0e20d08d76f1b799e4066a26f9aec5371293210ce052b43798daa8bddb0bd1c8a7339a8a75a8eebfb05cdaf3318d33dbe1d11db90356779f2cb5c9831c060c19 SHA512 90642a5a2a97d6ab64ccc3bb071c8d62c9c47996b8ef22582d54c11702f8bc996d440099a17b658385c9ad4c318b9ed120cbec469ea34fb392fa9f748b7d20e6 -EBUILD apparmor-2.13.2.ebuild 1502 BLAKE2B 10ad8cb49e3f216b9b97b3bdda55d308a9bb02691f541ac04bf05622a1978fdd98279da6c17b58a521f54242c460611d3e38537cf3b24909208b78057600656f SHA512 c17454f6d83c328591a65205fa1a69a0b55fcd537174e676f09ae05222b5cdf0e657214c759ccd4bb538749e65c21c1bcb77187c91f0762d845c98a6756ff67a +EBUILD apparmor-2.13.3.ebuild 1502 BLAKE2B 10ad8cb49e3f216b9b97b3bdda55d308a9bb02691f541ac04bf05622a1978fdd98279da6c17b58a521f54242c460611d3e38537cf3b24909208b78057600656f SHA512 c17454f6d83c328591a65205fa1a69a0b55fcd537174e676f09ae05222b5cdf0e657214c759ccd4bb538749e65c21c1bcb77187c91f0762d845c98a6756ff67a MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor/apparmor-2.13.2.ebuild b/sys-apps/apparmor/apparmor-2.13.2.ebuild deleted file mode 100644 index 020f3e4ff37f..000000000000 --- a/sys-apps/apparmor/apparmor-2.13.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 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}/${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}-2.13.1-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 -} - -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" ${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/apparmor-2.13.3.ebuild b/sys-apps/apparmor/apparmor-2.13.3.ebuild new file mode 100644 index 000000000000..020f3e4ff37f --- /dev/null +++ b/sys-apps/apparmor/apparmor-2.13.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2019 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}/${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}-2.13.1-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 +} + +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" ${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_load.sh b/sys-apps/apparmor/files/apparmor_load.sh old mode 100755 new mode 100644 diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh old mode 100755 new mode 100644 diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest index 9cf900100810..5f1cf46f3beb 100644 --- a/sys-apps/baobab/Manifest +++ b/sys-apps/baobab/Manifest @@ -1,3 +1,3 @@ DIST baobab-3.30.0.tar.xz 765760 BLAKE2B 7003507e0923eedd709db8f3934c341215decb77b300b6660a334f6c23dfa6d83476d3c0a0ef3d76a5104a1add0759f7e268e13bcf00f69f51ae5b9986bdefc5 SHA512 3fa1c20e6e3a654d3dfa11b8f0a7e0dea77cc8ab88ff65a4471cd467d3cb3a7d2d39521be1718f3f6ab32984b9331332574f87f5fcaf13c1aa8cf93bd081d7e0 -EBUILD baobab-3.30.0.ebuild 748 BLAKE2B 68c2372c12edc6ecc4f9c71af075e2e5a799feee07b660551644f4b2efb1796df141cdcbca104d5ddec858d630b16b7251c86af5d0817d654dce31004030065e SHA512 b371a75101d86cf473baeebfd09f11e8f1b597d7368a919c2595903b17f1dcaa7e24caa8365f17625321843f1d267d9ed976c9ab02255127602fda9a27a322b4 +EBUILD baobab-3.30.0.ebuild 755 BLAKE2B fb3355cae3415bd90b510c20bccb0a47df0932ca619d4f6f2e1d91b3914bab66b869d5cf8c3419cfeede75594f01cf1de0656b88ea635abfa098c2177590e50e SHA512 08c42f18e33a546971ef169fbba21de0128bcaa79fcffcbf6a75ddd971bbfb7791fb8b426f61d60724f01e6194b588de0f862773c869a74eff77ffeb6885f265 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/baobab/baobab-3.30.0.ebuild b/sys-apps/baobab/baobab-3.30.0.ebuild index dbf8bc56e8c9..88b375ea38f3 100644 --- a/sys-apps/baobab/baobab-3.30.0.ebuild +++ b/sys-apps/baobab/baobab-3.30.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" LICENSE="GPL-2+ FDL-1.1+" SLOT="0" IUSE="" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.44:2 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 63c01cd6fc47..7f9c3201ac8d 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -19,7 +19,7 @@ DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730 EBUILD busybox-1.29.0.ebuild 9287 BLAKE2B 681bdbc60c569cce49fd2bd0b01d68200b46c8a95a11fcb60f8686777e6d743a18c55bc5e87e0b466f101a45393ff57558a76a115909f133f1c9874d757a9736 SHA512 fe0adba8450c6073721d0540fb4103e617d33136fe40465e2576143c8781018bcf07f002b20bcb498302d87299016a125be4bcff5231b956a5d073f93dd8966c EBUILD busybox-1.29.3.ebuild 9429 BLAKE2B 2834009dcabca4e276462f7d0e8ddce1ef1d830e26218e7608b2506b108b88b5e5bf4ec74da93c6ac3ab97893d432bdc306ce9df809ce0d0c57c7a496f9d4bda SHA512 18c3eaac9e243af3a7ca82018ea6976136b1635b57f6d698a1d8b6303c6f68e8800638b95614abb7f73b30ae3b60214872c2395049f586ea5b9ead18e9c5bf79 -EBUILD busybox-1.30.1.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8 +EBUILD busybox-1.30.1.ebuild 9429 BLAKE2B 2834009dcabca4e276462f7d0e8ddce1ef1d830e26218e7608b2506b108b88b5e5bf4ec74da93c6ac3ab97893d432bdc306ce9df809ce0d0c57c7a496f9d4bda SHA512 18c3eaac9e243af3a7ca82018ea6976136b1635b57f6d698a1d8b6303c6f68e8800638b95614abb7f73b30ae3b60214872c2395049f586ea5b9ead18e9c5bf79 EBUILD busybox-1.31.0.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8 EBUILD busybox-9999.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff --git a/sys-apps/busybox/busybox-1.30.1.ebuild b/sys-apps/busybox/busybox-1.30.1.ebuild index c15fa90610c7..85ab3f4a8240 100644 --- a/sys-apps/busybox/busybox-1.30.1.ebuild +++ b/sys-apps/busybox/busybox-1.30.1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P=${PN}-${PV/_/-} SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" # GPL-2 only diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest index fdcbeabef496..465c0a04baa6 100644 --- a/sys-apps/checkpolicy/Manifest +++ b/sys-apps/checkpolicy/Manifest @@ -1,10 +1,6 @@ -DIST checkpolicy-2.7.tar.gz 65967 BLAKE2B 6918187363cd74a1a23df41f0af23a2231c7087c696d3935db65db4c6750cf7dfa7613b1d569dc76b80f9781fed9f58ef8d41e6ed4325086a10fb322f7f8f754 SHA512 fba8a4132f90c98f8222de563dc15aac1b739d3a6207779b6a4715d2813e7553081351c54f42371a1b704a1f5038d40821b61213c4ad53eb705823975858cf7f DIST checkpolicy-2.8.tar.gz 66243 BLAKE2B cd4b5ead13606df9888260a15d982eb43d59c659a6f021a18c598657b2a07de5e70a9eacee6528855f26256d26b27bd8bec27b95a7366cf2e44ba5d426369582 SHA512 d1a52dffefcc8f9f879214290f01beb5f4978f1764ab6378ee03a62ef924206b9a6f6a512001ae556034ababcd3a0043d455f5aef66b5629a4f152cd2c9f0b7a -DIST checkpolicy-2.9-rc1.tar.gz 66244 BLAKE2B 16f34d8ee46dd1d9a23cdb784e72dba28350293ba44fbd08621be013a1cd5e3509c8cde0e155fd45ca6bd000d69cf7ad7ed787011b6c47851c4f1403b6d5808e SHA512 1ad53f70219c0b57ad19ee1b242709b8e0721dc45a6f73f61553b602247e8a64a1c3896226bac977a795aa7c0fb83fa214d1ad1d6ccb6dc3bbc4228f33fe89b0 DIST checkpolicy-2.9.tar.gz 68735 BLAKE2B 092b7b67ea952be6a829529249f0b209c31245490f263b248cb0208d9f1f4ec922522791c6555c0b913b56b8a0037bfde54a3511940f0be287f13e3a193c8f26 SHA512 8dafdd871c5fd32023883149c74891279c386cc87d70cbfc6f0a8dcb0406f17f1158f9078c1b35892a0f0edcb6b5208a031594ab80898eec016ad765ad046e03 -EBUILD checkpolicy-2.7.ebuild 1232 BLAKE2B a2375ca69a96de38a648904261277d54222ef50fcef3722deaa9430995c62a8adcd24cc06a9b86b868f932d95b5acb27e076115ad73b0e76f6e9630f37e3e38f SHA512 b671810da7baedcd74e6456f53cdd63afdf73cbedab7d5f942023534d863aef4d536ff8e6acf370964352707a86c0b72bd3530601025aa27f96395b29ff3c1f8 EBUILD checkpolicy-2.8.ebuild 1187 BLAKE2B 1114b1ac3e3591dfc7b1d68d3ddba13e693283e0cf1cf11f8947e49c62b35e520ac85fc0c014b335d31642585c3dc7385b6812964d2d6f329d9fe9913f1e0d50 SHA512 9e2e4cefd22c41bfe102048f88d84883238c826cce1fd186bf4ad0a95d7cbfcde3be1db446f9aab23859e72292efb919882681a2bd984d3b3696d1f9595d32f7 -EBUILD checkpolicy-2.9.ebuild 1169 BLAKE2B da040fe75e5781f417358ba7f94048df9571ad6729ee80fe25d3daf7dfa596cf4ca04b4dd32984c3858ffd549c0f0ac36b8a595f3261d915f808305b80629e05 SHA512 5bf62badf49b4c33268b56660e0d9ac86d3fc8372311fcf27021691361da519c43269eb1e62bd46eb8307a59019793ba71a706303c3973c7290c2abb2a246a1c -EBUILD checkpolicy-2.9_rc1.ebuild 1169 BLAKE2B aceea7226388d4e727a783e231186bd397473af88d0b2639240361bffbf16f83ad784adcdb792f3c2e1e980260997f095a757610666029f7c052315098222602 SHA512 aeacea41c9dbf261a467842e8db5b1b4c5dbbe7d644da0677c6ad56f10c22ef0c59ed0a98f1a131573ed0f21750df5b555175a1133fd4d33f7570f59f2201470 +EBUILD checkpolicy-2.9.ebuild 1167 BLAKE2B abc8401583d733530e3673cfa96c3059a8c3041578754fe745fb7850bbf92b852cac3458cbd0bbd550589e9830087d36c8e408d094be02a74d6ff396646deee9 SHA512 739189cf5e8d475e2eb3db2a3c323b32e03d4fff9b7684da149fe1d8470666d2359ca91470578ec0aec8b2f6d0c8e865c16016a0187b8eb2fbd0b8a62a2bce66 EBUILD checkpolicy-9999.ebuild 1169 BLAKE2B da040fe75e5781f417358ba7f94048df9571ad6729ee80fe25d3daf7dfa596cf4ca04b4dd32984c3858ffd549c0f0ac36b8a595f3261d915f808305b80629e05 SHA512 5bf62badf49b4c33268b56660e0d9ac86d3fc8372311fcf27021691361da519c43269eb1e62bd46eb8307a59019793ba71a706303c3973c7290c2abb2a246a1c MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb diff --git a/sys-apps/checkpolicy/checkpolicy-2.7.ebuild b/sys-apps/checkpolicy/checkpolicy-2.7.ebuild deleted file mode 100644 index 812e63ad518e..000000000000 --- a/sys-apps/checkpolicy/checkpolicy-2.7.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -MY_P="${P//_/-}" -MY_RELEASEDATE="20170804" - -SEPOL_VER="${PV}" -SEMNG_VER="${PV}" - -DESCRIPTION="SELinux policy compiler" -HOMEPAGE="http://userspace.selinuxproject.org" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER} - >=sys-libs/libsemanage-${SEMNG_VER} - sys-devel/flex - sys-devel/bison" - -RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}" - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - YACC="bison -y" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" -} - -src_install() { - emake DESTDIR="${D}" \ - LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ - install - - if use debug; then - dobin "${S}/test/dismod" - dobin "${S}/test/dispol" - fi -} - -pkg_postinst() { - einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy." -} diff --git a/sys-apps/checkpolicy/checkpolicy-2.9.ebuild b/sys-apps/checkpolicy/checkpolicy-2.9.ebuild index 76dc1f3e8240..7d2cafef77e8 100644 --- a/sys-apps/checkpolicy/checkpolicy-2.9.ebuild +++ b/sys-apps/checkpolicy/checkpolicy-2.9.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then S="${WORKDIR}/${MY_P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~mips x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-apps/checkpolicy/checkpolicy-2.9_rc1.ebuild b/sys-apps/checkpolicy/checkpolicy-2.9_rc1.ebuild deleted file mode 100644 index 529d55147c22..000000000000 --- a/sys-apps/checkpolicy/checkpolicy-2.9_rc1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -MY_P="${P//_/-}" -MY_RELEASEDATE="20190125" - -SEPOL_VER="${PV}" -SEMNG_VER="${PV}" - -DESCRIPTION="SELinux policy compiler" -HOMEPAGE="http://userspace.selinuxproject.org" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER} - >=sys-libs/libsemanage-${SEMNG_VER} - sys-devel/flex - sys-devel/bison" - -RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}" - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - YACC="bison -y" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" -} - -src_install() { - emake DESTDIR="${D}" \ - install - - if use debug; then - dobin "${S}/test/dismod" - dobin "${S}/test/dispol" - fi -} - -pkg_postinst() { - einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy." -} diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest index 2311024b7eb5..cc6c8b78eec6 100644 --- a/sys-apps/dbus-broker/Manifest +++ b/sys-apps/dbus-broker/Manifest @@ -1,11 +1,20 @@ +DIST c-dvar-7c0833f9cae446163077b204b2296287bbee7c67.tar.gz 24727 BLAKE2B e18de53ac8014e77cffbcd9c71230847db0055e43e54b5cdfc3f48367570878b34d6fc7c299e4312708455ef2fa4ddff9fa5b48b603a05d6fbe28ce84e5e5906 SHA512 a006bdfc8a5a8e9a803ffa29f152858cb699cbf0e59d4f0550a4736ad29f85cfdef6bd8ef3cfbe8770045c76ed092db00c7338d62a8b0cd54ae5bd03f1c8b422 DIST c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz 36281 BLAKE2B 4a1ee57e1aeec5010bd5b84d355aa94a923dc6e03f5cd1b58db3af9b64f15e9e565a0930e9e1d8ca79602ac7e366a3231ed66d7a2429b0ff769e0c3428742493 SHA512 b77ce063fbaf92d3ee4462eb440229870fe3bb41ea3d02e79502cca48eb8983da4f8e3d6fa29fb2f066879af0d7e9166e0105ca56d1ff12d47f2592f2be1b2e2 +DIST c-ini-847c55f5b3d33baa47af9a1286175d58b34f91d5.tar.gz 14094 BLAKE2B 49ac949d4fc46ec63f253d48921be0acd585b3d301d56144e9477baaf81a0cfb3fb5f0706d1673c921962d1bbbeb89b2d83e07dba9265dff7b1f57da6059eaef SHA512 eec3a4d2a3e1a4d9d65385b2e3cfd87dfb482b365731bc15f989faa59fb7f2c6e88abcef6612f3718817b1d1953f12fcc9981fc36b01fa82d3146305e24eaa16 DIST c-ini-979a18fdd59f05f927d6cdf624d8ded6f81c6776.tar.gz 26116 BLAKE2B 23d6feca93bd48905745c8ab0ae5798be315e79fe189e1f8d181922db0a2cfc9cbef8e250796bdabd46fe8cd434010912ddffbe280f99a0967a6ef0ef68e263b SHA512 a17f1202ee019814251d0d4225ce41fad471cd7d40f2f0c1f80415562019305cdc98f903f37e47a1493f7d135b656210b61b0718a0d19d65ecbb0d24496e785a +DIST c-list-2e4b605c6217cd3c8a1ef773f82f5cc329ba650d.tar.gz 9383 BLAKE2B 70f8ed083a784a08da3b5d5fe75709cf9dcbaaee523ab9b1cd3b36931f5bb0c1e920cc38561c002f4de2efeda7b4edaf9b5fb9411f0fcd8aa1055ab966066789 SHA512 4db91e8af837d6739b9becbc2b405300e2006a82e39c01ade015eabf39ba550dc38879e800fd415bc5fa4ac220090cfdfa3a13d4f748a1278e51544c4a6183be DIST c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz 21457 BLAKE2B cec1ffbc7591479c8a7b1fbbfbef69a8dfc8b756a864f31910202967be431027d85191b4f412f04507152d5d81113e3668ab1e22319547607d21a139f75ea4a5 SHA512 0b0add65248cd17a5d3c52adf3f709ce8a7c5739f153516fb9577b0a44b709242b3571637efbaa0f78f0afba2691ec0993561b1fb643df4d1eb6a45167f50473 +DIST c-rbtree-b46392d25de7a7bab67d48ef18bf8350b429cff5.tar.gz 26065 BLAKE2B ec5486b2e1b9b835a3aac42b9f87275bbdbc73cdb0698304db01a80f0d52bf542b8df56d6e58bd98cbceccee9418d7115e90605c8077ac8670b6326304806c9e SHA512 8177c111390f8491a3b535ec5a3b8de13a3b9d0358166494e503d68bd5748dae0cd2b092b0311258be885ecbeee2bb83a2389d9734bc28e4f78e85de3ed9b3f5 DIST c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz 37838 BLAKE2B 5c40f444f43cb2f76c60fbd3ecedfb084ca39e90db9a297d630f6ca8ef931e52917e1ef1bd310d1024b003a37214d6549dce6f3d2b49f9b7e1f19441d04c64fa SHA512 6ac8e0eb7b704e2dfd1b69f9dd20ad08d490d13bcf7198d30825d5c8fb20d001998df3e5beece7346a1bda4341c900f63e3c67da9648ea8492607851946a1265 +DIST c-shquote-34e1e25299fb82ab9fd0c8bfd8a66010ead1497b.tar.gz 10824 BLAKE2B e2cc32acdb83a9d2c759d5068ef69feb4b0fbcdf908bbce08c9229c26dc1d1d421e522b844232328b62af851ebb93cbdc282be04b26ec04e327eb59e9e5173c7 SHA512 8f5ae3554239d42ec50b093f81b13715a55215b406a2000853da5a8581a11650ba1020f06eb8f7551d0ec372e786ea6cc56c2c803d0fc86d016db69895b391eb DIST c-shquote-b7e325c7ff098787f2937dd91597677374f038b6.tar.gz 22764 BLAKE2B 9fd0c7e17c7dc3614748e54125bc04d34c03c97f6ee148c66e2398827872e005aaff3326fdca32e01efcc04efdcc735059070e50fb0b5a5a6cef80e271110fde SHA512 1403bcc57f45df33509d7e9c03e964cbdbc5bb8dc3c853e6fd6bcebe304bf7c21e4f887ed471cd9cb4a8aa6000d7017e8ae02adfdbb43cdeac6415a15f29fa40 +DIST c-stdaux-11930d259212605a15430523472ef54e0c7654ee.tar.gz 13215 BLAKE2B f8022583c224e911ecf65f10f1ada2ae631f0dca1c0306c113a2ad1b6a996ff4fa45eba14fafa5146feabebef0ae9e275a46fa0bb78af454fc37e49c465c7e3f SHA512 7c0a5d1266462482674f9fc98ba19af65566d638e7a407969de9ccb66d5884692e0562c16b37e64269919e5c0d0c2a8ffd147e88159b9226f1bb738d460b78b8 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e +DIST c-utf8-34f5df0f4b28fc7ea6747680a432e666047082e4.tar.gz 9480 BLAKE2B 206d1b74a187e56cc1dbc6a657eb0935cbc4bf5344d4567b5aa99f0f3c559eb442e6ba2f05647f6fff1244874d64aca36062ddd290e368c4ca933802046165d8 SHA512 5b6c0de7d5b3f2a563442ca139ee1ca788a137cb0f5eede6c6e190e748dbe39b3489a2446682e1049dd6c91fdafff7743c819113eaedf370f4c3b1a28e97b22a DIST c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz 21611 BLAKE2B 17ae3aa209361629e02ddd8d2725da85cf54c06d8c27ff706d736b130a854711efbeacce87f4cc20703dbeb8479efc6c4e67e9196d65b0f92e41a67a6d0cf987 SHA512 c868587efc0d14ff13525edcb4149f84fb9ac7a4cd7ef5e29fed9f374436c36ff318d54a4d2555874ec06ec60b40eb6399ada1fb32daa023727694d0a4a6190d DIST dbus-broker-18.tar.gz 190294 BLAKE2B 0af9646183ac0942b5137a93ee2d1ccfcb7e59c34ef17566c52afa51f0b4b408a8f8a5864865528c12a448a7dc08a6ed1fc50e187b28023e0955b20788a52844 SHA512 fa175fb64b70e9c46ad6527bc0c3793929b1813cca81e55c358a09fd997de33bab3fc430ef943b9d57eb5cf66dfa52f42cb94a0d3a465ceba37ee78b1c0bd33d +DIST dbus-broker-21.tar.gz 203390 BLAKE2B 9024c5545b4a09ce43ef44f7bc78ceb52407047f88f73575c60b5ddd6f4fa188c0f65c23d787c91679d1ab2a07f8e19fa06b8a1b60b327a0cc8d79a6006ba50e SHA512 527a8b5f27458a6443c7a5ad33ac39e4e31b32348a3b4cfd6679acd9de635add272f182fe8f72b493e0812ff6e07523a35e53507f3656d05b56705ed8a00e643 EBUILD dbus-broker-18.ebuild 2422 BLAKE2B c0cde0ded44a524006d55b46ca6c2ff64f85948ffbd008e5788c085b25d66aa02834ce55313aa08630d86df012b9618dff81db78c55ac89a2ea4183e0433e9ee SHA512 652da9f7d80fbfd991ee73f9ad37a371e69983bc5732a6b0c475f2f610f3b35b679610329a0a7b829a598367374fb1ec19c075e9a00df437dbf15d3116f4e550 -EBUILD dbus-broker-9999.ebuild 2422 BLAKE2B c0cde0ded44a524006d55b46ca6c2ff64f85948ffbd008e5788c085b25d66aa02834ce55313aa08630d86df012b9618dff81db78c55ac89a2ea4183e0433e9ee SHA512 652da9f7d80fbfd991ee73f9ad37a371e69983bc5732a6b0c475f2f610f3b35b679610329a0a7b829a598367374fb1ec19c075e9a00df437dbf15d3116f4e550 +EBUILD dbus-broker-21.ebuild 1844 BLAKE2B 09306a2563bb18aab2b8376962198397f1ea450235c05db49c928f4aa844c6685cbb48ad434c71299411c4a67cdea0cb02868731e7daef673c08ceae778f4751 SHA512 6400d4d07978c6ccfd57dd87098ee969b534b3b4f2e5b495e091f8b9e2a667f81104815cd62812fced0360b49812bdafe14e6124497faa8048d372278e4bf606 +EBUILD dbus-broker-9999.ebuild 1844 BLAKE2B 09306a2563bb18aab2b8376962198397f1ea450235c05db49c928f4aa844c6685cbb48ad434c71299411c4a67cdea0cb02868731e7daef673c08ceae778f4751 SHA512 6400d4d07978c6ccfd57dd87098ee969b534b3b4f2e5b495e091f8b9e2a667f81104815cd62812fced0360b49812bdafe14e6124497faa8048d372278e4bf606 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1 diff --git a/sys-apps/dbus-broker/dbus-broker-21.ebuild b/sys-apps/dbus-broker/dbus-broker-21.ebuild new file mode 100644 index 000000000000..b54197dd4535 --- /dev/null +++ b/sys-apps/dbus-broker/dbus-broker-21.ebuild @@ -0,0 +1,76 @@ +# Copyright 2017-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz" + declare -Ag SUBPROJECTS=( + [c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67 + [c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5 + [c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d + [c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5 + [c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b + [c-stdaux]=11930d259212605a15430523472ef54e0c7654ee + [c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4 + ) + for sp in "${!SUBPROJECTS[@]}"; do + commit=${SUBPROJECTS[${sp}]} + SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz" + done + unset sp commit +fi + +DESCRIPTION="Linux D-Bus Message Broker" +HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="audit doc +launcher selinux" + +DEPEND=" + audit? ( + >=sys-process/audit-2.7 + >=sys-libs/libcap-ng-0.6 + ) + launcher? ( + >=dev-libs/expat-2.2 + >=sys-apps/systemd-230:0= + ) + selinux? ( sys-libs/libselinux ) +" +RDEPEND="${DEPEND} + launcher? ( sys-apps/dbus )" +BDEPEND=" + doc? ( dev-python/docutils ) + dev-python/docutils + virtual/pkgconfig +" + +src_prepare() { + if [[ ${PV} != 9999 ]]; then + local sp commit + for sp in "${!SUBPROJECTS[@]}"; do + commit=${SUBPROJECTS[${sp}]} + rmdir "subprojects/${sp}" || die + mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die + done + fi + default +} + +src_configure() { + local emesonargs=( + -Daudit=$(usex audit true false) + -Ddocs=$(usex doc true false) + -Dlauncher=$(usex launcher true false) + -Dselinux=$(usex selinux true false) + ) + meson_src_configure +} diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild index 12db86f7f160..b54197dd4535 100644 --- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild +++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild @@ -9,23 +9,22 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" else - dvar=9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46 - ini=979a18fdd59f05f927d6cdf624d8ded6f81c6776 - list=dda36d30c7d655b4d61358519168fa7ce0e9dae9 - rbtree=bf627e0c32241915108f66ad9738444e4d045b45 - shquote=b7e325c7ff098787f2937dd91597677374f038b6 - sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769 - utf8=b245df543717ee19ad398f8139447e3807c11c96 - SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz - https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz - https://github.com/c-util/c-ini/archive/${ini}/c-ini-${ini}.tar.gz - https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz - https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz - https://github.com/c-util/c-shquote/archive/${shquote}/c-shquote-${shquote}.tar.gz - https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz - https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz - " KEYWORDS="~amd64" + SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz" + declare -Ag SUBPROJECTS=( + [c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67 + [c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5 + [c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d + [c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5 + [c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b + [c-stdaux]=11930d259212605a15430523472ef54e0c7654ee + [c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4 + ) + for sp in "${!SUBPROJECTS[@]}"; do + commit=${SUBPROJECTS[${sp}]} + SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz" + done + unset sp commit fi DESCRIPTION="Linux D-Bus Message Broker" @@ -35,7 +34,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="audit doc +launcher selinux" -RDEPEND=" +DEPEND=" audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 @@ -46,7 +45,8 @@ RDEPEND=" ) selinux? ( sys-libs/libselinux ) " -DEPEND="${RDEPEND}" +RDEPEND="${DEPEND} + launcher? ( sys-apps/dbus )" BDEPEND=" doc? ( dev-python/docutils ) dev-python/docutils @@ -55,14 +55,12 @@ BDEPEND=" src_prepare() { if [[ ${PV} != 9999 ]]; then - rmdir subprojects/c-{dvar,ini,list,rbtree,shquote,sundry,utf8} || die - mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die - mv "${WORKDIR}/c-ini-${ini}" subprojects/c-ini || die - mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die - mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die - mv "${WORKDIR}/c-shquote-${shquote}" subprojects/c-shquote || die - mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die - mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die + local sp commit + for sp in "${!SUBPROJECTS[@]}"; do + commit=${SUBPROJECTS[${sp}]} + rmdir "subprojects/${sp}" || die + mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die + done fi default } diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 745d79cf6f52..495545f82667 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb -EBUILD dbus-1.12.16.ebuild 7849 BLAKE2B ed08491929414926f5b682dd4eba4935907ba0cba7b6d0fbad81a2f0e72ec6d2d91743653be4722e01c3671368cf02ae4d327ba9e55c144899b45623bccc9039 SHA512 885ad24294ed78144f7524fbdb3e816277b55391c1201e44949fef1a442d84013371a873d3941a15de5412e642544663cb603b25859ac7bd538d8b630c3ce3db +EBUILD dbus-1.12.16.ebuild 7824 BLAKE2B ea8d684e5ff60195293b2290041cdf97e9d1127a53225a70e59dcade964dbf387ef85407b1e19023e737b3818d263b2feaa2c109f71112dfaeb49bdbb9376939 SHA512 5775687d3abe56da013cf8ced6ee8acf8e1c042ebf072ed1179484d21b37990b1bb1fc4cc3c5b94356be943f7c533f8cef2a9c2b7e9a22ef5c4c9980f795801f MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738 diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild index 017661595eb1..c32f5abc2930 100644 --- a/sys-apps/dbus/dbus-1.12.16.ebuild +++ b/sys-apps/dbus/dbus-1.12.16.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal +inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal DESCRIPTION="A message bus system, a simple way for applications to talk to each other" HOMEPAGE="https://dbus.freedesktop.org/" @@ -18,6 +18,7 @@ IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-sessi REQUIRED_USE="?? ( elogind systemd )" BDEPEND=" + acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 sys-devel/autoconf-archive @@ -42,6 +43,7 @@ DEPEND="${COMMON_DEPEND} ) " RDEPEND="${COMMON_DEPEND} + acct-user/messagebus selinux? ( sec-policy/selinux-dbus ) " @@ -59,9 +61,6 @@ PATCHES=( ) pkg_setup() { - enewgroup messagebus - enewuser messagebus -1 -1 -1 messagebus - use test && python-any-r1_pkg_setup if use kernel_linux; then diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest index 99747f171faf..d69f120fbef5 100644 --- a/sys-apps/dstat/Manifest +++ b/sys-apps/dstat/Manifest @@ -1,4 +1,4 @@ AUX dstat-0.7.3-skip-non-sandbox-tests.patch 705 BLAKE2B 3a20e75fd1aaed47d02066b7c889c13b4e1d8a2f8fd9772973d99736eb7cdf1fa9b8c04126beace166a6ac65de5de8743b904e9fa20d60a3aeae706f7ca41d18 SHA512 efa1c6a807efc7fabf8566ec446be94922e1fe78191101648dc066f107474f1b89c4c8cac51d6d1ba7d4b1061ce0358abf317761ce52199479667da1684f0929 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2 EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0 -MISC metadata.xml 943 BLAKE2B 3eb8757b717c959a6b187ae40393e737ac93941fa579095e7b73dd71400be60f3c75deb316b2509029bf369abb10ac5aae16bac306fbdbe480109d81088ef34b SHA512 6f6a07f819f8b710ce19a5ff28f3c1655a158a92cb2ccd05deeb3840c15702ca9d727e2c39d32ba8c9b52a8f45bdfe3c10da6241495c793aaf95564bab9ea0a4 +MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9 diff --git a/sys-apps/dstat/metadata.xml b/sys-apps/dstat/metadata.xml index 97a18fb59d10..4ae294d3be22 100644 --- a/sys-apps/dstat/metadata.xml +++ b/sys-apps/dstat/metadata.xml @@ -18,9 +18,6 @@ compare disk usage in combination with interrupts from your IDE controller, or compare the network bandwidth numbers directly with the disk throughput (in the same interval). - - Enable wireless network functions - dagwieers/dstat diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index eb949ab87139..80ef9a726146 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -8,4 +8,4 @@ EBUILD etckeeper-1.18.6-r1.ebuild 1775 BLAKE2B 6b957febafaa09290c02a9946f9745ce2 EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795 EBUILD etckeeper-1.18.7.ebuild 1866 BLAKE2B f04bba588be503ba8d6acd96aeee63a39c60fe9463477cee3f1d45fc6a70fb43c067996d22172521f1ec25118ec1fdbf8b53d06443c45b4e450fdfab000d63f7 SHA512 e2e44061b211a5278e0bcabcc42a88ba5c46f09fa02d40d10b84369430e4d27977237c900b26f615e297bc70f7c58061d7dd03d05a3b6fadfa2ff6d90d5ec045 EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b -MISC metadata.xml 980 BLAKE2B c3c6a13f0b45eddef29c767f55c739298f6554e94f444723e19d6b93dd9af2bfda7aabcf8c6d0e56fba482b4067a2130c4474373708652eb9d8216119177fd7d SHA512 41d4b97b4073278af7543cd459c1c5bcfc951bdb6a6c2a201cba6cdc0e0fedc640fca5d9e59041951315a961f5eea284eb3c12260148bfbe97c11ee15b11ad9f +MISC metadata.xml 778 BLAKE2B d3291ffd8dacecb55cbb2798c9bf98b8eb361bd0c82e2c440868757604edb98145ed04c3446ca92e9b18564a1a53f7b0fbbb94cf51adcf19ebcb9162086690f1 SHA512 49f78f732de99b82fad3f3ec6915d15f2050d9f6f1382a74221aa5608efc76b8e5e908d0f51a276afb8b28bec9d8291454695b3cd70314ad8836f444a03b2735 diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml index 380a1241b6ce..8d9bc56c585d 100644 --- a/sys-apps/etckeeper/metadata.xml +++ b/sys-apps/etckeeper/metadata.xml @@ -1,14 +1,7 @@ - - m.j.everitt@iee.org - Michael Everitt - - - proxy-maint@gentoo.org - Proxy Maintainers - + Support dev-vcs/bzr based repository diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest index f1a4ebd4ab95..ad115ef87ad3 100644 --- a/sys-apps/fd/Manifest +++ b/sys-apps/fd/Manifest @@ -56,5 +56,5 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -EBUILD fd-7.3.0.ebuild 1861 BLAKE2B 3bccc82e48af260438ea4ba5d4057c9cdaa1805ce8c255f4c092daf46c46e7e3e6e8003803eecd55cc443ea59d00cb482fefa9ca8ddf6772193085c178dbf6b5 SHA512 631c7453570bd84d63da2dc2ac39c09175d5c2f8ba782844183fa081c9a29e391cd394c6f55d6236094da831c159342dba6d179e8bac77642b0ad6995e10b256 +EBUILD fd-7.3.0.ebuild 1868 BLAKE2B bc79abf657fe85127383cf566edd9ed978fe428d4008f2e6c1d08fe47e52fd19b55d0639e3c05e0fa5ca878605e2f807fea7c709c7f968e14c9f483c1861864b SHA512 c5182249c93f901180f853d878c0c04c59008e8456bc4e91bdfedc61cc352f5c063c4216c8f5178724a55fe441f4e740f61e93f05e407da03fbba664183ba1ac MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758 diff --git a/sys-apps/fd/fd-7.3.0.ebuild b/sys-apps/fd/fd-7.3.0.ebuild index b3c4bb938174..f617c8de21de 100644 --- a/sys-apps/fd/fd-7.3.0.ebuild +++ b/sys-apps/fd/fd-7.3.0.ebuild @@ -72,7 +72,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="|| ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="" DEPEND=">=virtual/rust-1.31.0" diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest index e2b35f990e6f..b336da95319b 100644 --- a/sys-apps/firejail-lts/Manifest +++ b/sys-apps/firejail-lts/Manifest @@ -1,5 +1,9 @@ +AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7923e6db1bad7b414054c1c83842a23cf56b4f3b51878bfbd37cb8bdbbf8c1890a72e37082d834a4d9b51539045030df97a94edf05fa SHA512 c43f5872a50d73febbfba0daeb815b42796ca241faeb3c9262c861b02e5952e5f3c65d84c041275172d87ff831f44dd47c2cd0031901c020090a84e1654ef983 DIST firejail-0.9.38.10.tar.bz2 159476 BLAKE2B e0ae02cd2b3feaf5d9e3e799d720f5a635ed4e3b6fca7041d0795ea09a3563bfece1cc42c391df65f05cf55199b97ae354092c2c2bb48f108ed2e2be4513fb3b SHA512 61a41655a46031c34f44f7f24e3c5369e3187edc10cb091b0d429ead8d367e79acdaa4bb41573cdf733111ce353fc91efe51cb95e331ad7c2fdb639a60e194fb DIST firejail-0.9.38.12.tar.bz2 164962 BLAKE2B c89252548c70e347c6a841a8460501622fb6aa1f264e0458918bf903c94d84f6a9dc5eaaa2ea678e2754c277a3074cfdc3df7c9602ab0a4f4f867348a8c5cc92 SHA512 d0d6e81d9dbf404c653914bbbdad95caa3ce69ee6d5082cd30c60c0ddad02a2f0c2535bf15b6fcf68a0e4a5a738806fdd738407adbd5dd57eb289827f4cc487d +DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a EBUILD firejail-lts-0.9.38.10.ebuild 734 BLAKE2B 2d3797be4ba77f171452cc2c8b13f4eb1e3a9ddda7461349c863342d9fbe51dcc6ac4a8118676a311bdd59b6ba34b080ae8fe7d17699713fd607c47ba321ff6c SHA512 182d12ca0dcb10a125f7feebe5ecb3d18887bdac555dd470aef6e11bd60a01a6ff3c33a00b6e4ca1adf5ca3de1e062eab59cb802b8ff6dac8e6726e117401ec4 EBUILD firejail-lts-0.9.38.12.ebuild 735 BLAKE2B 9cc47a2b6a6538f8b61a3d5b6c4cbf9f4c6f4b505b04a8a7567006a8d54b84cd0288b1801aee72fbef0ab63cab90a6aeb7c92a9e5fe1a8bba738399e5cc77b26 SHA512 e0b340593f6b0afe5e04e4af2c1e7984f145dde6b363edd81c01e21fcaddba4b05165c35226ea3a65b938981ad898c977596652816f40541f871606134224ab9 -MISC metadata.xml 826 BLAKE2B 7986df4f06bf548de16715079b0e8c9fcd43867e7579595188da3be6674b2a8025784d273cbe73ca5c9a5eb2522981393c1d874d8c32e6057f06d2b106e43442 SHA512 03ea8bd5d1ac7b658a50d4900966a1b23c16f9a9f7c8685f2752ad3ecb3d81d973185093cc13ce6d4367ad1370e4081338614bf5aa17dbc66ec516fdaffc7ee1 +EBUILD firejail-lts-0.9.56.2-r1.ebuild 1238 BLAKE2B b0a897e953c6ef24cd1d1822d613ea6b8359baea67b8f3b4ce1f392ca666a4acbe843475124752b680daaf85f820d8f35bb3368ad7a06cee467a2c1dd0f62381 SHA512 d52904049477f591ded912b694263fe0f1776a48653c634072baa03469b7290f8866f452ad42dbb1cd0f7747f3d55e42f844205f5e4ecbc20c03b4b166016904 +EBUILD firejail-lts-0.9.56.2.ebuild 1175 BLAKE2B 2cf26b3011994054a66a9b64f273b32a9f200dd69cf7d4c1a823bfcde3175a48a1ba6e9835f862bd819a74b1ed6b67258ba0e282b76ba5e58d4ec36cea94a848 SHA512 a7e783dfdf09fa22dfc0f14f8f5538a21dfafb7d5ad3bd41ac2dcce460fac807ddb8e03818bcadd41048254f9a810f60a64aa85caf18aeb094f6c4f9aca256f3 +MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1 diff --git a/sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch b/sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch new file mode 100644 index 000000000000..313c1c2a9dd3 --- /dev/null +++ b/sys-apps/firejail-lts/files/firejail-lts-fix-compressed-manpages.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile.in b/Makefile.in +index 9dafb56..4117468 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -127,10 +127,9 @@ endif + install -m 0755 -d $(DESTDIR)/$(mandir)/man5 + for man in $(MANPAGES); do \ + rm -f $$man.gz; \ +- gzip -9n $$man; \ + case "$$man" in \ +- *.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \ +- *.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \ ++ *.1) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man1/; ;; \ ++ *.5) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man5/; ;; \ + esac; \ + done + rm -f $(MANPAGES) $(MANPAGES:%=%.gz) diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild new file mode 100644 index 000000000000..831a680daa5e --- /dev/null +++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Security sandbox for any type of processes; LTS version" +HOMEPAGE="https://firejail.wordpress.com/" + +MY_PN=firejail + +SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist" + +DEPEND="!sys-apps/firejail + apparmor? ( sys-libs/libapparmor ) + test? ( dev-tcltk/expect )" + +RDEPEND="apparmor? ( sys-libs/libapparmor )" + +PATCHES=( "${FILESDIR}/${PN}-fix-compressed-manpages.patch" ) + +S="${WORKDIR}/${MY_PN}-${PV}-LTS" + +src_prepare() { + default + + 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 +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable apparmor) \ + $(use_enable globalcfg) \ + $(use_enable network) \ + $(use_enable seccomp) \ + $(use_enable suid) \ + $(use_enable userns) \ + $(use_enable whitelist) + +} diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild new file mode 100644 index 000000000000..58dc1df4e153 --- /dev/null +++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Security sandbox for any type of processes; LTS version" +HOMEPAGE="https://firejail.wordpress.com/" + +MY_PN=firejail + +SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist" + +DEPEND="!sys-apps/firejail + apparmor? ( sys-libs/libapparmor ) + test? ( dev-tcltk/expect )" + +RDEPEND="apparmor? ( sys-libs/libapparmor )" + +S="${WORKDIR}/${MY_PN}-${PV}-LTS" + +src_prepare() { + default + + 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 +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable apparmor) \ + $(use_enable globalcfg) \ + $(use_enable network) \ + $(use_enable seccomp) \ + $(use_enable suid) \ + $(use_enable userns) \ + $(use_enable whitelist) + +} diff --git a/sys-apps/firejail-lts/metadata.xml b/sys-apps/firejail-lts/metadata.xml index b1d77ccb9cfc..74406c739693 100644 --- a/sys-apps/firejail-lts/metadata.xml +++ b/sys-apps/firejail-lts/metadata.xml @@ -1,22 +1,29 @@ - + + expeditioneer@gentoo.org + Dennis Lamm + - Firejail is a SUID program that reduces the risk of security breaches - by restricting the running environment of untrusted applications using - Linux namespaces and seccomp-bpf. It allows a process and all its - descendants to have their own private view of the globally shared - kernel resources, such as the network stack, process table, mount - table. + Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of + untrusted applications using Linux namespaces and seccomp-bpf. It allows a process and all its descendants to + have their own private view of the globally shared kernel resources, such as the network stack, process table, + mount table. - This is long term support branch of firejail. For bleeding edge version - see sys-apps/firejail. + This is long term support branch of firejail. For the regular version see sys-apps/firejail. + The code base is approximately 40% smaller than the regular version, + providing a smaller attack surface for the SUID executable. - firejail + netblue30/firejail + Enable support for custom AppArmor profiles + Enable global config file + Enable networking features Enable system call filtering + Enable attaching a new user namespace to a sandbox (--noroot option) + Enable file and directory whitelisting diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest index dbff4bd257af..837f51fc51e6 100644 --- a/sys-apps/firejail/Manifest +++ b/sys-apps/firejail/Manifest @@ -1,10 +1,8 @@ AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889 -AUX 0.9.56-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889 +AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230 DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d -DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df -EBUILD firejail-0.9.56-r1.ebuild 1043 BLAKE2B dc1d81125051047c0d0a8b253adc439f1e407435efaaa97411b31a2fd9c8135a459426cf0a40c0dc7f94353506434da60d18890903bc02b6221cc097645cc31b SHA512 894b1503497f7a63823680c90f06de25f8100036b3b5c5742b84921dac420abf9f678b59afd66d04e96aa577d94977cd5eb19cc1d7107174840e57025473b5a5 -EBUILD firejail-0.9.56.ebuild 1080 BLAKE2B 3b582b3ecd88c9ec67bb8033c3d5c545e01a9f9e8121ca4986131d786dff15150f27d3d61942b41b590f9e21e643cd6f2695247c6f3b251809ae5cea046e3ecb SHA512 136fcf1f21e23427766e2580c2b94702700d7cc4bde298a28c4cdd82d47425f30dc84123434229e1a0d71d231565e3904ecb0438fcf19293b8699af9ef80490c -EBUILD firejail-0.9.60.ebuild 1444 BLAKE2B aa0d758ee3e7e4582736eb60445ca62ff47a397f1432c8653448e0e67a20b2e9d3fbafb69c1675c87256f52d8f84564d59a6855fbc9f64c7601124f4743f06f0 SHA512 58a264fe9b11cdfb00eb3ff1b9b4117b2abcbceb4d9b0ddd48e998e03d4ab79b0b888b4344de95e4ad64257706604d742b9b15065ee03326387dac59fdccf2c0 -MISC metadata.xml 1834 BLAKE2B 8c8e167dd5cc7b3ccf6d65ef6766f52631bc569676b0fe0fa6527af5c6d2fb2d003c368a484a7e6dff06a601d0b53a120eede324f6cbd7d7871d9bed6748a80b SHA512 76799530328fc5d0341493a0633edf2b7512f2c9e99999f5b0f85b1d864c155ab2414e1ff3fdad9f15677b2cb5b54e9b01ac7cd20c107f40e0036c6047ac7934 +EBUILD firejail-0.9.60-r1.ebuild 1740 BLAKE2B 14fe571b2acabfd6623cb3eab1dbfb79d2909b07aa3036d08534eacb08e88634f4ec005363017b3bed9315f5dba2388356ad16102e0f357883869d426b50b264 SHA512 e913417f982a39906b2c0eee5bd1956a3291dae3489fad13944057cea04fe8c606cfc74b2c344aaffd4a278e5e0ea55ed33414c7817e88506ec7cb9725ad4b02 +EBUILD firejail-9999.ebuild 2138 BLAKE2B 5f5134f7714330077f997a1d2714204dff80c4f41ed204ebc6d0e84c728e2d55b292b0bbad79903d01725492b4d9a45454948a8b9967379e694f82e49712ec1b SHA512 74426f3056a37ef9e9f8d430deafc9af15ba6957fef58cf0e43fdb9edf4321971ef92136c8261e528d53efba9602e304bf72c7096d65ba872808db0fe8e6d9c3 +MISC metadata.xml 1839 BLAKE2B 89a65b4a6f02a94778bee8b4fadb9b54cfb1220407f5fb256e7b0bb0a439a10069d7c84470be6a12ad478413eb2563b5f18f8cea0c60a11fb6582c94f991c06f SHA512 539f6f95e5df4bd194a473e140205414620dfa47d0be1e51a3557b04f3185b8471d6f378b9dc661c41f1cb04962810b1276f79477377f8f0880171a2b0f47b9b diff --git a/sys-apps/firejail/files/0.9.56-contrib-fix.patch b/sys-apps/firejail/files/0.9.56-contrib-fix.patch deleted file mode 100644 index 7192bba34807..000000000000 --- a/sys-apps/firejail/files/0.9.56-contrib-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py ---- firejail-0.9.48/contrib/fix_private-bin.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fix_private-bin.py 2017-08-27 23:19:52.868481040 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - - __author__ = "KOLANICH" - __copyright__ = """This is free and unencumbered software released into the public domain. -diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py ---- firejail-0.9.48/contrib/fjclip.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fjclip.py 2017-08-27 23:19:58.476562539 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import re - import sys -diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py ---- firejail-0.9.48/contrib/fjdisplay.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fjdisplay.py 2017-08-27 23:20:01.932612762 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import re - import sys -diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py ---- firejail-0.9.48/contrib/fjresize.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fjresize.py 2017-08-27 23:20:06.932685422 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import sys - import fjdisplay diff --git a/sys-apps/firejail/files/firejail-compressed-manpages.patch b/sys-apps/firejail/files/firejail-compressed-manpages.patch new file mode 100644 index 000000000000..8a43bcac2618 --- /dev/null +++ b/sys-apps/firejail/files/firejail-compressed-manpages.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile b/Makefile +index 9c9b93d..2eb8ab2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -141,10 +141,9 @@ endif + install -m 0755 -d $(DESTDIR)/$(mandir)/man5 + for man in $(MANPAGES); do \ + rm -f $$man.gz; \ +- gzip -9n $$man; \ + case "$$man" in \ +- *.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \ +- *.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \ ++ *.1) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man1/; ;; \ ++ *.5) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man5/; ;; \ + esac; \ + done + rm -f $(MANPAGES) $(MANPAGES:%=%.gz) diff --git a/sys-apps/firejail/firejail-0.9.56-r1.ebuild b/sys-apps/firejail/firejail-0.9.56-r1.ebuild deleted file mode 100644 index 6da35dbc147b..000000000000 --- a/sys-apps/firejail/firejail-0.9.56-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apparmor +chroot contrib +file-transfer +network - +seccomp suid +userns x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" ) - -RESTRICT=test - -src_prepare() { - default - find -name Makefile.in -exec sed -i -r \ - -e '/^\tinstall .*COPYING /d' \ - -e '/CFLAGS/s: (-O2|-ggdb) : :g' \ - -e '1iCC=@CC@' {} + || die -} - -src_configure() { - local myeconfargs=( - $(use_enable apparmor) - $(use_enable chroot) - $(use_enable contrib contrib-install) - $(use_enable file-transfer) - $(use_enable network) - $(use_enable seccomp) - $(use_enable suid) - $(use_enable userns) - $(use_enable x11) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/firejail/firejail-0.9.56.ebuild b/sys-apps/firejail/firejail-0.9.56.ebuild deleted file mode 100644 index e3704836fb2a..000000000000 --- a/sys-apps/firejail/firejail-0.9.56.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apparmor +chroot contrib +file-transfer +network - +seccomp suid +userns x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor )" -RDEPEND="${DEPEND} - x11? ( x11-wm/xpra[client,server] )" - -PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" ) - -RESTRICT=test - -src_prepare() { - default - find -name Makefile.in -exec sed -i -r \ - -e '/^\tinstall .*COPYING /d' \ - -e '/CFLAGS/s: (-O2|-ggdb) : :g' \ - -e '1iCC=@CC@' {} + || die -} - -src_configure() { - local myeconfargs=( - $(use_enable apparmor) - $(use_enable chroot) - $(use_enable contrib contrib-install) - $(use_enable file-transfer) - $(use_enable network) - $(use_enable seccomp) - $(use_enable suid) - $(use_enable userns) - $(use_enable x11) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/firejail/firejail-0.9.60-r1.ebuild b/sys-apps/firejail/firejail-0.9.60-r1.ebuild new file mode 100644 index 000000000000..c8262c74d0d9 --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.60-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Security sandbox for any type of processes" +HOMEPAGE="https://firejail.wordpress.com/" + +SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +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 )" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${PN}-compressed-manpages.patch" ) + +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 +} + +src_configure() { + econf \ + $(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.60.ebuild b/sys-apps/firejail/firejail-0.9.60.ebuild deleted file mode 100644 index 31390b5dea62..000000000000 --- a/sys-apps/firejail/firejail-0.9.60.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" - -SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns +whitelist x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - -RDEPEND=" apparmor? ( sys-libs/libapparmor )" - -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 -} - -src_configure() { - econf \ - $(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) -} diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild new file mode 100644 index 000000000000..f47575ac444f --- /dev/null +++ b/sys-apps/firejail/firejail-9999.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 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 \ + $(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/metadata.xml b/sys-apps/firejail/metadata.xml index ff858199d284..3af2a06d7a1d 100644 --- a/sys-apps/firejail/metadata.xml +++ b/sys-apps/firejail/metadata.xml @@ -14,7 +14,7 @@ This is the regular version. For a long term support version see sys-apps/firejail-lts. - firejail + netblue30/firejail Enable support for custom AppArmor profiles diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest index 3a538785638c..5a4e195ef237 100644 --- a/sys-apps/help2man/Manifest +++ b/sys-apps/help2man/Manifest @@ -1,10 +1,8 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff +DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 -DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6 -DIST help2man-1.47.9.tar.xz 202012 BLAKE2B 08d0a906e61978b12fd00b9d807b8cdb6b2436165223aff539957f217786442bc31fb5d437833d6dae3bd6a4b83e1df28d7bd434d0c753f38fea96b8cf751b76 SHA512 91cddd5ebc8eb2a89bc27fab4298ee18c18fa73363378be8c220258bf415634a0147b8502970c5fea48ddaccddda63753cbd215bf6894798452c2b4b89c4309a -EBUILD help2man-1.47.10.ebuild 1058 BLAKE2B a0757c6c80887b8d1780f51b1855690c308e83958b2cccaabbac1e1f62aabf7e0d3bd7f2593f0bf885b9ceedf3a109cbe8ab03e7e7723ff7a83b942187006a6e SHA512 090f2b3ca3206e1e622adedc13da3439e952758d5e3e8096594cd72e7484500177d588e3fc8fb3cafefff2c33a9282189c5cc978ed511f0f9dd11a7ebc5c9449 +EBUILD help2man-1.47.10.ebuild 1050 BLAKE2B 3137d9a226894343573abe91e8624cf43871e83df3256faf9e25c37210bd176b8b4c4aff20c5fa90d43f5d63729ada02e69ff3b32b5851835c20825ec6fdaaa9 SHA512 314d4646958894b25dc2282af7e068cf3fd832a4250f8340bf05ee176f3231e981f4fe7f40fd690db0715b02bbd0e5611f99daf853440ce8807632007bde71d0 +EBUILD help2man-1.47.11.ebuild 1100 BLAKE2B 70424da45e9d06d459ecfbe426c59b7d6bf8b3ce6f0bed3713ba1c7cff909610e9386684f1025b285bc34a203f54d81cb81bd1fadbc0c2a4be3cf114143d20a8 SHA512 aef361c7aa593641e5cdc420d8de89d00148f2b5d723ae6f7d562b101c1d9f46b4b23ffbe1dfbd16d5ab0f8b59ddea46df21a587c1456e4275fec8005e6ca6ac EBUILD help2man-1.47.6.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be -EBUILD help2man-1.47.8.ebuild 1058 BLAKE2B a0757c6c80887b8d1780f51b1855690c308e83958b2cccaabbac1e1f62aabf7e0d3bd7f2593f0bf885b9ceedf3a109cbe8ab03e7e7723ff7a83b942187006a6e SHA512 090f2b3ca3206e1e622adedc13da3439e952758d5e3e8096594cd72e7484500177d588e3fc8fb3cafefff2c33a9282189c5cc978ed511f0f9dd11a7ebc5c9449 -EBUILD help2man-1.47.9.ebuild 1058 BLAKE2B a0757c6c80887b8d1780f51b1855690c308e83958b2cccaabbac1e1f62aabf7e0d3bd7f2593f0bf885b9ceedf3a109cbe8ab03e7e7723ff7a83b942187006a6e SHA512 090f2b3ca3206e1e622adedc13da3439e952758d5e3e8096594cd72e7484500177d588e3fc8fb3cafefff2c33a9282189c5cc978ed511f0f9dd11a7ebc5c9449 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild index 14f693709088..8fb42ea7f5f4 100644 --- a/sys-apps/help2man/help2man-1.47.10.ebuild +++ b/sys-apps/help2man/help2man-1.47.10.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls" RDEPEND="dev-lang/perl diff --git a/sys-apps/help2man/help2man-1.47.11.ebuild b/sys-apps/help2man/help2man-1.47.11.ebuild new file mode 100644 index 000000000000..8b28a4b8531f --- /dev/null +++ b/sys-apps/help2man/help2man-1.47.11.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="GNU utility to convert program --help output to a man page" +HOMEPAGE="https://www.gnu.org/software/help2man/" +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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls" + +RDEPEND="dev-lang/perl + nls? ( dev-perl/Locale-gettext )" +DEPEND="${RDEPEND}" + +DOCS=( debian/changelog NEWS README THANKS ) #385753 + +PATCHES=( + "${FILESDIR}"/${PN}-1.46.1-linguas.patch +) + +src_prepare() { + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i \ + -e 's/-shared/-bundle/' \ + Makefile.in || die + fi + default +} + +src_configure() { + # Disable gettext requirement as the release includes the gmo files #555018 + local myeconfargs=( + ac_cv_path_MSGFMT=$(type -P false) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/help2man/help2man-1.47.8.ebuild b/sys-apps/help2man/help2man-1.47.8.ebuild deleted file mode 100644 index 14f693709088..000000000000 --- a/sys-apps/help2man/help2man-1.47.8.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="GNU utility to convert program --help output to a man page" -HOMEPAGE="https://www.gnu.org/software/help2man/" -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls" - -RDEPEND="dev-lang/perl - nls? ( dev-perl/Locale-gettext )" -DEPEND=${RDEPEND} - -DOCS=( debian/changelog NEWS README THANKS ) #385753 - -PATCHES=( - "${FILESDIR}"/${PN}-1.46.1-linguas.patch -) - -src_prepare() { - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's/-shared/-bundle/' \ - Makefile.in || die - fi - default -} - -src_configure() { - # Disable gettext requirement as the release includes the gmo files #555018 - econf \ - ac_cv_path_MSGFMT=$(type -P false) \ - $(use_enable nls) -} diff --git a/sys-apps/help2man/help2man-1.47.9.ebuild b/sys-apps/help2man/help2man-1.47.9.ebuild deleted file mode 100644 index 14f693709088..000000000000 --- a/sys-apps/help2man/help2man-1.47.9.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="GNU utility to convert program --help output to a man page" -HOMEPAGE="https://www.gnu.org/software/help2man/" -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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls" - -RDEPEND="dev-lang/perl - nls? ( dev-perl/Locale-gettext )" -DEPEND=${RDEPEND} - -DOCS=( debian/changelog NEWS README THANKS ) #385753 - -PATCHES=( - "${FILESDIR}"/${PN}-1.46.1-linguas.patch -) - -src_prepare() { - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's/-shared/-bundle/' \ - Makefile.in || die - fi - default -} - -src_configure() { - # Disable gettext requirement as the release includes the gmo files #555018 - econf \ - ac_cv_path_MSGFMT=$(type -P false) \ - $(use_enable nls) -} diff --git a/sys-apps/hponcfg/Manifest b/sys-apps/hponcfg/Manifest index 2a2d033b291b..b519c2c12638 100644 --- a/sys-apps/hponcfg/Manifest +++ b/sys-apps/hponcfg/Manifest @@ -1,6 +1,6 @@ DIST hponcfg-4.6.0-0.i386.rpm 39344 BLAKE2B a1fb8c4237eae8caa90086b49dd89ad641c77663e0c98f82ec97724564437837223ea3acd15136aaf6c575e35923f2e804766c51179771aead9800ecae424cd1 SHA512 534e2d656349e34c539755d807456a671363640ca8dd6853787dbf7f2a594acb88478b59b2e21ca07b8c6f118f6ad3c2e0eb1ec072484db6a8fb707bd593e0e7 DIST hponcfg-4.6.0-0.x86_64.rpm 44121 BLAKE2B 5fb073a0789380527066087a14e1806bd98a7ee76da18facbc578b0aff397a73df8a3236c22939bda4e8af19e3b6a03670947998c666fdd9b8e390a77be6d9e3 SHA512 830abe6816295fa7e0888e0848d707ab41510a9ea6dc17d01fd5de2fa56faf49af43ef6698aa379ac8baa6ab729262e77e209b90103ce67d45bf6f0b2d4df142 -DIST hponcfg-5.2.0-0.x86_64.rpm 59714 BLAKE2B dc78b47824195f8ec9b0d7537390b45984c949ecddabcfedfd9b04634d670633eb65d09b31d90fb17968b1e63541c9cb6384da73c117b5b045635f50a106ba39 SHA512 cc5ac7062d6b4e76c49be470d11697cf65dece225505c1f0cc8749b43ee34632a931a076d0f7ff2b021a79f2bf269d59a72f5153bf32cd2d0f5c6a9e0ad570cb +DIST hponcfg-5.4.0-0.x86_64.rpm 59246 BLAKE2B 50979eec63121ad89fa2e13eb286236b1cd6fc02269ba93767a9cf19a7782aea570577f98cb307e75c73fcac1fc8bc8c281f21187be157cb816253751d263ed6 SHA512 55583acd1a9e5a639fe63ecff051af9676518130e431ba76a0cdbf2ba18f4b600aaae8388895631eb0b9be343e110b5fe39dc4ab844c3a2afef0bc601756c04c EBUILD hponcfg-4.6.0.0.ebuild 1214 BLAKE2B 81641e95bcf8eaae323e8a465bfbd524aaf544fa13b4535a83c8d69e8c484f5d74c97028e43481833b301002af8128fbbf4dd4f67c1882240a93a1ae2cdad04f SHA512 bbf4e33582cab5cbe33339537e9e66f2c6c7185f8447d25d51e08e3f873225d7252d019acfc7f17d78d932b283bf7f6af2a1912d952746921405daa02e69231b -EBUILD hponcfg-5.2.0.0.ebuild 986 BLAKE2B ff2ad4fb5811e71537dd338effe1de0fde4ab5a98578659fdf2b18785d3937c31d589b13cd4cef8725efc0e7cfb9315aabca7ee248d7f088756670932046ee90 SHA512 62ed9c972c8be58a819c599029e7bd3e22fe7d72720ed08335c16a20e1edb0992476984030403f280e711757fa6b9e3c3e3ba667072cf0c6dfa808e48b2b3a7b +EBUILD hponcfg-5.4.0.0.ebuild 947 BLAKE2B 5e433cfbfc8f468656740ec1bfa24d99703d90312b1217e61cf504a37d38d18eaed1a9763707f9550268061d32ee904752caabf9eba25b2b909c15388fe22979 SHA512 b2e65d46faf05e6c90c1eca0bfe96ea3efbd8f79c908e659522cba6159afc9bfdc98ec80dd408d4fa15200256a4f40ffd07bdbf278f8ef6a4d6d42c61b0ea87c MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772 diff --git a/sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild b/sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild deleted file mode 100644 index d7eab2b4e3c2..000000000000 --- a/sys-apps/hponcfg/hponcfg-5.2.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pax-utils rpm versionator - -MY_PV=$(replace_version_separator 3 '-') - -DESCRIPTION="HP Lights-Out Online Configuration Utility (HPONCFG)" -HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29" -SRC_URI="amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/${PN}-${MY_PV}.x86_64.rpm )" - -LICENSE="hpe" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="" - -DEPEND="" -RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )" - -S="${WORKDIR}" - -QA_PRESTRIPPED="/usr/sbin/hponcfg /usr/li.*/libcpqc.*" -QA_PREBUILT="/usr/sbin/hponcfg" - -src_install() { - dosbin sbin/hponcfg - - # When bumping, verify SONAME (scanelf -S libhponcfg64.so)! - newlib.so "${S}"/usr/lib64/libhponcfg64.so libcpqci64.so.3 - dosym libcpqci64.so.3 /usr/$(get_libdir)/libhponcfg64.so - - dodoc "${S}"/usr/share/doc/hponcfg/* - - pax-mark m "${D}"usr/sbin/hponcfg -} diff --git a/sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild b/sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild new file mode 100644 index 000000000000..8afc8cddad42 --- /dev/null +++ b/sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pax-utils rpm + +MY_PV=$(ver_rs 3 '-') + +DESCRIPTION="HP Lights-Out Online Configuration Utility (HPONCFG)" +HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5ab6295f49964f16a699064f29" +SRC_URI="amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/${PN}-${MY_PV}.x86_64.rpm )" + +LICENSE="hpe" +SLOT="0" +KEYWORDS="-* amd64" +IUSE="" + +DEPEND="" +RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )" + +S="${WORKDIR}" + +QA_PRESTRIPPED="usr/sbin/hponcfg usr/lib*/libcp*" +QA_PREBUILT="${QA_PRESTRIPPED}" + +src_install() { + dosbin sbin/hponcfg + + # When bumping, verify SONAME (scanelf -S libhponcfg64.so)! + newlib.so "${S}"/usr/lib64/libhponcfg64.so libcpqci64.so.3 + dosym libcpqci64.so.3 /usr/$(get_libdir)/libhponcfg64.so + + dodoc "${S}"/usr/share/doc/hponcfg/* + + pax-mark m "${D}"/usr/sbin/hponcfg +} diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest index 0a36defc01f9..1fcca0a327f8 100644 --- a/sys-apps/ibm-powerpc-utils/Manifest +++ b/sys-apps/ibm-powerpc-utils/Manifest @@ -1,8 +1,5 @@ AUX ibm-powerpc-utils-1.3.5-docdir.patch 265 BLAKE2B 2ec9b24404a6e6c78a75a8a29a002eba6b30180883a3cc0ebd3610d202188ec6aabfd2830eacf42f9e8c57c961f6aa097a12bcc92d04fd85ade63e3ef083257f SHA512 69a6545e1e29778d4ea31c7bc90be678b8f78c1d897f6bfa9a2f8ed3b223d4b5894663ffb10dc409c334754152c1f28a0c0d7a1991c65186488116a1cd983aa8 -DIST ibm-powerpc-utils-1.3.5.tar.gz 318046 BLAKE2B cb154dd6203aea2f95c8cce96e3ea5f40c0c4d9f8c649c988d0d66adfc475bb15764554160faeeebddd5569de39502c149bf93f08fa433e8e309498fff59cae1 SHA512 a01f8fc45abd91d0629f8f48e3c2877a863aa1f244907bb65fcc457c2c933e7043181666c237956723f956b7c3d7ce7a0cedc36eaf26ce3cf777aa8f0525244d DIST ibm-powerpc-utils-1.3.6.tar.gz 320582 BLAKE2B cce656ca7eefda3912f26c6df99112ceef831cac834af4edaf507c28c63d6bbca0d6ae0dd096474b7d3ac45daffb37dbc1068cb33b83f676922e4f27ca46ae2e SHA512 a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977 -EBUILD ibm-powerpc-utils-1.3.5-r1.ebuild 727 BLAKE2B d5958f614d3ca69504200a36d9b7bfd4d5f9d8b7462c20ed6a3d794fa7a8333ac57493530a7fd5a15b420dc28af16ee961c7d5970c2d95f63623be6a221fdf08 SHA512 4de5262ca50752af6474abf137f859ff7d0b3fdc604f34713446c998719a70a83a13b22f05629822dd89bb3bef291929ac4a76b8569311eeee70c9f253a175e9 -EBUILD ibm-powerpc-utils-1.3.5.ebuild 681 BLAKE2B 787ff813b26d9c29c0620906dabe88ec8f05f246ad0452d506f0a6205f5fa22be15775773ac92d5163ecdb44ea6bbfee100d446f79bcb23b00f52c5d6911aa80 SHA512 ab7c70d113eb8922251d8d455afda1ee22f54d6c5493c710a15c6f436b907c258dce3ced75d6f618011877fef2e24aaa5b6ee8c92a20bcd78a237bac25bf6633 -EBUILD ibm-powerpc-utils-1.3.6.ebuild 720 BLAKE2B ba6938a6c17d19e4b207bef8a768a4f4874e319a3167858725296cb07f3c5bee40d61cdfe1f0520d8995413e53027e2825e46ab947c5d8282815f4afd64ef947 SHA512 373c8a77f3b545df3d5044f794f9f0754bd537fad851bd41f8c0f2896c39272143ffca6af3411eedba8c6715fa67c3509b9784b5ae987c09dfa5c74d128b47d6 +EBUILD ibm-powerpc-utils-1.3.6.ebuild 718 BLAKE2B 6067af1272a54f61d86f6768027104018c4bfeea5566b2478853498e2448a8ab9bc40dad68406ffc2e514736dcc923fad526b1cf72539ea0530410a11c9c542e SHA512 fe546d95b31eb5863be2cceb585c03e7c38f80eca6ed2ed0b8bcdf140b4699c63c05ee0071feff7f651e3f11f9c8a4eda3d039a9ef32baf0ce521328b8c52f9e EBUILD ibm-powerpc-utils-99999.ebuild 619 BLAKE2B 0af4588dfa5d37dfa6d7300d40e9431a0c0644b9bdfc184f9559cc4043e5003520f483388b7ec217ab623a4e62d58af20e2458bdf6d0616ecc1975eece2c4342 SHA512 67b5061004b0084a8c4600ff6422ecadb3c72bc9146a65554598acf8611209f64efa6c0cb94ccf6c0b5688ef4d309d4ae174790b479b0847266413ee8d7cab54 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3 diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5-r1.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5-r1.ebuild deleted file mode 100644 index 6d7d066eea71..000000000000 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -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="IBM" -KEYWORDS="~ppc ~ppc64" - -DEPEND=" - sys-devel/bc -" -RDEPEND=" - !sys-apps/powerpc-utils - ${DEPEND} - 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.5.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild deleted file mode 100644 index 17d1ba204788..000000000000 --- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -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="IBM" -KEYWORDS="ppc ppc64" - -DEPEND=" - sys-devel/bc -" -RDEPEND=" - !sys-apps/powerpc-utils - rtas? ( >=sys-libs/librtas-2.0.2 ) - ${DEPEND} -" - -src_prepare() { - eapply_user - - eautoreconf -} - -src_configure() { - econf $(use_with rtas librtas) -} 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 index a7cd32918d9a..589373034585 100644 --- 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 @@ -13,7 +13,7 @@ S="${WORKDIR}/${P//ibm-}" SLOT="0" LICENSE="IBM" -KEYWORDS="~ppc ~ppc64" +KEYWORDS="ppc ppc64" DEPEND=" sys-devel/bc diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 250df54fce1f..b65867237109 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -1,6 +1,5 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577 -AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28 AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42 AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864 diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch deleted file mode 100644 index a8b7aaa9efe0..000000000000 --- a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001 -From: Michal Privoznik -Date: Fri, 8 Dec 2017 11:18:07 +0100 -Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() - -Not all callers want parse_action_control*() to advance the -arguments. For instance act_parse_police() does the argument -advancing itself. - -Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions") -Signed-off-by: Michal Privoznik ---- - tc/m_bpf.c | 1 + - tc/m_connmark.c | 1 + - tc/m_csum.c | 1 + - tc/m_gact.c | 10 +++++----- - tc/m_ife.c | 1 + - tc/m_mirred.c | 4 +++- - tc/m_nat.c | 1 + - tc/m_pedit.c | 1 + - tc/m_sample.c | 1 + - tc/m_skbedit.c | 1 + - tc/m_skbmod.c | 1 + - tc/m_tunnel_key.c | 1 + - tc/m_vlan.c | 1 + - tc/tc_util.c | 1 - - 14 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/tc/m_bpf.c b/tc/m_bpf.c -index 1c1f71c..576f69c 100644 ---- a/tc/m_bpf.c -+++ b/tc/m_bpf.c -@@ -129,6 +129,7 @@ opt_bpf: - - parse_action_control_dflt(&argc, &argv, &parm.action, - false, TC_ACT_PIPE); -+ NEXT_ARG_FWD(); - - if (argc) { - if (matches(*argv, "index") == 0) { -diff --git a/tc/m_connmark.c b/tc/m_connmark.c -index 37d7185..47c7a8c 100644 ---- a/tc/m_connmark.c -+++ b/tc/m_connmark.c -@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - } - - parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_PIPE); -+ NEXT_ARG_FWD(); - - if (argc) { - if (matches(*argv, "index") == 0) { -diff --git a/tc/m_csum.c b/tc/m_csum.c -index 7b15673..e1352c0 100644 ---- a/tc/m_csum.c -+++ b/tc/m_csum.c -@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p, - } - - parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); -+ NEXT_ARG_FWD(); - - if (argc) { - if (matches(*argv, "index") == 0) { -diff --git a/tc/m_gact.c b/tc/m_gact.c -index e7d91da..b30b042 100644 ---- a/tc/m_gact.c -+++ b/tc/m_gact.c -@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, - if (argc < 0) - return -1; - -- -- if (matches(*argv, "gact") == 0) { -- argc--; -- argv++; -- } else if (parse_action_control(&argc, &argv, &p.action, false) == -1) { -+ if (matches(*argv, "gact") != 0 && -+ parse_action_control(&argc, &argv, &p.action, false) == -1) { - usage(); /* does not return */ - } - -+ NEXT_ARG_FWD(); -+ - #ifdef CONFIG_GACT_PROB - if (argc > 0) { - if (matches(*argv, "random") == 0) { -@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, - if (parse_action_control(&argc, &argv, - &pp.paction, false) == -1) - usage(); -+ NEXT_ARG_FWD(); - if (get_u16(&pp.pval, *argv, 10)) { - fprintf(stderr, - "Illegal probability val 0x%x\n", -diff --git a/tc/m_ife.c b/tc/m_ife.c -index 205efc9..4647f6a 100644 ---- a/tc/m_ife.c -+++ b/tc/m_ife.c -@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, - - parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_mirred.c b/tc/m_mirred.c -index 3870d3a..aa7ce6d 100644 ---- a/tc/m_mirred.c -+++ b/tc/m_mirred.c -@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p, - } - - -- if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) -+ if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) { - parse_action_control(&argc, &argv, &p.action, false); -+ NEXT_ARG_FWD(); -+ } - - if (argc) { - if (iok && matches(*argv, "index") == 0) { -diff --git a/tc/m_nat.c b/tc/m_nat.c -index 1e4ff51..f5de4d4 100644 ---- a/tc/m_nat.c -+++ b/tc/m_nat.c -@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct - - parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_pedit.c b/tc/m_pedit.c -index 26549ee..dc57f14 100644 ---- a/tc/m_pedit.c -+++ b/tc/m_pedit.c -@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - - parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_sample.c b/tc/m_sample.c -index ff5ee6b..31774c0 100644 ---- a/tc/m_sample.c -+++ b/tc/m_sample.c -@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p, - - parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c -index aa374fc..c41a7bb 100644 ---- a/tc/m_skbedit.c -+++ b/tc/m_skbedit.c -@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - parse_action_control_dflt(&argc, &argv, &sel.action, - false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c -index 561b73f..bc268df 100644 ---- a/tc/m_skbmod.c -+++ b/tc/m_skbmod.c -@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p, - - parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c -index 1cdd035..2dc9187 100644 ---- a/tc/m_tunnel_key.c -+++ b/tc/m_tunnel_key.c -@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, - parse_action_control_dflt(&argc, &argv, &parm.action, - false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/m_vlan.c b/tc/m_vlan.c -index 161759f..edae0d1 100644 ---- a/tc/m_vlan.c -+++ b/tc/m_vlan.c -@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p, - parse_action_control_dflt(&argc, &argv, &parm.action, - false, TC_ACT_PIPE); - -+ NEXT_ARG_FWD(); - if (argc) { - if (matches(*argv, "index") == 0) { - NEXT_ARG(); -diff --git a/tc/tc_util.c b/tc/tc_util.c -index 1887905..ee9a70a 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p, - } - result |= jump_cnt; - } -- NEXT_ARG_FWD(); - *argc_p = argc; - *argv_p = argv; - *result_p = result; --- -cgit v1.1 - diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index bd319aa576ef..8cb6d5479ed9 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,9 +1,10 @@ AUX kbd-2.0.4-vlock_configure_switch.patch 848 BLAKE2B 1e1cb785b75b0e9dbd9c4893081b7ccef7ce09d18835bc6644543f79b1e1bdca3619863c37f14adcabf07814680769caaac57ed24026440df50e14dc2f2fbba0 SHA512 46cba6402489db0ef5c7fb06ea8f2c91724699294e6ce7b2b67dbfa3ed696d8917355ee6999e897be092911570d206ce9127adc06e5159199a23f79ce79e6b81 AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28443ba7e340ee6306dcc6a429c6e939684ed3058213681476342a428e06384739a8e51f08c549058b0c8b686 SHA512 14645a299e22afd38d2b118b9f1029280392880ce56c2b65a8e61bcfebd818d5e3b61f9a701d3b362b4f1d31bee4db2d23179b6e31e235e6e82b05b1e17d22b1 +AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 EBUILD kbd-2.0.4-r1.ebuild 1512 BLAKE2B ea78c2739f01dac41344870001a6dd34469f3311bfae0a2f7ad56b6e3c93ab5cd71fef852cd27753fb5677b671b009d4ac762027c5dd1664eb127702df7d88eb SHA512 21152c3daf9cc848f8c63aef17789da0371b55293e79b57243a119543334383c2541556efea6b864fcec60c0d96c022cd1f41e03648119a8504d165e88ccb448 EBUILD kbd-2.0.4.ebuild 1346 BLAKE2B 954e13a347196bcc161977c95e10a090b95242167cb7d575ae434a3f4be4f1e92d3053402a49691252c8bc66db1e59659616f5823490c598b75ac4ddba9d4326 SHA512 7e533b92655479e4e56ad56cf029b8f983dc83fc525952d7990f8c9fc868f783e3340925ea78633a3dd2673ebba60eff784fe495da128f3ef9cdbf9257749fb6 -EBUILD kbd-2.2.0-r1.ebuild 1529 BLAKE2B 70a1c129e03344b3f6e5a2b87b1926715e3708468eb2568fe0f2d2f8392638f497e97b08f4fff24a24f327dabce4e967cc17824071a1aa1a801041169dfd5c20 SHA512 66c030906b545cfa0e4289b4eb411aea3f2e292ce73146248067ae93babee6f3b6c8613a062264809a700ea23fd0da7a6a7f1e141fe3ffffea0b21b9cf9a89e5 +EBUILD kbd-2.2.0-r2.ebuild 1581 BLAKE2B 22135bc429e2a4bdc48acc58d5fa33c03bd87f81d6d32f0a8e0e59c7e0dfa9eb92a919731cb696c4b4504058877ad791736698f6e7200d2b4db47df891112627 SHA512 b5234d1465a7580133381e82ac099832df42644416efde1c9c991ddf9efd1b827f5e6514e14a20898f6d5ab9c7ca05ba57395bfe41d8f11730d0ef4a38fbb0a8 EBUILD kbd-9999.ebuild 1496 BLAKE2B 328079e258ec023c510049ebe14200fb5ff09be766ff05d4621d1adbd5af21af5c9f24e9eb1ef5ce8a8d2b8928fee0be0673de5e7ec9c65cfd85cd04e3050f9f SHA512 43cda0f03636fbedb4494564f231f39fd87188d74102697951803c193212c83eff24051cf1716a7e9f8ae11c0df85c661c7eba3183f48f6725bed3287c436995 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch new file mode 100644 index 000000000000..4b545f5bc2a2 --- /dev/null +++ b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch @@ -0,0 +1,31 @@ +From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov +Date: Tue, 6 Aug 2019 13:59:34 +0200 +Subject: [PATCH] libkbdfile: Do not stop on the first error + +The kbdfile_find() gets a list of directories in which the filename. If +we could not find the filename in the first directory, you do not need +to return an error. + +Link: https://github.com/legionus/kbd/issues/31 + +Signed-off-by: Alexey Gladkov +--- + src/libkbdfile/kbdfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c +index 804f04a..fb8e035 100644 +--- a/src/libkbdfile/kbdfile.c ++++ b/src/libkbdfile/kbdfile.c +@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp) + rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp); + free(dir); + +- if (rc <= 0) +- return rc; ++ if (!rc) ++ return 0; + } + + return 1; diff --git a/sys-apps/kbd/kbd-2.2.0-r1.ebuild b/sys-apps/kbd/kbd-2.2.0-r1.ebuild deleted file mode 100644 index 895a4995c52c..000000000000 --- a/sys-apps/kbd/kbd-2.2.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam - -if [[ ${PV} == "9999" ]] ; then - inherit autotools git-r3 - #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" - EGIT_REPO_URI="https://github.com/legionus/kbd.git" - EGIT_BRANCH="master" -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" - -RDEPEND=" - app-arch/gzip - pam? ( - !app-misc/vlock - virtual/pam - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( dev-libs/check ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-cflags.patch" #691142 -) - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - else - default - fi - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable nls) - $(use_enable pam vlock) - $(use_enable test tests) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - docinto html - dodoc docs/doc/*.html - use pam && pamd_mimic_system vlock auth account -} diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild new file mode 100644 index 000000000000..3675430c7a9d --- /dev/null +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools pam + +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-r3 + #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" + EGIT_REPO_URI="https://github.com/legionus/kbd.git" + EGIT_BRANCH="master" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" + +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + virtual/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +PATCHES=( + "${FILESDIR}/${P}-cflags.patch" #691142 + "${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch" +) + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + docinto html + dodoc docs/doc/*.html + use pam && pamd_mimic_system vlock auth account +} diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest index d08d0f9dda84..3be371767dcf 100644 --- a/sys-apps/keyutils/Manifest +++ b/sys-apps/keyutils/Manifest @@ -9,10 +9,13 @@ AUX keyutils-1.5.9-endian-check-2.patch 1131 BLAKE2B a5fd6fd62dd94be2bb23b3b60ce AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26b17bdc80621c4197c3f7a2e47c3cdb9fd703fe92adfb5da419775d4b4bb334ffe7fb57e26645a8fc201568f070b11cdd923 SHA512 f7d5423173c0e65080931653604d9179a9c6dbc4e22c7e62b67685d444e81b33a2a61d26906e47987521a61e28c199fe4ab4fc7f9ba8cacd2faf00bc443259c1 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b +AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9 DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d SHA512 5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2 +DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad4999990 SHA512 ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff EBUILD keyutils-1.5.11-r1.ebuild 3820 BLAKE2B d929dd8276d16e2f2cd38f6e815bf5fa63c43e20699ab69523d291ff88e2bac54386d7db45626564b50205f3e3943185a1066f9af1fc781bcef437f739cae244 SHA512 390277040f96c6ccd9b7d8a329e66c09fda691762e8c479e4f6c18cba6a02c718e139c9ea074ec678f4c7bc0e8b3f5d66e4a5eb758c93e02ecbb468e8cc3f6d4 EBUILD keyutils-1.5.9-r4.ebuild 2986 BLAKE2B 75f613871ba022cc24deebd12dea2cb0dee06db56477c96693c59b65fa4f63c33c212af624ac73bc4ad1c34aadc12783867821300cde0b2d49426e31401ac42f SHA512 bf13e04b7e089a1cedbd3a9f12a941066043352ad66128d6ba7a02149ff0e54b2030e81c93556f805fd2d5b286df121e20ecff7d06bd02d1a5852321b83558aa +EBUILD keyutils-1.6.1.ebuild 3864 BLAKE2B 27e707f83a05bbb72cd6f27622ef72060edb69505026ed322e8c15d7ae58c134dc7470d16556c7f6218fd4974e191615291974fb0de7eab0b58d4f6adaed62a7 SHA512 4ff1350d32b0b4449aac6f49b2f582da39ea8866504f0cafb6c9611b33f2d47b02966cb21e0c8b96a924cce99e550a90f71d495505822ea63ebe6426306fd907 EBUILD keyutils-1.6.ebuild 3805 BLAKE2B 9bfc8ac3ae965220f36b021b4dc2373e911387097aaa7f828334fa661964577a23bb6cf97818f7225f38de279d16b7d1fad8e96131482288e885e094e14d5402 SHA512 c35a43569ff5bfced26b1be0813d4f6420c12268af2be95294b5dbf53a0ca87887668f4aa8dc733d81ddc40f012cd179806c84697e82581f3f594ac4fd6b4018 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e diff --git a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch new file mode 100644 index 000000000000..f68d7d111a0c --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch @@ -0,0 +1,20 @@ +Hide + +> grep: /etc/rpm: No such file or directory +> grep: /usr/lib/rpm: No such file or directory + +errors. + +Bug: https://bugs.gentoo.org/656446 + +--- keyutils-1.6.1/Makefile ++++ keyutils-1.6.1/Makefile +@@ -267,7 +267,7 @@ + ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL) + + BUILDID := .local +-dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm)) ++dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null)) + release3:= $(word 2,$(shell grep ^Release: $(SPECFILE))) + release2:= $(subst %{?dist},$(dist),$(release3)) + release1:= $(subst %{?buildid},$(BUILDID),$(release2)) diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild new file mode 100644 index 000000000000..9bb0b02d6775 --- /dev/null +++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript + +DESCRIPTION="Linux Key Management Utilities" +HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git" +SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0/1.9" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="static static-libs test" + +RDEPEND="" +DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6-endian-check-1.patch + "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch + "${FILESDIR}"/${PN}-1.6.1-silence-rpm-check.patch #656446 + "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 + "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch +) + +pkg_setup() { + # To prevent a failure in test phase and false positive bug reports + # we are enforcing the following options because testsuite expects + # that these options are available. I.e. testsuite only decides based + # on kernel version which tests will be called, no feature checking. + if use test ; then + CONFIG_CHECK="KEYS" + ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!" + + if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then + CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS" + ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" + fi + + if kernel_is -ge 4 7 ; then + CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS" + ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!" + fi + else + CONFIG_CHECK="~KEYS" + ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!" + + if kernel_is -ge 4 7 ; then + CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS" + ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!" + fi + fi + + linux-info_pkg_setup +} + +src_prepare() { + default + + # The lsb check is useless, so avoid spurious command not found messages. + sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die + # All the test files are bash, but try to execute via `sh`. + sed -i -r \ + -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \ + tests/{Makefile*,*.sh} || die + find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + || die + # Some tests call the kernel which calls userspace, but that will + # run the install keyutils rather than the locally compiled one, + # so disable round trip tests. + rm -rf tests/keyctl/requesting/{bad-args,piped,valid} + + multilib_copy_sources +} + +multilib_src_compile() { + tc-export AR CC + sed -i \ + -e "1iRPATH = $(usex static -static '')" \ + -e '/^C.*FLAGS/s|:=|+=|' \ + -e 's:-Werror::' \ + -e '/^BUILDFOR/s:=.*:=:' \ + -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \ + -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \ + -e "s: /: ${EPREFIX}/:g" \ + -e '/^NO_ARLIB/d' \ + Makefile || die + + # We need the static lib in order to statically link programs. + if use static ; then + export NO_ARLIB=0 + # Hack the progs to depend on the static lib instead. + sed -i \ + -e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \ + Makefile || die + else + export NO_ARLIB=$(usex static-libs 0 1) + fi + emake +} + +multilib_src_test() { + # Execute the locally compiled code rather than the + # older versions already installed in the system. + LD_LIBRARY_PATH=${BUILD_DIR} \ + PATH="${BUILD_DIR}:${PATH}" \ + emake test +} + +multilib_src_install() { + # Possibly undo the setting for USE=static (see src_compile). + export NO_ARLIB=$(usex static-libs 0 1) + + default + use static || gen_usr_ldscript -a keyutils +} + +multilib_src_install_all() { + dodoc README +} diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest index 3da29edd1808..5fb09e1f8578 100644 --- a/sys-apps/kmscon/Manifest +++ b/sys-apps/kmscon/Manifest @@ -1,5 +1,5 @@ AUX kmscon-SIGUNUSED.patch 385 BLAKE2B 0384e96bb5809d7b8c702f2cfe79e885bd469b4bfc44eda7f313c0b4caf0b72e278a537c5b0d4a053dcef604baa3cf6acacba61e636c23fa6cf46803d38642f2 SHA512 5bbdbd7f3f8a11d4fb8b5ff01455214de2aef5b65ee04c8da868d62ab1bba75f4bae0f348d15cee8667586d935afb7a8165a041f2c7df5f5e79d1f6fb6baaa36 AUX kmscon-sysmacros-fix.patch 339 BLAKE2B c088bf8bad2ac171af219e763f404b6311c67541ac4febf0e8a02349783c49720912eebbc31f0a7c124b563394477ef9de4e2461931a20ae8c4448a1dd0ea593 SHA512 2b227b6cfa959002938209e85e0aac85d4bd4c567a7023ce0734f5d2131b001f29bdb3a62304d295747adb487ff10da9df4080c87139120da2eb9c8dda6f18df DIST kmscon-8.tar.xz 950068 BLAKE2B 7c4bbcc6eb0967d8e38e05a3e6fac60109a0ce468bc8967364b621274a9af4dd12a31af692be2efe0cc234af36f760836ec421b6567460efd4b7b1c3d913f44b SHA512 ac1581c2520a9c30406848dafc27231b38d392b2176e3ed4dd95b03cd54e256dd22f09e04057fc089effbbe08eb25546164bb885e0e5cbdbd752d4c27d07a41d -EBUILD kmscon-8.ebuild 2647 BLAKE2B 9ae4595f9fb0d8a016deac51a8aa9f25ba5ca9f4698147cd9f9f89dffe4aed1692d24b9d4916568c50972769a70aa95518d08cba3d81129791d224f98fa8cafe SHA512 a1ed419e71d2123b6b1c7794b63448a23b4a0785bb98539cecadf1456a3334f69eb9deba78c96431faaad0998733ab2b97eb87e43584b585a46befe75933712f +EBUILD kmscon-8.ebuild 2670 BLAKE2B 6d42861c38cc076caf3ce23001e527d4020fe86c64834d3d25890b10c02a7421f7945c2ec04f7cecb031099a8a696a1b7719167c61b4a59d7ff2d1a1723808aa SHA512 1afe98ba566e9df50a603fcf027d85fc2ef9109658ce56a0694696c3d3692c7cf004e737196f0ce1b4177056dc0f732dd3c4d8c681d54c24257310a93bdd9155 MISC metadata.xml 664 BLAKE2B 7c1efe65339f48a43b2fe2134fbd23c3145a73671bcec300af6f6700454b9c1a852f5ff9a5e17a94c263186f31e7703853973da5b5489ede6e59c5648f890f8d SHA512 95cfea7cb2c3c2e07a234af335dc708be83f3e6239231faf28c4e9544a37cb6ae8f619000b15382357c26fd01e2656666f8b13f0717e8b529999ca347d8b8230 diff --git a/sys-apps/kmscon/kmscon-8.ebuild b/sys-apps/kmscon/kmscon-8.ebuild index ca585cfb9a23..047da6387527 100644 --- a/sys-apps/kmscon/kmscon-8.ebuild +++ b/sys-apps/kmscon/kmscon-8.ebuild @@ -19,6 +19,7 @@ COMMON_DEPEND=" >=virtual/udev-172 x11-libs/libxkbcommon dev-libs/libtsm + media-libs/mesa[X(+)] drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl,gbm] ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest index f0a794d20324..eac459a3e624 100644 --- a/sys-apps/logwatch/Manifest +++ b/sys-apps/logwatch/Manifest @@ -1,6 +1,8 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c +DIST logwatch-7.5.2.tar.gz 475277 BLAKE2B e3d841749af4776da84646444dd90bb084dc33712c1a6eeab87d46cb267656527008505f78506168b7ded40f3d0f8209c205249c2f953e6ee8af7a6cd82833d9 SHA512 157486143ba12167f6c50c778372a4295db3744878607bceba8e0813357651bffd8924ef5ef41a4fbd20811c020dcc031eb354a0f52b8eb6d9aac197087c2bc5 EBUILD logwatch-7.5.1.ebuild 2421 BLAKE2B 331cca62555720132abb6370e61a646f948a9cab8c7b8ca586c8e1e31d99d8aa33e9a0b8b47d096f0c9018cfac18e9983b15f582d4fb0eaa9b41d1aacf94d00b SHA512 d16c0c55e425e81652701f9e276bbcef001fd58c91c48269fa1f6db5788ec188c51f2d661e5706aa3a4e5bea27dd5a7e6b986e611008ff3ffd681a6c61e96bc1 +EBUILD logwatch-7.5.2.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21 EBUILD logwatch-9999.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7 diff --git a/sys-apps/logwatch/logwatch-7.5.2.ebuild b/sys-apps/logwatch/logwatch-7.5.2.ebuild new file mode 100644 index 000000000000..eefc16389fc7 --- /dev/null +++ b/sys-apps/logwatch/logwatch-7.5.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit tmpfiles + +PATCHES=() + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +fi + +DESCRIPTION="Analyzes and Reports on system logs" +HOMEPAGE="http://www.logwatch.org/" + +LICENSE="MIT" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="virtual/cron + virtual/mta + virtual/mailx + dev-lang/perl + dev-perl/Date-Calc + dev-perl/Date-Manip + dev-perl/Tie-IxHash + dev-perl/Sys-CPU + dev-perl/Sys-MemInfo" + +src_install() { + dodir /usr/share/logwatch/lib + dodir /usr/share/logwatch/scripts/services + dodir /usr/share/logwatch/scripts/shared + dodir /usr/share/logwatch/default.conf/logfiles + dodir /usr/share/logwatch/default.conf/services + dodir /usr/share/logwatch/default.conf/html + keepdir /etc/logwatch + + # logwatch.pl requires cache dir (bug #607668) + newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf + + newsbin scripts/logwatch.pl logwatch.pl + + exeinto /usr/share/logwatch/lib + doexe lib/*.pm + + exeinto /usr/share/logwatch/scripts/services + doexe scripts/services/* + + exeinto /usr/share/logwatch/scripts/shared + doexe scripts/shared/* + + insinto /usr/share/logwatch/default.conf + doins conf/logwatch.conf + + insinto /usr/share/logwatch/default.conf/logfiles + doins conf/logfiles/* + + insinto /usr/share/logwatch/default.conf/services + doins conf/services/* + + insinto /usr/share/logwatch/default.conf/html + doins conf/html/* + + # Make sure logwatch is run before anything else #100243 + exeinto /etc/cron.daily + newexe "${FILESDIR}"/logwatch 00-logwatch + + doman logwatch.8 + dodoc README HOWTO-Customize-LogWatch + + # Do last due to insopts modification. + insinto /usr/share/logwatch/scripts/logfiles + insopts -m755 + doins -r scripts/logfiles/* +} + +pkg_postinst() { + # Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243) + if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then + local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch) + [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \ + && rm -f "${ROOT}"/etc/cron.daily/logwatch \ + || ewarn "You have two logwatch files in /etc/cron.daily/" + fi + + # Trigger cache dir creation to allow immediate use of logwatch (bug #607668) + tmpfiles_process ${PN}.conf +} diff --git a/sys-apps/lsadb/Manifest b/sys-apps/lsadb/Manifest index 1cc27fb47a43..50e16fd9a620 100644 --- a/sys-apps/lsadb/Manifest +++ b/sys-apps/lsadb/Manifest @@ -1,4 +1,5 @@ -AUX lsadb-makefile.patch 224 BLAKE2B 0ab70a22363bf1f3130ebfed8974f58448a38c60f8fcb72e34c324aca9d195942560bdb4345e6862af5f17406a2301d041df9eb08930e49ae787c38b6ae647b1 SHA512 1e7d158b5e17b0fea943879d1f6aeb20cbb2ad4fabcc5233f8143ef2943d218c7d263e87959f3159ffb6d4c1539cd14e0b2a0cafc502757e8a5a733e0f638787 +AUX lsadb-makefile.patch 163 BLAKE2B e7dee70dd5bf1f0e97d4eaee7b68011c13486725dfb5e027e2901f25a39b6ed752b36051439e95627c8bd5f2149e1a32f2012e303dced315abc8adac03a92f75 SHA512 e281c294c6c08c176b9439382395cbd225971469721536506a581dab4a82ffbd1461b023edd8dc4e2c70f7ec9dfc31eaa781e520bf043a0da06fa81e1da6dc9c DIST lsadb-0.1.3.tgz 7098 BLAKE2B 54fa717aaf0ed6800e592d1da5b6f3c4872c5b1c5ad62fad1864734ee4d0ef7336371a799fe3ea214918f69c720d9f0d2d2ce1f8be93c7969711b5c54ae69f56 SHA512 cb5193ba4e3806a140848dd7b06e08e115ac95f12fe2e4dbd7a0b464926cbc0ecf1113331bbbeedc72fd1d51b7d87f3115ce4772efcfe7bee20dc2d954dcf646 +EBUILD lsadb-0.1.3-r1.ebuild 558 BLAKE2B b1030808df67588dbc94cb2999f0888ac259fe0382ab6f74264ab49be8ec159dbe3f9b73213331844d5be708cb96b04454c21072e1ad2b1979d2fe6e6e01ccc6 SHA512 a995ea956af3fa4bff1e2af23a5b007e2a971b88975f93400130d2969479249cafa590efb576d52e4afc59ce692b9baade1eff57359bf84f43ae6c9f40484ea3 EBUILD lsadb-0.1.3.ebuild 663 BLAKE2B 3005b3d5bc4dffe47809d2c3eb92c4efc08cabfa23169c92167a0c9d6a4feebd0ad7ada6813a22bb3a0aa694e80494cab78c6ebd84d4a14ba23731b2a3535c4c SHA512 953c07c9012f44c121088922330cb69e3caede836484ff192a6968324442ec0a1a11b821df3bd3a033feaa3a0cf07bb0b4a67f210c5626ce0e00a88c8200e64a MISC metadata.xml 263 BLAKE2B e66994388bfb417186bf7a8f1d7e8b12c243f9fb8b2a5d911129327b569829be2cf0896c099c3ae4b283f10636dbf03e109b7d7037f4373b98827d27a4dce8f7 SHA512 f72954ee8887da0e1b3e59effb6eb40294102e91b1060c2d736fa47a3a12513d959b44e77fc62f881408e38d30a47f1c5b1c4a0d9c3646b5fb75118e5295ea5d diff --git a/sys-apps/lsadb/files/lsadb-makefile.patch b/sys-apps/lsadb/files/lsadb-makefile.patch index fb396cc85b22..08faacceb8a2 100644 --- a/sys-apps/lsadb/files/lsadb-makefile.patch +++ b/sys-apps/lsadb/files/lsadb-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.bak 2009-11-30 14:31:07.000000000 -0500 -+++ Makefile 2009-11-30 14:31:34.000000000 -0500 +--- a/Makefile ++++ b/Makefile @@ -1,6 +1,2 @@ - - @@ -7,4 +7,4 @@ - gcc -Wall -O2 -o $@ $< && strip $@ - - -+ ${CC} -Wall ${CFLAGS} -o $@ $< ++ ${CC} -Wall $(CFLAGS) $(LDFLAGS) -o $@ $< diff --git a/sys-apps/lsadb/lsadb-0.1.3-r1.ebuild b/sys-apps/lsadb/lsadb-0.1.3-r1.ebuild new file mode 100644 index 000000000000..aa0234ff5eaf --- /dev/null +++ b/sys-apps/lsadb/lsadb-0.1.3-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Prints out information on all devices attached to the ADB bus" +HOMEPAGE="http://pbbuttons.berlios.de/projects/lsadb/" +#SRC_URI="mirror://berlios/pub/pbbuttons/${PN}-${PV}.tgz" +SRC_URI="mirror://gentoo/${P}.tgz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="-* ~ppc" +PATCHES=( + "${FILESDIR}"/${PN}-makefile.patch +) + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin lsadb + doman lsadb.1 + dodoc README +} diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest index 79b37b7b67c2..24a61f4d40c8 100644 --- a/sys-apps/lsd/Manifest +++ b/sys-apps/lsd/Manifest @@ -1,9 +1,13 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 +DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de +DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caeefe4c4847c1864c51fa2538769c9c8cea2c45176910f594f7e208c8bca8d1479ceac27c41fe393a02187572d508836bb6 SHA512 47ca23567abf41975007025bdbb2b30ae9a59d8381069408716ff9d2c60f77bcd8c9aadd5cb672902d73cb85b3123b7818c20c8823a27f3a99cecd50cae47cd3 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0 +DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c +DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e @@ -14,14 +18,28 @@ DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72 DIST lsd-0.14.0.tar.gz 33646 BLAKE2B b0bc5f8c9ef764e8e2c1a17da144e507ff6181bbde88a002950b47fb1678f4f4790e1cdc9e438c59ebf8e84eb7ef4c7a6308a45c21c75d63b56d0b5078bef987 SHA512 f1c17b63769f7c390a36e2ff99caf6d1da326fefc041a992986f756614a70db5aae4c87a0a33e416a6096d8ce65f0c0cbed50d168a8d0ca6dc2e97f0065593a0 DIST lsd-0.15.1.crate 38136 BLAKE2B 6540beb147161fbce2bc59fd97221b961d87a0fe27f23c7b7e168ee80c219854ab1929f4fc92afa2cf70dc82b8ee2c9f7694e9aa9bac91f3c37ccfb981e8e53d SHA512 ab1ba61901c372a39a7e26eda5b53adceb0b357dec998f880d23a8e97c3addc16bf1d6e21cac262f23bec3d4061b3e9f6734d85d856b8e649e8b33805acf094a DIST lsd-0.15.1.tar.gz 40728 BLAKE2B 6e3b6c432f23b476bdf53cc0a6bdb353c9c4151e718cb6b848824c9a128c4e34f4c34ab9ff415bc76124e15addcaa989d629ddde009a4599dab146323a7607e8 SHA512 58a280615e72f9dc685e49532d147c17d94be099f80400add15b983d5945d98004a6a636f7f7a76809376dc07cab25f44d716a4b00456db0201c34f935952ed3 +DIST lsd-0.16.0.crate 39872 BLAKE2B cdf78606856d689e22edad5cf1f4f555edff2030e1b10ff0e706f7dbbe98c5836ef4a8ad6d061fd3c968f8499815b79c97595d0fff43d513e8fec40a4f3a632b SHA512 cd761e039f810c6fcb925228bdbc284ea0a3a9b16a11038de3086bf89ad1f99b442e33a0020612079bc40e7adb1a3ae056565f4022e2714bc9cc47767e7fc03e +DIST lsd-0.16.0.tar.gz 43284 BLAKE2B fb8813f33fa487afea428a3dd3a01fe6c9e56616a8c69e7a97430e41deb4a0ed0cd5b4c6ee79ba02d145267d2fd2ee2167365b81fdcf868bec2cdce0a98a1535 SHA512 562c070d3e716af26ff3a54632cd176a1b95471fbb7e947f8175f89df483ff5b337d1a0d7578fa6ee41f77fa7ed1a618d37e91ebf1b8428e6a857918b415aa39 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3 +DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 +DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b +DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 +DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 +DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f +DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e +DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a +DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 +DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c +DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 +DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 DIST redox_syscall-0.1.43.crate 15212 BLAKE2B cd2e3bbd3cad2568bb61d71931f84b9c09ce694500508ef1fd78c841424bcc40515645062c3fa47cf0d6d99082cff3800a789c0bd0acab87ef5bfebe4e9f25e6 SHA512 c506b1b9067d1c40419a3b4bbd5b2b9bf2e92fba775d51f46bc80d322412a9a8d6d2f4e384071f27ba0e8e58e8ddc2ba4a0ee99567ba2e82e63472924fa46354 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe +DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f DIST terminal_size-0.1.8.crate 7289 BLAKE2B 17a620858a1a3f32f105fa61cd3f57166e1fae57c422a1ed9b59ff61d3c8f7916c1f7e3d7e3728b8f3cad481b1529d8bddd5ea98ca425e37c14cb469dec08858 SHA512 2392e2d3c34e6dc83c43e804ceb9990af82066879a2d74b21e4ab88bf9a8698f34c8734f3e8e3febdda44c0633819809259fb34bd48d138d22ad6c4b448f396c @@ -41,4 +59,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 EBUILD lsd-0.14.0.ebuild 1163 BLAKE2B 175ce505dd0d0dda5c45f9a28438cc9a42aca08ff6456e24353177260e23c2b624a9c37960fd44e24bb2545c44e6575ffbe68b854e2ffc381d5e14b2a3be45aa SHA512 c2017256d9a8f218b828944157420787805787362c74d12953c523d8a51ba4090ff661bbc5c05562c84c4fcca062fd8459260f4ae6f56a023e32641c50442f56 EBUILD lsd-0.15.1.ebuild 1198 BLAKE2B 20831852880793d640f57e149bf15cbe3249329f28998f5beef8174bb911a03e28a8c091810883e52a822eace54131021d7af6e33b5407930b07aab1abb53e87 SHA512 11b31ade354e54d4676ab386c4f2bf079883ac4d0d1e796f32c7a84a416e1b85e01ba49552593685f102ce108dcd314c647f034c2de31bbbb1cdb6221b5b17d8 +EBUILD lsd-0.16.0.ebuild 1376 BLAKE2B 9520dd82a54653f1298ff488ac1f8167713f325ce3a953d45be6c800caebad2817a7e8f7111f9827537e88c305e0d879528b1d0ba02ad2af3e13e3ca0296fbbf SHA512 1951bb3be213e65e3a06ace2d466617bfb0f1ca2c2cc37958ef27d512474ff3da51ba76cefe1582f232c7daecc01e8fad484376c73e700a0ea28673ffea064b9 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599 diff --git a/sys-apps/lsd/lsd-0.16.0.ebuild b/sys-apps/lsd/lsd-0.16.0.ebuild new file mode 100644 index 000000000000..9e3d88dadba3 --- /dev/null +++ b/sys-apps/lsd/lsd-0.16.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" +ansi_term-0.11.0 +atty-0.2.11 +autocfg-0.1.4 +bitflags-1.0.4 +cfg-if-0.1.9 +chrono-0.4.6 +chrono-humanize-0.0.11 +clap-2.32.0 +cloudabi-0.0.3 +fuchsia-cprng-0.1.1 +glob-0.2.11 +kernel32-sys-0.2.2 +libc-0.2.55 +lscolors-0.5.0 +lsd-0.16.0 +num-integer-0.1.39 +num-traits-0.2.6 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.0 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.4 +rand_os-0.1.3 +rand_pcg-0.1.2 +rand_xorshift-0.1.1 +rdrand-0.4.0 +redox_syscall-0.1.43 +redox_termios-0.1.1 +remove_dir_all-0.5.1 +strsim-0.7.0 +tempfile-3.0.8 +term_grid-0.1.7 +term_size-0.3.1 +terminal_size-0.1.8 +termion-1.5.1 +textwrap-0.10.0 +time-0.1.40 +unicode-width-0.1.5 +users-0.9.1 +vec_map-0.8.1 +version_check-0.1.5 +wild-2.0.1 +winapi-0.2.8 +winapi-0.3.6 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo + +DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons" +HOMEPAGE="https://github.com/Peltoche/lsd" +SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris ${CRATES})" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" +BDEPEND=">=virtual/rust-1.31.0" + +QA_FLAGS_IGNORED="/usr/bin/lsd" + +src_install() { + cargo_src_install --path . + einstalldocs +} diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 631764b435cd..8ecb7438f08b 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,11 +1,10 @@ -AUX man-db-2.8.4-berkdb_build_fix.patch 661 BLAKE2B 2f8950d05ef4c467089ebef3d73b9df1d1a6f1f235ce01e87830b14644d9317da0b255702d7c40507c67d65710cb13a1cb85210739f55b4b7e7ee282acceedae SHA512 c99f61ef08be2e88feb90376dfe3c4f1b028c6916c46aea92d145de304ca380d381a334bb1c0bc5828ea38c24532960cf0d449c18cd6db59a47ca3bdc3fac43b AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301 -DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d875edd79f0aad992d884e83fc28a8c3b7d82ded187293d858dfadae48eb088722c3ffc91eec64b71cdf46750be SHA512 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66 DIST man-db-2.8.5.tar.xz 1787244 BLAKE2B b908a6fb0187d42f8d1f842063e0afdf1e052244ea727f0aaaf4d658bb8954a216c0555df5511b27246fd12c2a388c44dcfccf243449d25d6e741c5c3466d3be SHA512 8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69 +DIST man-db-2.8.6.1.tar.xz 1829328 BLAKE2B 5dce50a4d5003a370595b3db0b1d7f01c54b53d26f011307bd91447cdeed410ea20a6720b12eae301d21c0b9674ed84b055f38f44e09d5543ce1647dff8b5bca SHA512 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 EBUILD man-db-2.7.6.1-r2.ebuild 3166 BLAKE2B 12cc1a5704569692825c9487433a604f5752caf366fcf152d5565b58b3b26a4db0e4816afdf2974cc3570142d024d07ccbe5e0a3f8f084c463b50c895f7e2f21 SHA512 95afcd9fd93c690003a3fdeb9ba1f2b794fd8d7fdc882d1d9f0658f6caf62fb0157d4e590033852f2b6f9b4634229b7256826a4799c9f37f68f8e986f12f3335 -EBUILD man-db-2.8.4.ebuild 3437 BLAKE2B b10866c070904e397994d214eca7f2f95993669b9c67e55e691bcc74aff5a536c81b3fdccfe7ea90c705d4792c53b43c966634c1a415e4f445415463d8eeba4a SHA512 64ec42d1789b187318696394a885329d30151a3d52b1065ab831a5deaf85d2c8a06e63f4c8d45b24dbe5b152965b03d520ce85e0133c609d5e8106914ee6f0e2 EBUILD man-db-2.8.5-r1.ebuild 3556 BLAKE2B 54d767f777edaf57755569261009c4287bb73107913e736482685e30cd93f76c62f31a51f55625e72ada927134ecb8d2ead1b610db16a206a4906858188bea19 SHA512 3b1f03cad7087b28bfe60df5a5a16fe1db4a33518cc43c11a0c79b3fcb8cd10c35a98941f359d8dd35c8b8f6dc5e693eeae917baf4bc2cdf70f9ea154ac4a29b -EBUILD man-db-9999.ebuild 3556 BLAKE2B 54d767f777edaf57755569261009c4287bb73107913e736482685e30cd93f76c62f31a51f55625e72ada927134ecb8d2ead1b610db16a206a4906858188bea19 SHA512 3b1f03cad7087b28bfe60df5a5a16fe1db4a33518cc43c11a0c79b3fcb8cd10c35a98941f359d8dd35c8b8f6dc5e693eeae917baf4bc2cdf70f9ea154ac4a29b +EBUILD man-db-2.8.6.1.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860 +EBUILD man-db-9999.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79 diff --git a/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch b/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch deleted file mode 100644 index 30052f268157..000000000000 --- a/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dd0f554b5c1d563f9ee625c19c8745d8982e00e3 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Thu, 2 Aug 2018 10:34:00 +0100 -Subject: Fix build with Berkeley DB - -Fixes Savannah bug #54425. - -* libdb/db_btree.c: Include for free. ---- - libdb/db_btree.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdb/db_btree.c b/libdb/db_btree.c -index fdd9b15..4469bf6 100644 ---- a/libdb/db_btree.c -+++ b/libdb/db_btree.c -@@ -28,6 +28,7 @@ - /* below this line are routines only useful for the BTREE interface */ - #ifdef BTREE - -+#include - #include - #include - #include --- -cgit v1.0-41-gc330 - diff --git a/sys-apps/man-db/man-db-2.8.4.ebuild b/sys-apps/man-db/man-db-2.8.4.ebuild deleted file mode 100644 index 1fc95e763ef2..000000000000 --- a/sys-apps/man-db/man-db-2.8.4.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit ltprune user versionator - -DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" -HOMEPAGE="http://www.nongnu.org/man-db/" -if [[ "${PV}" = 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib" - -CDEPEND=" - !sys-apps/man - >=dev-libs/libpipeline-1.5.0 - sys-apps/groff - berkdb? ( sys-libs/db:= ) - gdbm? ( sys-libs/gdbm:= ) - !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) - seccomp? ( sys-libs/libseccomp ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${CDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( - >=app-text/po4a-0.45 - sys-devel/gettext - ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-mandb ) -" -PDEPEND="manpager? ( app-text/manpager )" - -PATCHES=( "${FILESDIR}"/${P}-berkdb_build_fix.patch ) - -pkg_setup() { - # Create user now as Makefile in src_install does setuid/chown - enewgroup man 15 - enewuser man 13 -1 /usr/share/man man - - if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 - ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" - fi -} - -src_configure() { - export ac_cv_lib_z_gzopen=$(usex zlib) - local myeconfargs=( - --docdir='$(datarootdir)'/doc/${PF} - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --enable-setuid - --enable-cache-owner=man - --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" - $(use_enable nls) - $(use_enable static-libs static) - $(use_with seccomp libseccomp) - --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) - ) - econf "${myeconfargs[@]}" - - # Disable color output from groff so that the manpager can add it. #184604 - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die -} - -src_install() { - default - dodoc docs/{HACKING,TODO} - prune_libtool_files - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron man-db #289884 -} - -pkg_preinst() { - local cachedir="${EROOT}var/cache/man" - # If the system was already exploited, and the attacker is hiding in the - # cachedir of the old man-db, let's wipe them out. - # see bug #602588 comment 18 - local _replacing_version= - local _setgid_vuln=0 - for _replacing_version in ${REPLACING_VERSIONS}; do - if version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then - debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" - else - _setgid_vuln=1 - debug-print "Applying cleanup for security bug #602588" - fi - done - [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" - - # Fall back to recreating the cachedir - if [[ ! -d ${cachedir} ]] ; then - mkdir -p "${cachedir}" || die - chown man:man "${cachedir}" || die - fi - - # Update the whatis cache - if [[ -f ${cachedir}/whatis ]] ; then - einfo "Cleaning ${cachedir} from sys-apps/man" - find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete - fi -} - -pkg_postinst() { - if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then - einfo "Rebuilding man-db from scratch with new database format!" - mandb --quiet --create - fi -} diff --git a/sys-apps/man-db/man-db-2.8.6.1.ebuild b/sys-apps/man-db/man-db-2.8.6.1.ebuild new file mode 100644 index 000000000000..4d2bfc884fe9 --- /dev/null +++ b/sys-apps/man-db/man-db-2.8.6.1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" +HOMEPAGE="http://www.nongnu.org/man-db/" +if [[ "${PV}" = 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" +else + SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib" + +CDEPEND=" + !sys-apps/man + >=dev-libs/libpipeline-1.5.0 + sys-apps/groff + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) + seccomp? ( sys-libs/libseccomp ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + nls? ( + >=app-text/po4a-0.45 + sys-devel/gettext + ) +" +RDEPEND=" + ${CDEPEND} + acct-group/man + acct-user/man + selinux? ( sec-policy/selinux-mandb ) +" +PDEPEND="manpager? ( app-text/manpager )" + +pkg_setup() { + if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 + ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" + fi +} + +src_configure() { + export ac_cv_lib_z_gzopen=$(usex zlib) + local myeconfargs=( + --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --disable-setuid #662438 + --enable-cache-owner=man + --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" + $(use_enable nls) + $(use_enable static-libs static) + $(use_with seccomp libseccomp) + --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) + ) + econf "${myeconfargs[@]}" + + # Disable color output from groff so that the manpager can add it. #184604 + sed -i \ + -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ + src/man_db.conf || die + + cat > 15man-db <<-EOF || die + SANDBOX_PREDICT="/var/cache/man" + EOF +} + +src_install() { + default + dodoc docs/{HACKING,TODO} + find "${ED}" -name "*.la" -delete || die + + exeinto /etc/cron.daily + newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884 + + insinto /etc/sandbox.d + doins 15man-db +} + +pkg_preinst() { + local cachedir="${EROOT}/var/cache/man" + # If the system was already exploited, and the attacker is hiding in the + # cachedir of the old man-db, let's wipe them out. + # see bug #602588 comment 18 + local _replacing_version= + local _setgid_vuln=0 + for _replacing_version in ${REPLACING_VERSIONS}; do + if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then + debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" + else + _setgid_vuln=1 + debug-print "Applying cleanup for security bug #602588" + fi + done + [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" + + # Fall back to recreating the cachedir + if [[ ! -d ${cachedir} ]] ; then + mkdir -p "${cachedir}" || die + chown man:man "${cachedir}" || die + fi + + # Update the whatis cache + if [[ -f ${cachedir}/whatis ]] ; then + einfo "Cleaning ${cachedir} from sys-apps/man" + find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete + fi +} + +pkg_postinst() { + if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then + einfo "Rebuilding man-db from scratch with new database format!" + su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null + fi +} diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index 0bcb6f92ce69..4d2bfc884fe9 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit user eapi7-ver systemd +inherit systemd DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" HOMEPAGE="http://www.nongnu.org/man-db/" @@ -29,8 +29,8 @@ CDEPEND=" seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${CDEPEND} +DEPEND="${CDEPEND}" +BDEPEND=" app-arch/xz-utils virtual/pkgconfig nls? ( @@ -40,15 +40,13 @@ DEPEND=" " RDEPEND=" ${CDEPEND} + acct-group/man + acct-user/man selinux? ( sec-policy/selinux-mandb ) " PDEPEND="manpager? ( app-text/manpager )" pkg_setup() { - # Create user now as Makefile in src_install does setuid/chown - enewgroup man 15 - enewuser man 13 -1 /usr/share/man man - if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" fi @@ -92,7 +90,7 @@ src_install() { } pkg_preinst() { - local cachedir="${EROOT}var/cache/man" + local cachedir="${EROOT}/var/cache/man" # If the system was already exploited, and the attacker is hiding in the # cachedir of the old man-db, let's wipe them out. # see bug #602588 comment 18 diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest index bb0daaa1377c..7734f8f4b9c2 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -1,6 +1,6 @@ -DIST man-pages-5.00.tar.xz 1659648 BLAKE2B 7b4da6767613ad1453618e47a3cfaa4e2273600c4b55cac5290dd93db79fe61810bbaefdf0ee42c910824430beddca207228caa8466d19b65d1b401da742d0ba SHA512 7ab44d5c8ed06696e7c463ec5118305fada7a6d284fc38d32e0771faa3ff12b74a8b696f9577481a0d1d2c7f1e5e78a21a72d80d2f34bd50955622b226b39fa2 DIST man-pages-5.01.tar.xz 1662512 BLAKE2B e2b77aea38eaed44fcefbfc21a59ae3f972901a055d3491effda286f0ef7cd8d1e32b4a610707c5ba8ad18ac7d5ff81df4927f7c68c99f54753af49b40c07f17 SHA512 0f95198e230fe28da2821c931f0078adf67bc4d92434b4da5e67dcfe3b462fd22b3268b7c0b9385603f0bfa7aa273c97ae152edd2b6f6975b9199b6e73e1f457 +DIST man-pages-5.02.tar.xz 1668616 BLAKE2B 91fb6618e13d25c1ad81ac5f6acc20ac0075b0e33b5ecfc271a4a4abcfffb37e4f22dbd15128a3a54ea2a7ed03c0374b907998da15dde90f4b9fb0da7ebf0947 SHA512 424d382f69611e29bd512ad166db7189633dea92b9d57466480a88cc69e83e6f364e16d4303efea19f2252bc9681c14158d60eef79c4cc4be41185300b67a4fd DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 -EBUILD man-pages-5.00.ebuild 1654 BLAKE2B 8ea95b7c504adf20ac93a2f9f64f172b1d1d310d93429c18c8d459d57b508707525ec19dd2d59c9df6cea773e9e352ebbe7e229225997f35bf62d06d26a9905b SHA512 c27aee0bf6726d60f850e598ac1507d9bda6e7c4f4e4f0276bc50efdc2e5b8d0f277a1b678318eedd067a22816034746e1d56dac6916246cb647d105c4081fd7 -EBUILD man-pages-5.01.ebuild 1667 BLAKE2B c9aee8e2fb67c76c0811550f70e2f50a7d81750b92eb59538e391e4c93ae035f6fa4cc88dec63046565f1fb1f11c8cece50ce7488d0f4659234cdfb9c8e55246 SHA512 f33706fd68d56c6fba7ca34fea95f68a758c2868708b2457c7b7e6801fe7dc8a9c0f2eb76561c2ab292be0964a50bba0b724efa6f60cca4247effcda3b3baea9 +EBUILD man-pages-5.01.ebuild 1654 BLAKE2B 8ea95b7c504adf20ac93a2f9f64f172b1d1d310d93429c18c8d459d57b508707525ec19dd2d59c9df6cea773e9e352ebbe7e229225997f35bf62d06d26a9905b SHA512 c27aee0bf6726d60f850e598ac1507d9bda6e7c4f4e4f0276bc50efdc2e5b8d0f277a1b678318eedd067a22816034746e1d56dac6916246cb647d105c4081fd7 +EBUILD man-pages-5.02.ebuild 1667 BLAKE2B 088998e261ca06ab4600f63e74bd49ad052f0f74c7e782217c1ad7245ea80a8b26e850b06f5d7ec5854fef70dd0625edc2d484bea866756b0c62fd87d8e91c39 SHA512 7a63a4a2e95fe8b54db8891045b1f37b205588d879d2937b32949890b74e64f57d08fc18af59f9270c46107786938095651b575a49938d59b9a8c810f451a16e MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/man-pages/man-pages-5.00.ebuild b/sys-apps/man-pages/man-pages-5.00.ebuild deleted file mode 100644 index 54ff0e614cef..000000000000 --- a/sys-apps/man-pages/man-pages-5.00.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_PATCH=2 - -DESCRIPTION="A somewhat comprehensive collection of Linux man pages" -HOMEPAGE="https://www.kernel.org/doc/man-pages/" -SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz - mirror://kernel/linux/docs/man-pages/${P}.tar.xz - mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 - https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2" - -LICENSE="man-pages GPL-2+ BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE_L10N=" da de fr it ja nl pl ru zh-CN" -IUSE="nls ${IUSE_L10N// / l10n_}" -RESTRICT="binchecks" - -# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462 -RDEPEND="virtual/man - ! seunshare -### dbus -> restorecond - -# pax-utils for scanelf used by rlpkg -RDEPEND="${DEPEND} - app-misc/pax-utils - ! seunshare -### dbus -> restorecond - -# pax-utils for scanelf used by rlpkg -RDEPEND="${DEPEND} - app-misc/pax-utils - ! seunshare -### dbus -> restorecond - -# pax-utils for scanelf used by rlpkg -RDEPEND="${DEPEND} - app-misc/pax-utils - !> 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 epydoc && targets+=( epydoc ) - - 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 epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - systemd_dotmpfilesd "${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 - python_export PYTHON_SITEDIR - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || 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 -} diff --git a/sys-apps/portage/portage-2.3.71.ebuild b/sys-apps/portage/portage-2.3.71.ebuild new file mode 100644 index 000000000000..969ce20d8767 --- /dev/null +++ b/sys-apps/portage/portage-2.3.71.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_5 python3_6 python3_7 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 linux-info systemd 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 ~sh ~sparc ~x86 ~amd64-fbsd" +SLOT="0" +IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" + +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 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# 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/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_5} pypy) + rsync-verify? ( + >=app-portage/gemato-14[${PYTHON_USEDEP}] + >=app-crypt/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + 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 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !> 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 epydoc && targets+=( epydoc ) + + 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 epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + systemd_dotmpfilesd "${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 + python_export PYTHON_SITEDIR + [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || 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 +} diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest index cd1a75b13a29..87a529ae11e8 100644 --- a/sys-apps/restorecond/Manifest +++ b/sys-apps/restorecond/Manifest @@ -1,11 +1,7 @@ AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e0406247e8d2d06a41ec977110bdb9c77f4a75d97fc179bf507b0fd58b962c1976eff57a743cf019c684a SHA512 ee0ff9bfe542124eff0217dbf9cc2e00586b4577e0eee2bfa67946f78a97fe009c6e5c337e8ad68e1cd9af2f69ec3ce3acba9157b4d53c2fdeeb01f9e0aa9d0a -DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad DIST restorecond-2.8.tar.gz 17740 BLAKE2B ad873acbbb7c56c29a8523a42dc053ea79036a15bed71b47a690d01d4012394b5ecf74ae75b27affb4007d754935ec90246f22ef3e0b9611556ec7baf59670db SHA512 5d72336782c3ad095746f8e6fa67e36448e5e76ca29586d8fe4962c64e505fa95c1458e8fc8f7d5bd589fff71b4be3758fb0cee3dacd2ccd0bc8476423e2540e -DIST restorecond-2.9-rc1.tar.gz 17747 BLAKE2B 0bcccb45b77bd97830f1e17e48c529f08d2e7eb1467f817ecc3520543e89d0f287c755baee53c27d0820d81a18cef34573b5f5e943b5c2d1e827886ce137f906 SHA512 6d0b0e3e36dfe567cf5349801078bc6ff9c6a7e7f2afc13f7ae775c9ae1d74fddfce14f3c83933f386e110ae5b4836c633d8307c9c4bce2000a3230bfcdb64eb DIST restorecond-2.9.tar.gz 18893 BLAKE2B fcdae1a4ec489f3f581212cdd3c13c5561feac3ee758f354dca75c97938c62b9ed04aedbd4b3b5cde09a5887247389262718145620d0b9749e364d1614f57241 SHA512 6de9dd4c6b8e5d8275221aba5df27437998f635cfe83a5da75de479e260ceea884a36253eb873a8d71e1a77ed67544d8657fb75fe409af1f630052ce73ec5d8a -EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8 EBUILD restorecond-2.8.ebuild 1165 BLAKE2B 7834d473f312d93be8885bfba2cd3930268bb7a056b6d968253f70259d959699a7246436ed8810e41ade5c24e312b0a9c86a8c078df652bfe032cde7ec03b2c5 SHA512 9f488cf1e460aed3c48e5e453bde2940a6132dec29e5ee599a21928543bd2549c21800603129a0847c5c85071216144c87b45543abbc57f6658e03f3976c2852 -EBUILD restorecond-2.9.ebuild 1147 BLAKE2B 5e8707a3636dec5a806ec1584bc1ca7031567a3e483f48dd086bcd3e67f707252bfa31a6ae89edc25612791a56ea197af5f4ae68c9985639b35d686b53caab0c SHA512 64c5273d79a410b428891504d1ea8e9b163ed43d7a6d18a4eb87a4c9a63cd827a999d4ed89ecb4410a33661c276e6fc7e65a4268ac375c3c280678515bb3cedb -EBUILD restorecond-2.9_rc1.ebuild 1147 BLAKE2B 155fbcff0c3c613b4dd9fb0dea20a256afc9db266c7231be3a6438e7e5873aab979d0fe4c12f513cccbbe315458e01c58f6960d1260aaca6354a8ec618bf892f SHA512 7ba97dcbe1f5978593bc0e5f96ee544c10ad29d4ce8fa1be3d7f7e3f6e75bbb6b7401bd325f2c4c1d4696706031022922bd7df0118a65112da9851be50b9621c +EBUILD restorecond-2.9.ebuild 1145 BLAKE2B af99619a522615ebd01935b687f24c45d512510522bd725eb66b430c6b7d46086cc33634db109dc9f08f165f82e8bf059d34cdd4414ab9873298a52020d9730a SHA512 d6de5a092b1241d43e2b4663441e93568fa463444d41b032245e157c7994d072e318ac217a8e252549994bb72acdbdfb36453d51966707c18dd628fa5b7d4126 EBUILD restorecond-9999.ebuild 1147 BLAKE2B 5e8707a3636dec5a806ec1584bc1ca7031567a3e483f48dd086bcd3e67f707252bfa31a6ae89edc25612791a56ea197af5f4ae68c9985639b35d686b53caab0c SHA512 64c5273d79a410b428891504d1ea8e9b163ed43d7a6d18a4eb87a4c9a63cd827a999d4ed89ecb4410a33661c276e6fc7e65a4268ac375c3c280678515bb3cedb MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a diff --git a/sys-apps/restorecond/restorecond-2.7.ebuild b/sys-apps/restorecond/restorecond-2.7.ebuild deleted file mode 100644 index d55b72f66e5f..000000000000 --- a/sys-apps/restorecond/restorecond-2.7.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -MY_RELEASEDATE="20170804" - -MY_P="${P//_/-}" -IUSE="" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libsepol-${PV}:= - >=sys-libs/libselinux-${PV}:= - dev-libs/dbus-glib - dev-libs/libpcre:= - >=sys-libs/libcap-1.10-r10:=" - -RDEPEND="${DEPEND} - ! - - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid()) - SELinuxProject/selinux diff --git a/sys-apps/selinux-python/selinux-python-2.7.ebuild b/sys-apps/selinux-python/selinux-python-2.7.ebuild deleted file mode 100644 index 5f01a11222d2..000000000000 --- a/sys-apps/selinux-python/selinux-python-2.7.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -PYTHON_REQ_USE="xml" - -inherit python-r1 toolchain-funcs - -MY_P="${P//_/-}" - -MY_RELEASEDATE="20170804" -SEPOL_VER="${PV}" -SELNX_VER="${PV}" -SEMNG_VER="${PV}" - -IUSE="audit pam dbus" -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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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.1.1[${PYTHON_USEDEP}] - dev-python/ipy[${PYTHON_USEDEP}] - !dev-python/sepolgen - ${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)" \ - PYLIBVER="${EPYTHON}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" - } - python_foreach_impl building -} - -src_install() { - installation() { - emake -C "${BUILD_DIR}" \ - DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ - 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-2.8-r1.ebuild b/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild index af8f4d4296f6..76d7035f05ae 100644 --- a/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild +++ b/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]] ; then S="${WORKDIR}/${MY_P}/${PN#selinux-}" else SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~mips ~x86" + KEYWORDS="amd64 ~arm64 ~mips x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-apps/selinux-python/selinux-python-2.8.ebuild b/sys-apps/selinux-python/selinux-python-2.8.ebuild deleted file mode 100644 index 799855a2979d..000000000000 --- a/sys-apps/selinux-python/selinux-python-2.8.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -PYTHON_REQ_USE="xml" - -inherit python-r1 toolchain-funcs - -MY_P="${P//_/-}" - -MY_RELEASEDATE="20180524" -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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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.1.1[${PYTHON_USEDEP}] - dev-python/ipy[${PYTHON_USEDEP}] - !dev-python/sepolgen - ${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-2.9.ebuild b/sys-apps/selinux-python/selinux-python-2.9.ebuild index eb75834f5ef4..925ab20f61a9 100644 --- a/sys-apps/selinux-python/selinux-python-2.9.ebuild +++ b/sys-apps/selinux-python/selinux-python-2.9.ebuild @@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]] ; then 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" + KEYWORDS="amd64 ~arm64 ~mips x86" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild b/sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild deleted file mode 100644 index e68742e64f4f..000000000000 --- a/sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{3_5,3_6} ) -PYTHON_REQ_USE="xml" - -inherit python-r1 toolchain-funcs - -MY_P="${P//_/-}" - -MY_RELEASEDATE="20190125" -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}] - !dev-python/sepolgen - ${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/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest index bd78e342ccfe..25c89219d13f 100644 --- a/sys-apps/semodule-utils/Manifest +++ b/sys-apps/semodule-utils/Manifest @@ -1,10 +1,6 @@ -DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8 DIST semodule-utils-2.8.tar.gz 12536 BLAKE2B 93a2f8fee887eba72b009071549a687fe86045344979e31493b3f17041ddf3f31c29ea3c754a31f6029847798dfe26d63b02fadc1042bc68aa414050b283d208 SHA512 13d79a22115f5448dafc5202dc3dec66b9ad826051d61d7c126defe823407959511db35713d97c7dfe9e79de96193fec91a10b98c13743e06a1213f5734f4ae7 -DIST semodule-utils-2.9-rc1.tar.gz 12548 BLAKE2B 62a4413f23ee8e30a9d60c00814425789362da4b056b03f5b27462534759d08f22c44b30a4d25c69bb5bd7447b5ed9e8cc89efb102e43c437adb4bf18f9a3540 SHA512 2e03dd8c23ad1b2f2492194ccd4a6fc39d4ee2d513778264b794011121c3b6eb896dab4a2236cf3934d1e200ad1f86ba6223bb6ac7aa81b1fd4c2a700dc7081a DIST semodule-utils-2.9.tar.gz 14259 BLAKE2B f72630c520504596171ac6f678b1fde2bb8482b620f0d8f6374c59b85d634ee8c407e3e4b268dae4d6cecfa2749b26f8808dd56f7c5391e7d1ba11f4a8a789e5 SHA512 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952 -EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d EBUILD semodule-utils-2.8.ebuild 997 BLAKE2B 90d4e8740267ebc4f9e6bc3453dbe70ebbab54fb9025665c79e46df829fe8df4a754beafab46ad13b32273fa4dd527014ad47692e4858eff85672391dcd9c02d SHA512 689ec194b0852d3eb75f0f618a1cf4db0927718d408e4040a5240b874548169d326ec17be7233f78313ad4c5c8f12e5c02428aaccef12170e8ba3efa2afefdd3 -EBUILD semodule-utils-2.9.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8 -EBUILD semodule-utils-2.9_rc1.ebuild 979 BLAKE2B cc4a3f4f9ace03e8fea8d0555fa5cd21f0c5943155235f687a908f694b83199eb911e6ee93511b219cc48a63a96e139cb0cea140ea3b066c117830637bce189c SHA512 eec40e9327cef1e4689d0a618a876be3243665904a836cef064527cf820d6f74b1c1ee52211e6f8b02714f4a1bbafd3c1b10ff49ddcc8a49b9d07696dba99768 +EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701 EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689 diff --git a/sys-apps/semodule-utils/semodule-utils-2.7.ebuild b/sys-apps/semodule-utils/semodule-utils-2.7.ebuild deleted file mode 100644 index a0ef418401f7..000000000000 --- a/sys-apps/semodule-utils/semodule-utils-2.7.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -MY_RELEASEDATE="20170804" -SEPOL_VER="${PV}" -SELNX_VER="${PV}" - -MY_P="${P//_/-}" -IUSE="" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~mips x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="SELinux policy module utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=" - -RDEPEND="${DEPEND} - !Install Supermicro's kernel module. + diff --git a/sys-apps/smc-sum/smc-sum-2.2.0.20190220-r1.ebuild b/sys-apps/smc-sum/smc-sum-2.2.0.20190220-r1.ebuild new file mode 100644 index 000000000000..aa3d81c05b4c --- /dev/null +++ b/sys-apps/smc-sum/smc-sum-2.2.0.20190220-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 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.2.0.20190220.ebuild b/sys-apps/smc-sum/smc-sum-2.2.0.20190220.ebuild deleted file mode 100644 index d72c9760f770..000000000000 --- a/sys-apps/smc-sum/smc-sum-2.2.0.20190220.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 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 ~x86" - -RDEPEND="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/systemd/Manifest b/sys-apps/systemd/Manifest index 864c14fa24d0..81324f545fd5 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,5 +1,3 @@ -AUX 241-version-dep.patch 5015 BLAKE2B 63a2f591c6199787cabc5af4c0df14c76e8dba189ca2d69cf539b13a0187fb7f29f7d6a2550b7eee046859d99c9b4de4af11573c624787968a8041e210d8bc75 SHA512 22667683fdec5b92d9dd7afe40930d7483f3025b24152a6d0f9497ac81e9e2a75b467d2b02770d2321ea53236444b5d01217b6f97d725913974ebd2522c6ac58 -AUX 241-wrapper-msan-unpoinson.patch 2248 BLAKE2B fe5ae8e9b770ff973b6a8ac6afa694a920ff1f731b97b93198307c8d0068571e799f21d53acf4c1c5d8b50562a4c1aaa0d176ad7d56eab6fd4fefec9f63c8483 SHA512 93719736a4847d210dc57f92c10b6dd1b18c2ddf0c9885c83ba729466088a54df9709605e5c81e2bb7c528e03523ba5f2af08682cc9e8af1cd9d750c63d4c578 AUX 242-file-max.patch 1314 BLAKE2B 3057d95ff701e188da4fba3b72b8a6e17dec2350a67e056cf1a2e0fa216d0b3aec22cbfbacd11e6ee17331cbda27dbf201fbc9ba2aa794fec9efbe0f612b3b43 SHA512 508a0b56b55839bccef3b3dc48f054e3d2876936cd8a36009dbadaa9a0ae85a5897f95de5c9c4b0e48d80d176e788fa342bd4235224e8cf3adacbe04dfbcebd0 AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554 AUX 242-network-domains.patch 2373 BLAKE2B cc9253d3d8f579ef61c2eae0e5e2446afa68a339233b10b3d184cfaa21e6b6c7c53e9d2aa824b80f46ba31a9bded0b55b9a84a8463806edf9ebed0de13f937f5 SHA512 9a3f86e306f69237ae2e3572ac2f0eba1603adff622304e676a06b51ae6f41f68e269f69bdcbbdf537c99b6a9decfdfebe0527d7c500566ae72b8170011f2e26 @@ -8,16 +6,18 @@ AUX 242-rdrand-ryzen.patch 16177 BLAKE2B 7d1d3709098a233ba58727788b77c30025c0497 AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907 AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9 AUX 243-rc1-analyze.patch 5053 BLAKE2B 5c2a5b320193406c7850762f51c007f94ba3ecba088539ac53f66a8e8af9c8c69b2e778b9d83776878505dc53a011321489b0259516e51ef27be576401d19a11 SHA512 49ce62b19e58b512997ad4c4d70f5f29c089890c502899a1bb930d9b69df00d7bed1d4e7e4a901cb1404df64add99037c04d962c95a05b0ac3b4e70a7023be7d +AUX 243-rc1-cryptsetup.patch 5712 BLAKE2B 614572e920f3fb914fa8b4d6317626613dd4fd3fc21630664bc008a874b2522d2cc7957c63e5989b7883eb22f225f82572dd15d5f4d1dff0884c1c2b6afb5e90 SHA512 e99c74bfa1857cd7f83b91b10ed6b93b83acad59ae333f4cf94f2b0d4fd3b8909fbdb4f488499456da45b4167bb32cd354caf473020f6edfcfaab23623a5391d +AUX 243-rc1-revert-logind-remove-unused-check.patch 1148 BLAKE2B 83b908c06bb452943e6f65e7c3acb7759eccada7eb0323eb20f60150f8d95c9186c0f3d6175cfc60ac4ef897b86b12ecd1fa094deec77cd2da7ab9da159987a4 SHA512 17f48b76508069093b4fc5b4678997e2c1f286bae0d10c4ffafd09b082e65d7fd7e6cc65a103628b930166aee8de201c2cac0a77afcef4e63adb7a2f670fdd91 +AUX 243-rc1-udev-properties.patch 1961 BLAKE2B 8f75ddf715de2c0ff8479dfdc276eb29c642658699a567b2cbdf1f91d230a8953d4b257e592fa07629e5fae952d8b3ea89d3d8e3ee51f13d9fd58bd52d02cfec SHA512 ea9bfca902cbb4fc90796026e66f11a564ac9b646aaed1221a33d8a531da109775d9e19cf0fb2115ef69d7e12ea1511c423d7992f08e2faec4c22e0b41c77eec AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch 1848 BLAKE2B 348c35881ce039f92d8fc8dc8c87af2efa95696afbe79ad8fc4e01129524bdf28b529ab86ec611d08446e589176c0678018d94d8c5fc068c65ab4eb429746cf9 SHA512 693afe328ebc20d34cbf07c632a8da90ee293147e793a599a4d2aac6f757738bfab93048a2f8ed6e68d16f865e9b4112e737c692ad01c7d4946f8c430714161d AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460 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-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c -AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4 DIST systemd-243-rc1.tar.gz 8209533 BLAKE2B 6f28d839563104b488bfe030483bf1b24c3d01cedb59ffa655f03a37d7c636c2daef34ca9d13b9fbe848b131d21920138583c63a049c1747f7e569c68384c0bf SHA512 6626d7fd5781578d01a30c0d2647a293668d0819f2f85ce78a6aaf62ae1aa4b2c687cf237ca833c5befbc00321a344ff5ca56747cedc6ce00cd0f51c71dd25ff -EBUILD systemd-242-r6.ebuild 13863 BLAKE2B 0b99239d3a55dd85c3d337a12c91c49bf38eaf3f1a1aff4f3d1d7f90056c4a1559cb8a835cf1fa97ac7bbc3257298d34d09967f034a14f60d5c2cca2fea918d8 SHA512 e3bd2ab3986d99bca4ddafb3a831b389ed2dd728060388f401a4ea5e79adde28d2236aba6388788edacdfdcab7f023346a5ed157e9018b480c6db64cd47d9d45 -EBUILD systemd-243_rc1.ebuild 13399 BLAKE2B 30e2142f4098c9917f9f60e34fdaa05521856be9ac632dc9618cb69364352e02e3a85014561c71ee1664ac10c8c0a426e01b28e69fafb65a52b5b531b0348bbd SHA512 b20984a072a32b2f13a6ec9f251ba8218fdd785a3df6f117851d3a7e671be336409830366c1eeb035291a7b64216c41789fc5b1dee65ef00f37e52940b2377b9 -EBUILD systemd-9999.ebuild 13361 BLAKE2B fa7a0b0eb157fbe5132044cbf865dbbdb2e53396b0bec5a065c5248124c965b52c4bcdf9efa210b5f634a830f118462bbca5bd7be932ad459efc4b0179d7ba85 SHA512 7505f7d9803ac956fab47c13f75a686ef8797580b0d5f525cd21aa70696bdee6b10a49ae8bf78538f81012635e9854586428f19e4c3d57945db301c086c4c2e4 -MISC metadata.xml 2035 BLAKE2B e38c5ee2b2db699ff926aab596d880804b57650ca3fc8627d92f0188249070b445263c3fa82b8a08b0aafa9d7a295790299928e34ae87e327f1f5665a2380beb SHA512 73083a03ae004e5c6d85747a122d715e14a2e81776a2e5d12e82621d10a51ece1d183f302df8eab3cf3a0192e5348a79145aebf56f4eec1e5b2ca82f4a6ebd00 +EBUILD systemd-242-r6.ebuild 14156 BLAKE2B e3f993817df49534a0fa0960f7232ee6168330511bbba2deef09d58e0e3d1e6efa727bc5909151683b77604e51d872daf4d05346e5ef6e1daa3270e9b331d3ee SHA512 9a4e424d9cf0dffe5928d9238c6173d7376db0a7f4b9e547f49d939759c47d74e51ed00584ec0410c33474bae33f47b4f2053b204fe2c5236d2c3a0c10e0855a +EBUILD systemd-243_rc1-r2.ebuild 13916 BLAKE2B 4a9a326ba07267db738329ef758dbdde4a024807b630429f50117ac33186684798590b5105daeb18e36480b9b2a6594d8254702f5cfb7c2629d78d05b8efd18e SHA512 5d94ab7d327be92c9ddee57f6d26fa8f4d9d825df7745d9a3fb3b14fb52ab519cc89fa6622b18b62cf6351c843e3ce39fe782c639054ef9aa1f7abe8aa890db3 +EBUILD systemd-9999.ebuild 13734 BLAKE2B a5d5c38099bef787f76aada7cf222b64ec329e054085a106d5bcfaecc02b13dad1670e6b0e016fd000974b87270fad5fb1fff39e1ef615b1fdf786dfe2c27164 SHA512 6ea1c2a6c4642be7d2cef52d180a8f7334c22ea71eb3d4530d5403f3eb6b39c8afd6c213828b1071bab401a59204d52297310945fc6df2de95856918a4e6469e +MISC metadata.xml 2126 BLAKE2B 8478ef3f19109c9654e894b20148d06a38ae0ffc45d47425fd4275825ba2d28c1de8ebf2e0a67d30a1ce88df9cbf1a04ea3a57a2e37127378f6e3ee5f3efccfd SHA512 642f406a6aee2644920aefdfcd14fb956eab1de98054a9b68e0b4e5683b7ca9b7e3f6dbbfec0d5a21b2eb96fee3511deae0cb4cf69f799b20a04528151f51da8 diff --git a/sys-apps/systemd/files/241-version-dep.patch b/sys-apps/systemd/files/241-version-dep.patch deleted file mode 100644 index 55abea989316..000000000000 --- a/sys-apps/systemd/files/241-version-dep.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 60722ad778d005790231038eecc4ba3034c1a0fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sun, 24 Feb 2019 22:49:38 +0100 -Subject: [PATCH] meson: declare version.h as dep for various targets that - include build.h - -Should fix #11565. ---- - meson.build | 19 +++++++++++++------ - src/core/meson.build | 3 ++- - src/udev/meson.build | 1 + - 3 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index ed787d47492..82ecb4d0e69 100644 ---- a/meson.build -+++ b/meson.build -@@ -1634,7 +1634,8 @@ exe = executable('systemd-analyze', - include_directories : includes, - link_with : [libcore, - libshared], -- dependencies : [threads, -+ dependencies : [versiondep, -+ threads, - librt, - libseccomp, - libselinux, -@@ -2180,7 +2181,8 @@ if conf.get('ENABLE_IMPORTD') == 1 - systemd_pull_sources, - include_directories : includes, - link_with : [libshared], -- dependencies : [libcurl, -+ dependencies : [versiondep, -+ libcurl, - libz, - libbzip2, - libxz, -@@ -2229,7 +2231,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 - systemd_journal_upload_sources, - include_directories : includes, - link_with : [libshared], -- dependencies : [threads, -+ dependencies : [versiondep, -+ threads, - libcurl, - libgnutls, - libxz, -@@ -2555,6 +2558,7 @@ exe = executable('systemd-stdio-bridge', - 'src/stdio-bridge/stdio-bridge.c', - include_directories : includes, - link_with : [libshared], -+ dependencies : [versiondep], - install_rpath : rootlibexecdir, - install : true) - public_programs += exe -@@ -2638,7 +2642,8 @@ exe = executable('systemd-udevd', - link_with : [libudev_core, - libsystemd_network, - libudev_static], -- dependencies : [threads, -+ dependencies : [versiondep, -+ threads, - libkmod, - libidn, - libacl, -@@ -2655,7 +2660,8 @@ exe = executable('udevadm', - link_with : [libudev_core, - libsystemd_network, - libudev_static], -- dependencies : [threads, -+ dependencies : [versiondep, -+ threads, - libkmod, - libidn, - libacl, -@@ -2795,7 +2801,8 @@ foreach tuple : tests - sources, - include_directories : incs, - link_with : link_with, -- dependencies : dependencies, -+ dependencies : [versiondep, -+ dependencies], - c_args : defs, - build_by_default : want_tests != 'false', - install_rpath : rootlibexecdir, -diff --git a/src/core/meson.build b/src/core/meson.build -index 85021bdc010..88fb093732b 100644 ---- a/src/core/meson.build -+++ b/src/core/meson.build -@@ -150,7 +150,8 @@ libcore = static_library( - load_fragment_gperf_c, - load_fragment_gperf_nulstr_c, - include_directories : includes, -- dependencies : [threads, -+ dependencies : [versiondep, -+ threads, - librt, - libseccomp, - libpam, -diff --git a/src/udev/meson.build b/src/udev/meson.build -index 2de88c0d93b..01e4c09f57f 100644 ---- a/src/udev/meson.build -+++ b/src/udev/meson.build -@@ -180,6 +180,7 @@ foreach prog : [['ata_id/ata_id.c'], - prog, - include_directories : includes, - c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], -+ dependencies : [versiondep], - link_with : [libudev_static], - install_rpath : udev_rpath, - install : true, diff --git a/sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch b/sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch deleted file mode 100644 index e337b4f4ca52..000000000000 --- a/sys-apps/systemd/files/241-wrapper-msan-unpoinson.patch +++ /dev/null @@ -1,76 +0,0 @@ -From c322f379e6ca972f1c4d3409ac97828b1b838d5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 22 Feb 2019 13:07:00 +0100 -Subject: [PATCH] Add wrapper for __msan_unpoinson() to reduce #ifdeffery - -This isn't really necessary for the subsequent commit, but I expect that we'll -need to unpoison more often once we turn on msan in CI, so I think think this -change makes sense in the long run. ---- - src/basic/alloc-util.h | 10 ++++++++++ - src/basic/random-util.c | 11 ++--------- - 2 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h -index 893a1238ff..78ee34bb71 100644 ---- a/src/basic/alloc-util.h -+++ b/src/basic/alloc-util.h -@@ -8,6 +8,10 @@ - - #include "macro.h" - -+#if HAS_FEATURE_MEMORY_SANITIZER -+# include -+#endif -+ - typedef void (*free_func_t)(void *p); - - /* If for some reason more than 4M are allocated on the stack, let's abort immediately. It's better than -@@ -160,3 +164,9 @@ void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size); - (ptr) = NULL; \ - _ptr_; \ - }) -+ -+#if HAS_FEATURE_MEMORY_SANITIZER -+# define msan_unpoison(r, s) __msan_unpoison(r, s) -+#else -+# define msan_unpoison(r, s) -+#endif -diff --git a/src/basic/random-util.c b/src/basic/random-util.c -index f7decf60b6..ca25fd2420 100644 ---- a/src/basic/random-util.c -+++ b/src/basic/random-util.c -@@ -23,16 +23,13 @@ - # include - #endif - -+#include "alloc-util.h" - #include "fd-util.h" - #include "io-util.h" - #include "missing.h" - #include "random-util.h" - #include "time-util.h" - --#if HAS_FEATURE_MEMORY_SANITIZER --#include --#endif -- - int rdrand(unsigned long *ret) { - - #if defined(__i386__) || defined(__x86_64__) -@@ -58,11 +55,7 @@ int rdrand(unsigned long *ret) { - "setc %1" - : "=r" (*ret), - "=qm" (err)); -- --#if HAS_FEATURE_MEMORY_SANITIZER -- __msan_unpoison(&err, sizeof(err)); --#endif -- -+ msan_unpoison(&err, sizeof(err)); - if (!err) - return -EAGAIN; - --- -2.22.0 - diff --git a/sys-apps/systemd/files/243-rc1-cryptsetup.patch b/sys-apps/systemd/files/243-rc1-cryptsetup.patch new file mode 100644 index 000000000000..e922d4d29cbd --- /dev/null +++ b/sys-apps/systemd/files/243-rc1-cryptsetup.patch @@ -0,0 +1,148 @@ +From f4ea8432e67110b73b07dd0e47a5339d83b350fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 31 Jul 2019 09:38:15 +0200 +Subject: [PATCH] cryptsetup-generator: fix coverity issue + +Fixes coverity issue 1403772 +--- + src/cryptsetup/cryptsetup-generator.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c +index c51bb9ae189..960f4762b7d 100644 +--- a/src/cryptsetup/cryptsetup-generator.c ++++ b/src/cryptsetup/cryptsetup-generator.c +@@ -46,30 +46,30 @@ STATIC_DESTRUCTOR_REGISTER(arg_disks, hashmap_freep); + STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep); + STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep); + +-static int split_keyspec(const char *keyspec, char **keyfile, char **keydev) { ++static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) { + _cleanup_free_ char *kfile = NULL, *kdev = NULL; +- char *c; ++ const char *c; + + assert(keyspec); +- assert(keyfile); +- assert(keydev); ++ assert(ret_keyfile); ++ assert(ret_keydev); + + c = strrchr(keyspec, ':'); + if (c) { + kfile = strndup(keyspec, c-keyspec); + kdev = strdup(c + 1); +- if (!*kfile || !*kdev) ++ if (!kfile || !kdev) + return log_oom(); + } else { + /* No keydev specified */ + kfile = strdup(keyspec); + kdev = NULL; +- if (!*kfile) ++ if (!kfile) + return log_oom(); + } + +- *keyfile = TAKE_PTR(kfile); +- *keydev = TAKE_PTR(kdev); ++ *ret_keyfile = TAKE_PTR(kfile); ++ *ret_keydev = TAKE_PTR(kdev); + + return 0; + } +From 5d2100dc4c32abbce4109e75cbfbbef6e1b2b7b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 1 Aug 2019 08:13:13 +0200 +Subject: [PATCH] cryptsetup: use unabbrieviated variable names + +Now that "ret_" has been added to the output variables, we can name +the internal variables without artificial abbrevs. +--- + src/cryptsetup/cryptsetup-generator.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c +index 960f4762b7d..84483143945 100644 +--- a/src/cryptsetup/cryptsetup-generator.c ++++ b/src/cryptsetup/cryptsetup-generator.c +@@ -47,7 +47,7 @@ STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep); + STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep); + + static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) { +- _cleanup_free_ char *kfile = NULL, *kdev = NULL; ++ _cleanup_free_ char *keyfile = NULL, *keydev = NULL; + const char *c; + + assert(keyspec); +@@ -56,20 +56,20 @@ static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_key + + c = strrchr(keyspec, ':'); + if (c) { +- kfile = strndup(keyspec, c-keyspec); +- kdev = strdup(c + 1); +- if (!kfile || !kdev) ++ keyfile = strndup(keyspec, c-keyspec); ++ keydev = strdup(c + 1); ++ if (!keyfile || !keydev) + return log_oom(); + } else { + /* No keydev specified */ +- kfile = strdup(keyspec); +- kdev = NULL; +- if (!kfile) ++ keyfile = strdup(keyspec); ++ keydev = NULL; ++ if (!keyfile) + return log_oom(); + } + +- *ret_keyfile = TAKE_PTR(kfile); +- *ret_keydev = TAKE_PTR(kdev); ++ *ret_keyfile = TAKE_PTR(keyfile); ++ *ret_keydev = TAKE_PTR(keydev); + + return 0; + } +From fef716b28be6e866b8afe995805d5ebe2af6bbfa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 1 Aug 2019 08:15:43 +0200 +Subject: [PATCH] cryptsetup: don't assert on variable which is optional + +https://github.com/systemd/systemd/commit/50d2eba27b9bfc77ef6b40e5721713846815418b#commitcomment-34519739 + +In add_crypttab_devices() split_keyspec is called on the keyfile argument, +which may be NULL. +--- + src/cryptsetup/cryptsetup-generator.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c +index 84483143945..4815ded753f 100644 +--- a/src/cryptsetup/cryptsetup-generator.c ++++ b/src/cryptsetup/cryptsetup-generator.c +@@ -50,10 +50,14 @@ static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_key + _cleanup_free_ char *keyfile = NULL, *keydev = NULL; + const char *c; + +- assert(keyspec); + assert(ret_keyfile); + assert(ret_keydev); + ++ if (!keyspec) { ++ *ret_keyfile = *ret_keydev = NULL; ++ return 0; ++ } ++ + c = strrchr(keyspec, ':'); + if (c) { + keyfile = strndup(keyspec, c-keyspec); +@@ -567,7 +571,7 @@ static int add_crypttab_devices(void) { + } + + for (;;) { +- _cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keydev = NULL, *keyfile = NULL, *keyspec = NULL, *options = NULL; ++ _cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keyspec = NULL, *options = NULL, *keyfile = NULL, *keydev = NULL; + crypto_device *d = NULL; + char *l, *uuid; + int k; diff --git a/sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch b/sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch new file mode 100644 index 000000000000..30a20c17661d --- /dev/null +++ b/sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch @@ -0,0 +1,31 @@ +From 18f689b1fa35c53580da62bfce875fb15d20d448 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Sun, 4 Aug 2019 05:43:34 +0900 +Subject: [PATCH] Revert "logind: remove unused check" + +This reverts commit f2330acda408a34451d5e15380fcdd225a672473. + +Fixes #13255. +--- + src/login/logind-action.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/login/logind-action.c b/src/login/logind-action.c +index fa92f4870a2..140953eec10 100644 +--- a/src/login/logind-action.c ++++ b/src/login/logind-action.c +@@ -61,8 +61,12 @@ int manager_handle_action( + int r; + + assert(m); +- /* We should be called only with valid actions different than HANDLE_IGNORE. */ +- assert(handle > HANDLE_IGNORE && handle < _HANDLE_ACTION_MAX); ++ ++ /* If the key handling is turned off, don't do anything */ ++ if (handle == HANDLE_IGNORE) { ++ log_debug("Refusing operation, as it is turned off."); ++ return 0; ++ } + + if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) { + /* If the last system suspend or startup is too close, diff --git a/sys-apps/systemd/files/243-rc1-udev-properties.patch b/sys-apps/systemd/files/243-rc1-udev-properties.patch new file mode 100644 index 000000000000..5e2ffa1868a3 --- /dev/null +++ b/sys-apps/systemd/files/243-rc1-udev-properties.patch @@ -0,0 +1,53 @@ +From 41c81c4a626fda0969fc09ddeb8addb7aae6e4d9 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Sun, 4 Aug 2019 06:08:06 +0900 +Subject: [PATCH] udev: do not try to import properties on commented out lines + +Fixes #13257. +--- + src/udev/udev-rules.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c +index 3473a7eb7e5..1642f105354 100644 +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -1401,8 +1401,10 @@ static int get_property_from_string(char *line, char **ret_key, char **ret_value + key = skip_leading_chars(line, NULL); + + /* comment or empty line */ +- if (IN_SET(key[0], '#', '\0')) ++ if (IN_SET(key[0], '#', '\0')) { ++ *ret_key = *ret_value = NULL; + return 0; ++ } + + /* split key/value */ + val = strchr(key, '='); +@@ -1429,7 +1431,7 @@ static int get_property_from_string(char *line, char **ret_key, char **ret_value + + *ret_key = key; + *ret_value = val; +- return 0; ++ return 1; + } + + static int import_parent_into_properties(sd_device *dev, const char *filter) { +@@ -1681,6 +1683,8 @@ static int udev_rule_apply_token_to_event( + line); + continue; + } ++ if (r == 0) ++ continue; + + r = device_add_property(dev, key, value); + if (r < 0) +@@ -1719,6 +1723,8 @@ static int udev_rule_apply_token_to_event( + line); + continue; + } ++ if (r == 0) ++ continue; + + r = device_add_property(dev, key, value); + if (r < 0) diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r1.patch b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch deleted file mode 100644 index 9c53b8b18ab9..000000000000 --- a/sys-apps/systemd/files/gentoo-uucp-group-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/rules/50-udev-default.rules.in -+++ b/rules/50-udev-default.rules.in -@@ -22,7 +22,7 @@ - SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" --KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" -+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" - - SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 05423b63bbdc..76658cc29c52 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -11,6 +11,7 @@ Enable AppArmor support Enable support for sys-process/audit + Default to hybrid cgroup hierarchy instead of unified. Enable support for uploading journals Enable cryptsetup tools (includes unit generator for crypttab) Enable DNS-over-TLS support diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild index eb97107359b6..ca3aee2f6d17 100644 --- a/sys-apps/systemd/systemd-242-r6.ebuild +++ b/sys-apps/systemd/systemd-242-r6.ebuild @@ -465,6 +465,14 @@ pkg_postinst() { 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 diff --git a/sys-apps/systemd/systemd-243_rc1-r2.ebuild b/sys-apps/systemd/systemd-243_rc1-r2.ebuild new file mode 100644 index 000000000000..988973dd9a7e --- /dev/null +++ b/sys-apps/systemd/systemd-243_rc1-r2.ebuild @@ -0,0 +1,483 @@ +# Copyright 2011-2019 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 + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi + +PYTHON_COMPAT=( python{3_5,3_6,3_7} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev + +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 http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb" + +REQUIRED_USE="importd? ( curl gcrypt lzma )" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + !=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + 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? ( virtual/pam:=[${MULTILIB_USEDEP}] ) + pcre? ( dev-libs/libpcre2 ) + qrcode? ( media-gfx/qrencode:0= ) + 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 + ! "${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 +} + +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-243_rc1.ebuild b/sys-apps/systemd/systemd-243_rc1.ebuild deleted file mode 100644 index 3f4f5a43b843..000000000000 --- a/sys-apps/systemd/systemd-243_rc1.ebuild +++ /dev/null @@ -1,471 +0,0 @@ -# Copyright 2011-2019 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 - MY_PV=${PV/_/-} - MY_P=${PN}-${MY_PV} - S=${WORKDIR}/${MY_P} - SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -fi - -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) - -inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev - -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 cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb" - -REQUIRED_USE="importd? ( curl gcrypt lzma )" -RESTRICT="!test? ( test )" - -MINKV="3.11" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - !=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - curl? ( net-misc/curl:0= ) - dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - 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? ( virtual/pam:=[${MULTILIB_USEDEP}] ) - pcre? ( dev-libs/libpcre2 ) - qrcode? ( media-gfx/qrencode:0= ) - 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 - ! "${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 -} - -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 [[ -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 a2bb8171bab6..7556cea0b553 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -23,7 +23,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 cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -244,6 +244,7 @@ multilib_src_configure() { # no deps -Defi=$(meson_multilib) -Dima=true + -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified) # Optional components/dependencies -Dacl=$(meson_multilib_native_use acl) -Dapparmor=$(meson_multilib_native_use apparmor) @@ -342,7 +343,7 @@ multilib_src_install_all() { # 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,user} + keepdir /etc/systemd/{network,system,user} keepdir /etc/udev/{hwdb.d,rules.d} keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} keepdir /usr/lib/{binfmt.d,modules-load.d} @@ -444,6 +445,14 @@ pkg_postinst() { 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 diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 1b659c309e92..9eb857f45210 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,5 +1,7 @@ AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdaccb52fe6e54cce0a077a28501c7c87bec55f046172545d940c52345551cd3c01cff0895d12b32a15 SHA512 05a3c2542ceaff85c02c5c30a52be8f1bb95741fffef306777ad1b248b527cdd921f009571e1f43d7a6ede0cc61cf490a1dbbbfe0a50b234c258ad7688a37ad9 +AUX halt.sh 99 BLAKE2B 461ca8402ff0e867f4fed8d8bc740f1306e7c62c863748f88966e3f75e0cf84c222a4a20d55c840731e501b67dd533a9421e40936336abf12e02f6bf24727aae SHA512 532caf8247071fb0c726da42aa2e6025c7cc14e45dd6c4a75396895b82a9097ff0d9e56bc0497188df07525f944a061911a834e4fbc82a31bee06fff7e561660 AUX inittab-2.91 1981 BLAKE2B 4917bad0474c3ab7aa02d481697ed0ce207b3c4c0f54beac794af07e76ad7d98420da77d7a08a32cbec32199196f630c92f67b9d57fedda23f49c97be113aa81 SHA512 2020a37686c3800335693b0ad977b4fcb5d6ee5abb09b5e683369ff0ab943e17c15a9a7cae02ca96d11ee310d7b8ad2814562f5a56fb82abedb3d60e2a7d2aef +AUX inittab-2.95 1978 BLAKE2B b6fb1e0c6eaa68fb5d451d8065d1b1b5a53b15339f46a03f1c1ae410d03b40d102fe27e377750c1059377a4c741b30641c7f5e0f6f38c9d36180c43e25cac0ed SHA512 cae9909916b23c1bb6573b4b9bfc14ffb9d0b98e7c1546851713269528443b29417656c420f95810619fb0ae67f309bbe51804238825e938f53b75a0c4d76b81 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,5 +12,6 @@ DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e2387 DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28 EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900 EBUILD sysvinit-2.94.ebuild 3817 BLAKE2B dcf4a1ce3f2eb774783e0d3bab5a189e45f43bafefb05c8f6d60f3f09639c691576447c0b6922c974ed8f0f5ab7ecbacba1b427dcb569470163658c64dadaa06 SHA512 7b60c4537ad8f1d4bd70a3c922a8778501b89343ab103f5413322745077ae8c85c16344773746a8e7ae3ef1d185420c26fd30598e33b5641d57563d32f9c7179 +EBUILD sysvinit-2.95-r1.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e EBUILD sysvinit-2.95.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f diff --git a/sys-apps/sysvinit/files/halt.sh b/sys-apps/sysvinit/files/halt.sh new file mode 100644 index 000000000000..07a32b99574f --- /dev/null +++ b/sys-apps/sysvinit/files/halt.sh @@ -0,0 +1,6 @@ +#!/bin/sh +if [ "$INIT_HALT" = HALT ]; then + exec /sbin/halt -dhn +else + exec /sbin/poweroff -dhn +fi diff --git a/sys-apps/sysvinit/files/inittab-2.95 b/sys-apps/sysvinit/files/inittab-2.95 new file mode 100644 index 000000000000..03f226a8c3bf --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.95 @@ -0,0 +1,61 @@ +# +# /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, +# + +# 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 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.95-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild new file mode 100644 index 000000000000..6dd6484ee442 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2019 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 ~sh ~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.95 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 sh || 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 + + # dead symlink + rm "${ED}"/usr/bin/lastb || die + + newinitd "${FILESDIR}"/bootlogd.initd bootlogd + into / + dosbin "${FILESDIR}"/halt.sh +} + +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 [[ -e /dev/initctl && ! -e /run/initctl ]]; then + ln -s /dev/initctl /run/initctl + 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/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest index 2a1163571eb4..ab086fa468d0 100644 --- a/sys-apps/tcp-wrappers/Manifest +++ b/sys-apps/tcp-wrappers/Manifest @@ -2,6 +2,8 @@ AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9b AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa915b94b4466c79a23529e1d815487145dffef73d262a1d79e209caaf627fbf81b4f5402fca45af6f995c129fcb2539e4 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8 +DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac EBUILD tcp-wrappers-7.6.22-r1.ebuild 2510 BLAKE2B 6d3f6d9a39394aeb243816bf787b6a9c93b3627d00fa784864b93b44ec127e9b5e8851a99a08b5d692887184b6d24fddb1326a64f96e791a8db37dda01296241 SHA512 7357160a8a1de09761e7b454974f319701691ed09f9cde27e655f77252053b50573e442549b322f00b21d40c472d6290432d3df90d16a9acf92afed1be35a6e6 +EBUILD tcp-wrappers-7.6.28.ebuild 2402 BLAKE2B 3fbe739b8ff71cc4d55ff6ba7bcb9c066262fac84e9118fc167ac25cc1d03643744ae6f62a84a906b646467b8230fde760bf27646322c6233b58253c7b37a9bf SHA512 a03b62a74d15b111e276a37795476bee9620e300ac81bc43b272367811df9ec1564301e1e8d4c5a1943504fd5677f00f9db2f0b2fb0851714b63c240841b65e5 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5 diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild new file mode 100644 index 000000000000..00e58c8c433f --- /dev/null +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs flag-o-matic multilib-minimal usr-ldscript + +MY_PV=$(ver_cut 1-2) +DEB_PV=$(ver_cut 3) +MY_P="${PN//-/_}_${MY_PV}" +DESCRIPTION="TCP Wrappers" +HOMEPAGE="http://ftp.porcupine.org/pub/security" +SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz + mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz" + +LICENSE="tcp_wrappers_license" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="ipv6 netgroups static-libs" + +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series) + eapply "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch + + eapply_user + + multilib_copy_sources +} + +temake() { + local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED" + use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" + emake \ + REAL_DAEMON_DIR="${EPREFIX}/usr/sbin" \ + TLI= VSYSLOG= PARANOID= BUGS= \ + AUTH="-DALWAYS_RFC931" \ + AUX_OBJ="weak_symbols.o" \ + DOT="-DAPPEND_DOT" \ + HOSTNAME="-DALWAYS_HOSTNAME" \ + NETGROUP=$(usex netgroups -DNETGROUPS "") \ + STYLE="-DPROCESS_OPTIONS" \ + LIBS=$(usex netgroups -lnsl "") \ + LIB=$(usex static-libs libwrap.a "") \ + AR="$(tc-getAR)" ARFLAGS=rc \ + CC="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \ + LDFLAGS="${LDFLAGS}" \ + "$@" || die +} + +multilib_src_configure() { + tc-export AR RANLIB + temake config-check +} + +multilib_src_compile() { + temake all +} + +multilib_src_install() { + into /usr + use static-libs && dolib.a libwrap.a + dolib.so shared/libwrap.so* + + insinto /usr/include + doins tcpd.h + + if multilib_is_native_abi; then + gen_usr_ldscript -a wrap + dosbin tcpd tcpdchk tcpdmatch safe_finger try-from + fi +} + +multilib_src_install_all() { + doman *.[358] + dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5 + dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5 + + insinto /etc + newins "${FILESDIR}"/hosts.allow.example hosts.allow + + dodoc BLURB CHANGES DISCLAIMER README* +} + +pkg_preinst() { + # don't clobber people with our default example config + [[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow +} diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest index 27bea3b94776..24265a35b894 100644 --- a/sys-apps/tuned/Manifest +++ b/sys-apps/tuned/Manifest @@ -5,8 +5,8 @@ AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60 DIST tuned-2.7.0.tar.bz2 107541 BLAKE2B b26924a091fd78bbc7e61c8a45b49808d132eb5ebd3fdc00f96be7eaddcffd88183fa59595a29e2c402b2c434bfdb706601d397c2ebca9a5822c6a3416373465 SHA512 ce09dd854e89762fa376f7f63a59feb384940b5dbc5ad74370b33bbda3f060f09e79d2988de3535b072ad749ab7be43ccaaa46a343a9df50eec6c40d7ab85d55 DIST tuned-2.7.1.tar.bz2 107471 BLAKE2B c9259ee5ce502100edc7c537f6857de3a6af4af0be1773e0c9422c10de16b4a513d514532da26764b0a743f943577d527919f329ff48a012e269fd2a0ac59f10 SHA512 4a4785e3d20ed7f1c2969066676f5fa3d8286b500de1c63169d745e701e1410092d29429d25c13c3515d37ef73dd297945d69db176d693d4152bfbe9ba626833 -EBUILD tuned-2.10.0.ebuild 1244 BLAKE2B 71ccfd41ecf9f013398454ac236d7cff9bb7008e097c9e06c72cbbcca414bbab8ccdb0ef0e5e33c551fa63715168f134d4ca7cf67bd9614bd1824d4dafa0c632 SHA512 8029013f279fa820c6efa9994db4b689098c39f973364f9dca1a0dccc2b3d344d3e1156199b2b9e032002d6eea8de5d4c3b2e2075953bfcb682152aa79f75605 +EBUILD tuned-2.10.0.ebuild 1260 BLAKE2B 072a755292b5ce009d10ad07e534f556288e2a3c4e9bf39d92e9848f91c5d075d70ed6837824da7e7cef896f231cf48aeae5128e9c82204e5346ab4b8fc87581 SHA512 cd10e1561b88d5791b234ede308c280bbdcafb67e54314c381bec848f57b94e53f26fff3b3998a0852acfc892725fea94516b83a9ae32769918daa0928b328df EBUILD tuned-2.7.0.ebuild 1110 BLAKE2B 52ec7c2aedbf50d9433d535143c98868933e21c99ef4c715b7c76b5e561959061d99252943e911133d970bf0795f0dfb44e0ae40f439174d8c650d9f55f21679 SHA512 f745d80d4c25138f051764fa48af016c76cf9fac770b19b10f8901dcc010040ffaeb7d137e3685e90dbda331cecf48f0cf0abac97a95473f8f0cc0abdae0206e EBUILD tuned-2.7.1-r2.ebuild 1109 BLAKE2B 6cff0b820535bc77ee89aa35c3571e1e56b6f0d9424d922d60e56e519053d90128051ee571fad8015073983d2725284ac2931cb0a93a772750fc3f71722eac8c SHA512 4b4ef8ca04d2451bc084fe6654676ea50eb707df880fb3989d88d7728c73f5f2dc38a1d855a28a141eb4cc2d7d6f9e7087c291689504854a6946d8ffdd1ef1cc -EBUILD tuned-2.7.1-r3.ebuild 1100 BLAKE2B f430dae7468e39f600800a07020040e233ec35917ff451ff77b54276c21b7e815fb7b477536a4e0cf6d138bbda8c681363f11fbd3b9018f57c14f8a8411fead6 SHA512 b490acead79906d78289c354ef0e3ca7cb4f774c6915e010a386d1b80e27583633c918c6eb6e68222357001129bb86a3534ff7cceb396579712f6c373b5074b3 +EBUILD tuned-2.7.1-r3.ebuild 1113 BLAKE2B 978491459acfac39947ef6f8ad9d903d92081071b835bfc3539265e636be92406cb3acffafbcbd359a5f2aa88e289f7f4d6737bb304d1c56ba5e7dc8fb1ddd41 SHA512 c38175c8ab81d06d65c9d61ea3d3cd3586da8c846a2d589fc56fbc0470b40587adb3ba98db53f0d142d5252b41e225655c186a03de96ed4377029e09d45cdcd8 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea diff --git a/sys-apps/tuned/tuned-2.10.0.ebuild b/sys-apps/tuned/tuned-2.10.0.ebuild index 133b2755a18e..0d0931ccad3d 100644 --- a/sys-apps/tuned/tuned-2.10.0.ebuild +++ b/sys-apps/tuned/tuned-2.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,6 +18,7 @@ KEYWORDS="~amd64" REQUIRED_USE="${PYTHON_REQUIRED_USE}" CDEPEND=" + ${PYTHON_DEPS} dev-python/configobj[${PYTHON_USEDEP}] dev-python/decorator[${PYTHON_USEDEP}] dev-python/pyudev[${PYTHON_USEDEP}] diff --git a/sys-apps/tuned/tuned-2.7.1-r3.ebuild b/sys-apps/tuned/tuned-2.7.1-r3.ebuild index d8d3a5fb28ad..99c6ce5840b7 100644 --- a/sys-apps/tuned/tuned-2.7.1-r3.ebuild +++ b/sys-apps/tuned/tuned-2.7.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" CDEPEND=" + ${PYTHON_DEPS} dev-python/configobj[${PYTHON_USEDEP}] dev-python/decorator[${PYTHON_USEDEP}] dev-python/pyudev[${PYTHON_USEDEP}] diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 2137fe41b232..7a23bb7464bf 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -7,8 +7,8 @@ DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7 -EBUILD util-linux-2.33-r1.ebuild 8382 BLAKE2B dee934abe20d708b7cc4df6cb54c5fad579ecb440e8cd71d983e86d7502bee1d78a141c1ffe484fb649aaca1dbe0662e96c4d84830d24aba5706c9ea9fde9347 SHA512 5d6f88eaf359942278661076eb6ec9693d17c586ad1a708459fc3bdf8d044a4900162a9d6e139f5e0eb4bb42cdbb5ebf119890a6815cc4df4c525cf15ad31ec4 -EBUILD util-linux-2.33.1.ebuild 8651 BLAKE2B 30194cdff783d4105075985cf598ea14fcae7fa3bb0482ddcc9e9f843cb972bc2b0a3988e8aad58e0e11b0f0b6d88acbfe17f843fe72e6491b594774c28fcaa0 SHA512 6b94cecb337476ea23c80daaca7e27d2b61dd6b05034448d1540131550b8482620c443f5454e17b313c48db77689f1faba3ca8c5154287fea08516d5385e8cb0 +EBUILD util-linux-2.33-r1.ebuild 8318 BLAKE2B 365b5524836b404ed7267e0f7a27bd16e078fd39851c8925bbce172c7590291c6e0b52d72734fd22eff15ef2eca91f90dfc0c09e8ac8e2fc149d44542af1a907 SHA512 3e89181614a7dd217b92551376977bce9facce9af5a155d8e34c7a6ce1f28188063385289409ec253b418fab4aeab6dc7af0ccf1e73a3f3445c27f6fe422b529 +EBUILD util-linux-2.33.1.ebuild 8587 BLAKE2B 3338820cff72065646621f46df8a4ebadbccea79d32087dda7e76bc3763645e2a5218ead5a0499cff7ac2fda80b5991c65b5800d8a0eb41ba4a5032b9e58e24a SHA512 2285d7784c187a8f34428963cfd08bf20436ad07362e277a3d3ea3ac5f52183b98657d566a701b0941c13e3afad0e664497e384bbb6bd191f81fd8bc326a75f6 EBUILD util-linux-2.33.2.ebuild 8582 BLAKE2B b1d7f159f5cbfdbe0b0ab4ee08601ccff732b159ef1fcb6caf38ca00fd28ae9a966e12a378a9b4785aa815038d92d017f1491f07a5e24fd5d7f634da960a391e SHA512 69e20c41b8b646a2d48172d6f3743ca58df545155c980c29ec51da9d2ec0e22064e18230adc940c1e5f8ff2d40f0db10deb1dd823b7faede4a0c522e558554f6 EBUILD util-linux-2.34-r2.ebuild 8448 BLAKE2B c96573fc8b43e64b3902d7d122aaddc202389a709cdab68187179ae67e4622d53be0cc4b99bcfd19b6fb7fc6e699b3f6d844b846baef1ba7653186f9f6b14e92 SHA512 950015c302d7caf37781d631f4b38fedb1b3c31d5f9d6e2d6a26d3e7b3fc48b8638499d768abf6393c668827491b95180a246e3c2eb3974fca8c049a5a6ab9e0 EBUILD util-linux-9999.ebuild 8448 BLAKE2B c96573fc8b43e64b3902d7d122aaddc202389a709cdab68187179ae67e4622d53be0cc4b99bcfd19b6fb7fc6e699b3f6d844b846baef1ba7653186f9f6b14e92 SHA512 950015c302d7caf37781d631f4b38fedb1b3c31d5f9d6e2d6a26d3e7b3fc48b8638499d768abf6393c668827491b95180a246e3c2eb3974fca8c049a5a6ab9e0 diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild index 48646c81ec91..3bc1b7b6b9a8 100644 --- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.33-r1.ebuild @@ -1,5 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors and others -# Copyright 2018 Sony Interactive Entertainment Inc. +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild index 041c8e786de8..28eb1518bdf0 100644 --- a/sys-apps/util-linux/util-linux-2.33.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild @@ -1,5 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors and others -# Copyright 2018 Sony Interactive Entertainment Inc. +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest index c18ce145477a..ef8902da90e2 100644 --- a/sys-apps/xdg-desktop-portal/Manifest +++ b/sys-apps/xdg-desktop-portal/Manifest @@ -1,5 +1,3 @@ -DIST xdg-desktop-portal-1.2.0.tar.xz 405856 BLAKE2B 8d198c7c18b829f531e34d6526b52776a1acffcb874a2ea93953314710aa18bcb1988ffe190bb7b7f7c0d1c4eb1bc3d39fd2f7da626754730bf64f349ae75d39 SHA512 7c7dff8f1f44b4f564f195a8f9ad2985f6085d16638d18941459cd14d76d8ae7cafaf72f461f2c0c1414a8bace9f3ab4a5416de06edb71df677fd7bdca47f61a DIST xdg-desktop-portal-1.4.2.tar.xz 421660 BLAKE2B 5395218fa182947c589ff51cd43b838591e47442b23c4fe0719f0970bff3602e81c4f79ad93890bde97a529ca34a733032e85a1f21f41e9aa230d5c2d40e1136 SHA512 9a19dc8f6899a24f8827ce36447316ce74f293abed469be24adfaa16d18deac0b7c5d77f744eed9b540b54cd23145281dacb6811dc52b34180b21d6dc02efc5a -EBUILD xdg-desktop-portal-1.2.0.ebuild 1045 BLAKE2B 2061bb59d99bb21ed71e5ace6a25f4f5246cb082f4f0d047e30b7ac057848e5e25b4beed6009f56aa60bc4d52b9666826fd791f0716a8777338aaa4c23fce254 SHA512 25119b9438894da1b1bd9500087b6146054eb8d188d3114017bbbaf749d86bb521a9c359980f00007567d8d3a42573f04aa8be5020e046d6bf3435ca1fc615fa -EBUILD xdg-desktop-portal-1.4.2.ebuild 978 BLAKE2B ba6d4125cf86e04474286e193dc2183561de4b9322aea49033229a72cc3df5424715a2d47d2da200c4300eaf55e4cf8937811441db16a81fbe4e867254fc925a SHA512 00ae36995b73f502250c002b84e805547f933622f3c5fc53bdfda6044f504efc0feda8a2321df02740307efe862fde3667bd65e2c3f1440dcceab10e88105670 +EBUILD xdg-desktop-portal-1.4.2.ebuild 977 BLAKE2B 97a7170c7d4b625dd13a089180fe74780f0e3f967ebce3d912ff2a64055e47b17063557dd8bc3ac518ba0c7136c7e7ccb8f65ca558cc24c017d1c635e5c00d74 SHA512 1348d465bd5d3438d16cd9aaef2cf373c67fefbba35504b98131072777fe587785d29abfbf0613a0f6e8d19c8e4a3c645c048f41cc4dcc8727b4bfd29b0a27ac MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22 diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild deleted file mode 100644 index 65b6451ec6f4..000000000000 --- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 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 x86" -IUSE="doc" # geolocation - -BDEPEND=" - dev-util/gdbus-codegen - sys-devel/gettext - virtual/pkgconfig - doc? ( - app-text/xmlto - app-text/docbook-xml-dtd:4.3 - ) -" -DEPEND=" - dev-libs/glib:2[dbus] - sys-fs/fuse:0 -" -# geolocation? ( >=app-misc/geoclue-2.5.2:2.0 ) # bug 678802 -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -e "/^PKG_CHECK_MODULES(FLATPAK/s/^/# DONT /" -i configure.ac || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-pipewire - --with-systemduserunitdir="$(systemd_get_userunitdir)" - $(use_enable doc docbook-docs) - --disable-geoclue - ) -# $(use_enable geolocation geoclue) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild index e8fef5501652..c93537059712 100644 --- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild +++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.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 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" IUSE="doc geolocation screencast" BDEPEND=" @@ -28,7 +28,7 @@ DEPEND=" dev-libs/json-glib sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) - screencast? ( media-video/pipewire ) + screencast? ( media-video/pipewire:= ) " RDEPEND="${DEPEND}" diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest index 0b8097ddc7d0..5d75a83a05a3 100644 --- a/sys-apps/yarn/Manifest +++ b/sys-apps/yarn/Manifest @@ -3,11 +3,13 @@ DIST yarn-v1.12.3.tar.gz 1166553 BLAKE2B 8e0c56c46522eeccaa558dd1fccdca40e83d03d DIST yarn-v1.13.0.tar.gz 1169613 BLAKE2B 5fc730c0b456d67702ef5305223cfd933c4c8f1d13364ff383294f8ae2b7b3f400476ff32b9aa0b27c497116660ea295691831e4e9bf50cb699d03d2dcd99e6e SHA512 5277f0d9e79fbfc8a6b7864c3e1bc554fe38582cf7f21b83c641ecf98aabc78c014caef94ebd26877578ae1fb6370e6242ad2b70cfd569fa2d099a3da936f90c DIST yarn-v1.15.2.tar.gz 1169927 BLAKE2B 1ebf899b1f34dd3b6fea4fa001b1edda62dd4c8964099b8a1bc858a1b28b7ccbab3aa3e229bc7882892763db414ed4f7cfbe2deb636d2a8675da87df1754a835 SHA512 0e1a9a19ed8571829db8ee36776841c9793bcbc936938d87deecd875604c4ef70d72058ac7bc429095ac540422917bda1103761b224daf3f026e8a9499a051af DIST yarn-v1.16.0.tar.gz 1172930 BLAKE2B 1dbb754ae0af3b9666bb03057f587854407b3587fc4304e8282c759d5ea0cbee12eed58e526808893d3cf8e29c4ec69b13a28acccc6f6908bcdb8c9126d1a408 SHA512 71f7a6c8696758a035ce8a5452079b4cf7fc0b85a43c867e4c99a4970704009e2eea858fb49780cebb1a99a18687ff9bd5759ef16e75cb3008982e0059b591d6 +DIST yarn-v1.17.3.tar.gz 1240577 BLAKE2B a5b0fdd014928181da63a322bdc030e4aefd4033d27f49a37225aa2cb3199339dd06e9f74aaa442bfb4692b0470fda40102a41b52a1369c8b84282bae5bc46a6 SHA512 0a003ca3b9d165a42f99e17f581c76142edff56ff45f9f53d8868b62a80ca3aeb7ef07e9e66304b0cdd85e826d294b299e998324a97f8061619ea4beb0e37b84 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f SHA512 1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b EBUILD yarn-1.10.1.ebuild 982 BLAKE2B e425900b48d8d8c3e0c892244c8dc9aa851dc8b52235156b1db04e2b5c96b6e30fab6b0466385a27a6ed509e8bdf75cf79f8242155739c9014b08625b1b45992 SHA512 5516aa40f79ddd130e55b5ede8684fde739e868cf885ecfadf6185b27588680f6c5f050aae5cf50d1617fb9ef912fc222390246418ec79bab32335b6975837f9 EBUILD yarn-1.12.3.ebuild 982 BLAKE2B e425900b48d8d8c3e0c892244c8dc9aa851dc8b52235156b1db04e2b5c96b6e30fab6b0466385a27a6ed509e8bdf75cf79f8242155739c9014b08625b1b45992 SHA512 5516aa40f79ddd130e55b5ede8684fde739e868cf885ecfadf6185b27588680f6c5f050aae5cf50d1617fb9ef912fc222390246418ec79bab32335b6975837f9 EBUILD yarn-1.13.0.ebuild 982 BLAKE2B 095496de5e6d36be1f9323bb69bbb40f60bd17ad7f8351329b6ee0bceb28dfebe0a8c17fb0d63d12e3cea375f26a15ee51b9463c7b5f1c1edaa46a5e7a61eb24 SHA512 aae6d0d508bd30834b2e7a0d6b180cfddcc995292dea6a0c7ed15713779d32145a86cbec20e6a21e37ff92728bfdc32116804a1338d93f7318dac0229d7a5f42 EBUILD yarn-1.15.2.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4 EBUILD yarn-1.16.0.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4 +EBUILD yarn-1.17.3.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4 EBUILD yarn-1.9.4.ebuild 985 BLAKE2B 7b005c3aa6d5ac229d56eb115952f9280523a29d4ad94c52fd2d66b699199296d3819ad3add9e124c8be69fba103407ea1ea8b5e388a2f651f9ca0d8f23cd9af SHA512 8e5fe167f9067c05a25a8da3eac42a229898fa1e5de02beade97b25c4e6814717bf498c581f1e5113409afc34eba0d0bf70bb303a2a1b49497093b95f4d6a038 MISC metadata.xml 545 BLAKE2B 223f9132b5cbabf71b64028e2fd75d4de88566b59069db3e1ebcf195cf3143e1c4c0f04dfa05d911a65f9d8ff29504385a9d8ed3001f66473e39ee2bca2417ba SHA512 f742b0908db5b89cd69b910497da75f129a0bc73b6068df891a4b8673d233b3bacc5347d98a872fdf8984f588c4991ae6c2b65ab60fbf81bfc5474402efae44a diff --git a/sys-apps/yarn/yarn-1.17.3.ebuild b/sys-apps/yarn/yarn-1.17.3.ebuild new file mode 100644 index 000000000000..6366d1485234 --- /dev/null +++ b/sys-apps/yarn/yarn-1.17.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 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 ~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" + + 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