From nobody Thu Feb 9 20:55:35 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PCTfH2Mt6z3nh8S; Thu, 9 Feb 2023 20:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PCTfH1ttdz43Qd; Thu, 9 Feb 2023 20:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675976135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tk5DDCgxtq3k2MqiQuYivSgGnlejCpTT8W5LoTU8foY=; b=WS43Asr89dGmCRPYFSpMLdRdzSeqq3zPz3rut/Kh2tsoNRiwx+7OuYGS4liMn8pwoEY744 DPtuYQYw5G4qtGsBIs8rls+nBv6Bqwz1fKvAE6T9b4Y5WUKqxOUyVwfLj+U4Czz94VsYGQ k+SN6YhID41Mpr+KFwfW6+ksiPNrIA8IbJ1fY+U6trUsH/VT+OC/rvRSuN5bF9PDdv7P8E n5gDOZhxKYqdhteQU/s6M39bl/oLO0MRVF6vnRbW4RlQXv1mJNYTSCljCynu8Ep/JXkOkg h5RIN+Xx5Pufg0vJjvYFQK4vbnlb59cSDYU8UPSdraUmmEaX6xQ/CO3/Jl0jfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675976135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tk5DDCgxtq3k2MqiQuYivSgGnlejCpTT8W5LoTU8foY=; b=y2O/0H4pJif44HyExoPfMdE62RFDopCBouLPtZrS13L2cG2nSFaaO2lgkx4fzdA+k64g2n ACmzeXlAFkWvqhYhHHYU0sC6pQA561/cw/iyigRHo1ZXg7F1BJirabhig9D+z+7YwgPvMH Ear/Q0Fyza+ahJ0P5vVn4JvIMvhi350dKLbPicTOt/XJzMDid1ZLjDc4EjyZ6nke8U23KI mZ+s8rlXKDsiLL7z/fsULxlehJgtXHant9a/ViRfAvcic/qDxePdiBHue+Fsk100ltlTPk 9Gns1Z/ktDKiKeVEXoCl7EWAktuN0x2kx1FOqCoN1I9glWflByEG2hUhD9llaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675976135; a=rsa-sha256; cv=none; b=H4N8kGIsmEU+7ULZfWGBJ2ymYX0D3TalOj2DiV+CYqrti7Qdf0YqpuuHJTzrSzu5OlB/14 b03aCfyu3yQiHQwfnDtlZ7HPH+8gziM88XCYGWUivlFTljyLt+UcPe9j50zcRh+UYetnUj 6JtGF/oR/UHXU9lq6uKhr75Lv0PEbVOlACGU1IMjb7+D2HChEoLBS0oC7lpSvvifqfwj5I JB9TfAJ/YpmXnP1xqWIhygk/DtgI1hBa7qXwZmWAtREFl8SS9rmQM656tvhodPQ4k7lZdd piIbzLPmZJnaFi+ZdaN2gc1kAHjWrsYzwOBLVLYOWLLlOu0ZD33PVjjV+Nzd1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PCTfH0yPbzryj; Thu, 9 Feb 2023 20:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 319KtZbk014012; Thu, 9 Feb 2023 20:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319KtZi4014011; Thu, 9 Feb 2023 20:55:35 GMT (envelope-from git) Date: Thu, 9 Feb 2023 20:55:35 GMT Message-Id: <202302092055.319KtZi4014011@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 2cf20a89ee5c - main - sysutils/e2fsprogs-core: clean up a bit, drop coreutils depends List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cf20a89ee5cc43ccf5f2968f8ede26b2ff2fb2e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=2cf20a89ee5cc43ccf5f2968f8ede26b2ff2fb2e commit 2cf20a89ee5cc43ccf5f2968f8ede26b2ff2fb2e Author: Matthias Andree AuthorDate: 2023-02-09 20:50:14 +0000 Commit: Matthias Andree CommitDate: 2023-02-09 20:52:25 +0000 sysutils/e2fsprogs-core: clean up a bit, drop coreutils depends Patch a test script to work around BSD dd's missing oconv=append, and do away with coreutils as a build requisite. Move some REINPLACE_CMD features to individual patches that I intend to send upstream for inclusion, and remove others that are now no longer required. This should only affect the build and self-test phases, and not change package content, so not bumping PORTREVISION. --- sysutils/e2fsprogs-core/Makefile | 7 ------- .../files/patch-tests_f__detect__junk_script | 11 +++++++++++ .../files/patch-tests_t__mmp__fail_script | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/sysutils/e2fsprogs-core/Makefile b/sysutils/e2fsprogs-core/Makefile index e70f10fef4c5..7c3dd16cde85 100644 --- a/sysutils/e2fsprogs-core/Makefile +++ b/sysutils/e2fsprogs-core/Makefile @@ -36,7 +36,6 @@ CONFIGURE_ARGS?=--disable-fsck \ --libdir='${PREFIX}/lib/e2fsprogs/' \ --includedir='${PREFIX}/include/e2fsprogs/' \ --with-root-prefix='${PREFIX}' \ - DD=${LOCALBASE}/bin/gdd \ LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs' CONFIGURE_ENV?= LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf' # apparently HAVE_PTHREAD_H checks go missing if the FUSEFS option is unset, force it: @@ -74,7 +73,6 @@ FUSEFS_USES= fuse NLS_USES= gettext iconv:build -BUILD_DEPENDS+= gdd:sysutils/coreutils BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash @@ -136,13 +134,8 @@ libintl= EXTRA_PATCHES+= ${FILESDIR}/extrapatch-no-sbrk .endif -# d_fallocate_blkmap appears to fail on some systems for unknown reasons. -# m_offset sometimes failes, a make clean and re-build usually fixes this. Reason unknown. post-patch:: .if !empty(DISTFILES) - @${REINPLACE_CMD} -E -e 's/md5sum ([^ ]*)/printf "%s %s\\n" $$(md5 -q \1) \1/' \ - -e "s/ == 0/ = 0/" -e "s/tar x$$/tar xf -/" -e "s/\/gdd/" \ - ${WRKSRC}/tests/[a-z]_*/script @${REINPLACE_CMD} -e 's///' ${WRKSRC}/*/*.c @${REINPLACE_CMD} -e 's,/etc/blkid.tab,${ETCDIR}/blkid.tab,' ${WRKSRC}/misc/blkid* ${WRKSRC}/lib/blkid/blkidP.h @${REINPLACE_CMD} -E -e 's/__GNUC_PREREQ\>/__GNUC_PREREQ__/' ${WRKSRC}/*/*/*.[ch] ${WRKSRC}/*/*.c diff --git a/sysutils/e2fsprogs-core/files/patch-tests_f__detect__junk_script b/sysutils/e2fsprogs-core/files/patch-tests_f__detect__junk_script new file mode 100644 index 000000000000..45b544cf691d --- /dev/null +++ b/sysutils/e2fsprogs-core/files/patch-tests_f__detect__junk_script @@ -0,0 +1,11 @@ +--- tests/f_detect_junk/script.orig 2023-02-07 03:31:53 UTC ++++ tests/f_detect_junk/script +@@ -9,7 +9,7 @@ FSCK_OPT=-fn + IMAGE=$test_dir/image.bz2 + + bzip2 -d < $IMAGE > $TMPFILE +-$DD if=/dev/zero of=$TMPFILE conv=notrunc oflag=append bs=1024k count=16 > /dev/null 2>&1 ++$DD if=/dev/zero of=$TMPFILE conv=notrunc bs=1024k count=16 2>/dev/null >>$TMPFILE + + # Run fsck to fix things? + if [ -x $DEBUGFS_EXE ]; then diff --git a/sysutils/e2fsprogs-core/files/patch-tests_t__mmp__fail_script b/sysutils/e2fsprogs-core/files/patch-tests_t__mmp__fail_script new file mode 100644 index 000000000000..77fd70e4ccf2 --- /dev/null +++ b/sysutils/e2fsprogs-core/files/patch-tests_t__mmp__fail_script @@ -0,0 +1,19 @@ +--- tests/t_mmp_fail/script.orig 2023-02-07 03:31:53 UTC ++++ tests/t_mmp_fail/script +@@ -10,14 +10,14 @@ fi + + $TUNE2FS -O project $TMPFILE >> $test_name.log 2>&1 + status=$? +-if [ "$status" == 0 ] ; then ++if [ "$status" = 0 ] ; then + echo "'tune2fs -O project' succeeded on small inode" > $test_name.failed + echo "$test_name: $test_description: failed" + return 1 + fi + $TUNE2FS -o bad_option $TMPFILE >> $test_name.log 2>&1 + status=$? +-if [ "$status" == 0 ] ; then ++if [ "$status" = 0 ] ; then + echo "'tune2fs -o bad_option' succeeded" > $test_name.failed + echo "$test_name: $test_description: failed" + return 1