From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- app-misc/scrub/Manifest | 2 ++ app-misc/scrub/files/scrub-2.6.1-ub-fixes.patch | 44 +++++++++++++++++++++++++ app-misc/scrub/scrub-2.6.1-r2.ebuild | 19 +++++++++++ 3 files changed, 65 insertions(+) create mode 100644 app-misc/scrub/files/scrub-2.6.1-ub-fixes.patch create mode 100644 app-misc/scrub/scrub-2.6.1-r2.ebuild (limited to 'app-misc/scrub') diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest index 3a9b742ce943..4a2392c1b94b 100644 --- a/app-misc/scrub/Manifest +++ b/app-misc/scrub/Manifest @@ -1,6 +1,8 @@ AUX scrub-2.6.1-bashism-tests.patch 2064 BLAKE2B da474dc7501fb9b7c1b93a69b938b9d4b09643e2149a355696828c84a62c364ff8fff75a18d28a8ad110bbaa12beb780a62722550d33ead7359b36230bff7370 SHA512 b5fdcf71f862c633f86fdc5f96c68c2d88f256f3a685f655919e4524705bc74ed9e96dcfdd672741fcc9252cfcc55e4fb3afaad5c246b763ff3f8ff9ba92c442 AUX scrub-2.6.1-implicit-function-declaration-test.patch 594 BLAKE2B 824a8a3d1801a22c090fea14c917e4f9eb5a662d51981d26317ca57cb90003cbc51768bdfb628483e906150d385e66ec7ee7a505c78bf11edf5771a9595fbe90 SHA512 efc0874b03c52591e24035d914093d12f8894272cb9a0bc7e212385f44a8a624f50f933db0412d64595613cfb43fbff37540cc8327ca15471aad57d264b75451 AUX scrub-2.6.1-tests-block-size.patch 10495 BLAKE2B 4ff772fc9e71a43cce60c135e42401d23b02a41220954bfd314424db8fc6159dc8fd71d1943b9b127cd34cc54cbba963f491f335f92eed3e03b494c5262f42aa SHA512 f1bbdf6fb24782d4f24025edce20617449f6ddbc844b3291013c4d683394ff8ff4421d4c957ec04cd16e71489c79d8e8bb23b8d2c4fcfb721a53c716b00016d2 +AUX scrub-2.6.1-ub-fixes.patch 1522 BLAKE2B aa2f8f609623b58676435ed43b28d9c948b950cabab2777e671bd45fcd8124a07e0a422664bef9f38da2345b67da6126c16b302cf713a11073f785c720ada7ff SHA512 57fd8983c91f74ef5cef7e1623d31b165b480582750908712f8aea87129d7f5fd57b7b8fe86fdb3cb82eff12af2d0b67f1a5327be89a8425dcb4214ecbd96e75 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640 EBUILD scrub-2.6.1-r1.ebuild 535 BLAKE2B c0b2a22ef6365aa71112baabd81ea8bec6d32dce20ade20e8ee8b41afc3edd88282d5f406ccc82d2a628cc3000fd51d84920089062be37534afb3fa280f46b7b SHA512 1b5a3eebc67758c436defb6f9499ed0d0e087685ad0b1ec37f480418975c65cf7a99dc8d76363b35e54f1f024f5a5f2a17b7538f19a14f543c20683ad4f25616 +EBUILD scrub-2.6.1-r2.ebuild 581 BLAKE2B 44be757ed968a588ffd550806671ce873a1fb018fabc89404dff1f0cc610e278bb043d4a1055ea161210832c24fe855b0355459b2c60c7c91afa553ebb86daed SHA512 d6014e0fc165b1cd30ffdc84fbe7944a026df9d5fdb1644f88d5d90dec0f6afebd647ab5afa1cbbd127ef7e1d7ba4241c732295a0fd38a730b2b8d8e737f1d32 MISC metadata.xml 428 BLAKE2B 3b0dafd4c5c4c5f8b1f630ae20e6a33f1858e1465e20c920487fb1ade63de415787ac2e405cc1652c21508bb012a0333e810cb58d7610f02a684fcf1794e9915 SHA512 5868d55250b339a6cf8835f95efc6dbbcad2ee323415a910d78f261964ab3968708841f5ee9a649493c7e8446560037d0516e0c109a86b89ad943c404eaf3b62 diff --git a/app-misc/scrub/files/scrub-2.6.1-ub-fixes.patch b/app-misc/scrub/files/scrub-2.6.1-ub-fixes.patch new file mode 100644 index 000000000000..db18d69df103 --- /dev/null +++ b/app-misc/scrub/files/scrub-2.6.1-ub-fixes.patch @@ -0,0 +1,44 @@ +https://github.com/chaos/scrub/commit/9c9b3f28439835f44329228e2435f3f89e7dcee1 + +From 9c9b3f28439835f44329228e2435f3f89e7dcee1 Mon Sep 17 00:00:00 2001 +From: Sergio Correia +Date: Wed, 17 Mar 2021 08:08:07 -0300 +Subject: [PATCH] Minor fixes to keep clang static analyzer happy + +- Initialize `written' and `checked' in scrub() +- Initialize `mp->thd' before using it in refill_init() +- Do not assign return of read_all() to `n', if we do not read this + value, in writesig() +--- a/src/fillfile.c ++++ b/src/fillfile.c +@@ -122,6 +122,7 @@ refill_init(struct memstruct **mpp, refill_t refill, int memsize) + } + mp->size = memsize; + mp->refill = refill; ++ mp->thd = 0; + #if WITH_PTHREADS + if (!no_threads) { + if ((mp->err = pthread_create(&mp->thd, NULL, refill_thread, mp))) { +--- a/src/scrub.c ++++ b/src/scrub.c +@@ -445,7 +445,7 @@ scrub(char *path, off_t size, const sequence_t *seq, int bufsize, + prog_t p; + char sizestr[80]; + bool isfull = false; +- off_t written, checked; ++ off_t written = (off_t)-1, checked = (off_t)-1; + int pcol = progress_col(seq); + + if (!(buf = alloc_buffer(bufsize))) { +--- a/src/sig.c ++++ b/src/sig.c +@@ -74,7 +74,7 @@ writesig(char *path) + goto nomem; + if ((fd = open(path, O_RDWR)) < 0) + goto error; +- if ((n = read_all(fd, buf, blocksize)) < 0) ++ if (read_all(fd, buf, blocksize) < 0) + goto error; + memcpy(buf, SCRUB_MAGIC, sizeof(SCRUB_MAGIC)); + if (lseek(fd, 0, SEEK_SET) < 0) + diff --git a/app-misc/scrub/scrub-2.6.1-r2.ebuild b/app-misc/scrub/scrub-2.6.1-r2.ebuild new file mode 100644 index 000000000000..f4dfa6ae1f8f --- /dev/null +++ b/app-misc/scrub/scrub-2.6.1-r2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Overwrite files with iterative patterns" +HOMEPAGE="https://github.com/chaos/scrub" +SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-implicit-function-declaration-test.patch + "${FILESDIR}"/${PN}-2.6.1-bashism-tests.patch + "${FILESDIR}"/${PN}-2.6.1-tests-block-size.patch + "${FILESDIR}"/${PN}-2.6.1-ub-fixes.patch +) -- cgit v1.2.3