From owner-svn-ports-head@freebsd.org Mon Oct 19 19:40:29 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EE6CE4324D7; Mon, 19 Oct 2020 19:40:29 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from gmailer.gwdg.de (gmailer.gwdg.de [134.76.11.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFRtj3QwZz44Rb; Mon, 19 Oct 2020 19:40:29 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from excmbx-03.um.gwdg.de ([134.76.9.218] helo=email.gwdg.de) by mailer.gwdg.de with esmtp (GWDG Mailer) (envelope-from ) id 1kUb1A-0006sh-AZ; Mon, 19 Oct 2020 21:40:28 +0200 Received: from krabat.raven.hur (10.250.9.199) by EXCMBX-03.um.gwdg.de (134.76.9.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P521) id 15.1.2044.4; Mon, 19 Oct 2020 21:40:27 +0200 Subject: Re: svn commit: r552736 - head/Mk/Scripts To: Steve Wills , , , References: <202010191219.09JCJEvX070282@repo.freebsd.org> <2d9d7334-b5e5-0404-b5d3-b2f620e4fd9c@gwdg.de> <505fea0c-442f-7c3c-8d69-ce5f64c3fcd1@FreeBSD.org> Reply-To: From: Rainer Hurling Message-ID: Date: Mon, 19 Oct 2020 21:40:21 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <505fea0c-442f-7c3c-8d69-ce5f64c3fcd1@FreeBSD.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.250.9.199] X-ClientProxiedBy: excmbx-08.um.gwdg.de (134.76.9.215) To EXCMBX-03.um.gwdg.de (134.76.9.218) X-Virus-Scanned: (clean) by clamav X-Rspamd-Queue-Id: 4CFRtj3QwZz44Rb X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of rhurlin@gwdg.de designates 134.76.11.17 as permitted sender) smtp.mailfrom=rhurlin@gwdg.de X-Spamd-Result: default: False [-2.70 / 15.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rhurlin@FreeBSD.org]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:134.76.10.0/23:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[134.76.11.17:from]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEFALL_USER(0.00)[rhurlin]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[gwdg.de]; RCVD_IN_DNSWL_MED(-0.20)[134.76.11.17:from]; NEURAL_HAM_SHORT(-0.28)[-0.277]; NEURAL_HAM_MEDIUM(-0.92)[-0.918]; NEURAL_HAM_LONG(-1.01)[-1.009]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:680, ipnet:134.76.0.0/16, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[svn-ports-head,svn-ports-all] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 19:40:30 -0000 On 19.10.20 21:38, Steve Wills wrote: > Fixed It works again. Many thanks :) > > On 10/19/20 3:15 PM, Rainer Hurling wrote: >> Since this commit, I always get (again) the following error, when I try >> to build a port, which contains ${REINPLACE_CMD]: >> >> env: /usr/ports/Mk/Scripts/sed_checked.sh: Permission denied >> *** Error code 126 >> >> Am I the only one? >> >> Regards, >> Rainer Hurling >> >> >> On 19.10.20 14:19, Steve Wills wrote: >>> Author: swills >>> Date: Mon Oct 19 12:19:14 2020 >>> New Revision: 552736 >>> URL: https://svnweb.freebsd.org/changeset/ports/552736 >>> >>> Log: >>>    Revert >>> >>> Modified: >>>    head/Mk/Scripts/sed_checked.sh   (contents, props changed) >>> >>> Modified: head/Mk/Scripts/sed_checked.sh >>> ============================================================================== >>> >>> --- head/Mk/Scripts/sed_checked.sh    Mon Oct 19 11:56:42 2020    >>> (r552735) >>> +++ head/Mk/Scripts/sed_checked.sh    Mon Oct 19 12:19:14 2020    >>> (r552736) >>> @@ -1,84 +1,13 @@ >>>   #!/bin/sh >>>   -# Rationale: >>> -# The ports tree has accumulated quite a bit of REINPLACE_CMD lines >>> -# in its Makefile. Some of these have gone stale as ports were updated >>> -# upstream, or as the ports have evolved. >>> - >>> -# For DEVELOPERS, we check the effectiveness of REINPLACE_CMD lines >>> -# by requesting backup files be written, and comparing them against >>> -# source files. >>> - >>> -set -eu >>> - >>> -DEBUG=: >>> -#DEBUG=echo >>> - >>> -check_dash_i() { >>> -    # this must be called from a subshell so as not to clobber $@ >>> -    # WARNING: assumes that -i is given at least once! >>> -    unset OPTIND >>> -    $DEBUG >&2 DEBUG: check_dash_i "$@" >>> -    while getopts :EI:ae:f:i:lnru var ; do >>> -    $DEBUG >&2 DEBUG: option "$var" '"'"${OPTARG-""}"'"' >>> -    case "$var" in [iI]) >>> -        last_i="$OPTARG" >>> -    esac >>> -    done >>> - >>> -    $DEBUG >&2 DEBUG: last_i='"'"$last_i"'"' >>> -    printf '"%s"\n' "$last_i" >>> -} >>> - >>> -shadowed="$( (check_dash_i -i.bak "$@") )" >>> -if [ "$shadowed" != '".bak"' ] ; then >>> -    echo >&2 "WARNING: $0 -i.bak clobbered by caller's backup suffix >>> $shadowed" >>> -fi >>> - >>> -${SED-/usr/bin/sed} -i.bak "$@" >>> -check() { >>> -    issues=0 >>> -    files=0 >>> -    args= >>> -    for x in "${@}" ; do >>> -    # we decide very simply whether the argument we are looking at is >>> -    # a sed command or a file: if it's not a regular file, it must be >>> -    # a sed argument worth collecting for our warning message, >>> -    # so that maintainers can identify the failing sed command. >>> -    # >>> -    # We cannot easily relate to Makefile lines here. >>> -    if [ -f "${x}" ]; then >>> -        # File? Check if sed was effective. >>> -        files=$(($files + 1)) >>> -        if cmp -s "${x}" "${x}".bak ; then >>> -        issues=$(($issues + 1)) >>> -        if [ $issues -eq 1 ] ; then >>> -            echo "sed failed:${args} ..." >>> -        fi >>> -        echo "  - file content unchanged from backup: ${x#${WRKSRC}/}" >>> -        fi >>> -    else >>> -        # Not a file? Collect sed(1) command. >>> -        args="${args} ${x}" >>> -    fi >>> -    done >>> - >>> -    if [ ${issues} -gt 0 ] ; then >>> -    action="review" >>> -    if [ ${issues} -eq ${files} ] ; then >>> -        action=" FIX " # blanks at either end >>> -    else >>> -        action="review" >>> -    fi >>> -    echo "--- issues found: ${issues}, files to edit: ${files}, >>> please ${action} ---" >>> +set -e >>> +/usr/bin/sed -i.bak "$@" >>> +for x in "${@}" ; do >>> +    if [ -f "${x}" ]; then >>> +    if cmp -s "${x}" "${x}".bak ; then >>> +            if [ ! -z "${REWARNFILE}" ]; then >>> +                echo - - REINPLACE_CMD ran, but did not modify file >>> contents: ${x#${WRKSRC}/} >> ${REWARNFILE} >>> +            fi >>> +        fi >>>       fi >>> -} >>> - >>> -if [ ! -z "${REWARNFILE}" ] ; then >>> -    check "$@" | tee -a ${REWARNFILE} >>> -    # if ${REWARNFILE} is a regular file (not /dev/null) and empty, >>> delete it. >>> -    if [ -f "${REWARNFILE}" -a ! -s "${REWARNFILE}" ] ; then rm -f >>> "${REWARNFILE}" ; fi >>> -else >>> -    check "$@" >>> -fi >>> - >>> +done >>>