From 0d7aefa5885e7552b4c2221df9f54e5930696228 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Jul 2022 13:27:24 +0100 Subject: gentoo auto-resync : 10:07:2022 - 13:27:24 --- app-misc/scrub/Manifest | 3 + .../scrub/files/scrub-2.6.1-bashism-tests.patch | 85 ++++++++++++++++++++++ ...-2.6.1-implicit-function-declaration-test.patch | 22 ++++++ app-misc/scrub/scrub-2.6.1-r1.ebuild | 17 +++++ 4 files changed, 127 insertions(+) create mode 100644 app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch create mode 100644 app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch create mode 100644 app-misc/scrub/scrub-2.6.1-r1.ebuild (limited to 'app-misc/scrub') diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest index ae509a6d373f..d28833f5b9ab 100644 --- a/app-misc/scrub/Manifest +++ b/app-misc/scrub/Manifest @@ -1,3 +1,6 @@ +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 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640 +EBUILD scrub-2.6.1-r1.ebuild 489 BLAKE2B 388e129579074b030f49671762dcfef0131683a76026348c1723a2a6dbd17b7d732cc6dae75f264bba51eea1fda0adf5fe7b1b86c121201050ea993e2ef7c52b SHA512 2e602ce7ca40276b45e18a58d6beccdd03ad3d1af410b324dd652b8b91e6ed6932a684dbcd266f36597e902a23b5cf45cc3fec0251a59fb767f758c736cd12cc EBUILD scrub-2.6.1.ebuild 397 BLAKE2B ed880d7b83b0e71346cecaea24edc4ae795918bf1d990cc57602179c18db28f7ccaabe2e3722bf73d817c51cb3e04f0356216edde8c13e1c994ab5df603fc9d1 SHA512 9b6b275fb38e9de843335f27d8fb41cb07ba67f38fef39c64ac8f99ce0c6d51fc5410e1a24cf51295cb17af8523b4ddfe024f2f0040222532f79751c9567d153 MISC metadata.xml 428 BLAKE2B 3b0dafd4c5c4c5f8b1f630ae20e6a33f1858e1465e20c920487fb1ade63de415787ac2e405cc1652c21508bb012a0333e810cb58d7610f02a684fcf1794e9915 SHA512 5868d55250b339a6cf8835f95efc6dbbcad2ee323415a910d78f261964ab3968708841f5ee9a649493c7e8446560037d0516e0c109a86b89ad943c404eaf3b62 diff --git a/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch b/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch new file mode 100644 index 000000000000..17999f341cd2 --- /dev/null +++ b/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch @@ -0,0 +1,85 @@ +https://github.com/chaos/scrub/pull/31 + +From 545d1b9cae8da18864277ca14a227d4adfafdc32 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 10 Jul 2022 10:23:09 +0100 +Subject: [PATCH] test: fix bashisms in tests + +We're using a /bin/sh shebang but the tests aren't +compatible with a POSIX-compliant /bin/sh (like dash, +instead of the usual bash). + +Switch to = instead of == which works the same but +works with both Bash and dash. + +If desired, we could switch the shebangs to +/bin/bash which would work. + +(Notably, Debian defaults to dash as /bin/sh). +--- a/test/t09 ++++ b/test/t09 +@@ -4,7 +4,7 @@ + + TEST=`basename $0 | cut -d- -f1` + # Test requires root +-test `id -u` == 0 || exit 77 ++test `id -u` = 0 || exit 77 + + EXPFILE=${TEST}-`hostname`.exp + TESTDEV=/dev/scrub-testdisk +--- a/test/t10 ++++ b/test/t10 +@@ -4,7 +4,7 @@ + + TEST=`basename $0 | cut -d- -f1` + # Test requires root +-test `id -u` == 0 || exit 77 ++test `id -u` = 0 || exit 77 + + EXPFILE=${TEST}-`hostname`.exp + test -f $EXPFILE || exit 77 +--- a/test/t18 ++++ b/test/t18 +@@ -1,7 +1,7 @@ + #!/bin/sh + TEST=`basename $0 | cut -d- -f1` + # Test requires root +-test `id -u` == 0 || exit 77 ++test `id -u` = 0 || exit 77 + + TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX" + TESTDIR=`mktemp -d $TMPLATE` || exit 1 +--- a/test/t19 ++++ b/test/t19 +@@ -1,7 +1,7 @@ + #!/bin/sh + TEST=`basename $0 | cut -d- -f1` + # Test requires root +-test `id -u` == 0 || exit 77 ++test `id -u` = 0 || exit 77 + LOOPFILE=`losetup -f` || exit 77 + TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX" + TESTFILE=`mktemp $TMPLATE` || exit 1 +--- a/test/t20 ++++ b/test/t20 +@@ -1,7 +1,7 @@ + #!/bin/sh + TEST=`basename $0 | cut -d- -f1` + # Test requires root +-test `id -u` == 0 || exit 77 ++test `id -u` = 0 || exit 77 + LOOPFILE=`losetup -f` || exit 77 + TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX" + TESTFILE=`mktemp $TMPLATE` || exit 1 +--- a/test/t21 ++++ b/test/t21 +@@ -1,7 +1,7 @@ + #!/bin/sh + TEST=`basename $0 | cut -d- -f1` + # Test requires root +-test `id -u` == 0 || exit 77 ++test `id -u` = 0 || exit 77 + + TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX" + + diff --git a/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch b/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch new file mode 100644 index 000000000000..8d6b40a97536 --- /dev/null +++ b/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch @@ -0,0 +1,22 @@ +https://github.com/chaos/scrub/commit/188d999e2fb038dc702b47750d235ffd284dd518 + +From 188d999e2fb038dc702b47750d235ffd284dd518 Mon Sep 17 00:00:00 2001 +From: Jim Garlick +Date: Wed, 21 Jul 2021 13:09:57 -0700 +Subject: [PATCH] test: fix missing include in test program + +Problem: tgetsize emits a compiler warning because +strerror() is not defined. + +Include string.h to get the definition of strerror. +--- a/test/tgetsize.c ++++ b/test/tgetsize.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "getsize.h" + + diff --git a/app-misc/scrub/scrub-2.6.1-r1.ebuild b/app-misc/scrub/scrub-2.6.1-r1.ebuild new file mode 100644 index 000000000000..a7c1ab7b6ea6 --- /dev/null +++ b/app-misc/scrub/scrub-2.6.1-r1.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 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 +) -- cgit v1.2.3