diff options
Diffstat (limited to 'sys-process')
24 files changed, 430 insertions, 479 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz Binary files differindex a88933d1cc13..ea9fa537247a 100644 --- a/sys-process/Manifest.gz +++ b/sys-process/Manifest.gz diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest index 7e3390efebe0..0d565b5fc05c 100644 --- a/sys-process/acct/Manifest +++ b/sys-process/acct/Manifest @@ -6,5 +6,5 @@ AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e5322 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2 EBUILD acct-6.6.4-r1.ebuild 1070 BLAKE2B 72327ad0f437dd255ad4e2fa5d8efa4a90847843991b41092ceddeacdd3b14927a0249f7569b3d04f3a9f86873498b4073130d0321229684d834c871282c9694 SHA512 136ac501b8a7f929684a518f9ef4cfa3f137e3b4caa68b9e327f6063bf064ee9291df1b2cd76e5eb285338a5f5d080ab2c08be0e0965b481bd8b999e688ca02f -EBUILD acct-6.6.4-r2.ebuild 1081 BLAKE2B 8dab6c2bbe9951c4d60621b115c08306bbde48a46a565cc5f6fe5f1abd2d1d20cefb9c7cedf5832323c7d2618cc433d33de0d3dddc587b183b2b9c4f6a1a80ad SHA512 62bf6ec991044bf524699bce075d03bd8b5667127fd2a69d3a60543de1b5cc8144b99d0aca90c7af5c68c19c54960789b168e4af8bfbe6fba1a4aa6cbbca30c7 +EBUILD acct-6.6.4-r3.ebuild 1079 BLAKE2B 993ddf349fbe88a165afb449b67f27190e472b7ac25cdfe93d0a1363866da367a6c690f079bca062e341a3b4715847e341dad926e80deb396242420f487c9225 SHA512 57b01670e29678c998bf1c0aeb3da12ae54e2d63b83aa326899270bf0ebd37eeac69ee1109e74bc59eee05331b29b00cb0506fee6ae2d0b6aecc88547db83614 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-process/acct/acct-6.6.4-r2.ebuild b/sys-process/acct/acct-6.6.4-r3.ebuild index cd281dbfe1b5..4a561b723628 100644 --- a/sys-process/acct/acct-6.6.4-r2.ebuild +++ b/sys-process/acct/acct-6.6.4-r3.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools systemd DESCRIPTION="GNU system accounting utilities" @@ -11,9 +12,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="" -DEPEND="sys-apps/texinfo" +BDEPEND="sys-apps/texinfo" PATCHES=( "${FILESDIR}"/${PN}-6.6.4-cross-compile-fixed.patch @@ -30,10 +30,14 @@ src_configure() { src_install() { default + keepdir /var/account + newinitd "${FILESDIR}"/acct.initd-r2 acct newconfd "${FILESDIR}"/acct.confd-r1 acct + systemd_dounit "${FILESDIR}"/acct.service + insinto /etc/logrotate.d newins "${FILESDIR}"/acct.logrotate-r1 psacct diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest index e22a2b707425..fa3d78d4a13d 100644 --- a/sys-process/audit/Manifest +++ b/sys-process/audit/Manifest @@ -1,17 +1,12 @@ -AUX audit-2.4.3-python.patch 2768 BLAKE2B 374fb16cf85d4ee8bb108f6af1b045e140855fbb35527531adbf51dd8392069c3a3c3393e0b9bde892a8f8492b2e1845b89d7d9f801e26934150d7c05973ea2a SHA512 97c1f2eda07f3d986bab161d299f2cf110c1fdc76b889013748812ee7e33ece0fd6d3f34296d5d875db8c966d7fe77c57e2214c0cf6592beb48e462a504c1d70 -AUX audit-2.8.4-ia64-compile-fix.patch 4000 BLAKE2B df10ca3a5da69b70617c5914b336a83f04de74051109f31836b955ab6756dc9ee7122677efcad1fe88df08a7c009ec012a4d1f9100f96677df69ddf8d53d770e SHA512 6ccff74fbc1591bd3630140e06be66ec78dd3db129d50b65b4fa5e3ea9dc3adf3c4ac51f49fbc72ff1c3181702912b25528cf0c56e797ded9da349de0cc8d338 AUX audit-3.0.1-slibtool.patch 10052 BLAKE2B 5b88a2be001a95a94c717e4c9a5b92a4e83dcac75e4e11ce863b8ac1d43317d2fadef057b865af140e32fffe1254a7862ae84100d30302f07484e2ad2a6509b4 SHA512 8e838610818e033169aedd596ced83bd41852de1491d01d8a4e1500d8e084d681e708822b3971b2fb60dea644a6cef4dedd62e553c5cd13d5df9fd3274b5b43f AUX audit.rules-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d676a684223f48d1b22ce90441b2970c02b0eab882b3d3059f2b350d8a34109b03f5457f709624dccb3722e82 SHA512 a7bc52cbbea278a38e2837149524bb21b2c5367c96ed07fe576e08322595c5bee57ff07f8ebecd17391d9c3abe1ba187ac6e39400a153bf0ace4257303d036d3 AUX audit.rules.stop.pre 427 BLAKE2B ddf4ac16c3e1fd401c266287e792865adf8f4dd0b4bbaea6f991bf8dcee69c8ecd69c93d0cbd8352e280c3c61d24de23ca89f700e383c79036526e59c311c004 SHA512 def5ef378ad554f38754839d1c00c598686645a59896e37a3c7ff07b00aaa05a2b92305e49a750358eaba63a7d48fb647472529b155301069771678eed272463 AUX auditd-conf.d-2.1.3 734 BLAKE2B 018677362bc82c2052885cdd0e2185050cf5e97722ead4acdc51d428b52c265317c7dd03d1459be38b781e78f857cd967e5a60b68360c3381c31c62e1d61d843 SHA512 69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbbd6444136b7198828798f7b6428948503c344639fab5fea54962682be7c986950c2cbae8b7c9dfeb321a4b SHA512 1b48c248db5d34f148f9c79f8b2a6acbf61c729230341b861f5e331bbfb0c8356305a09eb2cc5c82c14c4fd9a13c7c13957e1ed493834b8b3b9ee38978e4c31f -DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f SHA512 78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101 -DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a DIST audit-3.0.1.tar.gz 1180286 BLAKE2B f29687ebc76f4eb88184cce1a3da0b8ca4464b2f81f56d71048ac4a64a713f33d6964e46e78b73c72b6ac2495f80114866773b3b86753c1d0dead25df73f7c43 SHA512 ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c DIST audit-3.0.2.tar.gz 1184356 BLAKE2B 13f76e9c40bc8ffc53b5499076b5cb75c2690d95414a0e1942fa9725b9617f10327a2ee676dc10cc46ba76d223f77509d305bcd22344b678443b7707cc6d10cd SHA512 9e831ed6f30ac7d58f028cede97adba431bde18dfd9045c19f5e03eff52cd28db3a6792e5969f555ce51aa562662b59fa5cc5265586c6acf0b3aa1feae4d720f DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88 -EBUILD audit-2.8.5-r2.ebuild 6395 BLAKE2B 262e839797410f22028128fa7ac232094e19c7a58557b9ff8c354599c409fe1c91fc94ba66ed9500f7ff90df1734d6d6354d7d22601ed0a5ad1bc56ebd1222bb SHA512 0695411810fd45c27d4b9e389f7807dc8d31acddc1a50d02407dc2b5bafe9cda36c902c8b86f6b4b564281e9b4327001a0ce0902bd6396f3dd4f06032fcae90a EBUILD audit-3.0.1.ebuild 4262 BLAKE2B 95c293ae585d4c8e5decbf05938012ab0fab3c4dafc6348977107043f6e02252947eec36c7d0fe446c872caf7143b56fa70641e8a399a7e0b4a467d6ccb02571 SHA512 fff5966e9deeaca3387d1de975e8e934c7dcce303fa6a1ea6a2ab60fe92a37e16eaf2af8b3a65ddd12c0ba20267a785cf57f0c00e31a710e86b3949f588586e2 EBUILD audit-3.0.2.ebuild 4215 BLAKE2B 1c349d818cd2d82a4956f61ff927a1da22cc3cfce0933b5f23a4f406d33ff4cfdb8bc54f779c8c7621f7e8ed53fb7d3447cf13f3584e9b9c6fd3c7c6a00d34e9 SHA512 34d842ff81a353ff5b5dd4ea96d83a935b394de4d10aabbe3b4fc9ab6a5c773166406c456f861acac6fab2b9fda781d94df8d766072ed566e3e6c87fc2fe0795 EBUILD audit-3.0.ebuild 4192 BLAKE2B 415b25348c40cf38e9333ff748acfc1f36cc2d22e104d57d71ee4d0cf43a0a2625ab52d05dac4d62cf577e7f3d2364de2e4fb38f08aaf5032398e221062db7b0 SHA512 563e1772e38d538d7f4335a1671622606352eaa84c7fa3e8315dc5964e45ff184e322e700f7e47568d7b6110adb927e961bb846a0d61cde0fafcdc33a14e9baa diff --git a/sys-process/audit/audit-2.8.5-r2.ebuild b/sys-process/audit/audit-2.8.5-r2.ebuild deleted file mode 100644 index e70218a14ef6..000000000000 --- a/sys-process/audit/audit-2.8.5-r2.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{3_7,3_8} ) - -inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript - -DESCRIPTION="Userspace utilities for storing and processing auditing records" -HOMEPAGE="https://people.redhat.com/sgrubb/audit/" -# https://github.com/linux-audit/audit-userspace/tree/2.8_maintenance -COMMIT='80866dc78b5db17010516e24344eaed8dcc6fb99' # contains many fixes not yet released -if [[ -n $COMMIT ]]; then - SRC_URI="https://github.com/linux-audit/audit-userspace/archive/${COMMIT}.tar.gz -> ${P}_p${COMMIT:0:12}.tar.gz" - S="${WORKDIR}/audit-userspace-${COMMIT}" -else - SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz" -fi -# -fno-common patch: -SRC_URI+=" https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch -> ${PN}-017e6c6ab95df55f34e339d2139def83e5dada1f.patch" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="gssapi ldap python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# Testcases are pretty useless as they are built for RedHat users/groups and kernels. -RESTRICT="test" - -RDEPEND="gssapi? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - sys-libs/libcap-ng - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.34 - python? ( dev-lang/swig:0 )" -# Do not use os-headers as this is linux specific - -CONFIG_CHECK="~AUDIT" - -pkg_setup() { - linux-info_pkg_setup -} - -src_prepare() { - # Do not build GUI tools - sed -i \ - -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \ - "${S}"/configure.ac || die - sed -i \ - -e 's,system-config-audit,,g' \ - "${S}"/Makefile.am || die - rm -rf "${S}"/system-config-audit - - # audisp-remote moved in multilib_src_install_all - sed -i \ - -e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \ - "${S}"/audisp/plugins/remote/au-remote.conf || die - - # Don't build static version of Python module. - eapply "${FILESDIR}"/${PN}-2.4.3-python.patch - - # glibc/kernel upstreams suck with both defining ia64_fpreg - # This patch is a horribly workaround that is only valid as long as you - # don't need the OTHER definitions in fpu.h. - eapply "${FILESDIR}"/${PN}-2.8.4-ia64-compile-fix.patch - - # there is no --without-golang conf option - sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die - - # -fno-common - eapply "${DISTDIR}/${PN}-017e6c6ab95df55f34e339d2139def83e5dada1f.patch" - - eapply_user - - # Regenerate autotooling - eautoreconf -} - -multilib_src_configure() { - local ECONF_SOURCE=${S} - local my_conf="$(use_enable ldap zos-remote)" - econf \ - ${my_conf} \ - --sbindir="${EPREFIX}/sbin" \ - $(use_enable gssapi gssapi-krb5) \ - $(use_enable static-libs static) \ - --enable-systemd \ - --without-python \ - --without-python3 - - if multilib_is_native_abi; then - python_configure() { - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - econf ${my_conf} --without-python --with-python3 - } - - use python && python_foreach_impl python_configure - fi -} - -src_configure() { - tc-export_build_env BUILD_{CC,CPP} - export CC_FOR_BUILD="${BUILD_CC}" - export CPP_FOR_BUILD="${BUILD_CPP}" - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - - python_compile() { - emake -C "${BUILD_DIR}"/bindings/swig \ - VPATH="${native_build}/lib" \ - LIBS="${native_build}/lib/libaudit.la" \ - _audit_la_LIBADD="${native_build}/lib/libaudit.la" \ - _audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ - USE_PYTHON3=true - emake -C "${BUILD_DIR}"/bindings/python/python3 \ - VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ - auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ - USE_PYTHON3=true - } - - local native_build="${BUILD_DIR}" - use python && python_foreach_impl python_compile - else - emake -C lib - emake -C auparse - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install - - python_install() { - emake -C "${BUILD_DIR}"/bindings/swig \ - VPATH="${native_build}/lib" \ - LIBS="${native_build}/lib/libaudit.la" \ - _audit_la_LIBADD="${native_build}/lib/libaudit.la" \ - _audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ - USE_PYTHON3=true \ - DESTDIR="${D}" install - emake -C "${BUILD_DIR}"/bindings/python/python3 \ - VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ - auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ - USE_PYTHON3=true \ - DESTDIR="${D}" install - python_optimize - } - - local native_build=${BUILD_DIR} - use python && python_foreach_impl python_install - - # things like shadow use this so we need to be in / - gen_usr_ldscript -a audit auparse - else - emake -C lib DESTDIR="${D}" install - emake -C auparse DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - dodoc AUTHORS ChangeLog README* THANKS - docinto contrib - dodoc contrib/{avc_snap,skeleton.c} - docinto contrib/plugin - dodoc contrib/plugin/* - docinto rules - dodoc rules/* - - newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd - newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd - - [ -f "${ED}"/sbin/audisp-remote ] && \ - dodir /usr/sbin && \ - mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die - - # Gentoo rules - insinto /etc/audit/ - newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules - doins "${FILESDIR}"/audit.rules.stop* - - # audit logs go here - keepdir /var/log/audit/ - - find "${D}" -name '*.la' -delete || die - - # Security - lockdown_perms "${ED}" -} - -pkg_preinst() { - # Preserve from the audit-1 series - preserve_old_lib /$(get_libdir)/libaudit.so.0 -} - -pkg_postinst() { - lockdown_perms "${EROOT}" - # Preserve from the audit-1 series - preserve_old_lib_notify /$(get_libdir)/libaudit.so.0 -} - -lockdown_perms() { - # Upstream wants these to have restrictive perms. - # Should not || die as not all paths may exist. - local basedir="$1" - chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null - chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null - chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null -} diff --git a/sys-process/audit/files/audit-2.4.3-python.patch b/sys-process/audit/files/audit-2.4.3-python.patch deleted file mode 100644 index 7b9ea53e09d2..000000000000 --- a/sys-process/audit/files/audit-2.4.3-python.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur audit-2.4.3.orig/bindings/python/python2/Makefile.am audit-2.4.3/bindings/python/python2/Makefile.am ---- audit-2.4.3.orig/bindings/python/python2/Makefile.am 2015-07-22 23:35:24.315424091 +0800 -+++ audit-2.4.3/bindings/python/python2/Makefile.am 2015-07-22 23:37:16.861510504 +0800 -@@ -29,5 +29,6 @@ - - auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c - auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) --auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro -+auparse_la_CFLAGS = -shared -+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro - auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la -diff -ur audit-2.4.3.orig/bindings/python/python3/Makefile.am audit-2.4.3/bindings/python/python3/Makefile.am ---- audit-2.4.3.orig/bindings/python/python3/Makefile.am 2015-07-22 23:35:24.315424091 +0800 -+++ audit-2.4.3/bindings/python/python3/Makefile.am 2015-07-22 23:37:30.395400641 +0800 -@@ -28,5 +28,6 @@ - - auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c - auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) --auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro -+auparse_la_CFLAGS = -shared -+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro - auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la -diff -ur audit-2.4.3.orig/bindings/swig/python/Makefile.am audit-2.4.3/bindings/swig/python/Makefile.am ---- audit-2.4.3.orig/bindings/swig/python/Makefile.am 2015-07-22 23:35:24.316424083 +0800 -+++ audit-2.4.3/bindings/swig/python/Makefile.am 2015-07-22 23:35:53.244189263 +0800 -@@ -28,7 +28,7 @@ - pyexec_LTLIBRARIES = _audit.la - pyexec_SOLIBRARIES = _audit.so - _audit_la_CFLAGS = -shared --_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro -+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro - _audit_la_HEADERS: $(top_builddir)/config.h - _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudit.la - _audit_la_LIBADD = $(top_builddir)/lib/libaudit.la -diff -ur audit-2.4.3.orig/bindings/swig/python3/Makefile.am audit-2.4.3/bindings/swig/python3/Makefile.am ---- audit-2.4.3.orig/bindings/swig/python3/Makefile.am 2015-07-22 23:35:24.316424083 +0800 -+++ audit-2.4.3/bindings/swig/python3/Makefile.am 2015-07-22 23:36:27.833908482 +0800 -@@ -29,7 +29,7 @@ - py3exec_LTLIBRARIES = _audit.la - py3exec_SOLIBRARIES = _audit.so - _audit_la_CFLAGS = -shared --_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro -+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro - _audit_la_HEADERS: $(top_builddir)/config.h - _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudit.la - _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la diff --git a/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch b/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch deleted file mode 100644 index ef04f7204958..000000000000 --- a/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch +++ /dev/null @@ -1,195 +0,0 @@ ---- a/audisp/audispd.c -+++ b/audisp/audispd.c -@@ -21,6 +21,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <unistd.h> - #include <stdlib.h> ---- a/audisp/plugins/prelude/audisp-prelude.c -+++ b/audisp/plugins/prelude/audisp-prelude.c -@@ -21,6 +21,8 @@ - * - */ - -+#include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <stdlib.h> - #include <signal.h> ---- a/audisp/plugins/remote/audisp-remote.c -+++ b/audisp/plugins/remote/audisp-remote.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <signal.h> - #include <syslog.h> ---- a/configure.ac -+++ b/configure.ac -@@ -216,6 +216,9 @@ AC_ARG_ENABLE(zos-remote, - AM_CONDITIONAL(ENABLE_ZOS_REMOTE, test "x$enable_zos_remote" != "xno") - AC_MSG_RESULT($enable_zos_remote) - -+AC_CHECK_HEADER([asm/ptrace.h], [AC_DEFINE([HAVE_ASM_PTRACE_H],[],[Define to 1 if you have asm/ptrace.h])], []) -+AC_CHECK_HEADER([linux/ptrace.h], [AC_DEFINE([HAVE_LINUX_PTRACE_H],[],[Define to 1 if you have linux/ptrace.h])], []) -+ - #gssapi - AC_ARG_ENABLE(gssapi_krb5, - [AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 support @<:@default=no@:>@])], ---- a/contrib/plugin/audisp-example.c -+++ b/contrib/plugin/audisp-example.c -@@ -37,6 +37,8 @@ - */ - - #define _GNU_SOURCE -+#include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <signal.h> - #include <string.h> ---- a/contrib/skeleton.c -+++ b/contrib/skeleton.c -@@ -13,6 +13,8 @@ - * gcc skeleton.c -o skeleton -laudit - */ - -+#include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <sys/types.h> - #include <sys/uio.h> ---- /dev/null -+++ b/lib/fixup.h -@@ -0,0 +1,17 @@ -+#ifndef _AUDIT_IA64_FIXUP_H_ -+#define _AUDIT_IA64_FIXUP_H_ -+ -+#ifdef __ia64__ /* what a pos */ -+# include <linux/types.h> -+# define _ASM_IA64_FPU_H -+#endif -+#include <signal.h> -+/* -+#ifdef HAVE_ASM_PTRACE_H -+# include <asm/ptrace.h> -+#endif -+#ifdef HAVE_LINUX_PTRACE_H -+# include <linux/ptrace.h> -+#endif -+*/ -+#endif ---- a/src/auditctl.c -+++ b/src/auditctl.c -@@ -23,6 +23,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <stdlib.h> - #include <stdbool.h> ---- a/src/auditd-config.c -+++ b/src/auditd-config.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <unistd.h> - #include <sys/stat.h> ---- a/src/auditd-dispatch.c -+++ b/src/auditd-dispatch.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <unistd.h> - #include <sys/uio.h> - #include <fcntl.h> ---- a/src/auditd-event.c -+++ b/src/auditd-event.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdlib.h> - #include <unistd.h> - #include <pthread.h> ---- a/src/auditd-listen.c -+++ b/src/auditd-listen.c -@@ -23,6 +23,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <unistd.h> - #include <sys/stat.h> ---- a/src/auditd-reconfig.c -+++ b/src/auditd-reconfig.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <pthread.h> - #include <signal.h> - #include <stdlib.h> ---- a/src/auditd-sendmail.c -+++ b/src/auditd-sendmail.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <unistd.h> // for access() - #include <string.h> ---- a/src/auditd.c -+++ b/src/auditd.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <sys/types.h> - #include <unistd.h> ---- a/src/ausearch.c -+++ b/src/ausearch.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <stdio_ext.h> - #include <string.h> ---- a/src/autrace.c -+++ b/src/autrace.c -@@ -21,6 +21,7 @@ - */ - - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <string.h> - #include <sys/wait.h> ---- a/src/delete_all.c -+++ b/src/delete_all.c -@@ -20,6 +20,7 @@ - * Steve Grubb <sgrubb@redhat.com> - */ - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <string.h> - #include <errno.h> diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest index 67b074ebaeeb..b4870df01752 100644 --- a/sys-process/bottom/Manifest +++ b/sys-process/bottom/Manifest @@ -165,5 +165,5 @@ DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c0 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -EBUILD bottom-0.6.3.ebuild 4374 BLAKE2B 79b07b149d87781cdee24315288799ac7b8bdf9f21271caa3277b91979501950cadd8402b9d6c7ef30db29d565f449272eed3555781ba2987874426b557de873 SHA512 d1659b645d82596dd6de030cb4b480d452c149f5ca36acbd88d8d0e8ccdf8c0f879cd324591e714dffb6b3cfc4b332b2efe999ec8e3ae391435a4c404b3e4ba7 +EBUILD bottom-0.6.3.ebuild 4373 BLAKE2B e9e21fb8def6064f9cf5eadb393005085d4c34dc50a5efc25c6f552492aa6428e728fecd7148a358fd0914b156a4767dfdc63f94e18805bb11220e4d8843889b SHA512 928f0fc0897cc79b0aaea6bbc1254c58cd98e5c9ce82a8f8d86fbceafe022055bc00d64d1b1a5a496399ed21e5f9ff19d43e1aa58bd8073095f8c9a9fe114911 MISC metadata.xml 704 BLAKE2B 9af54d4dba95d97158a7187ef4bb8e1f1cb4bb48124471ba841847445d1505253fc131f0328e9034d3e7b9c1b8c2aeff098f94d09fc33b57c5052f83ffeb461b SHA512 3fedcdd27ffe76bfdd2e5609f382f0afa4274130907926dfa4b8866f335ac99233655a4380b8a5162b0bbc625fc01dd11aee35edfa501fbe685dc540f6402302 diff --git a/sys-process/bottom/bottom-0.6.3.ebuild b/sys-process/bottom/bottom-0.6.3.ebuild index f5570c2bba25..e0f9cf01cff2 100644 --- a/sys-process/bottom/bottom-0.6.3.ebuild +++ b/sys-process/bottom/bottom-0.6.3.ebuild @@ -181,7 +181,7 @@ SRC_URI="$(cargo_crate_uris)" LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64" +KEYWORDS="amd64 arm64 ppc64" # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings QA_FLAGS_IGNORED="usr/bin/btm" diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index d3a6ee542f07..ae60cde619bf 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -2,8 +2,10 @@ AUX 2.2/criu-2.2-flags.patch 259 BLAKE2B 6e62d8e96ba9b2beaa4a525f14ebca1a198dae7 AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc42e657cc819acecd52653b2b3699db3f00cb5916148c9a1a8013159716d8607bfd6443d24a2f98bd6e0abe21f90 SHA512 9010b79a01f7bab35ca23749d6e61706404cca89d5cdacd31fc32aba82b088becd9997f9a82db460e16bd84d9f38b1b35e90d3c49ad04b0f141d037e9ebafdd8 AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121d1defea93371b17124130685c1d55969e3f472349f4e4f5ac211cd659980bfdecaa06b38a2fc6037d486d15dee6850884 SHA512 b535792caf39c9e8c21ed313551b9fc0f8675c494586c66d5caba17c67bb432c27c9ff3cbf5a7d2248c99fc438174c0daea355d89ef9d4ce1a8a26e688fdf7c3 AUX criu-3.15-pkg-config.patch 5131 BLAKE2B 3b4cc0a2ae3dac24eb5f76a20478844e10b601a9584e8ae7bdd6a0167add2ba715c606fd7ee00aea9893c9e99a9ee42f031b85b37c7f4fc5d4b1fcf9ecff78e7 SHA512 e424d3ee684463dfab504da234c7e178a8060a83efd743d940ad8c8ebc58f5c07de7a48cd3fc333fcc67a0947ad8c9b838e48163045a2093afe5923ca6ff1399 +AUX criu-3.15-protobuf-c-1.4.0.patch 5505 BLAKE2B 3131dcebf5cbf8205f70d5214bb9b6ae541df0d3111d2744f2b663589cef9e74dcc82dd6b600f1adc27154a4df5881b4eba9843c5353abdb5102a82847f955c5 SHA512 32d2b41028a4240e4e98df135eef108034a5b1a66d51766a7e82521a1719d9a560f3d4464f4bda11ef5b35cd76b1a004e74b098131c6a902c10a0b65d6b6fff6 DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6 DIST criu-3.15.tar.bz2 913904 BLAKE2B 2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159 SHA512 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc EBUILD criu-3.14-r2.ebuild 3189 BLAKE2B e999b7fc1a7bd8bfeff3c090aa9c6eb02b6755bcf4a0927d3478589f1ca24cc3e6bac2e0bde300e3212ae287c08ed9f13577801169a348bede5c29e1e2e14e44 SHA512 d49d449c807e00b37f1621118ce90e629c1ba5882d4c7a73ac49cee8230ba3be1960ffa0aaea68e11596e8582b729f2633dba01caea66e828b0ec33ec21f8ffe +EBUILD criu-3.15-r1.ebuild 3301 BLAKE2B 737d3a455a8d50f44c08e6ab58c275dc8642b105efe3b8b72c0584f2bb787eb10bc5844c3c2a66e04d2de73653b920db58251fdaf7b0a2d5c38b4c4ecb8d5b5e SHA512 0c36f4ecafe7420db49e1da2359a5cdfd05a29f443cc52cc22e97d399e0d35ab8b4595bdfce24941caefd22b4a7f5eb0aa40d09d271d96678376ad0a554fe39e EBUILD criu-3.15.ebuild 3231 BLAKE2B a0958fac51d7daa641f33974a98a33cfcdee066a6e0e38c0f208b22ec398f2b90eeaf4056577c01121b08045efce1a46e80322ceb2dbcd64b2de4d42f16eee37 SHA512 ff3006e68f1fa48a7eda167d5152d61d7e6166303ae14fecbe14fce0f3646e1e36385298801d8c7dbe3a72507f9de44010ba0bc79d1d736f26b6ea4f8f60a1ba MISC metadata.xml 489 BLAKE2B b147e18ffae358f6ea0c3ca2cc8addaa039d77fc845092758a258943852daa0bc674f9f2a5a94ba7094d2e6c65a179271304e2b0b4a01f1cff6d4ac20696dce8 SHA512 aebc8636c880916beff94bb80e4a9fda5eef6ef935c9e0305bbcab038e26e69a5947640e05d74978a034ca5b36d5096e177d9485c036314eaada010f16f144d4 diff --git a/sys-process/criu/criu-3.15-r1.ebuild b/sys-process/criu/criu-3.15-r1.ebuild new file mode 100644 index 000000000000..bb76d9a19d33 --- /dev/null +++ b/sys-process/criu/criu-3.15-r1.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) + +inherit toolchain-funcs linux-info python-r1 + +DESCRIPTION="utility to checkpoint/restore a process tree" +HOMEPAGE="https://criu.org/" +SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +IUSE="doc selinux setproctitle static-libs" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/protobuf-c-1.4.0:= + dev-libs/libnl:3 + net-libs/libnet:1.1 + sys-libs/libcap + selinux? ( sys-libs/libselinux ) + setproctitle? ( dev-libs/libbsd )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + )" +RDEPEND="${RDEPEND} + dev-python/protobuf-python[${PYTHON_USEDEP}]" + +CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER + ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK" + +# root access required for tests +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.2/${PN}-2.2-flags.patch + "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch + "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch + "${FILESDIR}"/${PN}-3.15-pkg-config.patch + "${FILESDIR}"/${PN}-3.15-protobuf-c-1.4.0.patch +) + +criu_arch() { + # criu infers the arch from $(uname -m). We never want this to happen. + case ${ARCH} in + amd64) echo "x86";; + arm64) echo "aarch64";; + ppc64*) echo "ppc64";; + *) echo "${ARCH}";; + esac +} + +pkg_setup() { + use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION" + linux-info_pkg_setup +} + +src_prepare() { + default + + if ! use selinux; then + sed \ + -e 's:libselinux:no_libselinux:g' \ + -i Makefile.config || die + fi + + use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install +} + +src_configure() { + # Gold linker generates invalid object file when used with criu's custom + # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 + tc-ld-disable-gold + + # Build system uses this variable as a trigger to append coverage flags + # we'd like to avoid it. https://bugs.gentoo.org/744244 + unset GCOV + + python_setup +} + +src_compile() { + local target="all $(usex doc 'docs' '')" + emake \ + HOSTCC="$(tc-getBUILD_CC)" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AR="$(tc-getAR)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 DEBUG=0 \ + SETPROCTITLE=$(usex setproctitle) \ + ${target} +} + +src_test() { + # root privileges are required to dump all necessary info + if [[ ${EUID} -eq 0 ]] ; then + emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test + fi +} + +install_crit() { + "${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die + python_optimize +} + +src_install() { + emake \ + ARCH="$(criu_arch)" \ + PREFIX="${EPREFIX}"/usr \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ + LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + V=1 WERROR=0 DEBUG=0 \ + install + + use doc && dodoc CREDITS README.md + + python_foreach_impl install_crit + + if ! use static-libs; then + find "${D}" -name "*.a" -delete || die + fi +} diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch new file mode 100644 index 000000000000..ea0b9134c683 --- /dev/null +++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch @@ -0,0 +1,168 @@ +https://bugs.gentoo.org/809092 +https://github.com/checkpoint-restore/criu/commit/1c25914a5dd1eb385937dffdd85901c3f5e39b8c + +From 1c25914a5dd1eb385937dffdd85901c3f5e39b8c Mon Sep 17 00:00:00 2001 +From: Zeyad Yasser <zeyady98@gmail.com> +Date: Thu, 22 Jul 2021 11:39:34 +0200 +Subject: [PATCH] protobuf: remove leading underscores from protobuf structs + +Fixes: #1560 + +The latest protobuf-c compiler breaks CRIU because they removed +leading underscores from structs in 1.4.0. + +This replaces those definitions with the standard generated structs. + +v2: remove struct _VmaEntry, struct _CredsEntry and struct _CoreEntry + +Signed-off-by: Zeyad Yasser <zeyady98@gmail.com> +--- + criu/include/irmap.h | 8 +++++--- + criu/include/parasite-syscall.h | 8 +++----- + criu/include/pstree.h | 2 +- + criu/include/rst_info.h | 5 ++--- + criu/include/shmem.h | 1 - + criu/mem.c | 2 +- + lib/c/criu.h | 3 ++- + 7 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/criu/include/irmap.h b/criu/include/irmap.h +index 033f71e372..188d753f4d 100644 +--- a/criu/include/irmap.h ++++ b/criu/include/irmap.h +@@ -1,13 +1,15 @@ + #ifndef __CR_IRMAP__H__ + #define __CR_IRMAP__H__ ++ ++#include "images/fh.pb-c.h" ++ + char *irmap_lookup(unsigned int s_dev, unsigned long i_ino); +-struct _FhEntry; + int irmap_queue_cache(unsigned int dev, unsigned long ino, +- struct _FhEntry *fh); ++ FhEntry *fh); + int irmap_predump_prep(void); + int irmap_predump_run(void); + int check_open_handle(unsigned int s_dev, unsigned long i_ino, +- struct _FhEntry *f_handle); ++ FhEntry *f_handle); + int irmap_load_cache(void); + int irmap_scan_path_add(char *path); + #endif +diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h +index c86a724fd1..afba95a9e7 100644 +--- a/criu/include/parasite-syscall.h ++++ b/criu/include/parasite-syscall.h +@@ -11,8 +11,6 @@ struct parasite_dump_misc; + struct parasite_drain_fd; + struct vm_area_list; + struct pstree_item; +-struct _CredsEntry; +-struct _CoreEntry; + struct list_head; + struct cr_imgset; + struct fd_opts; +@@ -31,11 +29,11 @@ extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc + struct parasite_ctl *ctl, struct pstree_item *); + + extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc); +-extern int parasite_dump_creds(struct parasite_ctl *ctl, struct _CredsEntry *ce); +-extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, struct _CoreEntry *core); ++extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce); ++extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core); + extern int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, + struct parasite_ctl *ctl, int id, +- struct pid *tid, struct _CoreEntry *core); ++ struct pid *tid, CoreEntry *core); + extern int dump_thread_core(int pid, CoreEntry *core, + const struct parasite_dump_thread *dt); + +diff --git a/criu/include/pstree.h b/criu/include/pstree.h +index 61ab0ce0eb..17d22e791e 100644 +--- a/criu/include/pstree.h ++++ b/criu/include/pstree.h +@@ -113,7 +113,7 @@ extern int prepare_task_entries(void); + extern int prepare_dummy_task_state(struct pstree_item *pi); + + extern int get_task_ids(struct pstree_item *); +-extern struct _TaskKobjIdsEntry *root_ids; ++extern TaskKobjIdsEntry *root_ids; + + extern void core_entry_free(CoreEntry *core); + extern CoreEntry *core_entry_alloc(int alloc_thread_info, int alloc_tc); +diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h +index 3283849e44..3dc119a931 100644 +--- a/criu/include/rst_info.h ++++ b/criu/include/rst_info.h +@@ -5,6 +5,7 @@ + #include "common/list.h" + #include "vma.h" + #include "kerndat.h" ++#include "images/mm.pb-c.h" + + struct task_entries { + int nr_threads, nr_tasks, nr_helpers; +@@ -25,8 +26,6 @@ struct fdt { + futex_t fdt_lock; + }; + +-struct _MmEntry; +- + struct rst_info { + struct list_head fds; + +@@ -40,7 +39,7 @@ struct rst_info { + struct fdt *fdt; + + struct vm_area_list vmas; +- struct _MmEntry *mm; ++ MmEntry *mm; + struct list_head vma_io; + unsigned int pages_img_id; + +diff --git a/criu/include/shmem.h b/criu/include/shmem.h +index 9afdb799af..798e28f347 100644 +--- a/criu/include/shmem.h ++++ b/criu/include/shmem.h +@@ -5,7 +5,6 @@ + #include "common/lock.h" + #include "images/vma.pb-c.h" + +-struct _VmaEntry; + struct vma_area; + + extern int collect_shmem(int pid, struct vma_area *vma); +diff --git a/criu/mem.c b/criu/mem.c +index 9fabe4c470..b0a76e4da9 100644 +--- a/criu/mem.c ++++ b/criu/mem.c +@@ -1230,7 +1230,7 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr) + + static int maybe_disable_thp(struct pstree_item *t, struct page_read *pr) + { +- struct _MmEntry *mm = rsti(t)->mm; ++ MmEntry *mm = rsti(t)->mm; + + /* + * There is no need to disable it if the page read doesn't +diff --git a/lib/c/criu.h b/lib/c/criu.h +index 3d64939584..d2bfbf958c 100644 +--- a/lib/c/criu.h ++++ b/lib/c/criu.h +@@ -22,6 +22,7 @@ + #include <stdbool.h> + + #include "version.h" ++#include "rpc.pb-c.h" + + #ifdef __GNUG__ + extern "C" { +@@ -112,7 +113,7 @@ void criu_set_pidfd_store_sk(int sk); + * some non-existing one is reported. + */ + +-typedef struct _CriuNotify *criu_notify_arg_t; ++typedef CriuNotify *criu_notify_arg_t; + void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na)); + + /* Get pid of root task. 0 if not available */ diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest index 0b2cc006038f..bc0fa7846550 100644 --- a/sys-process/glances/Manifest +++ b/sys-process/glances/Manifest @@ -2,5 +2,5 @@ AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d DIST glances-3.2.1.tar.gz 6851329 BLAKE2B 3f8eb91a0957961d0ed2465d8025d25158303cc8332b7a976c2af0bbd671405aae3b71b1d3a63eeb86ddb0d6e500b955bb0e1e5a93c0ba0b88835f88872eb979 SHA512 e2f8a46a9bc3b2e3aa16d0716b34e06991029df9dec4c29ef70c65b5fb7c96dee3c71cc565b551e35a31aa1c7e1a92538b158c2e660d15b22defad8ae04c4eb3 DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 99ed3298724a82f036660f05cfd374f8dfa4883ef3c710dfe789ed9f9986bfe873117096564f1dd46d91cd3d0304e0cd1876d17ecd6e3aad98c7dd9df2095265 SHA512 e77b62e5fa6131914b56f0b5249789b3bcac0c625cd429eeb0870a14be55f15c401956c002376e5868fa1332bbb219e9bd3a5bd14c739e3404b068a063af6821 EBUILD glances-3.2.1.ebuild 2697 BLAKE2B 085491a6c554e3ed9ae6c4f7e9a2351deb76926be98e2acc74222541f94d44655dbb08239e6ae4a01080ea5c86dcf77aa3bb2208ab9e2c40042fa1767ea2ef77 SHA512 f9b16b89a0bec90bdb9286c6a8ba3b320d22d4c311128ad5d90be0ac82b50fdad98181466fddc558c85993ed63970b6f877549ae77e12e0f1a740a9dccb14005 -EBUILD glances-3.2.2.ebuild 2643 BLAKE2B 167af3433c5fc72643a5c291efaa30c762d55c321042cfd6e7c18914aa08cf55cb61fabcfb237e30caa7f101b1acf29092e3ca519e86a8325acabf8963d973e6 SHA512 ced4681e8a96f559bdca362b1eecfebdcc04e9c9d35b984efd6128a18dd66630e025266b44676285ee9238bbd62e1df0d28a97fe5a9749b756b5fc3802831fce +EBUILD glances-3.2.2.ebuild 2642 BLAKE2B aac28fb9530edb6296d1b89cb3fcdced97de6734dd69363553251d2837d6f372aee4af54aeb9a1ba66e8ede0f6ca364a7ae1bf62ea57321a7e3734fcecfc9167 SHA512 2923670ed0a3b5194ea7869cd05eee585f3660d913902903176264ad316a2ab000ad8944f2fac68138c58251cbf2808b8e7587428b61b7d26828a08f3db4b8a3 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73 diff --git a/sys-process/glances/glances-3.2.2.ebuild b/sys-process/glances/glances-3.2.2.ebuild index fc337c591a1a..49a7f414d3ae 100644 --- a/sys-process/glances/glances-3.2.2.ebuild +++ b/sys-process/glances/glances-3.2.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index 1d694e548a10..683dbe74aad5 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,5 +1,5 @@ DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f -DIST htop-3.1.0_rc1.tar.gz 378045 BLAKE2B 65d5f2bdb6e41fb0a4edd76c62a36e951bd86a67ebb9908ca712b2ee7b5f9714c3fe5cd4193885b869b96dcd73bbf945ab22fcd31aa11d90598f9d9953ed4b0e SHA512 f917dbb8ba0de1a9f703423c13cec19f0f69da765df320739eeabf0e928495ec70cdd8eb0cca2871226cd6b472a713ee5ebc43aefa02b2ffbd6c29b1208f5cad +DIST htop-3.1.0_rc2.tar.gz 378563 BLAKE2B b619978dafe2d149ca5b321ab66c7416f09f1d64ac48fb9254b93b2428e54678ca96fdb0a02a7f09acb8352c8bd0ee81e94cc5ef64ddaad409097878de44856e SHA512 2f6e849ead0d29e31334e47fefacf56f242c0d1b6543bae4b2aca68ef56f58b6d3a96159faf5fe254b8af6665fad6c693145a62aaf5d73b5514258c9b444519f EBUILD htop-3.0.5-r1.ebuild 1778 BLAKE2B 7019c1a5668339b8e9efe626e01d8c44d6d802659cf8283069dad92943912d34d40f77e75bfd7834e35e07c129edcd71681fe621a3f61731d3f35aa85b72668c SHA512 1d3af3d7c65d6808eee5083f95a865715a7302da4d2b90f91c84b2fb6ba355cf474eb8f89946704af006d33dc5ad44f4cae430175193af5a65cfac0b8650788b -EBUILD htop-3.1.0_rc1.ebuild 2012 BLAKE2B 3a61c733c911ee1941cf015857f97ba204fa347ecbbd62af5f77580981d8a69d2e7885b833ed7e32c2b45d387601fe1284dd80dd8bdea3de60a965c656218a33 SHA512 e900adff6e53f58da94986ea81d59f9b6cc33314ac91976d4c18436ba416b76977a0d2f7035403443dc6ffc6b690269add0b683465e88918689f6be01dd4adf1 +EBUILD htop-3.1.0_rc2.ebuild 2234 BLAKE2B 8f58976d413c2cce5fa4f028a4b254e76fc44aa0b1e4d23bea8dfbd766b16974d559901e8e4d5d81aee3e385cc5206614f512a56ceca7e83a79687e0e142988d SHA512 9b43d40d019b4603deb65e08474f45493fbb409ed4b3ae7b6c4820117bc6abb0c514f9f3c6ecad48fb1e1d7fadd2ee69b5a88323e53701d4481867df204d970c MISC metadata.xml 1011 BLAKE2B 9986489fee7883f5b6619255ed00835d169d6cfcde7bb4d8cbeecc2670a623ad8f6f0aa1195dad8fa8a1cc6c77e327a2ae87c027ce47417255401abb68cbee48 SHA512 8ae67f87cbb4ab8e8875a530da7e3a8efe1b3d7f351161114c2077095fe05adcad60b5d4e0728f60ed9bec416dfd09530d8416df13bd6154d31809b73b5415b1 diff --git a/sys-process/htop/htop-3.1.0_rc1.ebuild b/sys-process/htop/htop-3.1.0_rc2.ebuild index 97f75eb53fee..2429313e1be6 100644 --- a/sys-process/htop/htop-3.1.0_rc1.ebuild +++ b/sys-process/htop/htop-3.1.0_rc2.ebuild @@ -71,6 +71,13 @@ src_configure() { $(use_enable lm-sensors sensors) ) else + if use kernel_Darwin ; then + # Upstream default to checking but --enable-affinity + # overrides this. Simplest to just disable on Darwin + # given it works on BSD anyway. + myeconfargs+=( --disable-affinity ) + fi + myeconfargs+=( --disable-capabilities --disable-delayacct diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest new file mode 100644 index 000000000000..2d203b7b40db --- /dev/null +++ b/sys-process/iotop-c/Manifest @@ -0,0 +1,4 @@ +DIST iotop-c-1.18.tar.gz 114838 BLAKE2B 8b3e13d00de4a5cd385a2d441d84bb27cc1d03a27012163b9628285c31176698bf840951e39199abef11b2d3c0413d500d6e7699f32a3b542360a1333307d00e SHA512 f0affbfdb106eb36078e7994860155f52d47878017f47e64d69aa7c04cc29756ca516a6634fd19d6d39c931100b9a0e93e07ca2f4d14c18014dc1c4f477907ea +EBUILD iotop-c-1.18.ebuild 775 BLAKE2B 3869a20c8ce7d1144a33a58db4596b95798f338d2d739bc28c2494185bca002fd736a0bbd9521bc2907aa8b1a078268f53f8aefa6c13f6696471103d5f6faddc SHA512 061611b94fc7c2c29e08ceffa09d58de640f255c1eccc57442804be051beda551584ca682409cb17ff9a7d48fc0e7a50f3bc6ee738d03d936a4144ead2fcdc9c +EBUILD iotop-c-9999.ebuild 701 BLAKE2B d87011d19c473ce2c4cba8d2f954d1c4e5e7d3cb43f04cef30f62bc238ad995db40c090107c1633acf37e983520474148f4975305c54cd40d01f428068bf85f4 SHA512 99bdda36efce6b2174a17746c21fe7398bcdf515943139776ac8123189d681bd630c063e9efcbb3cb91827fac75f518f3501fb11b09086cbc49442848308c055 +MISC metadata.xml 1376 BLAKE2B 4c377f582205438d0c85bc74ec56f55746a9ed8d5f82d13adf8c0beb81f5800d7e003e4ac9027edc2cd5a72a85a56eb829c82cac5c80aad31303aa3e50656077 SHA512 41827d5cb9e10c470ab065231727c5433947f78efc360f1474a05e6c6473c2a86f0dfd98389603203c6d5c35d3be8fa839d225e92b164e13ded4798cf5c8db0d diff --git a/sys-process/iotop-c/iotop-c-1.18.ebuild b/sys-process/iotop-c/iotop-c-1.18.ebuild new file mode 100644 index 000000000000..b6d52c5d05fa --- /dev/null +++ b/sys-process/iotop-c/iotop-c-1.18.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps linux-info toolchain-funcs + +DESCRIPTION="top utility for IO (C port)" +HOMEPAGE="https://github.com/Tomas-M/iotop" +SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/iotop-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="sys-libs/ncurses:= + !sys-process/iotop" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS" + +FILECAPS=( + cap_net_admin=eip usr/bin/iotop +) + +src_compile() { + emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1 +} + +src_install() { + dobin iotop + dodoc README.md + doman iotop.8 +} diff --git a/sys-process/iotop-c/iotop-c-9999.ebuild b/sys-process/iotop-c/iotop-c-9999.ebuild new file mode 100644 index 000000000000..b05952298d1d --- /dev/null +++ b/sys-process/iotop-c/iotop-c-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +EGIT_REPO_URI="https://github.com/Tomas-M/iotop" +inherit fcaps git-r3 linux-info toolchain-funcs + +DESCRIPTION="top utility for IO (C port)" +HOMEPAGE="https://github.com/Tomas-M/iotop" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND="sys-libs/ncurses:= + !sys-process/iotop" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS" + +FILECAPS=( + cap_net_admin=eip usr/bin/iotop +) + +src_compile() { + emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1 +} + +src_install() { + dobin iotop + dodoc README.md + doman iotop.8 +} diff --git a/sys-process/iotop-c/metadata.xml b/sys-process/iotop-c/metadata.xml new file mode 100644 index 000000000000..e99460ff502b --- /dev/null +++ b/sys-process/iotop-c/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> + <longdescription lang="en"> +Your Linux server is too slow or load is too high? One of the possible causes of such symptoms may be high IO (input/output) waiting time, which basically means that some of your processes need to read or write to a hard drive while it is too slow and not ready yet, serving data for some other processes. + +Common practice is to use iostat -x in order to find out which block device (hard drive) is slow, but such information is not always much helpful. It could help you much more if you knew which process reads or writes the most data from your slow disk, so you could possibly renice it using ionice or even kill it. + +IOTop will identify processes, which use high amount of input/output requests on your machine. It is similar to the well known top utility, but instead of showing you what consumes CPU the most, it lists processes by their IO consumption. Inspired by iotop python script from Guillaume Chazarain, but rewritten to C by Vyacheslav Trushkin so it now runs without python at all. + </longdescription> + <upstream> + <remote-id type="github">Tomas-M/iotop</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-process/iotop/Manifest b/sys-process/iotop/Manifest index b1a72a722703..5d2ace7fc731 100644 --- a/sys-process/iotop/Manifest +++ b/sys-process/iotop/Manifest @@ -3,5 +3,5 @@ AUX iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch 2826 BLAKE2B bef78 AUX iotop-0.6-Only-split-proc-status-lines-on-the-character.patch 984 BLAKE2B c43a4feaa7293b86454a96aaddbbc3c40c6a2afc2656448cc899230abc479d702adbc5785a818754214f7524bc499f4699ac1c841b7753601c9bcd89771440ec SHA512 291ed55dcebd988e0819f28805f12392bfff3ea0686cddebdb9bec8042f981c2d94c7ac3f8d9a4ba5e8611686129c47347bd1a9484ce82a2687c651007efb937 AUX iotop-0.6-setup.py3.patch 1151 BLAKE2B da00d36a1778173e2d77041fec584aa1ff42062932915ff2a6beb9aaeda0699fdb6a6c9903eee56e10efb9ed9d6def08a8d7fbbe714def4e8bff4504500aa55e SHA512 6b97da5ef9e78c268193ce0270328f4c4d99d30f532fe68dac9bd033bb0a5e6cdb3145b53a7670c7babdae7f170473d1f9eb23137b5950fdaceadde266b4bb73 DIST iotop-0.6.tar.bz2 29779 BLAKE2B 6c979f7beef4e9ec6536eb5ec113ab7089ccb0b8b00dfca6181408390584dac0eae18b110c3f4837a25defd7ab2c2e9d79f1f5cad762f97519e94847951f0037 SHA512 b1047da3bc46604447cc8ab22442a3a5381e1a79a6b176fe9ee8402ee5cebb959205407a6aeaffccccde9d2f67624ff8ee6717b051838f13ab88bf3a16db3ab9 -EBUILD iotop-0.6.ebuild 953 BLAKE2B 703f679633677cfaf9265589df0eba4ddba9a6e0efa0f920daee3b729d753f0ca85ad30cd54a272f2a10f0d8b674f60cd7c279438f11505d31777d952319e929 SHA512 636f2b4c8988392fb9b8f1656d2d23b95874e703436065ffb055257feeabacb3ed68860d288a68b6369e4c832c1cfe45d1278034e086dfef5da03db47cb31678 +EBUILD iotop-0.6.ebuild 980 BLAKE2B 295c97c0cdc9ea9adac6cbabd1e2b1fbd06fafaf95325b20b83b448b6c4f91c31e6a9928d7b6981f033c2ed5fca55aa5463933afaf77c2794ab98ba8eb74a593 SHA512 2477081889095cab7affa24c7c3931dc02ed9752d572eba3b03a52efb50bd01e4c0c92eda33003d94e30a85082bec6bd4bbc1726f9d34fd9c705090521d891bd MISC metadata.xml 359 BLAKE2B d2fa2d7b93eeb82a5494f0c92270a512083e71b60699ebdd9b860560796b21e94e77be8c5af0dcd4533bc3b6a4bc173d72cef1d5da736f7b948c83982ef91489 SHA512 12f1f2e8971ea7d83248c637e6128be106087f733af8625fea8dd7ad9c891ef38ea0eda8ed7f6cfe96a4c0b795a799c1b51301e0ae424898c413a354305c7852 diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild index 3b4c580f100a..7b59ad028fc9 100644 --- a/sys-process/iotop/iotop-0.6.ebuild +++ b/sys-process/iotop/iotop-0.6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="ncurses(+)" DISTUTILS_USE_SETUPTOOLS=no @@ -13,10 +13,11 @@ DESCRIPTION="Top-like UI used to show which process is using the I/O" HOMEPAGE="http://guichaz.free.fr/iotop/" SRC_URI="http://guichaz.free.fr/iotop/files/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="" + +RDEPEND="!sys-process/iotop-c" CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS" diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest index 7ca1e6793bc5..829941de3e49 100644 --- a/sys-process/numad/Manifest +++ b/sys-process/numad/Manifest @@ -4,6 +4,6 @@ AUX numad.confd 157 BLAKE2B c2b2c983c2192f63a8212bfbf05f51bebe5854e7bcee6df15ccb AUX numad.initd 315 BLAKE2B 6cc341364e6766a2376773f453973bb72353eda8fa95c1a768f119b3202c347e9807afb51659a323dc66fdd547b964595975c61b69222efc38909bdefd36ca2f SHA512 80b7f006f2f8a934413ec435ee1a48019e2dfeac16585f794102c47cc9011c3db0b290a9ce0b6df01b1ba8dda85e56932ae1f52eac7023e5658edf7d828d14de AUX numad.logrotated 60 BLAKE2B 384bada94db096e9c02555d5342fc998482012bfedb3a6c71af95ff41655a5ce17cddef19e589cfa0d4162f38228a7602ba24ba0ff5d791201593f7096776784 SHA512 6ffdc65b85fd44866b18318b3259e72188547b600e53ef2407ce8f7f1db41582ff9250bdfe4fd360e81816d533f93170cf46e3e8d89cfe57640a07a6bb101d81 DIST numad-0.5-334278f.tar.bz2 21007 BLAKE2B f226e90e0ad664b0cccd82c060b21cc8b7c4b086220f6eee1cd6e421b32f0efe2be11e66ce749142315f8207e19e635a718a41e5a8dd3ecfda02a96dfbd62798 SHA512 1b4a577f0713bae1386f2064fcb2dcbfb9453e23e7617f40cfff4e56d02a8c26a48c8d03f1ac7aa36e4ba168824572377f84bc669d1dabdc1820c2cdc4c57911 -EBUILD numad-0.5-r3.ebuild 1134 BLAKE2B a2af266fddb1f0f83455bb5b15dace9e0ef6d82526c78df1d2cb2b2f5e6083299abf7622fa33c2a037e0ecfde9f4345830ec148a790d24c607336651693f416a SHA512 de268c1b30ed9aa9d98dd344f9fc38436f7f56fd961ec1d0421454fc4cb9bc1d030983c89e47f1cea81dbd6300cfe213c402b01b739a1594b02c4bcfc76b6bf4 +EBUILD numad-0.5-r3.ebuild 1133 BLAKE2B f1be961f616dcd59488ffaca62ebfac54954d98101935053bfbf41ddaffffd416d0a9b88810bec439f4ffc3d1fc5632ce90d594da52359a034a0b1797524e191 SHA512 ea3eb7e4d9f4cc358b8a3098c66987040c7a70db7d9a8cf79afa7861d913cef895fb3f7c0332afa5e3d974387ce3b7f0f595a26ec88b9d9c2ed8a036b692637e EBUILD numad-9999.ebuild 987 BLAKE2B 5af25dfa704cb7aa3f8b7c914e492be8b6153639ead69120ba1d6eacdbe283832ac2c24bbc07ad168242576fa7c0700ae236e9932fe94a838902afe5c1f502cc SHA512 8f1b703d6e1b6cdad30a0941def476e0050501b3d924065313db90dcea5fafe81af46af555af83f2243c0655d334832bdf0f0c278e0a3cf0e3f80beead66153b MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-process/numad/numad-0.5-r3.ebuild b/sys-process/numad/numad-0.5-r3.ebuild index 5708c2782607..e90c00f370ed 100644 --- a/sys-process/numad/numad-0.5-r3.ebuild +++ b/sys-process/numad/numad-0.5-r3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then else EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693" SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2" - KEYWORDS="amd64 -arm ~arm64 ~ppc64 ~s390 x86" + KEYWORDS="amd64 -arm arm64 ~ppc64 ~s390 x86" S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}" fi |