From owner-svn-ports-head@freebsd.org Tue Jan 10 11:10:42 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 785EFCA86C3; Tue, 10 Jan 2017 11:10:42 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay110.isp.belgacom.be (mailrelay110.isp.belgacom.be [195.238.20.137]) (using TLSv1.2 with cipher RC4-SHA (128/128 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign Organization Validation CA - SHA256 - G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5200D18E3; Tue, 10 Jan 2017 11:10:41 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2AxCwDiwHRY//s+sVtdGwEBAQMBAQEJA?= =?us-ascii?q?QEBgzoBAQEBAR9AEA98EI5JkTYmAZcLIoYAAoFyQxEBAgEBAQEBAQFjKIRpAQU?= =?us-ascii?q?6HCMQCxgJJQ8qHgYTiHSyWIokAQEBAQEBBAEBAQEBI4smhEaFZgWbIYZbimp0g?= =?us-ascii?q?WGOF5JcNSKBJCkIhmY9NYhmAQEB?= X-IPAS-Result: =?us-ascii?q?A2AxCwDiwHRY//s+sVtdGwEBAQMBAQEJAQEBgzoBAQEBAR9?= =?us-ascii?q?AEA98EI5JkTYmAZcLIoYAAoFyQxEBAgEBAQEBAQFjKIRpAQU6HCMQCxgJJQ8qH?= =?us-ascii?q?gYTiHSyWIokAQEBAQEBBAEBAQEBI4smhEaFZgWbIYZbimp0gWGOF5JcNSKBJCk?= =?us-ascii?q?IhmY9NYhmAQEB?= Received: from 251.62-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.62.251]) by relay.skynet.be with ESMTP; 10 Jan 2017 12:10:38 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id v0ABAb4x010264; Tue, 10 Jan 2017 12:10:38 +0100 (CET) (envelope-from tijl@FreeBSD.org) Date: Tue, 10 Jan 2017 12:10:37 +0100 From: Tijl Coosemans To: Adam Weinberger Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r431058 - head/security/gnupg1 Message-ID: <20170110121037.5b0622c6@kalimero.tijl.coosemans.org> In-Reply-To: <201701100248.v0A2mrol028639@repo.freebsd.org> References: <201701100248.v0A2mrol028639@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 10 Jan 2017 11:10:42 -0000 On Tue, 10 Jan 2017 02:48:53 +0000 (UTC) Adam Weinberger wrote: > Don't link gpg to gpg2 on uninstallation. This is not a good idea. > The gnupg{,20} ports handle creating that symlink. > > Modified: head/security/gnupg1/pkg-plist > ============================================================================== > --- head/security/gnupg1/pkg-plist Tue Jan 10 02:46:49 2017 (r431057) > +++ head/security/gnupg1/pkg-plist Tue Jan 10 02:48:53 2017 (r431058) > @@ -1,4 +1,5 @@ > -@(,,%%GPGMODE%%) bin/gpg > +%%SUID_GPG%%@(,,4555) bin/gpg > +%%NO_SUID_GPG%%bin/gpg > bin/gpg-zip > bin/gpgsplit > bin/gpgv > @@ -41,4 +42,3 @@ man/man1/gpgv.1.gz > %%NLS%%share/locale/uk/LC_MESSAGES/gnupg.mo > %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo > %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo > -@postunexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true When gnupg2 is installed installing gnupg1 overwrites the symlink. Uninstalling gnupg1 then should restore the symlink so the system is back in the same state. @postunexec [ ! -e %D/bin/gpg2 ] || ln -sf gpg2 %D/bin/gpg