diff options
Diffstat (limited to 'sys-apps')
41 files changed, 657 insertions, 224 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 9334e06cb726..1b2f976c85a3 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest index d2baf39921a0..f50feb7ee259 100644 --- a/sys-apps/bleachbit/Manifest +++ b/sys-apps/bleachbit/Manifest @@ -1,3 +1,5 @@ DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb +DIST bleachbit-4.4.0.tar.bz2 640690 BLAKE2B 577b5498eeb25c499753468fd6d20fa398423ee0f36837069ecd3c6e32d20686bdf2e41492d8b082551ad373266f98963d900bc68042dc0715a5f509945be352 SHA512 ad117a790803dc405752a4582b735351842305603de7ea9d98b0d59d93e8f75e18d7125958c1cb907891098f79502ebe5a560191384036506ac4ea66694f93af EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055 +EBUILD bleachbit-4.4.0.ebuild 1738 BLAKE2B d24c44d43b78b469383eac541887d92d21fd5f8028db13414ddc9dd4ca3efd508b71697b9ca805b4fba7bb89ef2eaa2c39ec69b9df835686b400121791e393c3 SHA512 53c3ee807a31be866b4f518cc4a3d05d04a5bad954ab0ac61cb5c48f6bbf49911e9f30ff1aa4d8fb08885b724ed3aae676fc0ac7313925c07b6d1c2b18685a53 MISC metadata.xml 556 BLAKE2B 3d2e34427ddd2e3ba55b12f247feac62e522fea8f952e69af43eeeed04a246d851b04fdfa16e169f5804eff20938bc545f0040b9133a1622cb4fe5b764b549f1 SHA512 1e58cf757be397a69a57e4ede9feaed4ba495a9c094fbe690062ea5623cb955434e9926d12ddf5f0f651a40a0a2775d168e3f8343b64bac4efb514e403a3fe77 diff --git a/sys-apps/bleachbit/bleachbit-4.4.0.ebuild b/sys-apps/bleachbit/bleachbit-4.4.0.ebuild new file mode 100644 index 000000000000..3b1fdfbeb132 --- /dev/null +++ b/sys-apps/bleachbit/bleachbit-4.4.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_REQ_USE="sqlite(+)" +DISTUTILS_SINGLE_IMPL=1 + +inherit desktop distutils-r1 virtualx + +DESCRIPTION="Clean junk to free disk space and to maintain privacy" +HOMEPAGE="https://www.bleachbit.org" +SRC_URI="https://download.bleachbit.org/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + sys-devel/gettext + test? ( + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') + ) +" + +distutils_enable_tests unittest + +# tests fail under FEATURES=usersandbox +RESTRICT="test" + +python_prepare_all() { + if use test; then + # avoid tests requiring internet access + rm tests/Test{Chaff,Update}.py || die + + # fails due to non-existent $HOME/.profile + rm tests/TestInit.py || die + + # only applicable to Windows installer + rm tests/TestNsisUtilities.py || die + + # these fail on upstream Travis CI as well as on Gentoo + sed -e "s/test_notify(self)/_&/" \ + -i tests/TestGUI.py || die + + sed -e "s/test_get_proc_swaps(self)/_&/" \ + -i tests/TestMemory.py || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + emake -C po local +} + +python_test() { + virtx emake tests +} + +python_install() { + distutils-r1_python_install + python_newscript ${PN}.py ${PN} +} + +python_install_all() { + distutils-r1_python_install_all + emake -C po DESTDIR="${D}" install + + insinto /usr/share/bleachbit/cleaners + doins cleaners/*.xml + + insinto /usr/share/bleachbit + doins data/app-menu.ui + + doicon ${PN}.png + domenu org.${PN}.BleachBit.desktop +} diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 7d74516ad0b3..aa7969126867 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -3,7 +3,7 @@ AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280 DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 -DIST etckeeper-1.18.15.tar.gz 92574 BLAKE2B 1498d01394c9c5607eb081aa579f06c696b5df20af2899cb3deb2ac75ddf2b1f6ca7e64741b7e24819db2f8c751f3dd49da70cccad35fbfad255b328e208e973 SHA512 7b2cca6c346a7c2b97ffd9b418169712ec46d947a3c8685490ce95eb9f5b6fa389e7b3ae6ad2c1ad6774bed88212b05c5ffe202ad055dea19fdde2509a349a85 +DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 EBUILD etckeeper-1.18.14.ebuild 1705 BLAKE2B 6e4b27820a9de14ea5e1e0f6a588589983e3326a23ec968b0a53e3b486749e31de39cc230a0568bb32e889aea159effd15bb11a9002498c10a2091b196d7cc05 SHA512 d31598fc22846eaef27c8a653b72964de28ef944de6b627032b74cce5e5dce2ad220f56fd34581cf47d9e6bfae0b4c9e146f42758daaead79656995276999a41 -EBUILD etckeeper-1.18.15.ebuild 1715 BLAKE2B 579d63e72dac91686cb03a58137747bf9ba85b93216e87b2f3d722383bfd65366dd288d4083623c5a293b2f56a3004b106bd5d7f6508de552f8941936b3b9172 SHA512 e87bc74e6664d79de090146718500f804f0b434e019b795f9ba1efabc9bb656b52bf4da59e893b8288a580f94053e7f638a4db30e958e89843d36a4e3bff70da +EBUILD etckeeper-1.18.16.ebuild 1920 BLAKE2B 193e3a61c3d886e60bab88f06b92297edc84a6a3ceb0631b0abe64a97d510e622d8f0e5fe5dcc0f27cbc3b54b46e62a24987053d8632c8c825920a791649dba6 SHA512 9c0bf4d3d35847ad580d207d5cbb1fa0e28890146649c0d35f9dc8e8d1c15c17c51be919b3f5173252b0803e9d023f80a7119318618d26d9013885cef41c1835 MISC metadata.xml 784 BLAKE2B c9e0c9c6193bc006043882ca31347e796f8e6669d4ae6121bf4334b24209a69a128ea87fe797711a7bfd3238981017dbc889793eae8f3cdf4271542abe938fd6 SHA512 b896905b4940b22136b9f5a83db6d0625cd99ffbb8e586c2b1c29d8b780db1cd59a9eebaf72bea13a4e134f2014948fcf3c3247d38da06a49f952fd456d13181 diff --git a/sys-apps/etckeeper/etckeeper-1.18.15.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16.ebuild index 3765429cc700..a0c6cadf479c 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.15.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -60,7 +60,16 @@ src_install() { if use cron ; then exeinto /etc/cron.daily - newexe debian/cron.daily etckeeper + newexe - etckeeper <<'_EOF_' +#!/bin/sh +set -e +if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + . /etc/etckeeper/etckeeper.conf + if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then + /etc/etckeeper/daily + fi +fi +_EOF_ fi } diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index b4c95a1824b2..09dbeda01c14 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -1,11 +1,7 @@ -AUX ethtool-5.8-avoid_bashisms.patch 674 BLAKE2B 75b1fdd5980b91348eed8dbbfae00855e2c7f66e2ef4f95b2c8bc679b7d6759358c4d464825956bbb8ab01773d23af7cbe5bdc98eed856baa4589ac44b2cc172 SHA512 0755b7c05026935762b89ff58c083b4dbcc02227400285b0b64e5421f02c2c9c1fb373c8ba43eabe3d38110898fcdbbf664d6f1aff6e28d33759489339d1262b -AUX ethtool-5.8-only-memset-non-NULL-link-settings.patch 703 BLAKE2B b5c2dca415555f1aa7411296abc3501a33018290772c14adc2ca5a73ad39e11a62d1033042ad0ab644b141c9438168edb995a2d2f877ce62ad834c26776a6739 SHA512 c6014e931ff2f96f26b5dde6b5ab99ac7592ff4077af15eb8612ded35186c09490ccbd6d4a00bff46e40da5d18a26c2b6d6e6664f581c7c111ff18e2dd6d049f DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b240ab3e3300fa11d42769b664b1b5740ad6577daf4ef1b1054432e2323429ee63774af5e0210c1ec1c7d6aa4ac SHA512 128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6 DIST ethtool-5.12.tar.xz 311004 BLAKE2B 640d4a1576afea60c673a6060b649d10ccb2d2be64a817e4d74daeb6de4da2d30ccb059ff1113e05f9c44898f08beefd706be2ea6e323c42032c4d93926d380a SHA512 9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002 -DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b -DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e +DIST ethtool-5.13.tar.xz 318204 BLAKE2B 5e693368ce56fa155c5d371bc650e5fb7e8e1c8fd30982b45a674da63119e54f005484bea68c7b85e8d070efbf7aa15e92637e7a3b8b2010b4022851154a6809 SHA512 44426653aabd20707d2e597707113f4d30d12696b4f32c0ab0450af0dccece1b6a11e529a22d1299204f63c9e71ae41a1495d3d36b8f630f1734a72694d779be EBUILD ethtool-5.10.ebuild 584 BLAKE2B 60f911d7aeda794812f546fabb92eede1e079091882bc6e6263c12f0695b667065d1677314c84566978a89d7662786db45ddcc436c9603c35083ce169c563f4a SHA512 acb3529e9b7ed1e22d9ce910f7ad39121f4e5fb340b90edbfb58c046c8d3fe95e665b692f279bdbd210c34bba4cf04bcb5c67a3c60744d651b3b1affd49c7d9d EBUILD ethtool-5.12.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9 -EBUILD ethtool-5.4.ebuild 459 BLAKE2B 10c7df1a3e8df3cc1d1d2eabb54fd33fb1d59bc99486aaf5b1545bf62c663e5f4544b24e8bf7776fc9f92aacff48f2a86b38f4de80d98d4d8702e63f4be2b939 SHA512 bee519fea3dd8981660009d6a40c004d168a0fe9c06a7f45ff9a9cb757fc44889741fcc8df6ba97feefdea5961a44ab338344d51cc3bf6e85fc71b080c19cbbe -EBUILD ethtool-5.8-r1.ebuild 704 BLAKE2B 7d5dd8bc5702829eacf956bb324dc8002ea9caf9e4f7d62df11fbf47d60dadf15b1f99c0802b4364c54f6ac6a2e387928a0ed4da28252692984156516f877a0f SHA512 2ed3b6e06e2dfcc4d76c58f7b4db449298bb43fdaa3223efe38db27ddf630af690fe19886e4ac6a472b9e31d868d44940df3d268926edb9066e65baefcd32fb3 +EBUILD ethtool-5.13.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b diff --git a/sys-apps/ethtool/ethtool-5.8-r1.ebuild b/sys-apps/ethtool/ethtool-5.13.ebuild index 8e1cf0073e37..4ddb6be7e3ff 100644 --- a/sys-apps/ethtool/ethtool-5.8-r1.ebuild +++ b/sys-apps/ethtool/ethtool-5.13.ebuild @@ -9,18 +9,13 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="+netlink" BDEPEND="app-arch/xz-utils" RDEPEND="netlink? ( net-libs/libmnl )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-5.8-avoid_bashisms.patch" - "${FILESDIR}/${P}-only-memset-non-NULL-link-settings.patch" -) - src_configure() { econf $(use_enable netlink) } diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild deleted file mode 100644 index 159377da21d0..000000000000 --- a/sys-apps/ethtool/ethtool-5.4.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" - -BDEPEND="app-arch/xz-utils" diff --git a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch b/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch deleted file mode 100644 index 9cd9fd86fb70..000000000000 --- a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch +++ /dev/null @@ -1,29 +0,0 @@ -Running this script with dash results in an endless loop spitting out this: - - ./test-driver: 62: [: --test-name: unexpected operator - ./test-driver: 78: [[: not found - -This is caused by two bashisms which are being fixed by the below patch - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - ---- ethtool-5.8/test-driver -+++ ethtool-5.8/test-driver -@@ -59,7 +59,7 @@ - while test $# -gt 1; do - arg=${1%=*} - val=${1#*=} -- if [ $arg == $val ]; then -+ if [ $arg = $val ]; then - val=$2 - shift - fi -@@ -75,7 +75,7 @@ - --) break;; - -*) usage_error "invalid option: '$1'";; - esac -- [[ $arg != $val ]] && shift -+ [ $arg != $val ] && shift - done - - missing_opts= diff --git a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch b/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch deleted file mode 100644 index 573ee645615b..000000000000 --- a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/740114 -https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=cf12872ebe7d8fac2088e7d2cd5e2a0a5f03499d - ---- a/ethtool.c -+++ b/ethtool.c -@@ -3048,10 +3048,11 @@ static int do_sset(struct cmd_context *ctx) - struct ethtool_link_usettings *link_usettings; - - link_usettings = do_ioctl_glinksettings(ctx); -- memset(&link_usettings->deprecated, 0, -- sizeof(link_usettings->deprecated)); - if (link_usettings == NULL) - link_usettings = do_ioctl_gset(ctx); -+ else -+ memset(&link_usettings->deprecated, 0, -+ sizeof(link_usettings->deprecated)); - if (link_usettings == NULL) { - perror("Cannot get current device settings"); - err = -1; - diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index f3cca92abb4f..d70546d1e406 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -5,6 +5,6 @@ AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c805 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65 -EBUILD file-5.40-r3.ebuild 3479 BLAKE2B a5593561698744713de9d2f0dcd5ae4e59180c30cb7e2582a46b3a6560c4db1456249a4396e53f6ac29729109db6dd402426f49f1bca266ae2bc89f184db82fa SHA512 534939e826c1d47c8223677d306028a8ae35b528e730c37827c690a25182589af86837ab930b077c4df80b13d6fd57e65cf9ae3c377f4b994b0d537bf565b071 +EBUILD file-5.40-r3.ebuild 3478 BLAKE2B f7df8bd044bf132d596992cb40e8338328db30baf505af44bd34e5a37cb39291d0ffd65bae615550124cfef6fdb1587f0f7b69f1c33ac48d400f4b8606730756 SHA512 7338f2be3118728bef6c82b58da590ca766ba41571fa16fff30d0d391818d0806d1c9b77dc8af9fb5e96dc6c37614a09aebd630eb8970715cf59fe09141b23c3 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857 diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild index 879174d8cc32..a35b94c33d95 100644 --- a/sys-apps/file/file-5.40-r3.ebuild +++ b/sys-apps/file/file-5.40-r3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns" diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 4c62e10b4282..2e9ff50dc9d7 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,3 +1,5 @@ DIST gnome-disk-utility-40.1.tar.xz 1387480 BLAKE2B ef3650cadd2f5e264abbf805fa0af1c7e9e30e067c946d91dd879600e2db5b9af83cc8f7990954cd8d859a7456d4054ddb9bcad0ed716a08b848f78dddda98d8 SHA512 be7a298f6ca9afad5dfd420a5ff5386a1e096f7d956339d5528702b2bd2b657dad4b9017b0ae519d13480fe0806fa64fd1c94e2c1136ee00a6b17c7f21a0acf1 +DIST gnome-disk-utility-40.2.tar.xz 1387320 BLAKE2B fa5df2f3c18a6635e41fdbab7382b036771028b86bff6adf94241aa2919d2a489f1829299e6efb46ab25daccba01919d372269250a3456319f4057a0dcec76cd SHA512 a674968270fa00874f69e1d3db7afea9cab7d5a0cbedbc1aae02282941d5e92f4816b27f35b6775e758148fa27750460adbe4c6f591a68caab0c6c9d709fa50c EBUILD gnome-disk-utility-40.1.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34 +EBUILD gnome-disk-utility-40.2.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild new file mode 100644 index 000000000000..3192512980a0 --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Disk Utility for GNOME using udisks" +HOMEPAGE="https://wiki.gnome.org/Apps/Disks" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="fat elogind gnome systemd" +REQUIRED_USE="?? ( elogind systemd )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=" + >=media-libs/libdvdread-4.2.0:0= + >=dev-libs/glib-2.31:2 + >=x11-libs/gtk+-3.16.0:3 + >=media-libs/libcanberra-0.1[gtk3] + >=gui-libs/libhandy-1.1.90:1= + >=app-arch/xz-utils-5.0.5 + >=x11-libs/libnotify-0.7:= + >=app-crypt/libsecret-0.7 + >=dev-libs/libpwquality-1.0.0 + >=sys-fs/udisks-2.7.6:2 + elogind? ( >=sys-auth/elogind-209 ) + systemd? ( >=sys-apps/systemd-209:0= ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + fat? ( sys-fs/dosfstools ) + gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) +" +# libxml2 for xml-stripblanks in gresource +BDEPEND=" + dev-libs/libxml2:2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none)) + $(meson_use gnome gsd_plugin) + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index 8b5c2d6d5c12..0bb640e30391 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -4,6 +4,6 @@ DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96be DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331 EBUILD gptfdisk-1.0.6-r1.ebuild 1317 BLAKE2B c9643518d97dc57249f180f465ec41f8fd72ff29e4f6afb0974847bf3ddfe3cbcab95cb74a3607ae840a50c7f5d2847ef4bbbe820d667df07227f8ec007c0b23 SHA512 c0df406581b8c115c60115f7be89445dc71618c68da11f33e04d2e9fe96bc02f60e90ed1e0b6ed10a42790670cd52d43e8a174e09d529de024b3b450c80519ed -EBUILD gptfdisk-1.0.7.ebuild 1318 BLAKE2B fa659d24ef760b83ea639bdeffb42de1e555214e70e08dfda305a5a159b4240aa5ff9359e1e055f88048c16a8563bfaada97373fd8ff09311e69d9b84005bc73 SHA512 a725243e3592c49183db636311f991e7cf490b6b5545352851e0bd82b2a16881c7248d852a019034d08edee3c28e12027fb73858f76da892fc2c1793f771f649 +EBUILD gptfdisk-1.0.7-r1.ebuild 1318 BLAKE2B fa659d24ef760b83ea639bdeffb42de1e555214e70e08dfda305a5a159b4240aa5ff9359e1e055f88048c16a8563bfaada97373fd8ff09311e69d9b84005bc73 SHA512 a725243e3592c49183db636311f991e7cf490b6b5545352851e0bd82b2a16881c7248d852a019034d08edee3c28e12027fb73858f76da892fc2c1793f771f649 EBUILD gptfdisk-1.0.8.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5 diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild index 416ea4f72fae..416ea4f72fae 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.7-r1.ebuild diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index be89c766afcf..b6de7c8c03f6 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -9,7 +9,7 @@ DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549 DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc65862999a2ca9f31902256d7f3d166de8a1c76e4e137acce2b445d72ea6850bfec3640d1919cb82351d45dd3e47e SHA512 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d EBUILD iproute2-5.10.0-r1.ebuild 4764 BLAKE2B 4b9412a19f175d320ac4f1470f333d7f3ccec76f21a74bf8057a48bc59b2dd44eaa1f7d0466d9a791abaaf65ffc1e606e3722b4a82576e5abdee153534defa6c SHA512 455c325154f857be301998bbd0a693f1b3ae865f36e3e90dff9a23cf6e7d41a7c318bd4c4e7fca840571068f84337ef7bb5801ce4036ef1f430cbbab74528425 -EBUILD iproute2-5.12.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0 -EBUILD iproute2-5.13.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0 +EBUILD iproute2-5.12.0.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58 +EBUILD iproute2-5.13.0.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58 EBUILD iproute2-9999.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061 diff --git a/sys-apps/iproute2/iproute2-5.12.0.ebuild b/sys-apps/iproute2/iproute2-5.12.0.ebuild index 475fe98775ba..ae69e78cd831 100644 --- a/sys-apps/iproute2/iproute2-5.12.0.ebuild +++ b/sys-apps/iproute2/iproute2-5.12.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/iproute2/iproute2-5.13.0.ebuild b/sys-apps/iproute2/iproute2-5.13.0.ebuild index 475fe98775ba..ae69e78cd831 100644 --- a/sys-apps/iproute2/iproute2-5.13.0.ebuild +++ b/sys-apps/iproute2/iproute2-5.13.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest index 0fb1a6506724..4a0473cec610 100644 --- a/sys-apps/opentmpfiles/Manifest +++ b/sys-apps/opentmpfiles/Manifest @@ -2,12 +2,9 @@ DIST opentmpfiles-0.1.1.tar.gz 5626 BLAKE2B 2b2d21bae0c8280f31ea1ad35cd857a94b3d DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d94187a2600b3196314bef8de235fe7a640bb2b7f78f51727f94c18556fc27e7996ffccef71ff94e006b9f9a63810 SHA512 d86ba71e5fe96d7a8e1999e14b0b99c78e850c42fbfefd203916edca593d0269feaf2252aa01cc35a838906fc2909015430f72cde8370e2d5b1d478a11fe456d DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121 DIST opentmpfiles-0.2.tar.gz 5711 BLAKE2B e1ee7820b2d184d18e63e7e9d93227bb301eb82be8c2b6021c7a1092f55a4ca2bb5dfb7494ff00c3b6debace1963f6c89011ff557f665f0a93c907bd759a4c6f SHA512 bc384cc9156ba6c54d3308ddad4d26b1877f020aa8558e82df2ed49ffa65e0fed5a49eaa11b27193bfe2ad11a4d7368f7cdbc225b820b309af3b299327ddb07b -DIST opentmpfiles-0.3.1.tar.gz 6843 BLAKE2B 20cb40b34fd8db37da5797dc25912000f7d1feb38952b99c044220666cb21871eb40d3853074cb33ee8bcce8dc4858d102aeccb5730ce28df47e99a7edb50f2d SHA512 1e0985403013ac10c0fe50a7ba61a250357b1ea7ea426f9dc92d7071e97eb0e5209448550cf427734b917599defa5123254044d5352b9dcaa22e562e5ca6821f EBUILD opentmpfiles-0.1.1.ebuild 1019 BLAKE2B c0d93987039c42c1427f7067b0e872826c59c984a7f6137d85f9b1330f92d4af24d269f08a9e9142e9fe03eeba7f94d36bee5308a515a4f011934551d6878fde SHA512 2c300a89bfb02c46a8464d87218e976a694b4261ef0171efd09984994c66c53795f6f4a07c6e58f017aef9d71b8538195c1481032f9f088420931f9aad3eda9b EBUILD opentmpfiles-0.1.2.ebuild 1116 BLAKE2B 8d96cff81c513ccc21b280365ae18170fa0ca5be7560ad5434b1af6c45356f42d11fea10774a09a6c758de91551681afca3d73068ed670dd46d424c63750185b SHA512 1c6a68a202877c8e02d07549b8d6fc15a9db1d0ff3c18d07c0e3eeb1f4632d393d8d4372044aeff611561376e28b2e4bf86a0901651cf383f84ab340e8d0b7fd EBUILD opentmpfiles-0.1.3-r1.ebuild 1258 BLAKE2B aefc898a4e5839475cd4fc253c6598f2542f5d64566fa02b30e659647f9a93cb07e9f2bcfc4daabcf509a9e63dca726e25c4101874a4a8a51d9888ccf3eee1ff SHA512 eaf74899b6e924a95376b2f944cc75a330100ad358de698d5655acfae0f61c68192e9e82e8696df2afd631f559847f566ddc9afbb830178e525c4af5da6eb442 EBUILD opentmpfiles-0.1.3.ebuild 1115 BLAKE2B 3dfa3314c2b71c537e6dcbe13e4ee04142a6af9575e710c5247cbc24edbfc82dea6ffc46d07d744cc3cfd66ca658119f6514a804e42186237214418ef497f97b SHA512 f87649de01c82c0557ef628b70d26be4d7c577de3d7a93d5690015092f3ee450ea32637f8a7acfc01fa21ca4546f3ac75476a21e39b041b4e70876fc0f86d0e9 EBUILD opentmpfiles-0.2.ebuild 1383 BLAKE2B c234440bd0b2256c7049202c15b11618a93e1054f3e2d8e507e7feabfab9b6db35e7ed8c19447816bd10d543953aefdb2e05d486923aaedb923f2c7d6b679cd5 SHA512 f2a4e8623afc2077aa48b7f443afe464ffd08405d26206515b1ccf8e95e5a596a2ef118f13f8f3784871503b7b2a976b7581ac877042afb4689ed1dde3e15cd7 -EBUILD opentmpfiles-0.3.1.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c -EBUILD opentmpfiles-9999.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c MISC metadata.xml 445 BLAKE2B 4aad5dcfe48ca38a0de24e7c5a1fa53ec639827f9caa2f03c71fb2c054d74de487cda2eb7c8efccd20d5012955163bd9cef7f73f892a14e8ffd63bb73878dd90 SHA512 9dd3d1e30ceff27dbe6b5250ca0915d31957f94f830236b385d2cfcf2e28806d8fac23220148d7a7cfd09f73136e0bc728e1c289da77f939faff2c2d5c55dd6b diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild deleted file mode 100644 index 77eba6b9687b..000000000000 --- a/sys-apps/opentmpfiles/opentmpfiles-0.3.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit prefix - -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openrc/${PN}" -else - SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz -> - ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files" -HOMEPAGE="https://github.com/openrc/opentmpfiles" - -LICENSE="BSD-2" -SLOT="0" -IUSE="selinux" - -RDEPEND="!<sys-apps/openrc-0.23 - selinux? ( sec-policy/selinux-base-policy )" - -src_prepare() { - default - hprefixify tmpfiles.sh -} -src_install() { - emake DESTDIR="${ED}" install - einstalldocs - cd openrc - for f in opentmpfiles-dev opentmpfiles-setup; do - newconfd ${f}.confd ${f} - newinitd ${f}.initd ${f} - done -} - -add_service() { - local initd=$1 - local runlevel=$2 - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} - -pkg_postinst() { - if [[ -z $REPLACING_VERSIONS ]]; then - add_service opentmpfiles-dev sysinit - add_service opentmpfiles-setup boot - fi -} diff --git a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild deleted file mode 100644 index 77eba6b9687b..000000000000 --- a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit prefix - -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openrc/${PN}" -else - SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz -> - ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files" -HOMEPAGE="https://github.com/openrc/opentmpfiles" - -LICENSE="BSD-2" -SLOT="0" -IUSE="selinux" - -RDEPEND="!<sys-apps/openrc-0.23 - selinux? ( sec-policy/selinux-base-policy )" - -src_prepare() { - default - hprefixify tmpfiles.sh -} -src_install() { - emake DESTDIR="${ED}" install - einstalldocs - cd openrc - for f in opentmpfiles-dev opentmpfiles-setup; do - newconfd ${f}.confd ${f} - newinitd ${f}.initd ${f} - done -} - -add_service() { - local initd=$1 - local runlevel=$2 - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} - -pkg_postinst() { - if [[ -z $REPLACING_VERSIONS ]]; then - add_service opentmpfiles-dev sysinit - add_service opentmpfiles-setup boot - fi -} diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest index 22b07991489e..84c3690f9d0d 100644 --- a/sys-apps/osinfo-db/Manifest +++ b/sys-apps/osinfo-db/Manifest @@ -3,5 +3,5 @@ DIST osinfo-db-20210531.tar.xz 118600 BLAKE2B 5068014ecfe5bf213e5dcdaca392701199 DIST osinfo-db-20210621.tar.xz 118292 BLAKE2B 6051916322b52cc3496819a29257940421dfaa3071a7d3adc2aa644fd04e1100b2c6d272e88a9fb0205d97c4b7e9035f6e4d5833bf901b985c472164ab98034d SHA512 c0ed0621d799b6515038716bd3b78f6b9f7fa6f80dc83899f691e69a9dc604a43d8d36f0ba5810c68731f0e3ded5fac0a66b7be9c66a14d501384c6850bdb797 EBUILD osinfo-db-20210426.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d EBUILD osinfo-db-20210531.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd -EBUILD osinfo-db-20210621.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd +EBUILD osinfo-db-20210621.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/osinfo-db/osinfo-db-20210621.ebuild b/sys-apps/osinfo-db/osinfo-db-20210621.ebuild index b76468286d57..109cfb6ee818 100644 --- a/sys-apps/osinfo-db/osinfo-db-20210621.ebuild +++ b/sys-apps/osinfo-db/osinfo-db-20210621.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" BDEPEND="sys-apps/osinfo-db-tools" diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest index 5d7c752b75bd..7fac235a2097 100644 --- a/sys-apps/secilc/Manifest +++ b/sys-apps/secilc/Manifest @@ -1,6 +1,6 @@ DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45 EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904 -EBUILD secilc-3.2.ebuild 766 BLAKE2B 4bda80f27ea47df93e24828b78619ce10a3de60bb3b318899e714ea89666a88b53ec8252e35436d25fd7aeef69da42b75e5e0589e4f40bbff79ed054d8598cc8 SHA512 1c584dc5b3bdd4a7b0bc8f4de599d962ebe59719895c02fd5162badec79318d6f411ddedde7989df2547a62c5ffbc49810ccb7a3f211c204dd5018385498789c +EBUILD secilc-3.2.ebuild 773 BLAKE2B 2abdab69d2bb2347f80075463c5f755e26f2cfc7bb27893c1a85c09270e7e64d199c5c0d10bd749c7b497b0c774fecc43adae0c734d8dd2a596354ec7d08501e SHA512 fb15d7940c27423cf3145a4a26130579fd2ccdf54bcd71211407c0fc2c1d61bfd969ecc0bee9bbe9ed1ea9d084026f84375d29486ee13b3ada8687f944f81e53 EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310 diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.2.ebuild index 5bb8db55a984..f77d113c66ba 100644 --- a/sys-apps/secilc/secilc-3.2.ebuild +++ b/sys-apps/secilc/secilc-3.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" fi LICENSE="GPL-2" diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index e676ab4edcd6..390e4ba8ecab 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -4,7 +4,6 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d -AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b EBUILD shadow-4.8.1-r3.ebuild 5918 BLAKE2B 340acae099fdaec90e1de8b3905e723c450f1b6961be8ca76495cde7b62e0c5b8fa9cb17db7503d87774c4d46c7dd64ee9be42cf05e2fc931fb522326a6eeda9 SHA512 446cd1935f9250b20fde1e5996394371120a566ee9e9827cd6d2e5fde74b0364b08e4245b29ec711a1cd0bb60585b2edafeffd72743173c1fc946fd594e70d33 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7 diff --git a/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch deleted file mode 100644 index 08382fcb9500..000000000000 --- a/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 97839741..ff153d92 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,8 +2,8 @@ - EXTRA_DIST = \ - .indent.pro - --ubindir = ${bindir} --usbindir = ${sbindir} -+ubindir = ${prefix}/bin -+usbindir = ${prefix}/sbin - suidperms = 4755 - sgidperms = 2755 - diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index b3fc8ad7e8fd..aa4a8ed19045 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,3 +1,5 @@ +AUX 249-hostnamed-error-variable.patch 1987 BLAKE2B 80f5d2518c4012f3c4011964896dc6f16ce7e799f82e0f0deb287e0b9fc880facf608deae740b6adef66f8c61645b16881b91d2b258ae69a62483cb2a99dc954 SHA512 fac633b3165497bbd3a7212fae3e67580bba5e48ff1ae4990d4831ac142384641cf5c3e70da2612d467a4ea4712c712c019f22a2d759d16cb9d3bd1e2af5dc8f +AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0 @@ -6,7 +8,7 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485 -EBUILD systemd-248.3-r1.ebuild 15192 BLAKE2B 799a00c488d832569392e3f6fdfd95abb529122b6084b392a8eeefbbb2b21a58d2e96439fbf33ab97b78792a412a28ffe49194b8cd249d282e8af1826a265752 SHA512 0abc8db451e49093ca9e352a0da22b33130df0bbf219a87ce2323dbb8b08d87c5e4546da76b3cc158f9ea3d56eab847a58b118bcda93902487d8000b73485f62 -EBUILD systemd-249.ebuild 14857 BLAKE2B adb4a4628071b11408d5430eb2d6c6e632589d56f68bea0d9c98475fe51336944bb5c1ad9796b95a4d326ab00491917dc28079a922b6c859123bc1e7463da6fc SHA512 a38d4cdbfbc4a524057dbd13dfdb5ce5bdb1c6b607ad25832fa3dae47ef63536683c11327d3fa7287d6544a9003fd1b725cf150822f5e7b041c0e5e74577e188 -EBUILD systemd-9999.ebuild 14857 BLAKE2B adb4a4628071b11408d5430eb2d6c6e632589d56f68bea0d9c98475fe51336944bb5c1ad9796b95a4d326ab00491917dc28079a922b6c859123bc1e7463da6fc SHA512 a38d4cdbfbc4a524057dbd13dfdb5ce5bdb1c6b607ad25832fa3dae47ef63536683c11327d3fa7287d6544a9003fd1b725cf150822f5e7b041c0e5e74577e188 +EBUILD systemd-248.3-r1.ebuild 15147 BLAKE2B 0b80d3da5bda9497d35d76c791c165f9f4ec3ad2ad012cb487e3f69b3decf23de57d2755675b65e99471960928df80d9db52d63473ac82fff0a7703aff817a19 SHA512 626f66cf8b8018870b53b623fc68170c150a9c3e7b18cfd022d2d4e1f5d49582d7bcf5da23633a8b9fc1741182aabc715a4b2865df811149889d49d6ad7b3243 +EBUILD systemd-249-r3.ebuild 14904 BLAKE2B 653d9a76594ed8bd16e3b4047399dd6cffd45199d162d43c8631f9824071b23e468c8925b69509ea14b0749b79db883f9c4fd5d41f8d96f4bc91dcc2e82c7866 SHA512 0498a15ac9d8d15b9c3f639bd85f15015e3c2a87c44cf67b05a9f4eaa84602058967b70736046397a83ff69bfa90e75771a8398c87aac0d4729264fd65440fdf +EBUILD systemd-9999.ebuild 14812 BLAKE2B aee682e4b01400bd2fd3b347be8f219014681e2ce314ec64bc0d51c9187e1c06239efef9985b7c88580ec29e333f3ac959ab8df7d943b5be0ea3c3e3b7b1948f SHA512 0199f497a1d5607f7b1f751efdac6eed18eff34b1d6e8276bf6004778006cba09fe0cbc952e6a178efa44d77f959a2e8f6080c9cce6fa3f2b39097ff6bd59d8b MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7 diff --git a/sys-apps/systemd/files/249-hostnamed-error-variable.patch b/sys-apps/systemd/files/249-hostnamed-error-variable.patch new file mode 100644 index 000000000000..7fe7af73a003 --- /dev/null +++ b/sys-apps/systemd/files/249-hostnamed-error-variable.patch @@ -0,0 +1,50 @@ +From 105a4245ff13d588e1e848e8ee3cffd6185bd0ae Mon Sep 17 00:00:00 2001 +From: Jan Palus <jpalus@fastmail.com> +Date: Thu, 8 Jul 2021 00:23:21 +0200 +Subject: [PATCH] hostnamed: correct variable with errno in fallback_chassis + +fixes assertion failure on arm: + +systemd-hostnamed[642]: Assertion '(_error) != 0' failed at src/hostname/hostnamed.c:207, function fallback_chassis(). Aborting. +--- + src/hostname/hostnamed.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c +index bd535ddc4d80..36702f2fb0cd 100644 +--- a/src/hostname/hostnamed.c ++++ b/src/hostname/hostnamed.c +@@ -204,14 +204,14 @@ static const char* fallback_chassis(void) { + + r = read_one_line_file("/sys/class/dmi/id/chassis_type", &type); + if (r < 0) { +- log_debug_errno(v, "Failed to read DMI chassis type, ignoring: %m"); ++ log_debug_errno(r, "Failed to read DMI chassis type, ignoring: %m"); + goto try_acpi; + } + + r = safe_atou(type, &t); + free(type); + if (r < 0) { +- log_debug_errno(v, "Failed to parse DMI chassis type, ignoring: %m"); ++ log_debug_errno(r, "Failed to parse DMI chassis type, ignoring: %m"); + goto try_acpi; + } + +@@ -260,14 +260,14 @@ static const char* fallback_chassis(void) { + try_acpi: + r = read_one_line_file("/sys/firmware/acpi/pm_profile", &type); + if (r < 0) { +- log_debug_errno(v, "Failed read ACPI PM profile, ignoring: %m"); ++ log_debug_errno(r, "Failed read ACPI PM profile, ignoring: %m"); + return NULL; + } + + r = safe_atou(type, &t); + free(type); + if (r < 0) { +- log_debug_errno(v, "Failed parse ACPI PM profile, ignoring: %m"); ++ log_debug_errno(r, "Failed parse ACPI PM profile, ignoring: %m"); + return NULL; + } + diff --git a/sys-apps/systemd/files/249-libudev-static.patch b/sys-apps/systemd/files/249-libudev-static.patch new file mode 100644 index 000000000000..73375b716e9b --- /dev/null +++ b/sys-apps/systemd/files/249-libudev-static.patch @@ -0,0 +1,26 @@ +From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 9 Jul 2021 13:05:23 -0400 +Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc + +This resolves a failure when linking cryptsetup.static against libudev.a. + +``` +libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static -O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o src/utils_blockdev.o src/cryptsetup.o -pthread -pthread -Wl,--as-needed ./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl -lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread +/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o): in function `sd_is_mq': +(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr' +``` +--- + src/libudev/libudev.pc.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in +index 89028aaa6bf2..1d6487fa4084 100644 +--- a/src/libudev/libudev.pc.in ++++ b/src/libudev/libudev.pc.in +@@ -16,4 +16,5 @@ Name: libudev + Description: Library to access udev device information + Version: {{PROJECT_VERSION}} + Libs: -L${libdir} -ludev ++Libs.private: -lrt -pthread + Cflags: -I${includedir} diff --git a/sys-apps/systemd/systemd-248.3-r1.ebuild b/sys-apps/systemd/systemd-248.3-r1.ebuild index a6e3d207945c..cbf86f5cc09b 100644 --- a/sys-apps/systemd/systemd-248.3-r1.ebuild +++ b/sys-apps/systemd/systemd-248.3-r1.ebuild @@ -319,7 +319,6 @@ multilib_src_configure() { $(meson_native_true vconsole) # static-libs - $(meson_use static-libs static-libsystemd) $(meson_use static-libs static-libudev) ) diff --git a/sys-apps/systemd/systemd-249.ebuild b/sys-apps/systemd/systemd-249-r3.ebuild index 7b82142e7ac7..d11da3bdbde0 100644 --- a/sys-apps/systemd/systemd-249.ebuild +++ b/sys-apps/systemd/systemd-249-r3.ebuild @@ -218,6 +218,8 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}/249-hostnamed-error-variable.patch" + "${FILESDIR}/249-libudev-static.patch" ) if ! use vanilla; then @@ -321,7 +323,6 @@ multilib_src_configure() { $(meson_native_true vconsole) # static-libs - $(meson_use static-libs static-libsystemd) $(meson_use static-libs static-libudev) ) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 7b82142e7ac7..714f276a62f0 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -321,7 +321,6 @@ multilib_src_configure() { $(meson_native_true vconsole) # static-libs - $(meson_use static-libs static-libsystemd) $(meson_use static-libs static-libudev) ) diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest index c012bf0f53fb..4e67e3bf18ea 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-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0 +DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac EBUILD tcp-wrappers-7.6.28-r1.ebuild 2509 BLAKE2B 79b2fbb4710eab85626c207d78f1d0cdd4b995ff3e32b267ac9be30b6fe29602cb6ab395f617c9a9bb67a598dc16a33da48765a7fd1e796a45f6cba991c8e1d3 SHA512 b1007fc41f6c357c0f2b1e2ef62396dd1e30ed09994ac77935fe95b580947affd0674494097a38b0174b1af99310b56f87dfd022ae748b57d2684c44f9e8b4ef +EBUILD tcp-wrappers-7.6.31.ebuild 2630 BLAKE2B aed16260ff668acb5b1d0bc7ba5381edd6c77517e3a8cd3d1d1bae135e47b205099810ec70cfba41e831d4cfed90ce190749e94cc68fb37042bc355b6dbdb625 SHA512 f86846a8023352a5ba4a76c31ef7edcbc16b9160dee9c5c9da4f41b92173ee75fcbfc3bddd648b7251bd2847ce35a3d0f4e36dc044fa5d58313917ca39334b4c MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5 diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild new file mode 100644 index 000000000000..7ab6995f3d7f --- /dev/null +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs 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" +S="${WORKDIR}/${MY_P}" + +LICENSE="tcp_wrappers_license" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="ipv6 netgroups static-libs" + +RDEPEND="netgroups? ( net-libs/libnsl:= )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-7.6-redhat-bug11881.patch" + "${FILESDIR}/${PN}-7.6.28-no-external-malloc.patch" +) + +src_prepare() { + # Apply Debian patchset except for the series file which just lists + # the patches + eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series || die) + + default + + multilib_copy_sources +} + +temake() { + append-cppflags "-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED" + + if use ipv6; then + append-cppflags "-DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" + fi + + local myemakeargs=( + 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}" + LDFLAGS="${LDFLAGS}" + "$@" + ) + + emake "${myemakeargs[@]}" +} + +multilib_src_configure() { + tc-export AR RANLIB + temake config-check +} + +multilib_src_compile() { + # https://bugs.gentoo.org/728348 + unset STRINGS + 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/util-linux/Manifest b/sys-apps/util-linux/Manifest index 5278a854d4ff..bc73ce4795bf 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,10 +1,13 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd +AUX util-linux-2.37-avoid_autoreconf.patch 3661 BLAKE2B 5098c11338238c944b69a4f4d7929afa522f80ad1e93044592eabe89eda6bd3684ec7d4a382d4cb39527fdde6d046b3608a515a9d7da328b61c5af40d6137bf3 SHA512 6d6609235e05bf79f51bf03a306cab72e457031b92f7b49379c1fcc70ece0e49a72c633a727814e138aa9cbc10370664040e3f3bf1414da74bb99ffa79128b2f +AUX util-linux-2.37-lcrypt_link_fix.patch 1545 BLAKE2B 85b9259ae3f8f4d39b94387212cd3db743194c7f8e645deb9b626792e78084f0d786f37d7c6fca0051ea161f020d72a89b3359d9dd9f624e0e009285d9cc937d SHA512 8f0f6ecbbab84b7f0f64111d9fd27852f6a8d9bac69598ae292b2978c0d7a9bc6beaad509ebe7d3bbaf239c9c04a592db13da6642b0029a485c2ad354b0a13ce +AUX util-linux-2.37-lcrypt_use_LIBS.patch 2486 BLAKE2B bc1e73604932f6dc65c3ed262af37a6a180dd89d9196c531678f713ec3c3d979cef3f0f0627652a891079b71952463250e4edf29e9aaa898eefb9f25b99a0adc SHA512 cb2c37c8f5d668430eef15d87af0dcf237102d5b196ee674e2a4d5fe14482b323f2e915a1cb4f538f07330869dcf04af93281a955ddaa796db283971b1921723 AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615 EBUILD util-linux-2.36.2.ebuild 8942 BLAKE2B e26af16681c038a8d2818bfef7565b106711639e0fee55868a056496180648c6ae390e66595af22c1ac4c444052355ccd1a46ef359624b56ee1f8b3205ac2584 SHA512 4f9165ea6a2397b0b9df2971a8547d03005a3e1333673245b4d9397f2b78632cbab23bc12ccd4392ad6b90f1971fca764240730fd315eb22bfcb495937e5dc44 -EBUILD util-linux-2.37.ebuild 9843 BLAKE2B c5b8674337940621bd8a181e3d3837ef89df02ccc7eaab608ebbf26ea25888fd14fe8476b1d41667ee7fee7783dcae30f57f6ff80cad22199d471064adf19ced SHA512 8aa40f748041f53694425c8c84762b6c4e9c8ec4a1598a7eca5cee4ee4bed30b2ae33eda0f518a7c68db0dfd9bb20aaf02c6fb47b8641cf3f1be03393a38eeb4 +EBUILD util-linux-2.37.ebuild 9998 BLAKE2B 034261b393a61b7cc2f2f17e9178b6187f5fc5b2504eb7a6e1a1862a67c69f225d86ec4472de47af7070a28b960e426eba40898ae5e982fb7ca962bacb628b49 SHA512 b7c28f43181c8ecad520d8117fac3e954b41b0c6de2c8208f9a1b288db8730af2f0a3c5773317f6c9af16e1a149fed4b4eb7a251ba3f4d305ee2d9a1fb081f53 EBUILD util-linux-9999.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4 diff --git a/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch b/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch new file mode 100644 index 000000000000..44ea6e5c2bed --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch @@ -0,0 +1,136 @@ +--- util-linux-2.37/config.h.in ++++ util-linux-2.37/config.h.in +@@ -216,9 +216,6 @@ + /* Define to 1 if you have the `cap-ng' library (-lcap-ng). */ + #undef HAVE_LIBCAP_NG + +-/* Do we need -lcrypt? */ +-#undef HAVE_LIBCRYPT +- + /* Define if libeconf is available */ + #undef HAVE_LIBECONF + +--- util-linux-2.37/configure ++++ util-linux-2.37/configure +@@ -4965,12 +4965,7 @@ + program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac ++ MISSING="\${SHELL} '$am_aux_dir/missing'" + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then +@@ -25591,7 +25586,10 @@ + + else + ++ ++ old_LIBS="$LIBS" + LIBS="$LIBS -lcrypt" ++ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25612,10 +25610,7 @@ + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- +-$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h ++if ac_fn_c_try_link "$LINENO"; then : + + have_libcrypt=yes + have_crypt=yes +@@ -25626,7 +25621,11 @@ + $as_echo "$as_me: WARNING: crypt() is not available" >&2;} + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++ LIBS="$old_LIBS" ++ + + fi + rm -f core conftest.err conftest.$ac_objext \ +@@ -25768,12 +25767,8 @@ + + + +- old_CFLAGS="$CFLAGS" +- old_CPPFLAGS="$CPPFLAGS" +- old_LDFLAGS="$LDFLAGS" +- CFLAGS="$CFLAGS " +- CPPFLAGS="$CPPFLAGS " +- LDFLAGS="$LDFLAGS $SELINUX_LIBS" ++ old_LIBS="$LIBS" ++ LIBS="$LIBS $SELINUX_LIBS" + + # This function is missing in old libselinux 1.xx versions + for ac_func in security_get_initial_context +@@ -25788,9 +25783,7 @@ + done + + +- CFLAGS="$old_CFLAGS" +- CPPFLAGS="$old_CPPFLAGS" +- LDFLAGS="$old_LDFLAGS" ++ LIBS="$old_LIBS" + + + fi +--- util-linux-2.37/Makefile.in ++++ util-linux-2.37/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.16.2 from Makefile.am. ++# Makefile.in generated by automake 1.16.3 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994-2020 Free Software Foundation, Inc. +@@ -4649,6 +4649,8 @@ + GZIP_ENV = --best + DIST_ARCHIVES = $(distdir).tar.xz + DIST_TARGETS = dist-xz ++# Exists only to be overridden by the user if desired. ++AM_DISTCHECK_DVI_TARGET = dvi + distuninstallcheck_listfiles = find . -type f -print + am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +@@ -14854,7 +14856,7 @@ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +@@ -14920,7 +14922,8 @@ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive +-install-exec: install-exec-recursive ++install-exec: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive + install-data: install-data-recursive + uninstall: uninstall-recursive + +@@ -16157,7 +16160,8 @@ + uninstall-man8 + + .MAKE: $(am__recursive_targets) all check check-am install install-am \ +- install-data-am install-exec-am install-strip uninstall-am ++ install-data-am install-exec install-exec-am install-strip \ ++ uninstall-am + + .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles am--refresh check check-am check-local clean \ diff --git a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch new file mode 100644 index 000000000000..2da99b2841d6 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch @@ -0,0 +1,50 @@ +From 637cc045ee464909c261d6fa16c71ed15cd455e3 Mon Sep 17 00:00:00 2001 +From: Alex Xu <351006+Hello71@users.noreply.github.com> +Date: Wed, 16 Jun 2021 13:58:25 +0000 +Subject: [PATCH] build-sys: Update configure.ac + +1. the test incorrectly used AC_COMPILE_IFELSE instead of + AC_LINK_IFELSE, defeating the purpose of checking -lcrypt. +2. the test did not properly restore LIBS, causing later checks to all + fail if libcrypt wasn't found. +3. HAVE_LIBCRYPT only controls whether to use -lcrypt, it is not + needed or used in any source files. + +[kzak@redhat.com: - improve commit message + - use UL_{SET,RESTORE}_FLAGS() rather than directly + modify $LIBS] + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5181d524c..939c6d2d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -845,8 +845,8 @@ char *c = crypt("abc","pw"); + have_libcrypt=no + have_crypt=yes + ],[ +- LIBS="$LIBS -lcrypt" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ UL_SET_FLAGS([], [], [-lcrypt]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_CRYPT_H + #include <crypt.h> + #else +@@ -856,12 +856,12 @@ char *c = crypt("abc","pw"); + ]], [[ + char *c = crypt("abc","pw"); + ]])],[ +- AC_DEFINE([HAVE_LIBCRYPT], [1], [Do we need -lcrypt?]) + have_libcrypt=yes + have_crypt=yes + ],[ + AC_MSG_WARN([crypt() is not available]) + ]) ++ UL_RESTORE_FLAGS + ]) + AM_CONDITIONAL([HAVE_LIBCRYPT], [test "x$have_libcrypt" = xyes]) + diff --git a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch new file mode 100644 index 000000000000..2173195be612 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch @@ -0,0 +1,91 @@ +From 75cba8d5cdb2a0e84c23de26007feac977837a6f Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 18 Jun 2021 17:21:13 +0200 +Subject: [PATCH] build-sys: use $LIBS rather than LDFLAGS + +Fixes: https://github.com/karelzak/util-linux/pull/1349 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + configure.ac | 8 ++++---- + m4/ul.m4 | 29 +++++++++++------------------ + 2 files changed, 15 insertions(+), 22 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 939c6d2d3..234cebc68 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -845,7 +845,7 @@ char *c = crypt("abc","pw"); + have_libcrypt=no + have_crypt=yes + ],[ +- UL_SET_FLAGS([], [], [-lcrypt]) ++ UL_SET_LIBS([-lcrypt]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_CRYPT_H + #include <crypt.h> +@@ -861,7 +861,7 @@ char *c = crypt("abc","pw"); + ],[ + AC_MSG_WARN([crypt() is not available]) + ]) +- UL_RESTORE_FLAGS ++ UL_RESTORE_LIBS + ]) + AM_CONDITIONAL([HAVE_LIBCRYPT], [test "x$have_libcrypt" = xyes]) + +@@ -883,10 +883,10 @@ AS_IF([test "x$with_selinux" = xno], [ + UL_PKG_STATIC([SELINUX_LIBS_STATIC], [libselinux]) + AM_CONDITIONAL([HAVE_SELINUX], [true]) + +- UL_SET_FLAGS([], [], [$SELINUX_LIBS]) ++ UL_SET_LIBS([$SELINUX_LIBS]) + # This function is missing in old libselinux 1.xx versions + AC_CHECK_FUNCS([security_get_initial_context]) +- UL_RESTORE_FLAGS ++ UL_RESTORE_LIBS + ]) + ]) + AC_SUBST([SELINUX_LIBS]) +diff --git a/m4/ul.m4 b/m4/ul.m4 +index 951db7371..724579462 100644 +--- a/m4/ul.m4 ++++ b/m4/ul.m4 +@@ -67,28 +67,21 @@ AC_DEFUN([UL_SET_ARCH], [ + ]) + + +-dnl UL_SET_FLAGS(CFLAGS, CPPFLAGS, LDFLAGS) +-dnl +-dnl Sets new global CFLAGS, CPPFLAGS and LDFLAG, the original +-dnl setting could be restored by UL_RESTORE_FLAGS() +-dnl +-AC_DEFUN([UL_SET_FLAGS], [ +- old_CFLAGS="$CFLAGS" +- old_CPPFLAGS="$CPPFLAGS" +- old_LDFLAGS="$LDFLAGS" +- CFLAGS="$CFLAGS $1" +- CPPFLAGS="$CPPFLAGS $2" +- LDFLAGS="$LDFLAGS $3" ++dnl UL_SET_LIBS(LIBS) ++dnl ++dnl Sets new global LIBS, the original setting could be restored by UL_RESTORE_LIBS() ++dnl ++AC_DEFUN([UL_SET_LIBS], [ ++ old_LIBS="$LIBS" ++ LIBS="$LIBS $1" + ]) + +-dnl UL_RESTORE_FLAGS() ++dnl UL_RESTORE_LIBS() + dnl +-dnl Restores CFLAGS, CPPFLAGS and LDFLAG previously saved by UL_SET_FLAGS() ++dnl Restores LIBS previously saved by UL_SET_LIBS() + dnl +-AC_DEFUN([UL_RESTORE_FLAGS], [ +- CFLAGS="$old_CFLAGS" +- CPPFLAGS="$old_CPPFLAGS" +- LDFLAGS="$old_LDFLAGS" ++AC_DEFUN([UL_RESTORE_LIBS], [ ++ LIBS="$old_LIBS" + ]) + + diff --git a/sys-apps/util-linux/util-linux-2.37.ebuild b/sys-apps/util-linux/util-linux-2.37.ebuild index 2b3ff76f988c..e12e94830621 100644 --- a/sys-apps/util-linux/util-linux-2.37.ebuild +++ b/sys-apps/util-linux/util-linux-2.37.ebuild @@ -90,6 +90,10 @@ S="${WORKDIR}/${MY_P}" PATCHES=( # https://github.com/karelzak/util-linux/pull/1329 "${FILESDIR}/${P}-ppc-nortas.patch" + + "${FILESDIR}/${P}-lcrypt_link_fix.patch" # 801403 + "${FILESDIR}/${P}-lcrypt_use_LIBS.patch" # 801403 + "${FILESDIR}/${P}-avoid_autoreconf.patch" # 801403 ) rm_man() { |