commit: fa82b07e09d98ff5f47126fa6aa6e76ea23575b0 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Sep 30 12:32:12 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Sep 30 12:40:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa82b07e
app-backup/tarsnap: drop 1.0.40-r2 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> app-backup/tarsnap/Manifest | 1 - .../tarsnap/files/tarsnap-1.0.39-respect-AR.patch | 14 -- .../files/tarsnap-1.0.40-strict-aliasing-fix.patch | 158 --------------------- app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild | 68 --------- 4 files changed, 241 deletions(-) diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest index 0aea2662b9e4..b181299d3069 100644 --- a/app-backup/tarsnap/Manifest +++ b/app-backup/tarsnap/Manifest @@ -1,2 +1 @@ -DIST tarsnap-autoconf-1.0.40.tgz 723380 BLAKE2B a794bb9bae3637c36841ad4bb0fa1c0e1c39a78ac2dc92f18cbe7dfe1036aa861f5421751dd8a85948dcb101ecb81f2177e844609b289238abd9a8448ba1655a SHA512 a4910c5cbea4a71218638703ba3140e5536a2c9bb7f35007115a7ae4a87fcd07b1be91d88e49240ee8db39be326bac049c0893c1406f215123d55a13b7b57941 DIST tarsnap-autoconf-1.0.41.tgz 763978 BLAKE2B 485305ad628c55b39cb639adae08eeb03ca03c5d9d610a466ebfacca09552e7a2016712d834b8f43270cccc593cc31f794f99615aea89eb33152ec81c38e25e6 SHA512 ea9fc30c9d9860040021eae2583c370c6ebd5bb37c5fa39d9d0ea141ff976d22e5df8c842c0963b6d930da9452eb0e6c3040e74e9cdb3a348e41f4aeec27deb8 diff --git a/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch b/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch deleted file mode 100644 index f5a1115f161d..000000000000 --- a/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/721914 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -124,7 +124,7 @@ CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LIBRARIES = $(noinst_LIBRARIES) --AR = ar -+AR := ar - ARFLAGS = cru - AM_V_AR = $(am__v_AR_@AM_V@) - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) - diff --git a/app-backup/tarsnap/files/tarsnap-1.0.40-strict-aliasing-fix.patch b/app-backup/tarsnap/files/tarsnap-1.0.40-strict-aliasing-fix.patch deleted file mode 100644 index d168d99222e8..000000000000 --- a/app-backup/tarsnap/files/tarsnap-1.0.40-strict-aliasing-fix.patch +++ /dev/null @@ -1,158 +0,0 @@ -https://github.com/Tarsnap/tarsnap/commit/ca40c06f290fb8298dc2e583303d45b58878f37b -https://github.com/Tarsnap/tarsnap/commit/4af6d8350ab53d0f1f3104ce3d9072c2d5f9ef7a - -From 4af6d8350ab53d0f1f3104ce3d9072c2d5f9ef7a Mon Sep 17 00:00:00 2001 -From: Graham Percival <[email protected]> -Date: Fri, 1 Apr 2022 16:58:43 -0700 -Subject: [PATCH] scrypt: Fix strict aliasing - -The original scrypt code treated its data as blobs of bytes, accessing -them in whatever manner was convenient from time to time: - -* as 32-bit words or vectors thereof for the purpose of the Salsa20/8 core -* in machine-word-sized chunks (aka. size_t) for block copy and xor operations -* as 32-bit words for the Integerify function. - -This worked fine at the time, but newer compilers apply strict aliasing rules -which allow them to assume that e.g. data accessed as a uint32_t is not the -same as data accessed as a size_t, resulting in miscompilation. - -Note that in recent versions of scrypt (after 2015-07-18; versions 1.2.0 and -later) such miscompilation should be detected by the built-in runtime testing. - -To avoid aliasing problems, the generic scrypt code now operates on uint32_t -throughout while the SSE2-enabled scrypt code operates on __m128i throughout. - -Experimentally, we found that memcpy() speeds up blkcpy() in the plain C -case, but slowed it down in the _sse2.c case (probably because memcpy -can make use of vector instructions internally, but cannot assume that -it will always have a multiple of 16 bytes, as we do). ---- a/lib/crypto/crypto_scrypt_smix.c -+++ b/lib/crypto/crypto_scrypt_smix.c -@@ -27,39 +27,32 @@ - * online backup system. - */ - #include <stdint.h> -+#include <string.h> - - #include "sysendian.h" - - #include "crypto_scrypt_smix.h" - --static void blkcpy(void *, const void *, size_t); --static void blkxor(void *, const void *, size_t); -+static void blkcpy(uint32_t *, const uint32_t *, size_t); -+static void blkxor(uint32_t *, const uint32_t *, size_t); - static void salsa20_8(uint32_t[16]); - static void blockmix_salsa8(const uint32_t *, uint32_t *, uint32_t *, size_t); --static uint64_t integerify(const void *, size_t); -+static uint64_t integerify(const uint32_t *, size_t); - - static void --blkcpy(void * dest, const void * src, size_t len) -+blkcpy(uint32_t * dest, const uint32_t * src, size_t len) - { -- size_t * D = dest; -- const size_t * S = src; -- size_t L = len / sizeof(size_t); -- size_t i; - -- for (i = 0; i < L; i++) -- D[i] = S[i]; -+ memcpy(dest, src, len); - } - - static void --blkxor(void * dest, const void * src, size_t len) -+blkxor(uint32_t * dest, const uint32_t * src, size_t len) - { -- size_t * D = dest; -- const size_t * S = src; -- size_t L = len / sizeof(size_t); - size_t i; - -- for (i = 0; i < L; i++) -- D[i] ^= S[i]; -+ for (i = 0; i < len / 4; i++) -+ dest[i] ^= src[i]; - } - - /** -@@ -145,9 +138,9 @@ blockmix_salsa8(const uint32_t * Bin, uint32_t * Bout, uint32_t * X, size_t r) - * Return the result of parsing B_{2r-1} as a little-endian integer. - */ - static uint64_t --integerify(const void * B, size_t r) -+integerify(const uint32_t * B, size_t r) - { -- const uint32_t * X = (const void *)((uintptr_t)(B) + (2 * r - 1) * 64); -+ const uint32_t * X = B + (2 * r - 1) * 16; - - return (((uint64_t)(X[1]) << 32) + X[0]); - } ---- a/lib/crypto/crypto_scrypt_smix_sse2.c -+++ b/lib/crypto/crypto_scrypt_smix_sse2.c -@@ -36,34 +36,30 @@ - - #include "crypto_scrypt_smix_sse2.h" - --static void blkcpy(void *, const void *, size_t); --static void blkxor(void *, const void *, size_t); -+static void blkcpy(__m128i *, const __m128i *, size_t); -+static void blkxor(__m128i *, const __m128i *, size_t); - static void salsa20_8(__m128i[4]); - static void blockmix_salsa8(const __m128i *, __m128i *, __m128i *, size_t); --static uint64_t integerify(const void *, size_t); -+static uint64_t integerify(const __m128i *, size_t); - - static void --blkcpy(void * dest, const void * src, size_t len) -+blkcpy(__m128i * dest, const __m128i * src, size_t len) - { -- __m128i * D = dest; -- const __m128i * S = src; - size_t L = len / 16; - size_t i; - - for (i = 0; i < L; i++) -- D[i] = S[i]; -+ dest[i] = src[i]; - } - - static void --blkxor(void * dest, const void * src, size_t len) -+blkxor(__m128i * dest, const __m128i * src, size_t len) - { -- __m128i * D = dest; -- const __m128i * S = src; - size_t L = len / 16; - size_t i; - - for (i = 0; i < L; i++) -- D[i] = _mm_xor_si128(D[i], S[i]); -+ dest[i] = _mm_xor_si128(dest[i], src[i]); - } - - /** -@@ -168,11 +164,18 @@ blockmix_salsa8(const __m128i * Bin, __m128i * Bout, __m128i * X, size_t r) - * Note that B's layout is permuted compared to the generic implementation. - */ - static uint64_t --integerify(const void * B, size_t r) -+integerify(const __m128i * B, size_t r) - { -- const uint32_t * X = (const void *)((uintptr_t)(B) + (2 * r - 1) * 64); -+ const __m128i * X = B + (2*r - 1) * 4; -+ uint32_t X0, X13; - -- return (((uint64_t)(X[13]) << 32) + X[0]); -+ /* Get the first 32-bit element in X[0]. */ -+ X0 = (uint32_t)_mm_cvtsi128_si32(X[0]); -+ -+ /* Get the second 32-bit element in X[3]. */ -+ X13 = (uint32_t)_mm_cvtsi128_si32(_mm_srli_si128(X[3], 4)); -+ -+ return (((uint64_t)(X13) << 32) + X0); - } - - /** diff --git a/app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild b/app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild deleted file mode 100644 index a4dff0662fe1..000000000000 --- a/app-backup/tarsnap/tarsnap-1.0.40-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 toolchain-funcs - -DESCRIPTION="Online backups for the truly paranoid" -HOMEPAGE="https://www.tarsnap.com/"; -SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"; -S="${WORKDIR}"/${PN}-autoconf-${PV} - -LICENSE="tarsnap BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="acl bzip2 lzma xattr" -# The tarsnap license allows redistribution only without modification. -# Commented out because patches apply only to files with a free license. -#RESTRICT="bindist" - -RDEPEND=" - app-arch/bzip2 - dev-libs/openssl:= - sys-fs/e2fsprogs - sys-libs/zlib - acl? ( sys-apps/acl ) - lzma? ( app-arch/xz-utils ) - xattr? ( sys-apps/attr ) -" -# Required for "magic.h" -DEPEND=" - ${RDEPEND} - virtual/os-headers -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.39-respect-AR.patch - "${FILESDIR}"/${P}-strict-aliasing-fix.patch -) - -QA_CONFIG_IMPL_DECL_SKIP=( - # false positive due to outdated autoconf, bug #900124 - # release tarballs don't contain configure.ac!!! - makedev -) - -src_configure() { - local myeconfargs=( - $(use_enable xattr) - $(use_enable acl) - # The bundled libarchive (ancient copy) always builds - # the bzip2 bits. - --with-bz2lib - --without-lzmadec - $(use_with lzma) - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - dobashcomp misc/bash_completion.d/* -}
