diff options
Diffstat (limited to 'sys-apps')
34 files changed, 898 insertions, 759 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 3f114872889d..805a220a4cbb 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index bc68281b9fb7..a1f9f0451e32 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -16,6 +16,7 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a EBUILD busybox-1.32.1-r1.ebuild 9641 BLAKE2B 95830049ca9fd1ba62152d401bfab07c1f85221b2df691055d31c8eebda7ebe7441c51704b00dbc80529929e8e34a24ffbdbeb57ed46eb5d11cde24bec912f1d SHA512 7b1a7849cb2ca44237156533c48ca942663cdaa9794876ae3f5ac8d5052ce41695de561d32779ebb79c53ef07453b22bb1cdbb581b9f6a6999909f0c4f7b667e +EBUILD busybox-1.33.1-r1.ebuild 9656 BLAKE2B cde66c145df7cfb41651124955609e482d5cf3fb8cdce91d206e9ed96620b35ab14b329c0eef14f8f3b2202ef0196855dab9ac750de9f82a1c0ad6d741e6e2ff SHA512 ddacefda6ff09a8297adf74f36d52f06fb46e31f4f47ead25268985444b3b48cf18ca9669e16d1f1e33a351bd86e08ecdbcbfae2fee36b7e9ad0db5c9c44bc97 EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406 -EBUILD busybox-9999.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406 +EBUILD busybox-9999.ebuild 9656 BLAKE2B cde66c145df7cfb41651124955609e482d5cf3fb8cdce91d206e9ed96620b35ab14b329c0eef14f8f3b2202ef0196855dab9ac750de9f82a1c0ad6d741e6e2ff SHA512 ddacefda6ff09a8297adf74f36d52f06fb46e31f4f47ead25268985444b3b48cf18ca9669e16d1f1e33a351bd86e08ecdbcbfae2fee36b7e9ad0db5c9c44bc97 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff --git a/sys-apps/busybox/busybox-1.33.1-r1.ebuild b/sys-apps/busybox/busybox-1.33.1-r1.ebuild new file mode 100644 index 000000000000..19eb891b560f --- /dev/null +++ b/sys-apps/busybox/busybox-1.33.1-r1.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# See `man savedconfig.eclass` for info on how to use USE=savedconfig. + +EAPI=7 + +inherit flag-o-matic savedconfig toolchain-funcs + +DESCRIPTION="Utilities for rescue and embedded systems" +HOMEPAGE="https://www.busybox.net/" +if [[ ${PV} == "9999" ]] ; then + MY_P=${P} + EGIT_REPO_URI="https://git.busybox.net/busybox" + inherit git-r3 +else + MY_P=${PN}-${PV/_/-} + SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" # GPL-2 only +SLOT="0" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" +RESTRICT="test" + +# TODO: Could make pkgconfig conditional on selinux? bug #782829 +COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) + pam? ( sys-libs/pam ) + virtual/libcrypt:=" +DEPEND="${COMMON_DEPEND} + static? ( + virtual/libcrypt[static-libs] + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) + >=sys-kernel/linux-headers-2.6.39" +BDEPEND="virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + mdev? ( !<sys-apps/openrc-0.13 )" + +S="${WORKDIR}/${MY_P}" + +busybox_config_option() { + local flag=$1 ; shift + if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then + busybox_config_option $(usex ${flag} y n) "$@" + return + fi + local expr + while [[ $# -gt 0 ]] ; do + case ${flag} in + y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;; + n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;; + *) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;; + esac + sed -i -e "${expr}" .config || die + einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")" + shift + done +} + +busybox_config_enabled() { + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) + case ${val} in + "") return 1 ;; + y) return 0 ;; + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; + esac +} + +# patches go here! +PATCHES=( + "${FILESDIR}"/${PN}-1.26.2-bb.patch + # "${FILESDIR}"/${P}-*.patch +) + +src_prepare() { + default + unset KBUILD_OUTPUT #88088 + append-flags -fno-strict-aliasing #310413 + use ppc64 && append-flags -mminimal-toc #130943 + + cp "${FILESDIR}"/ginit.c init/ || die + + # flag cleanup + sed -i -r \ + -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ + Makefile.flags || die + #sed -i '/bbsh/s:^//::' include/applets.h + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ + Makefile || die + sed -i \ + -e 's:-static-libgcc::' \ + Makefile.flags || die +} + +src_configure() { + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 -s oldconfig >/dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 -s allyesconfig >/dev/null + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 -s oldconfig >/dev/null + + # now turn off stuff we really don't want + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_2_4_MODULES #607548 + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n FEATURE_CLEAN_UP + busybox_config_option n MONOTONIC_SYSCALL + busybox_config_option n USE_PORTABLE_CODE + busybox_config_option n WERROR + # triming the BSS size may be dangerous + busybox_config_option n FEATURE_USE_BSS_TAIL + + # These cause trouble with musl. + if use elibc_musl; then + busybox_config_option n FEATURE_UTMP + busybox_config_option n EXTRA_COMPAT + busybox_config_option n FEATURE_VI_REGEX_SEARCH + fi + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y ASH + busybox_config_option y SH_IS_ASH + busybox_config_option n HUSH + busybox_config_option n SH_IS_HUSH + + busybox_config_option '"/run"' PID_FILE_PATH + busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + busybox_config_option n UDHCPC6 + fi + + busybox_config_option pam PAM + busybox_config_option static STATIC + busybox_config_option syslog {K,SYS}LOGD LOGGER + busybox_config_option systemd FEATURE_SYSTEMD + busybox_config_option math FEATURE_AWK_LIBM + + # disable features that uClibc doesn't (yet?) provide. + if use elibc_uclibc; then + busybox_config_option n FEATURE_SYNC_FANCY #567598 + busybox_config_option n NSENTER + fi + + # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG_SANITIZE + busybox_config_option n DEBUG + busybox_config_option y NO_DEBUG_LIB + busybox_config_option n DMALLOC + busybox_config_option n EFENCE + busybox_config_option $(usex debug y n) TFTP_DEBUG + + busybox_config_option selinux SELINUX + + # this opt only controls mounting with <linux-2.6.23 + busybox_config_option n FEATURE_MOUNT_NFS + + # glibc-2.26 and later does not ship RPC implientation + busybox_config_option n FEATURE_HAVE_RPC + busybox_config_option n FEATURE_INETD_RPC + + # default a bunch of uncommon options to off + local opt + for opt in \ + ADD_SHELL \ + BEEP BOOTCHARTD \ + CRONTAB \ + DC DEVFSD DNSD DPKG{,_DEB} \ + FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ + FEATURE_DEVFS \ + HOSTID HUSH \ + INETD INOTIFYD IPCALC \ + LOCALE_SUPPORT LOGNAME LPD \ + MAKEMIME MKFS_MINIX MSH \ + OD \ + RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ + SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ + TASKSET TCPSVD \ + RPM RPM2CPIO \ + UDPSVD UUDECODE UUENCODE + do + busybox_config_option n ${opt} + done + + emake -j1 oldconfig > /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake V=1 busybox + + # bug #701512 + emake V=1 doc +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + dodir /bin + if use sep-usr ; then + # install /ginit to take care of mounting stuff + exeinto / + newexe busybox_unstripped ginit + dosym /ginit /bin/bb + dosym bb /bin/busybox + else + newbin busybox_unstripped busybox + dosym busybox /bin/bb + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* + + newinitd "${FILESDIR}"/mdev.initd mdev + fi + if use livecd ; then + dosym busybox /bin/vi + fi + + # add busybox daemon's, bug #444718 + if busybox_config_enabled FEATURE_NTPD_SERVER; then + newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" + newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" + fi + if busybox_config_enabled SYSLOGD; then + newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" + newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" + fi + if busybox_config_enabled KLOGD; then + newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" + newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" + fi + if busybox_config_enabled WATCHDOG; then + newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" + newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" + fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + exeinto "${path%/*}" + newexe examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" install + rm _install/bin/busybox + # for compatibility, provide /usr/bin/env + mkdir -p _install/usr/bin + ln -s /bin/env _install/usr/bin/env + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + use make-symlinks && doins busybox-links.tar + + dodoc AUTHORS README TODO + + cd docs || die + doman busybox.1 + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + docinto html + dodoc *.html + + cd ../examples || die + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm +} + +pkg_preinst() { + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then + ewarn "setting USE=make-symlinks and emerging to / is very dangerous." + ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." + ewarn "If you are creating a binary only and not merging this is probably ok." + ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + savedconfig_pkg_postinst + + if use make-symlinks ; then + cd "${T}" || die + mkdir _install + tar xf busybox-links.tar -C _install || die + false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + fi + + if use sep-usr ; then + elog "In order to use the sep-usr support, you have to update your" + elog "kernel command line. Add the option:" + elog " init=/ginit" + elog "To launch a different init than /sbin/init, use:" + elog " init=/ginit /sbin/yourinit" + elog "To get a rescue shell, you may boot with:" + elog " init=/ginit bb" + fi +} diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index e9062e18e44c..19eb891b560f 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -328,7 +328,7 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" fi if use sep-usr ; then diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index fb5fabaf33fc..2c47353e7083 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -3,5 +3,5 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 -EBUILD dbus-1.12.20-r1.ebuild 7308 BLAKE2B 9e72471b31f81f268c2d143f696a19a35810eb35ef2acb13e469291ac3a2bd73a5875b241d9b408ad8c40133667be92a9821a208c6cab749c58c3f9681802711 SHA512 f29f1c12c73d59290f06293ea2439f9ed8596a143c48d901c722ee1cf18c42ce980e478b0d6573a530a3fd47c824469d2dba0fa92301cf4583787bd21d20e4b0 +EBUILD dbus-1.12.20-r2.ebuild 7433 BLAKE2B deaa3d300fe835544b5e990e158f4e54b2261bec847c96c9eba330284388717947b355b419f6237933fb0505688c1b7c58fa12cedbabaad8ae690e6ffe9895cf SHA512 8bd2427ab152432d13876c38e83763b8304bbc9d9602647080f8112c19d96b42624cc841b6987bc174aeb91db619512806da508860f8d4822456b0dc8da9f331 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738 diff --git a/sys-apps/dbus/dbus-1.12.20-r1.ebuild b/sys-apps/dbus/dbus-1.12.20-r2.ebuild index 06071bbc0200..8b4f89206a05 100644 --- a/sys-apps/dbus/dbus-1.12.20-r1.ebuild +++ b/sys-apps/dbus/dbus-1.12.20-r2.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal +PYTHON_COMPAT=( python3_{8,9} ) +inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal DESCRIPTION="A message bus system, a simple way for applications to talk to each other" HOMEPAGE="https://dbus.freedesktop.org/" @@ -246,9 +246,12 @@ multilib_src_install_all() { pkg_postinst() { readme.gentoo_print_elog + tmpfiles_process dbus.conf + # Ensure unique id is generated and put it in /etc wrt #370451 but symlink # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) + # TODO: should be safe to remove at least the ln because of the above tmpfiles_process? dbus-uuidgen --ensure="${EROOT}"/etc/machine-id ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 2e9ff50dc9d7..44f5715f3e1f 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,5 +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 +EBUILD gnome-disk-utility-40.2.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34 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 index 3192512980a0..5879c632cfb8 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-2+" SLOT="0" IUSE="fat elogind gnome systemd" REQUIRED_USE="?? ( elogind systemd )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" DEPEND=" >=media-libs/libdvdread-4.2.0:0= diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index cd33f9a21541..5a97d2ec12d3 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,7 +1,9 @@ DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90 +DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82 EBUILD grep-3.4.ebuild 1497 BLAKE2B 0636337bf9ffff4e59273390408831eaa1f3eabea247712850e0e622bf415869e293dde7c6829a78654fab88efe1b2657ba738e08e75d252ccae37f4b2d95bc2 SHA512 f9964eefb816efd635f992566777385a86c2c429c1d2bbee8117057f88f8c8072d46a1fe0c55e52924bb7feeb8376351ec19aa307ba2d928c139a3b73fcb3c53 EBUILD grep-3.5.ebuild 1783 BLAKE2B 6e1d754fe158ba0a919db4e2f1a9f365450067dfdac4072621a8f5a2ded5dc2d63c06e1741ca6939ecb40042718c76c42a0a8bbc9b37ffbad38f6c0a66feea68 SHA512 b9b92a7572712a2127bae0763cc7df70db86a5b2bafa9a7665d575d4e4b96f05889bf0473b579cebf38e2372852338be14d71c3ba336cd9010c74c3debd54e14 EBUILD grep-3.6.ebuild 1760 BLAKE2B b642c2ecb17b684a16d4c4a89c03880e93b044d2b1b13c49cb0ecba1995119d88d7e413531bebc725575b4efbbaad4a4ece9281656b7b41e147e3d68268e939e SHA512 7adc72cb0669c752c84dfb8583b458c9359c70e550c225ababec1999a8e39622f18c1ac3ad2492da9bce629e99af0ac789669ceb0649559cd9f80744d6b75088 +EBUILD grep-3.7.ebuild 1761 BLAKE2B f24ca318068a98ad266cbbe177632590eac45b3ff85056f199c2d0d5c90260c77c9b314875112c3f4079f508e06aca5bfeb64164dc0994b1c586d40ad3df6089 SHA512 7f201f6cb15311bd202a948be4c0d399d02a41406e5421e37dfc1db5ffa1dcc95a4df215f5b9b766f459121a1b7181dbf4ed521ec1ce29074c5190292c555956 MISC metadata.xml 334 BLAKE2B 9b080b3e11ed75688b2a917ec2068dfbe3e1809637ee4806f24f0faecec971eac04892498961172b96493dc250c1fed7c12e6d46104b0d3e54e13bd91011b096 SHA512 a6f238cbf49e79edfa41fa6c296c86378f8477c08fe1d581d399d00d485b8472a31b69311d26f2e399ac8fefe056ddcdb9f59f08dee1a50c77ee1dca97e0bedd diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild new file mode 100644 index 000000000000..5d2f499deab4 --- /dev/null +++ b/sys-apps/grep/grep-3.7.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="https://www.gnu.org/software/grep/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls pcre static" + +# We lack dev-libs/libsigsegv[static-libs] for now +REQUIRED_USE="static? ( !sparc )" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] ) + sparc? ( dev-libs/libsigsegv )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + nls? ( virtual/libintl ) + virtual/libiconv" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + sed -i \ + -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ + -e "s:@grep@:${EPREFIX}/bin/grep:" \ + src/egrep.sh || die #523898 + + default +} + +src_configure() { + use static && append-ldflags -static + + # We used to turn this off unconditionally (bug #673524) but we now + # allow it for cases where libsigsegv is better for userspace handling + # of stack overflows. + # In particular, it's necessary for sparc: bug #768135 + export ac_cv_libsigsegv=$(usex sparc) + + # Always use pkg-config to get lib info for pcre. + export ac_cv_search_pcre_compile=$( + usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' + ) + local myeconfargs=( + --bindir="${EPREFIX}"/bin + $(use_enable nls) + $(use_enable pcre perl-regexp) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 9cd33b9de98f..e37ef3799672 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -3,7 +3,9 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646 DIST openrc-0.43.3.tar.gz 240431 BLAKE2B 4e7326e2cb87fbb9101b616f0ad5a955f38f387e9d940a0ae1d00a8b48e7733411b3f0a4bb70bfc6a63cb4769354d7836cb4accd695b73f601d9b6bab8b8a8ea SHA512 a6b0a3b7eba7624ed00cb33253cec71059b9af194f3828eb7417f9faba551ecdff7c1e1b5132772969a9c868ff60a92378b28e56e54edfe8e0f4e143aa43b8c5 +DIST openrc-0.43.4.tar.gz 241876 BLAKE2B c50cefb079a63c9a682f37244f84ea96e8428d6ddbfd5af7f6e03b5abf206158426d2b7af2b0e9354cf50178f59b6179a8698826b3b9af9086904c17f88bee56 SHA512 705ecb458ffbfcf143d53c17e7f01e0e2cd5450d43b7b0ddf1460f9ef684114d4bcd6ba50ef1510920db89c1cdbf13f954b744ef16a0e881650377ff7a254b55 EBUILD openrc-0.42.1-r1.ebuild 5471 BLAKE2B a3749af382add50151e08b679ac8548f4a229784de8ca796c1c5d113ea190c42980e18ad8bd5598fee43a049538e4d806398aabe7bdfa27a79361529bfdd5445 SHA512 638ff01c5c1de288e462790dbc9c5801b326768051933a96a9338278b36208a39934be4e7b9605ca286e30baa9e83dab58075e50ee9de112ce4e117cc0767b97 EBUILD openrc-0.43.3.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906 +EBUILD openrc-0.43.4.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3 EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1 diff --git a/sys-apps/openrc/openrc-0.43.4.ebuild b/sys-apps/openrc/openrc-0.43.4.ebuild new file mode 100644 index 000000000000..1b2b297f3023 --- /dev/null +++ b/sys-apps/openrc/openrc-0.43.4.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="https://github.com/openrc/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode" + +COMMON_DEPEND=" + ncurses? ( sys-libs/ncurses:0= ) + pam? ( sys-libs/pam ) + audit? ( sys-process/audit ) + sys-process/psmisc + !<sys-process/procps-3.3.9-r2 + selinux? ( + sys-apps/policycoreutils + >=sys-libs/libselinux-2.6 + ) + !<sys-apps/baselayout-2.1-r1 + !<sys-fs/udev-init-scripts-27" +DEPEND="${COMMON_DEPEND} + virtual/os-headers + ncurses? ( virtual/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + bash? ( app-shells/bash ) + !prefix? ( + sysv-utils? ( + !sys-apps/systemd[sysv-utils(-)] + !sys-apps/sysvinit + ) + !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) + virtual/tmpfiles + ) + selinux? ( + >=sec-policy/selinux-base-policy-2.20170204-r4 + >=sec-policy/selinux-openrc-2.20170204-r4 + ) + !<app-shells/gentoo-bashcomp-20180302 + !<app-shells/gentoo-zsh-completions-20180228 +" + +PDEPEND="netifrc? ( net-misc/netifrc )" + +src_prepare() { + default + if [[ ${PV} == "9999" ]] ; then + local ver="git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die + fi +} + +src_compile() { + MAKE_ARGS="${MAKE_ARGS} + LIBNAME=$(get_libdir) + LIBDIR=${EPREFIX}/$(get_libdir) + LIBEXECDIR=${EPREFIX}/lib/rc + MKBASHCOMP=yes + MKNET=$(usex newnet) + MKSELINUX=$(usex selinux) + MKSYSVINIT=$(usex sysv-utils) + MKAUDIT=$(usex audit) + MKPAM=$(usev pam) + MKSTATICLIBS=no + MKZSHCOMP=yes + OS=Linux + SH=$(usex bash /bin/bash /bin/sh)" + + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" +export BRANDING="Gentoo Linux" + export DEBUG=$(usev debug) + export MKTERMCAP=$(usev ncurses) + + tc-export CC AR RANLIB + emake ${MAKE_ARGS} +} + +# set_config <file> <option name> <yes value> <no value> test +# a value of "#" will just comment out the option +set_config() { + local file="${ED}/$1" var=$2 val com + eval "${@:5}" && val=$3 || val=$4 + [[ ${val} == "#" ]] && com="#" && val='\2' + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" +} + +set_config_yes_no() { + set_config "$1" "$2" YES NO "${@:3}" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install + + keepdir /lib/rc/tmp + + # Setup unicode defaults for silly unicode users + set_config_yes_no /etc/rc.conf unicode use unicode + + # Cater to the norm + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' + + # On HPPA, do not run consolefont by default (bug #222889) + if use hppa; then + rm -f "${ED}"/etc/runlevels/boot/consolefont + fi + + # Support for logfile rotation + insinto /etc/logrotate.d + newins "${FILESDIR}"/openrc.logrotate openrc + + if use pam; then + # install gentoo pam.d files + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + fi + + # install documentation + dodoc ChangeLog *.md + if use newnet; then + dodoc README.newnet + fi +} + +pkg_preinst() { + # avoid default thrashing in conf.d files when possible #295406 + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then + ( + unset hostname HOSTNAME + source "${EROOT}"/etc/conf.d/hostname + : ${hostname:=${HOSTNAME}} + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" + ) + fi + + # set default interactive shell to sulogin if it exists + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin + return 0 +} + +pkg_postinst() { + if use hppa; then + elog "Setting the console font does not work on all HPPA consoles." + elog "You can still enable it by running:" + elog "# rc-update add consolefont boot" + fi + + # Added for 0.35. + if [[ ! -h "${EROOT}"/lib ]]; then + if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then + cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib + fi + fi + + if ! use newnet && ! use netifrc; then + ewarn "You have emerged OpenRc without network support. This" + ewarn "means you need to SET UP a network manager such as" + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/connman," + ewarn " net-misc/NetworkManager, or net-vpn/badvpn." + ewarn "Or, you have the option of emerging openrc with the newnet" + ewarn "use flag and configuring /etc/conf.d/network and" + ewarn "/etc/conf.d/staticroute if you only use static interfaces." + ewarn + fi + + if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then + ewarn "Please add the network service to your boot runlevel" + ewarn "as soon as possible. Not doing so could leave you with a system" + ewarn "without networking." + ewarn + fi +} diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index 9a7e97a15401..fececd31c86f 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -6,11 +6,13 @@ DIST pkgcore-0.12.0.tar.gz 621376 BLAKE2B d58390ad7251fc48465d744a0b0694210d1f1c DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29eadbbeab85b7de029d0230a5ea77e2ee96b128381964afe92a327674d64878f833d8c1ddc983c0fe1381b008e2d62 SHA512 a78f3ffd5610f14adb07e2adce07c8446012e742c777d08bbc7ac711bf194508d66a14d21aa56f5d0c9353bd10354fdd34bc6eb4b6017c03bff5d1b565a53575 DIST pkgcore-0.12.2.tar.gz 621604 BLAKE2B 15964d9a73727028010b7267a61802566aa59f28769f4ac67aa91ccd32708b1a27914ba14957e1da848dc1a2a24ee9fbf92a7b4cee055a7cff22dd1f0d204f58 SHA512 192532dcee696e7ce159efad2f90597aa68801759ceb5ae85484a99a11242c1da98b73290ce1e4c9e29f2c92607989991b3802c4d0fb9bd1f4a866dd80f13cde DIST pkgcore-0.12.3.tar.gz 621912 BLAKE2B 629c42b9d0236196d018302b0941d05d36d15d2bdf31f51ef0d212ab0aad2968ff58aa938d22ff8ba65d115e5a1e80e0f444959c2c63aa227f34bd2da3868165 SHA512 6942d13aecfbf0af2969b71b92fcf4e8e938c367fe61e4a748cae14eeeb4ba831b7ac50deb04f4afa8a7f1a6dc31a893ce4106e54b188ff0a1036f7afd6798a4 +DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106 EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2 EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2 EBUILD pkgcore-0.12.1-r1.ebuild 1112 BLAKE2B 142795b861489cedd1abccd333803e814eda9356e32412dc5bcb6f68b17b5a5739f38eb53e9dd9faf2a2cdc170ccea9d0b1dcbca92b7dd196c1b16776a1d2199 SHA512 ce0e5e62ceb954ffe48ec510ddb658c2b43b3ce5b684c716a97ca9c2f61340bb1a1cbdace1fb2a24bb92fd4b7c7df5226814846195cbba3c6685fec18a89aa80 EBUILD pkgcore-0.12.2.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6 EBUILD pkgcore-0.12.3.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6 +EBUILD pkgcore-0.12.4.ebuild 1117 BLAKE2B 54e47a2fc7326b9b263069f2480df3e6bf61a42f32c0c4202622e712349237e2f9c61fd0ad7fc515d3a5045b77ca2b34c832e6334a6b59d2831ef33890b51945 SHA512 745e1937e956aa0ca89c072f93d8f796385a8d338ee93422680da29f789cfc42ad6845ffed4c8fc17c802d2256c4450b10e547168881319abefea5d7915be015 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5 diff --git a/sys-apps/pkgcore/pkgcore-0.12.4.ebuild b/sys-apps/pkgcore/pkgcore-0.12.4.ebuild new file mode 100644 index 000000000000..de125d8637ed --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.12.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_IN_SOURCE_BUILD=1 +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="a framework for package management" +HOMEPAGE="https://github.com/pkgcore/pkgcore" + +LICENSE="BSD MIT" +SLOT="0" + +RDEPEND=" + >=app-shells/bash-5.0 + dev-python/lxml[${PYTHON_USEDEP}]" +if [[ ${PV} == *9999 ]]; then + RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]" +fi +BDEPEND=" + test? ( + >=dev-python/pytest-6[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +distutils_enable_tests setup.py + +src_test() { + local -x PYTHONDONTWRITEBYTECODE= + distutils-r1_src_test +} + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${PV} == *9999 ]] || doman man/* + distutils-r1_python_install_all +} diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 56616995e2db..c508e833a2bf 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -3,6 +3,8 @@ AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490 +DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7 EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47 EBUILD rng-tools-6.13-r1.ebuild 1704 BLAKE2B 3005edac0db4da6d2222973f4a837d025742bb6c6e67fcdba9e4fde45b00ada12b1d3a9ee9e4f42fb4eb4b5d3a7575ee7252eaaa97c3879f85bea56df3dfec2b SHA512 8b7167cc590171dc2ab071b7fb63f245b2647cf086599b76fc5d58c33977af3672c3e6cc842b246bb072bc9b3d66b98856ead1369a009039b58a5a1e7194fd84 +EBUILD rng-tools-6.14.ebuild 1618 BLAKE2B 587d54c5031f754add10bb2a82806dddd6bebf56d5aece7f6440092fadd6e419da6d20baf67672fbe2aa0547103116a20888f737515d841364356f3c499a6870 SHA512 a089429c0d3173d27015bf74fbd5e4baa75bf9efb9710547b054480bf97e507550d56e4314bc3e54d4fe23d72283581d3ea44d8a00dde1a8b8e984c46cb2253f MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64 diff --git a/sys-apps/rng-tools/rng-tools-6.14.ebuild b/sys-apps/rng-tools/rng-tools-6.14.ebuild new file mode 100644 index 000000000000..44ac0e4d61c9 --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-6.14.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Daemon to use hardware random number generators" +HOMEPAGE="https://github.com/nhorman/rng-tools" +SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="jitterentropy nistbeacon pkcs11 selinux" + +DEPEND=" + dev-libs/openssl:0= + jitterentropy? ( app-crypt/jitterentropy:= ) + nistbeacon? ( + dev-libs/jansson + dev-libs/libxml2:2= + net-misc/curl[ssl] + ) + pkcs11? ( dev-libs/libp11:= ) + elibc_musl? ( sys-libs/argp-standalone )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-rngd )" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable jitterentropy) + $(use_with nistbeacon) + $(use_with pkcs11) + --without-rtlsdr # no librtlsdr in the tree + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/rngd-initd-6.11 rngd + newconfd "${FILESDIR}"/rngd-confd-6.11 rngd + systemd_dounit rngd.service + + if use pkcs11; then + local DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS=" +The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc') +to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in: + '${EPREFIX}/etc/conf.d/rngd' +reflects the correct PKCS11 engine path to be used by rngd. +" + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + use pkcs11 && readme.gentoo_print_elog +} diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest index 47669fcdc426..5187f093bbf8 100644 --- a/sys-apps/sg3_utils/Manifest +++ b/sys-apps/sg3_utils/Manifest @@ -1,4 +1,4 @@ -AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb +AUX sg3_utils-1.46-musl-drand48-compat.patch 4532 BLAKE2B 454837f33c374eb3002a47b441de9d34f57944ce99c26710b44cab010c1a5fdf538e97dfbea5714cb2d4ac5c7fd508fb23a5d835f0932ca6fcec22604dd55e46 SHA512 faba667b6cb4b7b1d6e04ddd7e80073cd5e80dd4ec7b2312c599a5c1c44df4b9ba8394354881a4968625450691587ddb42adec004043ab604f923d5fb643a86b DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf -EBUILD sg3_utils-1.46-r1.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf +EBUILD sg3_utils-1.46-r1.ebuild 1088 BLAKE2B 632dbbc1dd7e7211967ab167c68564ad7c0ea94ec99f37a9448c30b5c586d437d45ba5f065c1aebd8b1db16ee1ac446bba8c6fc7265f5c9721eb02ad5921b7f2 SHA512 8bcec3a5fe58004ea287cf27b9921f20220af986429a9fb31c2bc6ab9ae7dafea304fd163f9d918070cb2766f3f5d7b5d01465a57cc98f7249947ca6055a43c3 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch deleted file mode 100644 index 62fb30240e10..000000000000 --- a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Ed Catmur <ed@catmur.co.uk> -Gentoo-Bug: 229653 -X-Gentoo-URL: http://bugs.gentoo.org/show_bug.cgi?id=229653 -X-Gentoo-URL: http://bugs.gentoo.org/attachment.cgi?id=158565&action=view -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -For uint64_t to be available, <stdint.h> must be included: -http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html - ---- a/include/sg_cmds_basic.h -+++ b/include/sg_cmds_basic.h -@@ -30,6 +30,8 @@ - * - */ - -+#include <stdint.h> -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/include/sg_cmds_extra.h -+++ b/include/sg_cmds_extra.h -@@ -30,6 +30,8 @@ - * - */ - -+#include <stdint.h> -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch b/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch new file mode 100644 index 000000000000..d4152c3d2651 --- /dev/null +++ b/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch @@ -0,0 +1,99 @@ +diff -Naurp sg3_utils-1.46.orig/doc/sg_dd.8 sg3_utils-1.46/doc/sg_dd.8 +--- sg3_utils-1.46.orig/doc/sg_dd.8 2021-03-22 00:36:43.000000000 -0400 ++++ sg3_utils-1.46/doc/sg_dd.8 2021-08-16 14:07:16.703526168 -0400 +@@ -394,7 +394,7 @@ random + this flag is only active with \fIiflag=\fR and when given replaces + \fIif=IFILE\fR. If both are given an error is generated. The input will + be a stream of pseudo random bytes. The Linux getrandom(2) system call is +-used to create a seed and thereadter mrand48_r(3) is used to generate a ++used to create a seed and thereadter mrand48(3) is used to generate a + pseudo random sequence, 4 bytes at a time. The quality of the randomness + can be viewed with the ent(1) utility. This is not a high quality random + number generator, it is built for speed, not quality. One application is +diff -Naurp sg3_utils-1.46.orig/src/sg_dd.c sg3_utils-1.46/src/sg_dd.c +--- sg3_utils-1.46.orig/src/sg_dd.c 2021-03-27 20:58:36.000000000 -0400 ++++ sg3_utils-1.46/src/sg_dd.c 2021-08-16 12:56:26.316550042 -0400 +@@ -176,7 +176,6 @@ static uint8_t * free_zeros_buff = NULL; + static int read_long_blk_inc = READ_LONG_DEF_BLK_INC; + + static long seed; +-static struct drand48_data drand;/* opaque, used by srand48_r and mrand48_r */ + + static const char * proc_allow_dio = "/proc/scsi/sg/allow_dio"; + +@@ -2124,7 +2123,7 @@ main(int argc, char * argv[]) + #endif + if (verbose > 1) + pr2serr("seed=%ld\n", seed); +- srand48_r(seed, &drand); ++ srand48(seed); + } else if (iflag.zero) { + ccp = "<zero bytes>"; + cc2p = "00"; +@@ -2401,7 +2400,7 @@ main(int argc, char * argv[]) + for (kk = 0; kk < blocks; ++kk, bp += blk_sz) { + for (j = 0; j < blk_sz; j += jbump) { + /* mrand48 takes uniformly from [-2^31, 2^31) */ +- mrand48_r(&drand, &rn); ++ rn = mrand48(); + *((uint32_t *)(bp + j)) = (uint32_t)rn; + } + } +diff -Naurp sg3_utils-1.46.orig/testing/sgh_dd.cpp sg3_utils-1.46/testing/sgh_dd.cpp +--- sg3_utils-1.46.orig/testing/sgh_dd.cpp 2021-03-28 21:27:17.000000000 -0400 ++++ sg3_utils-1.46/testing/sgh_dd.cpp 2021-08-16 14:06:37.262536902 -0400 +@@ -312,7 +312,6 @@ typedef struct request_element + uint32_t in_mrq_q_blks; + uint32_t out_mrq_q_blks; + long seed; +- struct drand48_data drand; /* opaque, used by srand48_r and mrand48_r */ + pthread_t mrq_abort_thread_id; + Mrq_abort_info mai; + } Rq_elem; +@@ -1491,7 +1490,7 @@ read_write_thread(void * v_tip) + #endif + if (vb > 1) + pr2serr_lk("thread=%d: seed=%ld\n", rep->id, rep->seed); +- srand48_r(rep->seed, &rep->drand); ++ srand48(rep->seed); + } + if (clp->in_flags.same_fds || clp->out_flags.same_fds) + ; +@@ -1804,7 +1803,7 @@ normal_in_rd(Rq_elem * rep, int blocks) + for (k = 0, bp = rep->buffp; k < blocks; ++k, bp += clp->bs) { + for (j = 0; j < clp->bs; j += jbump) { + /* mrand48 takes uniformly from [-2^31, 2^31) */ +- mrand48_r(&rep->drand, &rn); ++ rn = mrand48(); + *((uint32_t *)(bp + j)) = (uint32_t)rn; + } + } +diff -Naurp sg3_utils-1.46.orig/testing/sg_mrq_dd.cpp sg3_utils-1.46/testing/sg_mrq_dd.cpp +--- sg3_utils-1.46.orig/testing/sg_mrq_dd.cpp 2021-03-28 21:27:17.000000000 -0400 ++++ sg3_utils-1.46/testing/sg_mrq_dd.cpp 2021-08-16 14:06:45.842752108 -0400 +@@ -313,7 +313,6 @@ typedef struct request_element + int out_local_partial; + int in_resid_bytes; + long seed; +- struct drand48_data drand; /* opaque, used by srand48_r and mrand48_r */ + } Rq_elem; + + /* Additional parameters for sg_start_io() and sg_finish_io() */ +@@ -1310,7 +1309,7 @@ read_write_thread(struct global_collecti + #endif + if (vb > 1) + pr2serr_lk("[%d] %s: seed=%ld\n", id, __func__, rep->seed); +- srand48_r(rep->seed, &rep->drand); ++ srand48(rep->seed); + } + + if (in_is_sg && clp->infp) { +@@ -1524,7 +1523,7 @@ normal_in_rd(Rq_elem * rep, int64_t lba, + for (k = 0; k < blocks; ++k, bp += clp->bs) { + for (j = 0; j < clp->bs; j += jbump) { + /* mrand48 takes uniformly from [-2^31, 2^31) */ +- mrand48_r(&rep->drand, &rn); ++ rn = mrand48(); + *((uint32_t *)(bp + j)) = (uint32_t)rn; + } + } diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild index 9a35e645d320..ef1bff372bc5 100644 --- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild +++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit multilib @@ -19,7 +19,8 @@ DEPEND="sys-devel/libtool" RDEPEND="!sys-apps/rescan-scsi-bus" PATCHES=( - "${FILESDIR}"/${PN}-1.26-stdint.patch #580236 + # Bug #808600 + "${FILESDIR}"/${PN}-1.46-musl-drand48-compat.patch ) src_configure() { diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index efe97ce72cd8..7775d1c0e689 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -4,11 +4,12 @@ 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.9-SHA-rounds.patch 1714 BLAKE2B 71dbc5189486cded95e34aa5d1b1a2af836004d42c0ccaf4b0fed7bdf525e87aaa73fd40ceb29b19eabc0043e20843aab846eaebce3e9d84d67a3106af8c3252 SHA512 f7b332818a2eb5b4c72021ca6f4befb5d067277599d9e57a5f68fa92dadfc40b6c3286627e42d237468ab3c41868b607ae35c08e2e60439ad5d08627318bfe4f AUX shadow-4.9-libcrack.patch 738 BLAKE2B 7ba0fd5e2c9c81bbefa75b2f1e29ed94ae32f302cf81c9ff978319bdb81a905248a638a535131df92c401383c184b22aff174d1a366e37a9dbb8756c9f7975ba SHA512 c967227926a5bd2c511ecc9d4e39b39aef50615404c79ad30d1e7bb967e09d52669ac9e2047d7d5039cdfad9b2dcf53f2de17a6d917cecbf9c8a72a77f1c0a10 AUX shadow-4.9-libsubid_oot_build.patch 2933 BLAKE2B 9bc638bd1d0733c6e51b54ab1f1db132bd4499a24b33efc76c58c306267015ebd9e2e927e774c3631cfa94490bb249b4d2267a163ae85f9f6ba18b964fcc81d4 SHA512 7f42cd84cb606fde19750f26883c4650642499dc6cb0078bc733d5d61a51b39c9f1c3898000e2df8ceb84eaecadbab6ae502178bf51d205fe644bb8c58a62bfa AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e6347568013b0092beb57d08a51e6bbca0480773525518febd0ec975dd37a9c071c5ec17d56541586b9afa12010081a392dc60cee4c13 SHA512 49a40045520358d1fb29daae30f9fef1f8aab4516596f16781d3702642ef70592959536d69f4755d57689fc6e30d029c5dfc545d95362e811a284900cb628b6b DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95 EBUILD shadow-4.8.1-r4.ebuild 6134 BLAKE2B a3effe54f52408bfee5ed17134a58806e005aab38391d4ff78888e3ae18c86f0d76dd946c2494bc92901e8400e7b98db0e4045f004a8880cb6c437acff28d560 SHA512 2e7375dd6c94bdc85eabfe8cb65d0c7df4bb1bc9b2aff418824046a8af80493f3a481476f63bdc91abca4aefcc61105b2aa6c551e8b260b8da1db2d0587b56fb -EBUILD shadow-4.9-r1.ebuild 6340 BLAKE2B ebe11dd7bb7776f9580ee2de30cd5a16dc1aa166f4780ba9235d216f4832cdde995a1be0f20c973318ca0c393d9fd7b1ae7c5cab41a84d3547de12773315f036 SHA512 46f7ef1b3be5cb224e787f1fa1cff5e30bdcc55ab7268d3ac376ba5e570f7746debf714a290ebfe82277d2c669272d67e0429b21f06aaa1cb8113bf71d0896f5 +EBUILD shadow-4.9-r2.ebuild 6383 BLAKE2B 4e457a262c781c84d479b19a34ae898f2052aef9f40f930d55abc4e30fc12b74175852a2cf69e58dd0d638169da7c66db29fd1c06d0f10fa752c26d57166c638 SHA512 24419419aaaf358b92fcc7bdb0c40771e1f22ddcc19bd8bc4b109c39d4f594171763cc4347c10cc7ce12d78cb8684c6a9cfbe143a4ae0cbfc66491f068021ffe MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7 diff --git a/sys-apps/shadow/files/shadow-4.9-SHA-rounds.patch b/sys-apps/shadow/files/shadow-4.9-SHA-rounds.patch new file mode 100644 index 000000000000..05be7adc1b19 --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.9-SHA-rounds.patch @@ -0,0 +1,57 @@ +From 234e8fa7b134d1ebabfdad980a3ae5b63c046c62 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sat, 14 Aug 2021 13:24:34 -0400 +Subject: [PATCH] libmisc: fix default value in SHA_get_salt_rounds() + +If SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS are both unspecified, +use SHA_ROUNDS_DEFAULT. + +Previously, the code fell through, calling shadow_random(-1, -1). This +ultimately set rounds = (unsigned long) -1, which ends up being a very +large number! This then got capped to SHA_ROUNDS_MAX later in the +function. + +The new behavior matches BCRYPT_get_salt_rounds(). + +Bug: https://bugs.gentoo.org/808195 +Fixes: https://github.com/shadow-maint/shadow/issues/393 +--- + libmisc/salt.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +diff --git a/libmisc/salt.c b/libmisc/salt.c +index 91d528fd..30eefb9c 100644 +--- a/libmisc/salt.c ++++ b/libmisc/salt.c +@@ -223,20 +223,21 @@ static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *pre + if ((-1 == min_rounds) && (-1 == max_rounds)) { + rounds = SHA_ROUNDS_DEFAULT; + } ++ else { ++ if (-1 == min_rounds) { ++ min_rounds = max_rounds; ++ } + +- if (-1 == min_rounds) { +- min_rounds = max_rounds; +- } ++ if (-1 == max_rounds) { ++ max_rounds = min_rounds; ++ } + +- if (-1 == max_rounds) { +- max_rounds = min_rounds; +- } ++ if (min_rounds > max_rounds) { ++ max_rounds = min_rounds; ++ } + +- if (min_rounds > max_rounds) { +- max_rounds = min_rounds; ++ rounds = (unsigned long) shadow_random (min_rounds, max_rounds); + } +- +- rounds = (unsigned long) shadow_random (min_rounds, max_rounds); + } else if (0 == *prefered_rounds) { + rounds = SHA_ROUNDS_DEFAULT; + } else { diff --git a/sys-apps/shadow/shadow-4.9-r1.ebuild b/sys-apps/shadow/shadow-4.9-r2.ebuild index 545c8cb652b1..8ce94660aad6 100644 --- a/sys-apps/shadow/shadow-4.9-r1.ebuild +++ b/sys-apps/shadow/shadow-4.9-r2.ebuild @@ -57,6 +57,7 @@ PATCHES=( "${FILESDIR}/${P}-libsubid_pam_linking.patch" "${FILESDIR}/${P}-libsubid_oot_build.patch" "${FILESDIR}/shadow-4.9-libcrack.patch" + "${FILESDIR}/shadow-4.9-SHA-rounds.patch" ) src_prepare() { diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest index 89b88bf7fb1b..69c52b11a905 100644 --- a/sys-apps/tcp-wrappers/Manifest +++ b/sys-apps/tcp-wrappers/Manifest @@ -5,5 +5,5 @@ DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec58 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 2568 BLAKE2B 1d6582fb738c6c3c43027053c9d1b156cceb7bbebdcb0770b46ae6f55e5bea0fef3bcd33f8ba770a34893ebf1821ccf5e2591e665dd4d7a84042a2e6e895012f SHA512 5bf49b12e5b607865cd34c433617ab5f160da76db8bc31f6bfee5c3aefb1bd8540d618e45e035601f6fbc85bc0cd43c512596df0a3a2e9ee7b6cd3c149d85738 +EBUILD tcp-wrappers-7.6.31.ebuild 2566 BLAKE2B ca6ac68d00b60a7c3444c75d0579a41c1055d3642e3107676b8a2a3d9595b17748020f55cc54a8c7bb993fb976a05d0a0b428371250ed9b21f07bc90d5d54c88 SHA512 3ec19a7ae2839f719865b56e932213e9aa84475c3b36663ea031a6d884b58957d85ddffc0ef5b92a89ca39fd2db56a7e6b95603b4ea9b188599df3e4e1386489 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 index 69030d9a27c7..a6351d4ea22a 100644 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild @@ -16,7 +16,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" IUSE="ipv6 netgroups" RDEPEND="netgroups? ( net-libs/libnsl:= )" diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 3ef88f94caa1..5f6f110ea0f5 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,21 +1,14 @@ 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 AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca AUX util-linux-2.37.1-ipcutils_calloc_check.patch 845 BLAKE2B 44e92d33ccf3bd56c86f5d9d0e4acc9e31fdc7c5e7f9e19c76eace88dbe1488140d57eb73a00e7e15f0b11bcdc676032f5b58597a5a369c4a24b9975a0b1a993 SHA512 d2f9ca3180867d23eeddf2dea89bcf7ec1294b24fec8a5116208ba187b816bc29f3456f6daef3f5a55560e1a06da4f6f08113214d8040ea824a79c00480ac4f7 AUX util-linux-2.37.1-libmount_setgroups_fix.patch 1039 BLAKE2B a04ece245e5f27b48d585795c2bda419a710382801e518cfdbd9c304eb9329d5e6c41deae6c23f13885f20ec60e8dad403c1b5f51e04961b279d363b8bc3055b SHA512 cfa5b399509740109e034401984d75245ec6f84ea57ac01945fe3580f317967a462cced4f002ad34639c37c37dbe22471043ccee8814587cf36e02532a428027 AUX util-linux-2.37.1-lscpu_NULL_dereference_fix.patch 1796 BLAKE2B 58034cae22d589640010bbeccc5d13dfb1d5ed6f51bbc17c6977732ddefb346a0bf46ea472e5dfddfd7f21b62dbc8b92212f18ca4e976ab67f9c6da1b21aa07d SHA512 da7114d008c52f27662aecb9aecfea05f54c5d8ce4a5948a43ce6fac3b12a61c86f8f943848f05f04d65eeff6595a0fab65e0df36436aabd25a8aff9baa8e80f -AUX util-linux-2.37.1-lscpu_nullptr.patch 828 BLAKE2B 1847450e9b3580964d54184718f3e8971d42c00a4ba51f320a969058ace35a00bac9eae4e188dd6be6ce4c120aca53429011f4e3a2d9affea03000bdcfa6362c SHA512 29228cd5024eb94394f665656cd033ac52560e023a4575ce311393dd0922b80a753508dc9b23f16ba92fe0f00a171dada8b4789660225f571823614dfe439f9e 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.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9dd457d83e5beab8d6b97a5e7f312332ecfcd1ddbb88ae5ec9ee483bb15452b8d58bce1f931f9dfa35be3ce042da3da SHA512 ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555 -DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615 +DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d EBUILD util-linux-2.36.2-r1.ebuild 8943 BLAKE2B 02deedf4a71d2acc2cd15fce983471237f84bf131debc2f161ec9afa7102b70dcdbd0aa70062ca4208d0e2fa444f5a9effe4650d07e4d9ec027fa7c1004b0e85 SHA512 4ac8f481c02d804078a16c3d92ffaf9320028630ca4bd9233ca5461a1ed373cb8c5aaee7a08be49b38ed103698f089cb5db0e87f119911423154b4754e39d23f -EBUILD util-linux-2.37-r1.ebuild 9999 BLAKE2B fc8118a93be6b7c434d86773da8e3b5dd78e18153cce7eb6b806a9e6e0741cc2a30e2cce4cf9f0637fb2fab73b1db27396abb06023e722642350779135ed775a SHA512 5588ac089b27a20df5f813a15164ba282d3321cc288b4c0fcbffc7fba36db57eed496af7f8cb05d372bc87e1466195bc3a31035ea2de03b74bf65784035ece9c EBUILD util-linux-2.37.1-r1.ebuild 9500 BLAKE2B bc24b39aef44405c5a2043fad701fec7ed115378e18c309322aa2543b12b1d3747c76259cb28f5bdccead828f46fbdbbee08a73a7f642f5d00ce1f035f5d8cd9 SHA512 bdfde984bace6c53f186be04eeafa1491e052c3e6c4d5b13fb23241bd4611fa4c758bdd8bb1b47fec592eee4196025654e699161572789c8fc36ae633b6ca210 -EBUILD util-linux-2.37.1.ebuild 9288 BLAKE2B 3be449936783f0da3269d4e45f8c39881cb28c96a6844a14f498991a697286e168700bafe092df750e941bbe099e503c2782ca098027733dee8f46aa2f12ec50 SHA512 d6accd9769ec8dfc23bd6602e195d1b62a8776fec5754418cf2f8fd06caca48d4bc90c5fe12c86f53782fe5d334d528c517f5ef558e52958d460fd297a843161 -EBUILD util-linux-9999.ebuild 9227 BLAKE2B 2b797ee2166256daa32f4d04593d28663746937fa81a07821b7204b07b31b92874c8266e0ffa3d9b1eeb7191f0329d6d7d13e228360f47e0e94a2e4921a74db8 SHA512 9a430472ec02d0e3c76927f9479ee4b5bdab9231e249991c8c6ff48f4922a099bc15d6533a2502ddd455f18def6530ad21c7d166fb39790614348db6eed3aef7 +EBUILD util-linux-2.37.2.ebuild 9301 BLAKE2B be36a4e14d3fcd9052f29f96ac8e2517ea1accada937ccafca6cc7865d489651e9224e0a6a34ef4389c1f5d171cfad51d13625ea56356e9bc866fb93413ff66c SHA512 debcf3ba1ffbc231a1edec77a3a56f2de0f93264ef3ecd16d7cf7f9bd9dbf8e623c351e6d0b1b4ed1aa76d61f82d8ddc565ddd2f6f499b6aa3f5d4ec13854230 +EBUILD util-linux-9999.ebuild 9226 BLAKE2B 827ddedb6525d13f491a337be25ba220104b1c13f26f8eb1349f233cbdf62051f9300de9bef13e54fef075af345d5396866b7bb3195f11fd99afaac27e08fe56 SHA512 b794514c3e4119ae22b79354cce7af8b996143e40fbccf7f58ad20ca1207259468a06058d1d3fd00a6cc514f8c3ddbe5b5c74ca76d8701d581a95a2d744507ed 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 deleted file mode 100644 index 44ea6e5c2bed..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- 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 deleted file mode 100644 index 2da99b2841d6..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 2173195be612..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch +++ /dev/null @@ -1,91 +0,0 @@ -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/files/util-linux-2.37-ppc-nortas.patch b/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch deleted file mode 100644 index b3ac47163233..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 45cd3aa4ded6df54dde85e6939b48bb273c8b6c3 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Wed, 2 Jun 2021 13:59:26 -0700 -Subject: [PATCH] lscpu: fix build on powerpc - -fails with error: label at end of compound statement -and fix typo as bonus. - -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - sys-utils/lscpu-cputype.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c -index cf7af361c..d5ca8e1f1 100644 ---- a/sys-utils/lscpu-cputype.c -+++ b/sys-utils/lscpu-cputype.c -@@ -724,7 +724,7 @@ int lscpu_read_archext(struct lscpu_cxt *cxt) - } - - #if defined(HAVE_LIBRTAS) -- /* Get PowerPC speficic info */ -+ /* Get PowerPC specific info */ - if (!cxt->noalive) { - int rc, len, ntypes; - -@@ -745,8 +745,8 @@ int lscpu_read_archext(struct lscpu_cxt *cxt) - ct->physsockets = strbe16toh(buf, 4); - ct->physchips = strbe16toh(buf, 6); - ct->physcoresperchip = strbe16toh(buf, 8); --nortas: - } -+nortas: - #endif - return 0; - } diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch deleted file mode 100644 index bfb528cf1f15..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch +++ /dev/null @@ -1,26 +0,0 @@ -If you call a function which can return a null pointer you probably want -to check the return value before attempting to dereference it. </sarcasm> - ---- a/sys-utils/lscpu.c -+++ b/sys-utils/lscpu.c -@@ -966,7 +966,7 @@ - *(p - 2) = '\0'; - add_summary_s(tb, sec, _("CPU op-mode(s):"), buf); - } -- if (ct->addrsz) -+ if (ct && ct->addrsz) - add_summary_s(tb, sec, _("Address sizes:"), ct->addrsz); - #if !defined(WORDS_BIGENDIAN) - add_summary_s(tb, sec, _("Byte Order:"), "Little Endian"); -@@ -1008,9 +1008,9 @@ - sec = NULL; - - /* Section: cpu type description */ -- if (ct->vendor) -+ if (ct && ct->vendor) - sec = add_summary_s(tb, NULL, _("Vendor ID:"), ct->vendor); -- if (ct->bios_vendor) -+ if (ct && ct->bios_vendor) - add_summary_s(tb, sec, _("BIOS Vendor ID:"), ct->bios_vendor); - - for (i = 0; i < cxt->ncputypes; i++) diff --git a/sys-apps/util-linux/util-linux-2.37-r1.ebuild b/sys-apps/util-linux/util-linux-2.37-r1.ebuild deleted file mode 100644 index 5aa4349db6e9..000000000000 --- a/sys-apps/util-linux/util-linux-2.37-r1.ebuild +++ /dev/null @@ -1,362 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ - pam python-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz - https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" - -LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND=" - virtual/libcrypt:= - audit? ( >=sys-process/audit-2.6:= ) - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) - hardlink? ( dev-libs/libpcre2:= ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)?] - magic? ( sys-apps/file:0= ) - ) - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) - pam? ( sys-libs/pam ) - ppc? ( sys-libs/librtas ) - ppc64? ( sys-libs/librtas ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) -" -DEPEND=" - ${RDEPEND} - virtual/os-headers -" -RDEPEND+=" - hardlink? ( !app-arch/hardlink ) - logger? ( !>=app-admin/sysklogd-2.0[logger] ) - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - su? ( - !<sys-apps/shadow-4.7-r2 - !>=sys-apps/shadow-4.7-r2[su] - ) - !net-wireless/rfkill - !<app-shells/bash-completion-2.7-r1 -" - -# Required for man-page generation -if [[ "${PV}" == 9999 ]] ; then - BDEPEND+=" - dev-ruby/asciidoctor - " -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -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() { - [[ -n $1 ]] || die - local el - for el in $1 ; do - find "${WORKDIR}/man" -type f -name "${el}.?" -delete \ - || die - done -} - -src_prepare() { - default - - # Prevent uuidd test failure due to socket path limit. #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - - if ! use userland_GNU ; then - # test runner is using GNU-specific xargs call - sed -i -e 's:xargs:gxargs:' tests/run.sh || die - # test requires util-linux uuidgen (which we don't build) - rm tests/ts/uuid/oids || die - fi - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - else - # Conditionally remove some man-pages - use hardlink || rm_man "hardlink" - use kill || rm_man "kill" - use logger || rm_man "logger" - use ncurses || rm_man "pg" - use su || rm_man "su" - use tty-helpers || rm_man "mesg wall write" - fi - - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -python_configure() { - local myeconfargs=( - "${commonargs[@]}" - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - --with-python - ) - if use userland_GNU ; then - myeconfargs+=( - --enable-libblkid - --enable-libmount - --enable-pylibmount - ) - fi - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - popd >/dev/null || die -} - -multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - - # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 - export NCURSES6_CONFIG=false NCURSES5_CONFIG=false - export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false - - # configure args shared by python and non-python builds - local commonargs=( - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - ) - - local myeconfargs=( - "${commonargs[@]}" - --with-bashcompletiondir="$(get_bashcompdir)" - --without-python - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) - $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(multilib_native_use_with audit) - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with ncurses tinfo) - $(use_with selinux) - ) - # build programs only on GNU, on *BSD we want libraries only - if multilib_is_native_abi && use userland_GNU ; then - myeconfargs+=( - --disable-chfn-chsh - --disable-login - --disable-newgrp - --disable-nologin - --disable-pylibmount - --disable-vipw - --enable-agetty - --enable-bash-completion - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable caps setpriv) - $(use_enable cramfs) - $(use_enable fdformat) - $(use_enable hardlink) - $(use_enable kill) - $(use_enable logger) - $(use_enable ncurses pg) - $(use_enable su) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_with cryptsetup) - ) - if [[ ${PV} == *9999 ]] ; then - myeconfargs+=( --enable-asciidoc ) - else - # We ship pre-generated man-pages for releases - myeconfargs+=( --disable-asciidoc ) - fi - else - myeconfargs+=( - --disable-all-programs - --disable-asciidoc - --disable-bash-completion - --without-systemdsystemunitdir - # build libraries - --enable-libuuid - --enable-libblkid - --enable-libsmartcols - --enable-libfdisk - ) - if use userland_GNU ; then - # those libraries don't work on *BSD - myeconfargs+=( - --enable-libmount - ) - fi - fi - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_configure - fi -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - emake all - popd >/dev/null || die -} - -multilib_src_compile() { - emake all - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_compile - fi -} - -python_test() { - pushd "${BUILD_DIR}" >/dev/null || die - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - popd >/dev/null || die -} - -multilib_src_test() { - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - if multilib_is_native_abi && use python ; then - python_foreach_impl python_test - fi -} - -python_install() { - pushd "${BUILD_DIR}" >/dev/null || die - emake DESTDIR="${D}" install - python_optimize - popd >/dev/null || die -} - -multilib_src_install() { - if multilib_is_native_abi && use python ; then - python_foreach_impl python_install - fi - - # This needs to be called AFTER python_install call (#689190) - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use userland_GNU ; then - # need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if [[ ${PV} != 9999 ]] ; then - doman "${WORKDIR}"/man/man*/* - fi - - if ! use userland_GNU ; then - # manpage collisions - # TODO: figure out a good way to keep them - rm "${ED}"/usr/share/man/man3/uuid* || die - fi - - if use pam ; then - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - fi - - # Note: - # Bash completion for "runuser" command is provided by same file which - # would also provide bash completion for "su" command. However, we don't - # use "su" command from this package. - # This triggers a known QA warning which we ignore for now to magically - # keep bash completion for "su" command which shadow package does not - # provide. -} - -pkg_postinst() { - if ! use tty-helpers ; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.37.1.ebuild b/sys-apps/util-linux/util-linux-2.37.2.ebuild index c0b9a494a98e..43b2f16fe98d 100644 --- a/sys-apps/util-linux/util-linux-2.37.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.37.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8,9} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd @@ -87,7 +87,7 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${PN}-2.37.1-lscpu_nullptr.patch + "${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972 ) src_prepare() { diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 4f991bccc9a5..887e3f07cbc4 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8,9} ) inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ pam python-r1 multilib-minimal multiprocessing systemd |