Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 662E2781A49 for <~alpine/aports@lists.alpinelinux.org>; Sat, 25 Jul 2020 21:07:11 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id e13so11990040qkg.5 for <~alpine/aports@lists.alpinelinux.org>; Sat, 25 Jul 2020 14:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5GTU67jzXxrUeG6tcVsyFUXb22hCWp3LbXFdKP7gXRE=; b=m2fAuusIoEz6DhJUxyeI6H7D/Wtm2lhyy6SmDC7lrq9XE2RzrmDPHmqnSGGiKPl68n NRJGk5cTwzic8OtEBsEgegaRlieUTGtFdJlBa5q2c97FWr+fNOrPAkEULi4bPTvVYlln 5WMhIShQw8FOJeQHubs4qaylTnMVh3laxw5zlYBufeWCkpfR83FKu9WD2jJuCFioMDTP 4ZOlOXx/KW0aZpeLDd5q1woYO9mcftTUjbyuJp+sv1+hK0pK8fMOlarf1G22RBIO+TKr XCbmckw7Ucc8+XcT4W0Q72JBpLlPQi4w9M7cmTuIsfdqqYDAhJ2tXrCT9Q3e0Ws1CbWC lqOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5GTU67jzXxrUeG6tcVsyFUXb22hCWp3LbXFdKP7gXRE=; b=CuBeiteDkEhgmpuuCmCYbuQJFwBvO3QSdB9onXslCgLQlzrKLglOJqYJyeNANrOJjD NVZBC1SttXeffYQaSlUixCCIrAU0QycSWrues7vYeIcfyqdcuRd/aHA9KaQZgpdemQ9Y O8t9TFY2ZyD2n2rN0kHpo0jQO2c8LMJzUhutATDrFajeRcko/CCP0YUK4vcUQrJca+ML DILDommDIPP7Vfz2YKOi6qDDQjtV3vwLlroYAirliI2GVk7pptUAa2z81s8z+WYfqL2T ykfkUGJMeIuXlq4Zf950ZIPZUbKIDk4bxSf9KDqRGfXOeUWSLPRmQBiK+T4RSxPS3N6Y C3/g== X-Gm-Message-State: AOAM532CTl9RaEs3u+tW2PoZ6i65wzdKyluHO2fBOwo2/32EDKZLni10 efVOAj2l6N9pcRRTyDPTFcVrAOuC X-Google-Smtp-Source: ABdhPJxCt+viC/S41Vn/Ns6Po9z2RcIog+S4XxdWikWwxcpl2cGQ3St7NVQDtbIc46oxb7WSUTtzJg== X-Received: by 2002:a37:458f:: with SMTP id s137mr16929394qka.228.1595711230348; Sat, 25 Jul 2020 14:07:10 -0700 (PDT) Received: from enterprise ([2804:431:cfcd:4a79:15fd:d848:fb61:6f98]) by smtp.gmail.com with ESMTPSA id d16sm11882442qkk.106.2020.07.25.14.07.09 for <~alpine/aports@lists.alpinelinux.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 14:07:10 -0700 (PDT) Date: Sat, 25 Jul 2020 18:07:05 -0300 From: Leo To: ~alpine/aports@lists.alpinelinux.org Subject: Re: [PATCH] gnupg-scdaemon: fix pre-install group add Message-ID: <20200725180705.12fb87c2@enterprise> In-Reply-To: <20200725162955.87130-1-hblanks@artifex.org> References: <20200725162955.87130-1-hblanks@artifex.org> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-alpine-linux-musl) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Sat, 25 Jul 2020 09:29:55 -0700 Hunter Blanks wrote: > gnupg-scdaemon fails if /etc/group already contains the group > gnupg. Fix this by checking first if the group exists before > trying to add it. > > Example of the bug follows: > # apk add gnupg-scdaemon > ... > Executing gnupg-scdaemon-2.2.20-r0.pre-install > OK: 26 MiB in 44 packages > # grep gnupg /etc/group > gnupg:x:101: > # apk del gnupg-scdaemon > ... > # apk add gnupg-scdaemon > ... > Executing gnupg-scdaemon-2.2.20-r0.pre-install > ERROR: gnupg-scdaemon-2.2.20-r0.pre-install: script exited with > error 1 1 error; 26 MiB in 44 packages > # addgroup -S gnupg > addgroup: group 'gnupg' in use > --- > main/gnupg/gnupg-scdaemon.pre-install | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/main/gnupg/gnupg-scdaemon.pre-install > b/main/gnupg/gnupg-scdaemon.pre-install index 8d8262ceea..9e6e5ed01d > 100644 --- a/main/gnupg/gnupg-scdaemon.pre-install > +++ b/main/gnupg/gnupg-scdaemon.pre-install > @@ -1,2 +1,5 @@ > #!/bin/sh > -addgroup -S gnupg 2> /dev/null > +if ! grep -q -E '^gnupg:' /etc/group > +then > + addgroup -S gnupg 2> /dev/null > +fi Just add an 'exit 0' at the end of script like pre-install scripts shoul ddo. Also you need to bump pkgrel so your changes take effect. And please open it as a merge request on gitlab.alpinelinux.org/alpine/aports