diff options
Diffstat (limited to 'sys-fs')
21 files changed, 6 insertions, 1446 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex fb0dadf960b4..4d4ada3e9a30 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index d7558850a1cb..095e81687378 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -1,8 +1,5 @@ -AUX 2.4.0-dmcrypt.confd 4009 BLAKE2B efaf826fc78b60068aeddb6d5fbd9665bcf85e66c5f0b48fa74316d8ad98fb5400ed89f674b6a93e30d76fa1adc3391a209a95936156fcd472b779cf5dbdd8b4 SHA512 131cee054019eed3f1939615386ba849bad2b02e31042075d5839e9a5943c8716431aae01aece25b2193645bcd706e14e6c947ee59f1fab4c2d7e0afc80228be -AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f66ba4be5df1a0d29da7c1dadd0e2379a5f4ef35a9b17d4cb11fe2419cce6cad2df63546370b6a1975b SHA512 7f32bd09e22405deb4a7cd8233da0262764233562421a8fb49bd625be591f1dc27154c2204462df480668ab2f1a81aab5a992f426603a8a4fd86cd15a27a6a97 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a AUX 2.4.3-dmcrypt.rc 9697 BLAKE2B 356a54e5de24717731ffdcf6235fe229bc57169c3bd248f5cac77c1cbf0c596c77c0d95a5ef502972db3bab155f4253a53db9be2b7787e10791275d4695821d2 SHA512 61434a6ae3346e5a2f330656055add0c32d1c79a62fec3e8b0f4e38e95f8cf0a3e8ab8d1cc0955316e2ea1b47d9863bffbf46c980fc2f32d6fdd4e817769ca9c DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e EBUILD cryptsetup-2.4.3-r2.ebuild 4259 BLAKE2B 227bedbb96411297404c9c5468354cf263705f3105d7452f770c86718489ab5bb20ba3a991c0aa27703f1d8c8b38549d5756e9298604ed4b6ba12f4dd2a028b4 SHA512 00c15a4ff6dfd2a59370661d1005c411b0da4941b41e33e5b8571d86016323c3921f09679a4a6717c46175360a930f35c355f2eeb460cbd90bd4c4fe702f4cee -EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe MISC metadata.xml 1204 BLAKE2B aff35e9aa5025dce5c55206274e23bc575aa8138b1e8d0269ba322c86ef10f4702e69f7838c3d580a963e39c1270d2e907234f540febb5bd4fc403412623a83b SHA512 86f328fadbadb8e582b4ae9a055f943e0c9cb3711a9c80cf84868d5e329770957886d58fe43aaec7aa0f0985acb0e4ac12947f58d1a423814ea4ea8d290b2b39 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild deleted file mode 100644 index 79282c022d79..000000000000 --- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info tmpfiles - -DESCRIPTION="Tool to setup encrypted devices with dm-crypt" -HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md" -SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/12" # libcryptsetup.so version -[[ ${PV} != *_rc* ]] && \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" -# we don't support nss since it doesn't allow cryptsetup to be built statically -# and it's missing ripemd160 support so it can't provide full backward compatibility -IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs test +udev urandom" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) - static? ( !gcrypt !ssh !udev )" # 496612, 832711 - -LIB_DEPEND=" - dev-libs/json-c:=[static-libs(+)] - dev-libs/popt[static-libs(+)] - >=sys-apps/util-linux-2.31-r1[static-libs(+)] - argon2? ( app-crypt/argon2:=[static-libs(+)] ) - gcrypt? ( - dev-libs/libgcrypt:0=[static-libs(+)] - dev-libs/libgpg-error[static-libs(+)] - ) - nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) - openssl? ( dev-libs/openssl:0=[static-libs(+)] ) - pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - ssh? ( net-libs/libssh[static-libs(+)] ) - sys-fs/lvm2[static-libs(+)]" -# We have to always depend on ${LIB_DEPEND} rather than put behind -# !static? () because we provide a shared library which links against -# these other packages. #414665 -RDEPEND="static-libs? ( ${LIB_DEPEND} ) - ${LIB_DEPEND//\[static-libs\([+-]\)\]} - udev? ( virtual/libudev:= )" -# vim-core needed for xxd in tests -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - test? ( app-editors/vim-core )" -BDEPEND=" - virtual/pkgconfig -" - -S="${WORKDIR}/${P/_/-}" - -pkg_setup() { - local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256" - local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n" - local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n" - local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n" - local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n" - check_extra_config -} - -src_prepare() { - sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die - default -} - -src_configure() { - if use kernel ; then - ewarn "Note that kernel backend is very slow for this type of operation" - ewarn "and is provided mainly for embedded systems wanting to avoid" - ewarn "userspace crypto libraries." - fi - - local myeconfargs=( - --disable-internal-argon2 - --enable-shared - --sbindir=/sbin - # for later use - --with-default-luks-format=LUKS2 - --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" - --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) - $(use_enable argon2 libargon2) - $(use_enable nls) - $(use_enable pwquality) - $(use_enable reencrypt cryptsetup-reencrypt) - $(use_enable !static external-tokens) - $(use_enable static static-cryptsetup) - $(use_enable static-libs static) - $(use_enable udev) - $(use_enable !urandom dev-random) - $(use_enable ssh ssh-token) - $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2') - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if [[ ! -e /dev/mapper/control ]] ; then - ewarn "No /dev/mapper/control found -- skipping tests" - return 0 - fi - - local p - for p in /dev/mapper /dev/loop* ; do - addwrite ${p} - done - - default -} - -src_install() { - default - - if use static ; then - mv "${ED}"/sbin/cryptsetup{.static,} || die - mv "${ED}"/sbin/veritysetup{.static,} || die - mv "${ED}"/sbin/integritysetup{.static,} || die - if use ssh ; then - mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die - fi - if use reencrypt ; then - mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die - fi - fi - find "${ED}" -type f -name "*.la" -delete || die - - dodoc docs/v*ReleaseNotes - - newconfd "${FILESDIR}"/2.4.0-dmcrypt.confd dmcrypt - newinitd "${FILESDIR}"/2.4.0-dmcrypt.rc dmcrypt -} - -pkg_postinst() { - tmpfiles_process cryptsetup.conf -} diff --git a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd b/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd deleted file mode 100644 index 96c523e0f954..000000000000 --- a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd +++ /dev/null @@ -1,112 +0,0 @@ -# /etc/conf.d/dmcrypt - -# For people who run dmcrypt on top of some other layer (like raid), -# use rc_need to specify that requirement. See the runscript(8) man -# page for more information. - -#-------------------- -# Instructions -#-------------------- - -# Note regarding the syntax of this file. This file is *almost* bash, -# but each line is evaluated separately. Separate swaps/targets can be -# specified. The init-script which reads this file assumes that a -# swap= or target= line starts a new section, similar to lilo or grub -# configuration. - -# Note when using gpg keys and /usr on a separate partition, you will -# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly -# and ensure that gpg has been compiled statically. -# See http://bugs.gentoo.org/90482 for more information. - -# Note that the init-script which reads this file detects whether your -# partition is LUKS or not. No mkfs is run unless you specify a makefs -# option. - -# Global options: -#---------------- - -# How long to wait for each timeout (in seconds). -dmcrypt_key_timeout=1 - -# Max number of checks to perform (see dmcrypt_key_timeout). -#dmcrypt_max_timeout=300 - -# Number of password retries. -dmcrypt_retries=5 - -# Arguments: -#----------- -# target=<name> == Mapping name for partition. -# swap=<name> == Mapping name for swap partition. -# source='<dev>' == Real device for partition. -# Note: You can (and should) specify a tag like UUID -# for blkid (see -t option). This is safer than using -# the full path to the device. -# key='</path/to/keyfile>[:<mode>]' == Fullpath from / or from inside removable media. -# remdev='<dev>' == Device that will be assigned to removable media. -# gpg_options='<opts>' == Default are --quiet --decrypt -# options='<opts>' == cryptsetup, for LUKS you can only use --readonly -# loop_file='<file>' == Loopback file. -# Note: If you omit $source, then a free loopback will -# be looked up automatically. -# pre_mount='cmds' == commands to execute before mounting partition. -# post_mount='cmds' == commands to execute after mounting partition. -# wait=5 == wait given amount of seconds for source to appear -#----------- -# Supported Modes -# gpg == decrypt and pipe key into cryptsetup. -# Note: new-line character must not be part of key. -# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' - -#-------------------- -# dm-crypt examples -#-------------------- - -## swap -# Swap partitions. These should come first so that no keys make their -# way into unencrypted swap. -# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom -# If no makefs is given then mkswap will be assumed -#swap=crypt-swap -#source='/dev/hda2' - -## /home with passphrase -#target=crypt-home -#source='/dev/hda5' - -## /home with regular keyfile -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' - -## /home with gpg protected key -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' - -## /home with regular keyfile on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' -#remdev='/dev/sda1' - -## /home with gpg protected key on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' -#remdev='/dev/sda1' - -## /tmp with regular keyfile -#target=crypt-tmp -#source='/dev/hda6' -#key='/full/path/to/tmpkey' -#pre_mount='/sbin/mkreiserfs -f -f ${dev}' -#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' - -## Loopback file example -#target='crypt-loop-home' -#source='/dev/loop0' -#loop_file='/mnt/crypt/home' - -# The file must be terminated by a newline. Or leave this comment last. diff --git a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc b/sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc deleted file mode 100644 index 102576509515..000000000000 --- a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc +++ /dev/null @@ -1,350 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use modules - before checkfs fsck - - if grep -qs ^swap= "${conf_file}" ; then - before swap - fi -} - -# We support multiple dmcrypt instances based on $SVCNAME -conf_file="/etc/conf.d/${SVCNAME}" - -# Get splash helpers if available. -if [ -e /sbin/splash-functions.sh ] ; then - . /sbin/splash-functions.sh -fi - -# Setup mappings for an individual target/swap -# Note: This relies on variables localized in the main body below. -dm_crypt_execute() { - local dev ret mode foo source_dev - - if [ -z "${target}" -a -z "${swap}" ] ; then - return - fi - - # Set up default values. - : ${dmcrypt_key_timeout:=1} - : ${dmcrypt_max_timeout:=300} - : ${dmcrypt_retries:=5} - : ${wait:=5} - - # Handle automatic look up of the source path. - if [ -z "${source}" -a -n "${loop_file}" ] ; then - source=$(losetup --show -f "${loop_file}") - fi - case ${source} in - *=*) - i=0 - while [ ${i} -lt ${wait} ]; do - if source_dev="$(blkid -l -t "${source}" -o device)"; then - source="${source_dev}" - break - fi - : $((i += 1)) - einfo "waiting for source \"${source}\" for ${target}..." - sleep 1 - done - ;; - esac - if [ -z "${source}" ] || [ ! -e "${source}" ] ; then - ewarn "source \"${source}\" for ${target} missing, skipping..." - return - fi - - if [ -n "${target}" ] ; then - # let user set options, otherwise leave empty - : ${options:=' '} - elif [ -n "${swap}" ] ; then - if cryptsetup isLuks ${source} 2>/dev/null ; then - ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup." - return - fi - target=${swap} - # swap contents do not need to be preserved between boots, luks not required. - # suspend2 users should have initramfs's init handling their swap partition either way. - : ${options:='-c aes -h sha1 -d /dev/urandom'} - : ${pre_mount:='mkswap ${dev}'} - fi - - if [ -n "${loop_file}" ] ; then - dev="/dev/mapper/${target}" - ebegin " Setting up loop device ${source}" - losetup ${source} ${loop_file} - fi - - # cryptsetup: - # open <device> <name> # <device> is $source - # create <name> <device> # <name> is $target - local arg1="create" arg2="${target}" arg3="${source}" - if cryptsetup isLuks ${source} 2>/dev/null ; then - arg1="open" - arg2="${source}" - arg3="${target}" - fi - - # Older versions reported: - # ${target} is active: - # Newer versions report: - # ${target} is active[ and is in use.] - if cryptsetup status ${target} | egrep -q ' is active' ; then - einfo "dm-crypt mapping ${target} is already configured" - return - fi - splash svc_input_begin ${SVCNAME} >/dev/null 2>&1 - - # Handle keys - if [ -n "${key}" ] ; then - read_abort() { - # some colors - local ans savetty resettty - [ -z "${NORMAL}" ] && eval $(eval_ecolors) - einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) " - shift - # This is ugly as s**t. But POSIX doesn't provide `read -t`, so - # we end up having to implement our own crap with stty/etc... - savetty=$(stty -g) - resettty='stty ${savetty}; trap - EXIT HUP INT TERM' - trap 'eval "${resettty}"' EXIT HUP INT TERM - stty -icanon - stty min 0 time "$(( $2 * 10 ))" - ans=$(dd count=1 bs=1 2>/dev/null) || ans='' - eval "${resettty}" - if [ -z "${ans}" ] ; then - printf '\r' - else - echo - fi - case ${ans} in - [yY]) return 0;; - *) return 1;; - esac - } - - # Notes: sed not used to avoid case where /usr partition is encrypted. - mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg - key=${key%:*} - case "${mode}" in - gpg|reg) - # handle key on removable device - if [ -n "${remdev}" ] ; then - # temp directory to mount removable device - local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$" - if [ ! -d "${mntrem}" ] ; then - if ! mkdir -p "${mntrem}" ; then - ewarn "${source} will not be decrypted ..." - einfo "Reason: Unable to create temporary mount point '${mntrem}'" - return - fi - fi - i=0 - einfo "Please insert removable device for ${target}" - while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do - foo="" - if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then - # keyfile exists? - if [ ! -e "${mntrem}${key}" ] ; then - umount -n "${mntrem}" - rmdir "${mntrem}" - einfo "Cannot find ${key} on removable media." - read_abort "Abort" ${dmcrypt_key_timeout} && return - else - key="${mntrem}${key}" - break - fi - else - [ -e "${remdev}" ] \ - && foo="mount failed" \ - || foo="mount source not found" - fi - : $((i += 1)) - read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return - done - else # keyfile ! on removable device - if [ ! -e "${key}" ] ; then - ewarn "${source} will not be decrypted ..." - einfo "Reason: keyfile ${key} does not exist." - return - fi - fi - ;; - *) - ewarn "${source} will not be decrypted ..." - einfo "Reason: mode ${mode} is invalid." - return - ;; - esac - else - mode=none - fi - ebegin " ${target} using: ${options} ${arg1} ${arg2} ${arg3}" - if [ "${mode}" = "gpg" ] ; then - : ${gpg_options:='-q -d'} - # gpg available ? - if command -v gpg >/dev/null ; then - i=0 - while [ ${i} -lt ${dmcrypt_retries} ] ; do - # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected. - # save stdin stdout stderr "values" - timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \ - cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3} - ret=$? - # The timeout command exits 124 when it times out. - [ ${ret} -eq 0 -o ${ret} -eq 124 ] && break - : $(( i += 1 )) - done - eend ${ret} "failure running cryptsetup" - else - ewarn "${source} will not be decrypted ..." - einfo "Reason: cannot find gpg application." - einfo "You have to install app-crypt/gnupg first." - einfo "If you have /usr on its own partition, try copying gpg to /bin ." - fi - else - if [ "${mode}" = "reg" ] ; then - cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3} - ret=$? - eend ${ret} "failure running cryptsetup" - else - cryptsetup ${options} ${arg1} ${arg2} ${arg3} - ret=$? - eend ${ret} "failure running cryptsetup" - fi - fi - if [ -d "${mntrem}" ] ; then - umount -n ${mntrem} 2>/dev/null >/dev/null - rmdir ${mntrem} 2>/dev/null >/dev/null - fi - splash svc_input_end ${SVCNAME} >/dev/null 2>&1 - - if [ ${ret} -ne 0 ] ; then - cryptfs_status=1 - else - if [ -n "${pre_mount}" ] ; then - dev="/dev/mapper/${target}" - eval ebegin \"" pre_mount: ${pre_mount}"\" - eval "${pre_mount}" > /dev/null - ewend $? || cryptfs_status=1 - fi - fi -} - -# Lookup optional bootparams -get_bootparam_val() { - # We're given something like: - # foo=bar=cow - # Return the "bar=cow" part. - case $1 in - *=*) - echo "${1#*=}" - ;; - esac -} - -start() { - local header=true cryptfs_status=0 - local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev - - local x - for x in $(cat /proc/cmdline) ; do - case "${x}" in - key_timeout=*) - dmcrypt_key_timeout=$(get_bootparam_val "${x}") - ;; - esac - done - - while read targetline <&3 ; do - case ${targetline} in - # skip comments and blank lines - ""|"#"*) continue ;; - # skip service-specific openrc configs #377927 - rc_*) continue ;; - esac - - ${header} && ebegin "Setting up dm-crypt mappings" - header=false - - # check for the start of a new target/swap - case ${targetline} in - target=*|swap=*) - # If we have a target queued up, then execute it - dm_crypt_execute - - # Prepare for the next target/swap by resetting variables - unset gpg_options key loop_file target options pre_mount post_mount source swap remdev wait - ;; - - gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|wait=*|source=*) - if [ -z "${target}${swap}" ] ; then - ewarn "Ignoring setting outside target/swap section: ${targetline}" - continue - fi - ;; - - dmcrypt_*=*) - # ignore global options - continue - ;; - - *) - ewarn "Skipping invalid line in ${conf_file}: ${targetline}" - ;; - esac - - # Queue this setting for the next call to dm_crypt_execute - eval "${targetline}" - done 3< ${conf_file} - - # If we have a target queued up, then execute it - dm_crypt_execute - - ewend ${cryptfs_status} "Failed to setup dm-crypt devices" -} - -stop() { - local line header - - # Break down all mappings - header=true - egrep "^(target|swap)=" ${conf_file} | \ - while read line ; do - ${header} && einfo "Removing dm-crypt mappings" - header=false - - target= swap= - eval ${line} - - [ -n "${swap}" ] && target=${swap} - if [ -z "${target}" ] ; then - ewarn "invalid line in ${conf_file}: ${line}" - continue - fi - - ebegin " ${target}" - cryptsetup remove ${target} - eend $? - done - - # Break down loop devices - header=true - grep '^source=./dev/loop' ${conf_file} | \ - while read line ; do - ${header} && einfo "Detaching dm-crypt loop devices" - header=false - - source= - eval ${line} - - ebegin " ${source}" - losetup -d "${source}" - eend $? - done - - return 0 -} diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index eac72364d581..3e078599940f 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,12 +1,6 @@ AUX dd-rescue-1.99.11-musl-r2.patch 1556 BLAKE2B 6b71ac5e30c988894a5fe260372e004c48280f4eeea0f1d79ac5a103bfc3ce33f2c2d44b424203c0c58518bbecd374719a7de53d0d2c876336f843fb20eb75e7 SHA512 82ade941b969342b2b91c92667301c18d16da06eed88fae2e43d5e2833dfcd597c17b2842930ec6c5ae0712dbd3768e35499d9c6aaf67d8510bb0b9e469821b8 -AUX dd-rescue-1.99.8-sysrandom.patch 1204 BLAKE2B 4ef909c294a9299c93fb0ca793e5815fa6f98a9860de1886d9f8da8584a16c0320d56c6ecb6894cbe7f62be62e290f36b76319ed714ccc085c59f952a03cacc6 SHA512 14020e023ea7cf5b56d78776149933241f7424fb22076686a9541737f2fe887406b94e584c5cf650d754e9ead9bf6f2f96c390a2c1fba49f961955df49445a06 -AUX dd-rescue-1.99.8-testhole.patch 1267 BLAKE2B 137961d607cd93ad758c7cf6b8f8ab4b2e54017f43585e277563a5050e9c32ee52567de08af83a048e7e59b2ed05753fc67286d640d3c7998504bd11e9a1286c SHA512 f6a6649a4bce486a07f2eac382db609a47585361ad24ce03bad49da284c0b5485e35fcaec95445c46b74f6dfa5fe09d28c45a33a1b319a03c8cbb15c03a4ee8d -AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab568cfa501b14f1b56a48f80f7e9777e8be439fe0f1edbe9eb6232344e850360b504dc81ffd1052067c1f68b2152d78e SHA512 b9a2a0c3c035b89c9ef45f52b48d247bcb56f250e86e39bce905826c83823eb855407aeaeadefbf878c946ac019b4f7ec58a46930f0b3450b191b62bd524690a -AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904 DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001 -DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d EBUILD dd-rescue-1.99.11.ebuild 2379 BLAKE2B c139cf37004c7ecff737db83b41d5bcbe8c12e9b5855d442d1f3cb66992461c599ff6ed8f2e8af8692e28c6165574224f8eb1154e9e117449030738ee5f7afca SHA512 c47eaeb5495311afbca3f24d5682200d91ccbd103830a29964fdc7198160ff8cf2afedb2b4e6ce83afee85db3379195093908ad80dbfd7dff33c62d1cf421621 EBUILD dd-rescue-1.99.12.ebuild 2317 BLAKE2B 3c19c525b2aaa0b3f8a0441e279811950886b543f9debc7c6999145ef773289880e6ba54c7cb79f7350e16e899513b3da9640e6b5781105985325db758ef87c5 SHA512 38f0439c10eb86b10788194ccecf27a264c44552f239a180703eb91e41dfc7d243e2e90903e0e3bbfd96eedd65259e1420f55e6ac165bc80e8ad9bec8f771eb0 -EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild deleted file mode 100644 index d421dc83aa03..000000000000 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs flag-o-matic multilib autotools - -MY_PN="${PN/-/_}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Similar to dd but can copy from source with errors" -HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" -SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" - -RDEPEND="lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${MY_PN}-1.99-musl-r2.patch - "${FILESDIR}"/${PN}-1.99.8-xattr.patch - "${FILESDIR}"/${PN}-1.99.8-sysrandom.patch - "${FILESDIR}"/${PN}-1.99.8-testhole.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:-ldl:$(LDFLAGS) -ldl:' \ - -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ - Makefile || die - - if ! use cpu_flags_x86_sse4_2; then - sed -i \ - -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \ - configure.in || die - fi - - if ! use cpu_flags_x86_avx2; then - sed -i \ - -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \ - configure.in || die - fi - - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # OpenSSL is only used by a random helper tool we don't install. - ac_cv_header_attr_xattr_h=$(usex xattr) \ - ac_cv_header_openssl_evp_h=no \ - ac_cv_lib_crypto_EVP_aes_192_ctr=no \ - ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ - ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ - econf -} - -_emake() { - local arch - case ${ARCH} in - x86) arch=i386;; - amd64) arch=x86_64;; - arm) arch=arm;; - arm64) arch=aarch64;; - esac - - local os=$(usex kernel_linux Linux IDK) - - # The Makefile is a mess. Override a few vars rather than patch it. - emake \ - MACH="${arch}" \ - OS="${os}" \ - HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ - HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ - RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ - CFLAGS_OPT='$(CFLAGS)' \ - LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ - CC="$(tc-getCC)" \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - append-cflags -fcommon # bug 707796 - _emake check -} - -src_install() { - # easier to install by hand than trying to make sense of the Makefile. - dobin dd_rescue - dodir /usr/$(get_libdir)/${PN} - cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die - dodoc README.dd_rescue - doman dd_rescue.1 - use lzo && doman ddr_lzo.1 -} diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch deleted file mode 100644 index 5ef3da297747..000000000000 --- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch +++ /dev/null @@ -1,27 +0,0 @@ -Use sys/random.h for getrandom() decl if present. - ---- a/configure.in -+++ b/configure.in -@@ -6,7 +6,7 @@ AC_C_INLINE - AC_HEADER_STDC - #AC_PROG_INSTALL - #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" --AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) -+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h]) - AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports]) - AC_CHECK_LIB(dl,dlsym) - AC_CHECK_LIB(fallocate,linux_fallocate64) ---- a/random.c -+++ b/random.c -@@ -23,6 +23,10 @@ typedef unsigned int __u32; - #include <linux/random.h> - #endif - -+#ifdef HAVE_SYS_RANDOM_H -+#include <sys/random.h> -+#endif -+ - static void msleep(unsigned int msecs) - { - struct timespec ts1, ts2; - diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch deleted file mode 100644 index 444907088b3b..000000000000 --- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 7f2ff6434586083747bc5d046e0207886025e684 -Author: Kurt Garloff <kurt@garloff.de> -Date: Sat May 12 09:54:45 2018 +0000 - - Fix test case by ensuring there is a hole ... - -diff --git a/test_crypt.sh b/test_crypt.sh -index 47f1fc9..62cf853 100755 ---- a/test_crypt.sh -+++ b/test_crypt.sh -@@ -52,13 +52,20 @@ rm dd_rescue2 - - # Holes (all), skiphole - echo "*** Holes ***" -+# Produce file that consists of dd_rescue + hole + dd_rescue - ./dd_rescue -qpt dd_rescue dd_rescue3 - ./dd_rescue -qS 512k dd_rescue dd_rescue3 -+# Ensure there is a hole even if dd_rescue is long -+./dd_rescue -qS 384k -m 128k /dev/zero dd_rescue3 -+# Test without and with skiphole - enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qpt" - enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qpt" -+# Store 384k-512k in cmp3 - ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3 -+# Should be 128k of zeroes - ./dd_rescue -qm 128k /dev/zero dd_rescue3.cmp2 - cmp dd_rescue3.cmp2 dd_rescue3.cmp3 || exit 4 -+# Repeat test with reverse - enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qptr" - enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qptr" - ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3 - diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch deleted file mode 100644 index 39e719c33861..000000000000 --- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch +++ /dev/null @@ -1,300 +0,0 @@ ---- dd_rescue-1.99.8/configure.in -+++ dd_rescue-1.99.8/configure.in -@@ -6,7 +6,7 @@ - AC_HEADER_STDC - #AC_PROG_INSTALL - #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" --AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) -+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) - AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports]) - AC_CHECK_LIB(dl,dlsym) - AC_CHECK_LIB(fallocate,linux_fallocate64) ---- dd_rescue-1.99.8/dd_rescue.c -+++ dd_rescue-1.99.8/dd_rescue.c -@@ -161,8 +161,8 @@ - #endif - - /* xattrs */ --#ifdef HAVE_ATTR_XATTR_H --# include <attr/xattr.h> -+#ifdef HAVE_SYS_XATTR_H -+# include <sys/xattr.h> - #else - /* TODO: Could provide the prototypes for the syscalls ourselves ... */ - # warning No support for copying extended attributes / ACLs -@@ -1276,7 +1276,7 @@ - - /** Copy xattrs */ - int copyxattr(const char* inm, const char* onm) --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - { - char *attrs = NULL; - ssize_t aln = listxattr(inm, NULL, 0); -@@ -2486,7 +2486,7 @@ - #ifdef FITRIM - fprintf(stderr, "fitrim "); - #endif --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - fprintf(stderr, "xattr "); - #endif - #if (defined(__x86_64__) || defined(__i386__)) && !defined(NO_RDRND) ---- dd_rescue-1.99.8/libddr_crypt.c -+++ dd_rescue-1.99.8/libddr_crypt.c -@@ -47,8 +47,8 @@ - #include <endian.h> - #include <signal.h> - --#ifdef HAVE_ATTR_XATTR_H --#include <attr/xattr.h> -+#ifdef HAVE_SYS_XATTR_H -+#include <sys/xattr.h> - #endif - - #if __WORDSIZE == 64 -@@ -90,7 +90,7 @@ - size_t saltlen; - loff_t lastpos; - loff_t processed; --#if 1 //def HAVE_ATTR_XATTR_H -+#if 1 //def HAVE_SYS_XATTR_H - char* salt_xattr_name; - char sxattr, sxfallback; - char* key_xattr_name; -@@ -113,13 +113,13 @@ - " Parameters: [alg[o[rithm]]=]ALG:enc[rypt]:dec[rypt]:engine=STR:pad=STR\n" - "\t:keyhex=HEX:keyfd=[x]INT[@INT@INT]:keyfile=NAME[@INT@INT]:keygen:keysfile\n" - "\t:ivhex=HEX:ivfd=[x]INT[@INT@INT]:ivfile=NAME[@INT@INT]:ivgen:ivsfile\n" --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - "\t:keyxattr[=xattr_name]:kxfallback:ivxattr[=xattr_name]:ixfallback\n" - #endif - "\t:pass=STR:passfd=[x]INT[@INT@INT]:passfile=NAME[@INT@INT]\n" - "\t:salt=STR:salthex=HEX:saltfd=[x]INT[@INT@INT]:saltfile=NAME[@INT@INT]\n" - "\t:saltlen=INT:saltgen:saltsfile" --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - ":saltxattr[=xattr_name]:sxfallback" - #endif - "\n\t:pbkdf2[=INT]:opbkdf[11]:debug:bench[mark]:skiphole:weakrnd:outkeyiv:ctrbug198\n" -@@ -346,7 +346,7 @@ - state->saltlen = ATOL(param+8); - else if (!strcmp(param, "saltgen")) - state->sgen = 1; --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - else if (!strcmp(param, "saltxattr")) - err += set_flag(&state->sxattr, "saltxattr"); - else if (!memcmp(param, "saltxattr=", 10)) { -@@ -709,7 +709,7 @@ - return err; - } - --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - int get_xattr(crypt_state *state, const char* atrnm, - unsigned char* data, int dlen, - char fb, char* fbf, char* flag) -@@ -883,7 +883,7 @@ - sprintf(ivsnm, "IVS.%s", state->alg->name); - sprintf(keynm, "KEYS.%s", state->alg->name); - sprintf(saltnm, "SALT.%s", state->alg->name); --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->sxattr && !state->salt_xattr_name) { - state->salt_xattr_name = malloc(32); - snprintf(state->salt_xattr_name, 32, "user.salt.%s", state->alg->name); -@@ -958,7 +958,7 @@ - } - - /* 5c */ --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - /* Try getting salt from xattr */ - if (!state->sset && state->sxattr && !get_salt_xattr(state) && !state->enc) - state->sxattr = 0; -@@ -999,7 +999,7 @@ - if (write_file(state->sec->salt, state->sfnm, 8, 0640)) - return -1; - } --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - /* Write salt to xattr */ - if (state->sxattr && state->enc && set_salt_xattr(state)) { - if (!state->sxfallback) -@@ -1028,7 +1028,7 @@ - if (!state->keyf && !state->kxattr) - FPLOG(WARN, "Generated key not written anywhere?\n", NULL); - else { --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - /* Write key to xattr, failure is fatal */ - if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback) - return -1; -@@ -1066,7 +1066,7 @@ - FPLOG(FATAL, "Key generation with pass+salt failed!\n", NULL); - return -1; - } --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - /* Write key to xattr, failure is fatal */ - if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback) - return -1; -@@ -1077,7 +1077,7 @@ - return -1; - - } else { --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->kxattr) - get_key_xattr(state); - #endif -@@ -1100,7 +1100,7 @@ - } - } - } else { --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->kxattr && set_key_xattr(state) && !state->kxfallback) { - FPLOG(FATAL, "Can't save key in xattr"); - return -1; -@@ -1123,7 +1123,7 @@ - if (!state->ivf && !state->ixattr) - FPLOG(WARN, "Generated IV not saved?\n", NULL); - else { --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - /* Write IV to xattr, failure w/o fb is fatal */ - if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback) - return -1; -@@ -1149,7 +1149,7 @@ - return -1; - } - } --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - /* Write IV to xattr, failure w/o fb is fatal */ - if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback) - return -1; -@@ -1159,7 +1159,7 @@ - if (write_keyfile(state, ivsnm, encnm, state->sec->nonce1, BLKSZ, 0640, 1, 0)) - return -1; - } else { --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->ixattr) - get_iv_xattr(state); - #endif -@@ -1180,7 +1180,7 @@ - } - } - } else if (state->alg->stream->needs_iv) { --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->ixattr && set_iv_xattr(state) && !state->ixfallback) { - FPLOG(FATAL, "Can't save IV in xattr"); - return -1; -@@ -1454,7 +1454,7 @@ - FPLOG(INFO, "%.2fs CPU time, %.1fMiB/s\n", - (double)state->cpu/CLOCKS_PER_SEC, - state->processed/1024 / (state->cpu/(CLOCKS_PER_SEC/1024.0))); --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->salt_xattr_name) - free(state->salt_xattr_name); - if (state->key_xattr_name) ---- dd_rescue-1.99.8/libddr_hash.c -+++ dd_rescue-1.99.8/libddr_hash.c -@@ -36,8 +36,8 @@ - #include <netinet/in.h> /* For ntohl/htonl */ - #include <endian.h> - --#ifdef HAVE_ATTR_XATTR_H --#include <attr/xattr.h> -+#ifdef HAVE_SYS_XATTR_H -+#include <sys/xattr.h> - #endif - // TODO: pass at runtime rather than compile time - #define HASH_DEBUG(x) if (state->debug) x -@@ -75,7 +75,7 @@ - #endif - int hmacpln; - char xfallback; --#if 1 //def HAVE_ATTR_XATTR_H -+#if 1 //def HAVE_SYS_XATTR_H - char chk_xattr, set_xattr, xnmalloc; - char* xattr_name; - #endif -@@ -90,7 +90,7 @@ - ":multipart=size" - #endif - "\n" --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - "\t:chk_xattr[=xattr_name]:set_xattr[=xattr_name]:fallb[ack][=FILE]\n" - #endif - " Use algorithm=help to get a list of supported hash algorithms\n"; -@@ -167,7 +167,7 @@ - state->append = param+7; - else if (!memcmp(param, "prepend=", 8)) - state->prepend = param+8; --#if 1 //def HAVE_ATTR_XATTR_H -+#if 1 //def HAVE_SYS_XATTR_H - else if (!memcmp(param, "chk_xattr=", 10)) { - state->chk_xattr = 1; state->xattr_name = param+10; } - else if (!strcmp(param, "chk_xattr")) -@@ -258,7 +258,7 @@ - FPLOG(FATAL, "No hash algorithm specified\n"); - return --err; - } --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if ((state->chk_xattr || state->set_xattr) && !state->xattr_name) { - state->xattr_name = (char*)malloc(32); - state->xnmalloc = 1; -@@ -269,7 +269,7 @@ - } - #endif - if ((!state->chkfnm || !*state->chkfnm) && (state->chkf || state->outf --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - || state->xfallback - #endif - )) { -@@ -301,7 +301,7 @@ - if (!stat || !(*stat)) - return -1; - hash_state *state = (hash_state*)*stat; --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->xnmalloc) - free((void*)state->xattr_name); - #endif -@@ -351,7 +351,7 @@ - strcat(nnm, "->"); - strcat(nnm, opt->oname); - state->fname = nnm; --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->chk_xattr || state->set_xattr) { - --err; - FPLOG(WARN, "Can't access xattr in the middle of a plugin chain!"); -@@ -607,7 +607,7 @@ - return err; - } - --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - int check_xattr(hash_state* state, const char* res) - { - char xatstr[144]; -@@ -734,7 +734,7 @@ - err += check_chkf(state, res); - if (state->outf) - err += write_chkf(state, res); --#ifdef HAVE_ATTR_XATTR_H -+#ifdef HAVE_SYS_XATTR_H - if (state->chk_xattr) - err += check_xattr(state, res); - if (state->set_xattr) diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch deleted file mode 100644 index c98ddeca13a0..000000000000 --- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch +++ /dev/null @@ -1,161 +0,0 @@ -From e96b79c9e4cd6c40ba6e5fe495904f07a95fb909 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Wed, 13 Dec 2017 01:02:12 +0100 -Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL - -Rewrite of Justin Keogh's patch [Link 1] to fix build problems -on ARM. - -Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f -Fixes: https://bugs.gentoo.org/616364 ---- - configure.in | 2 +- - ddr_ctrl.h | 3 +++ - ffs.h | 3 +++ - fiemap.h | 4 ++++ - fmt_no.h | 2 ++ - fstrim.h | 3 +++ - libddr_hash.c | 4 ++++ - libddr_lzo.c | 3 +++ - libddr_null.c | 3 +++ - sha512.h | 4 ++++ - 10 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index eb2e813..355ea84 100644 ---- a/configure.in -+++ b/configure.in -@@ -6,7 +6,7 @@ AC_C_INLINE - AC_HEADER_STDC - #AC_PROG_INSTALL - #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" --AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) -+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) - AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports]) - AC_CHECK_LIB(dl,dlsym) - AC_CHECK_LIB(fallocate,linux_fallocate64) -diff --git a/ddr_ctrl.h b/ddr_ctrl.h -index ac71e4f..58cffd5 100644 ---- a/ddr_ctrl.h -+++ b/ddr_ctrl.h -@@ -7,6 +7,9 @@ - * License: GNU GPLv2 or v3 - */ - -+#define _GNU_SOURCE -+#include <fcntl.h> -+ - #ifndef _DDR_CTRL_H - #define _DDR_CTRL_H - -diff --git a/ffs.h b/ffs.h -index 2215080..c1f3444 100644 ---- a/ffs.h -+++ b/ffs.h -@@ -28,6 +28,9 @@ - #include <endian.h> - #endif - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif - - #ifdef HAVE_FFS - # define myffs(x) ffs(x) -diff --git a/fiemap.h b/fiemap.h -index df1ba95..31cde3b 100644 ---- a/fiemap.h -+++ b/fiemap.h -@@ -29,5 +29,9 @@ - - #endif /* HAVE_LINUX_FS_H */ - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif -+ - #endif /* _FIEMAPH */ - -diff --git a/fmt_no.h b/fmt_no.h -index cb0a81b..52ec236 100644 ---- a/fmt_no.h -+++ b/fmt_no.h -@@ -1,4 +1,6 @@ - /** Decl for int to str conversion with highlighting */ -+#define _GNU_SOURCE -+#include <fcntl.h> - - #ifndef _FMT_NO_H - #define _FMT_NO_H -diff --git a/fstrim.h b/fstrim.h -index 7447061..b9cdcbb 100644 ---- a/fstrim.h -+++ b/fstrim.h -@@ -1,3 +1,6 @@ -+#define _GNU_SOURCE -+#include <fcntl.h> -+ - #ifndef _FSTRIM_H - #define _FSTRIM_H - -diff --git a/libddr_hash.c b/libddr_hash.c -index 7c8cdf8..cdbbd4d 100644 ---- a/libddr_hash.c -+++ b/libddr_hash.c -@@ -33,6 +33,10 @@ - #include <unistd.h> - #include <fcntl.h> - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif -+ - #include <netinet/in.h> /* For ntohl/htonl */ - #include <endian.h> - -diff --git a/libddr_lzo.c b/libddr_lzo.c -index 8d3983e..8c83c04 100644 ---- a/libddr_lzo.c -+++ b/libddr_lzo.c -@@ -26,6 +26,9 @@ - #include <errno.h> - #include <netinet/in.h> - #include <sys/stat.h> -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif - #include <signal.h> - #include <lzo/lzo1x.h> - #include <lzo/lzo1y.h> -diff --git a/libddr_null.c b/libddr_null.c -index 3f0f194..c379961 100644 ---- a/libddr_null.c -+++ b/libddr_null.c -@@ -10,6 +10,9 @@ - #include "ddr_ctrl.h" - #include <string.h> - #include <stdlib.h> -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif - - /* fwd decl */ - extern ddr_plugin_t ddr_plug; -diff --git a/sha512.h b/sha512.h -index 4d08043..f54d371 100644 ---- a/sha512.h -+++ b/sha512.h -@@ -3,6 +3,10 @@ - - #include "hash.h" - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif -+ - void sha512_init(hash_t *ctx); - void sha384_init(hash_t *ctx); - void sha512_128(const uint8_t* msg, hash_t* ctx); --- -2.15.0 - diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index 9fd27ed1cccc..c2dac1eb9696 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -2,13 +2,10 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f AUX fuse-2.9.9-avoid-calling-umount.patch 1264 BLAKE2B f02bb80aab844f90638ed291891d819169946e3e4e58318bf370f5f3721aa80ba8ecd7cb127e387780e5ed8336875e3eca2d776ecde29a85e40821ee89c8264d SHA512 24f6c7ccf8b3d291e0e477685532854a21aeb65a90f7c428db039e6c7ba8a4cdb5435f2effba3a397448c0f6a44e056f2580eb55357a0b29c6c78bf5b364830c AUX fuse-2.9.9-closefrom-glibc-2-34.patch 1649 BLAKE2B 6697ecfd16ca8a71ec10c0caadee97c84fe412056c04124cf501a30df1dd7cb5bbbfd8a761692f2396755dda156fd94b86278d78f1a2bd2d7a41b9fd87f20fee SHA512 77bca6a67c235d7d22b156a9c3a8b906de59029d28fa0c985cb15e30d306b0dd6b9437d75eabe307aca7e159ecd90e47bd8fb723a582e95d0c491a6cb308e8a5 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 -DIST fuse-3.10.5.tar.xz 2931828 BLAKE2B 72de5e5867dc0934912248e1e626e2753c0f654626ba9d397753a7fbbf21dde877e6c528a44950ae1c828583f36a49c39f44a587544e44f8e749bd4c604b33b4 SHA512 da17788acc3fabef3dc7b736b7319c1638d7de27e163699f7dbc0fe9159aeba35964af6afa77a7654f1f321e2fc03ee167909f21516cbb585ead33cad95620fe DIST fuse-3.11.0.tar.xz 3515332 BLAKE2B 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 SHA512 033324de7ea4c7e91fb21c453211c01e53771ec5805c2126e13ef2d4334119a51f5c783b6249e888e28888c753aa04b48ed33cefb6d486d8d526546565f6ae50 DIST fuse-3.12.0.tar.xz 3206368 BLAKE2B 9f7df324f5c28480e48264c53c23fd2afc372592aab586bebdee38a809881603c93d05d0ca20c9007ba4b77efdf391705a93a0a6a12b218c9bd5541aa6a5275d SHA512 b66232785fbe83ec32a9779542d085dc2c19f1fe0655e5f1e22e1a7add69795df40eb58da256a963537e64a9bf798ed8dfbc678f977fdd22567c5befa5b6ca04 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55 -EBUILD fuse-2.9.9-r1.ebuild 2038 BLAKE2B 7f3651e463178f8ae6767cd156d5182e916e8031f40f7c84d31076d8b508569b6dacc33da339493bc55399a6d53645c314e57632b67d32e620360d9f1f50b38b SHA512 00a9431575b9b5d802c05c96b30757f432ca68e9a7701071ff91805537d44d8e86e2709c9da96632f182cc59ad53637bdf873509a521200b897f32fb6e23cea2 EBUILD fuse-2.9.9-r2.ebuild 2141 BLAKE2B 92bedf477999e4b306f48194f211769747f1c0955efa944421c5afbfd95f0d2f731b1b0ccc33dd403a8083a915c3c73081b332ea9c08629084923fcc470d0ca5 SHA512 808807cdd2daef32aa9923beb6317e4c13b9a70205899537aecf1c31ad88a7b1945f5b5242edb1869db9d0e56ade86a1fc2b65633c64b02236f9358bae9aafe3 -EBUILD fuse-3.10.5.ebuild 1810 BLAKE2B ca8d502a914aa0b85a2835a446af55615b630840c9b03dce94c556ad3db4551b14e27058d97f3189f9c7c045a6d0f1b4e4c863e53ea607778d395a634454b91b SHA512 531ee27a2cc22b3510e44f134df13a3f8818ff265610e4943754d0539494d05d211c88b16a4f84a336b68cb588764ca856dbffb5598f1e71381df45e8aca2d62 EBUILD fuse-3.11.0.ebuild 1817 BLAKE2B bc42b0bb79488b1106b9b8dc7382a40576f8e21941c45018807d504d1e0dd7fed2b32d36145d406de4b8e4060464f41adc7c8231c3689a7d49b9a76620e41980 SHA512 813c8414dedcdd36b9fa8b8f7c8991af7fbd50b5239ee6adc635e176c8bd67769b1bb0dab5ec2641c41b6a584abba36e0bb8f1432631658cd56d2d886a4a38db -EBUILD fuse-3.12.0.ebuild 1688 BLAKE2B 8c986f9360cefde1dc644819b8b6a9092b5d901e1c59a2962a6de781fa092cf8b0c85631019c55efefc5fed6c06d1e5a537ac6193135ca6640754e46f0d5c4c1 SHA512 47cd40224c28d361f1df7b4cbad8a77dbc7c7a922a721004624de2b22196a012bc48ecb0da8e1325303e04590f1947355bf042bbe13b0d259330e8ea034a840f +EBUILD fuse-3.12.0.ebuild 1680 BLAKE2B 113a7dbde8dc78707b9dcc010ecd417dc6c99c2d5fbafb7e34eb9021af177d8dda4deafd1e1781ef85ff25cb01c182ddc6ccd31b433cf97c7b779b2954ee97be SHA512 5d717d3a87afc16d6e784727becae6b7dd4afafcd3225541440cea60c2c352d6b05166ee874f2dd94b4dfb17e42e0e563793329a284ed6a202042cdaf35f7613 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild deleted file mode 100644 index a5bf77f814c8..000000000000 --- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic linux-info udev - -DESCRIPTION="An interface for filesystems implemented in userspace" -HOMEPAGE="https://github.com/libfuse/libfuse" -SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz" -# For bug #809920 to avoid a gettext dependency -# extracted from sys-devel/gettext-0.21-r1 -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples static-libs" - -BDEPEND="virtual/pkgconfig" -RDEPEND=">=sys-fs/fuse-common-3.3.0-r1" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch - "${FILESDIR}"/${PN}-2.9.9-avoid-calling-umount.patch - "${FILESDIR}"/${PN}-2.9.9-closefrom-glibc-2-34.patch -) - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~FUSE_FS" - WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils" - linux-info_pkg_setup - fi -} - -src_prepare() { - default - - # Can be dropped along with additional SRC_URI if dropping eautoreconf - cp "${WORKDIR}"/iconv.m4 m4/ || die - eautoreconf -} - -src_configure() { - # lto not supported yet -- https://github.com/libfuse/libfuse/issues/198 - # gcc-9 with -flto leads to link failures: #663518 (see also #863899) - # https://gcc.gnu.org/PR91186 - filter-lto - - econf \ - INIT_D_PATH="${EPREFIX}/etc/init.d" \ - MOUNT_FUSE_PATH="${EPREFIX}/sbin" \ - UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \ - $(use_enable static-libs static) \ - --disable-example -} - -src_install() { - local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt ) - default - - if use examples ; then - docinto examples - dodoc example/* - fi - - find "${ED}" -name '*.la' -delete || die - - # installed via fuse-common - rm -r "${ED}"/{etc,$(get_udevdir)} || die - - # handled by the device manager - rm -r "${D}"/dev || die -} diff --git a/sys-fs/fuse/fuse-3.10.5.ebuild b/sys-fs/fuse/fuse-3.10.5.ebuild deleted file mode 100644 index 3afb5b7135e0..000000000000 --- a/sys-fs/fuse/fuse-3.10.5.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -inherit meson-multilib udev python-any-r1 - -DESCRIPTION="An interface for filesystems implemented in userspace" -HOMEPAGE="https://github.com/libfuse/libfuse" -SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+suid test" -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - )" -RDEPEND=">=sys-fs/fuse-common-3.3.0-r1" - -DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt ) - -python_check_deps() { - python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python_setup -} - -multilib_src_configure() { - local emesonargs=( - $(meson_use test examples) - $(meson_use test tests) - -Duseroot=false - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - ) - meson_src_configure -} - -src_test() { - if [[ ${EUID} != 0 ]]; then - ewarn "Running as non-root user, skipping tests" - elif has sandbox ${FEATURES}; then - ewarn "Sandbox enabled, skipping tests" - else - multilib-minimal_src_test - fi -} - -multilib_src_test() { - ${EPYTHON} -m pytest test || die -} - -multilib_src_install_all() { - # installed via fuse-common - rm -r "${ED}"{/etc,$(get_udevdir)} || die - - # init script location is hard-coded in install_helper.sh - rm -rf "${D}"/etc || die - - # useroot=false prevents the build system from doing this. - use suid && fperms u+s /usr/bin/fusermount3 - - # manually install man pages to respect compression - rm -r "${ED}"/usr/share/man || die - doman doc/{fusermount3.1,mount.fuse3.8} -} diff --git a/sys-fs/fuse/fuse-3.12.0.ebuild b/sys-fs/fuse/fuse-3.12.0.ebuild index aad082f7b864..010d644d8bf5 100644 --- a/sys-fs/fuse/fuse-3.12.0.ebuild +++ b/sys-fs/fuse/fuse-3.12.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+suid test" RESTRICT="!test? ( test ) test? ( userpriv )" diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 6271f5a31a12..fb5618256e1f 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,7 +1,5 @@ DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4 -DIST mtools-4.0.41.tar.bz2 447256 BLAKE2B 9c0d24a2340038a2f482569e9ae6e326b0ba5fbc9abac3f70637682231e0541711c970b58c3c419f6114ce046084731b2ee7efd8c1e0cf091debec8816d851b5 SHA512 930321004d55c3fee17b1ed2319080446799d3230eee8df1cf4f0bbbbf9a82685837c3bfcce0d84749516fc8b945b1db01ac0379439ca53d974141c66b58ca8c DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811 EBUILD mtools-4.0.39.ebuild 1067 BLAKE2B 2201d21726df7847dd3f9d8d531109c58a47d0282da4c63bdd11870f333bf220895aa3fb63a5f1c8d66624e22dc96c7e7819b240fc99cd0abf912ca38d47169e SHA512 708e4ed394adcc07965530f736cd5b80033f28563a596a1ccdb798af5fb1eaa41ca4e9f72ffe06a88654400a869358dfdbaf76985403d0edc99b9c5ffa4e64e1 -EBUILD mtools-4.0.41.ebuild 1073 BLAKE2B 283d037ca23d4f96b682ef56b73157b3e34dc8ffaf062a4459a97f75734fe23e398af57f8c385dcada4766ee57c5de46388f8bb4613e4437614329edc86e1dfa SHA512 b0de29e692932ed81b1ffa4e09b66daf328857b13714d793fa3d0c7ca4ae978d91450bf61aa65418468dd307207df8ba80ecff47dc1abd86253520c3a3e95730 EBUILD mtools-4.0.42.ebuild 1073 BLAKE2B 283d037ca23d4f96b682ef56b73157b3e34dc8ffaf062a4459a97f75734fe23e398af57f8c385dcada4766ee57c5de46388f8bb4613e4437614329edc86e1dfa SHA512 b0de29e692932ed81b1ffa4e09b66daf328857b13714d793fa3d0c7ca4ae978d91450bf61aa65418468dd307207df8ba80ecff47dc1abd86253520c3a3e95730 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316 diff --git a/sys-fs/mtools/mtools-4.0.41.ebuild b/sys-fs/mtools/mtools-4.0.41.ebuild deleted file mode 100644 index c123dc4b895b..000000000000 --- a/sys-fs/mtools/mtools-4.0.41.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them" -HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris" -IUSE="gui" - -RDEPEND=" - virtual/libiconv - gui? ( - x11-libs/libICE - x11-libs/libXau - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXt - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - if ! use elibc_glibc && ! use elibc_musl ; then - # bug #447688 - append-libs "-liconv" - fi - - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/mtools - $(use_with gui x) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - local -a DOCS=( README* Release.notes ) - - default - - insinto /etc/mtools - doins mtools.conf - - # Default is fine - sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die -} diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 02a0fc40b6e6..db66ae5eabbc 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,3 +1,3 @@ DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896 EBUILD squashfs-tools-4.5.1-r1.ebuild 1361 BLAKE2B 0845f4a351fee8f6fd2982b345c9b04112720a2e00230ed5962a2e72ccab87a9c05f8505efb44f15ccbc5c2fddab46732ae2840052b6cdca9375b4a7f5bdd674 SHA512 210e4d6bcc71c16e6cd76a877869bd911ef5ecc792c8c9db7a259d8bb681c7f3441ced29725774b1b81efef1d1f358445941c6b0d732c91a72d66090e8567e20 -MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117 +MISC metadata.xml 407 BLAKE2B d9b2395d73165c829f6442d6da860e0a4f08f654e72c9b06d26080ef9626974967f6440121c7ddb9fb1c7da42f4f5e022ab4f9d8b0fb959e9fe885b938d72d44 SHA512 7639a59c8155b1735cfc86ab23c1b2392336cc346a956964b65c67b3a0bcc6ece43ed2552d776150f0f310703571dfdca89cf00e5742d10bbebbde0b5fba66ba diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index b772b072f223..2c922ee2c5c8 100644 --- a/sys-fs/squashfs-tools/metadata.xml +++ b/sys-fs/squashfs-tools/metadata.xml @@ -6,6 +6,7 @@ <name>Michał Górny</name> </maintainer> <upstream> + <remote-id type="cpe">cpe:/a:squashfs-tools_project:squashfs-tools</remote-id> <remote-id type="sourceforge">squashfs</remote-id> </upstream> </pkgmetadata> diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 75da477808e0..e602924c9ed2 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -6,6 +6,6 @@ DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957 DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739 DIST xfsprogs-5.19.0.tar.xz 1325160 BLAKE2B 37258ca34b3fc241a5153518ac5230aec9aeefc04d3fc05b96087d8e2fb374094ba21027fbcfa163cbafab21a69a510a7b278972130083387a97fd0027def6e2 SHA512 0b069cd44eb87052ee55ebffcce736ef103adeda539e854bd86d53942f541c07d74cc174f06a2221230eaa82b21d43327833492cd0ded577d442e1935a0abe7d EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e -EBUILD xfsprogs-5.18.0-r1.ebuild 2335 BLAKE2B 889580817ad1ca670695eaf8575cd2ce8758785108ec97588b4b31f00d6023c7f770e54f934cd24c9bf6954fd0e7d1df3ffd4bfd17c9566feb03117ce6297d3a SHA512 c275a27e05ea97a5963889a0a7ff7950f3972b13595aedde9cf67d783ea532bbacd6b59a60ca09eec91cf3e1c631cb37c0a20f9f1b7718571dacf7cd1cc654a2 +EBUILD xfsprogs-5.18.0-r1.ebuild 2328 BLAKE2B ce2442d5aae69e178059e9192a9b850ab0ae5629543825f952a2b79370766a26dc2fdce82a1dbfa050d2833b8c8c72c7173e57bc39d849d80ad58c532b06a70f SHA512 af99aab32f60713b056ec72f1cf21adc62eacc6fcce43b6dc10633bc3b71050070da17e42f8ac31014200239809f2d5505eac658567fd18d11190c38e814f679 EBUILD xfsprogs-5.19.0.ebuild 2335 BLAKE2B 889580817ad1ca670695eaf8575cd2ce8758785108ec97588b4b31f00d6023c7f770e54f934cd24c9bf6954fd0e7d1df3ffd4bfd17c9566feb03117ce6297d3a SHA512 c275a27e05ea97a5963889a0a7ff7950f3972b13595aedde9cf67d783ea532bbacd6b59a60ca09eec91cf3e1c631cb37c0a20f9f1b7718571dacf7cd1cc654a2 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild index 2f545bcf92b0..e85dda5a3eb3 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" IUSE="icu libedit nls selinux" RDEPEND="dev-libs/inih |