From owner-svn-ports-branches@freebsd.org Thu Aug 13 13:46:34 2020 Return-Path: Delivered-To: svn-ports-branches@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 93BCD37A2F2; Thu, 13 Aug 2020 13:46:34 +0000 (UTC) (envelope-from cy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BS7CG3MMkz4K99; Thu, 13 Aug 2020 13:46:34 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 566B41E30C; Thu, 13 Aug 2020 13:46:34 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07DDkYsS084300; Thu, 13 Aug 2020 13:46:34 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07DDkXco084297; Thu, 13 Aug 2020 13:46:33 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202008131346.07DDkXco084297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 13 Aug 2020 13:46:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r544811 - in branches/2020Q3/security/tripwire: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in branches/2020Q3/security/tripwire: . files X-SVN-Commit-Revision: 544811 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2020 13:46:34 -0000 Author: cy Date: Thu Aug 13 13:46:33 2020 New Revision: 544811 URL: https://svnweb.freebsd.org/changeset/ports/544811 Log: MFH: r544738 pkg delete tripwire results in an infinite loop due to it askking whether to retain the tripwrie databse or not. The resolution is to notify the user to manually remove the tripwrie database if it is not longer needed. (Packaging bugfix.) Approved by: portmgr (joneum) Modified: branches/2020Q3/security/tripwire/Makefile branches/2020Q3/security/tripwire/files/pkg-deinstall.in Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/security/tripwire/Makefile ============================================================================== --- branches/2020Q3/security/tripwire/Makefile Thu Aug 13 13:45:02 2020 (r544810) +++ branches/2020Q3/security/tripwire/Makefile Thu Aug 13 13:46:33 2020 (r544811) @@ -3,6 +3,7 @@ PORTNAME= tripwire PORTVERSION= 2.4.3.7 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= cy@FreeBSD.org Modified: branches/2020Q3/security/tripwire/files/pkg-deinstall.in ============================================================================== --- branches/2020Q3/security/tripwire/files/pkg-deinstall.in Thu Aug 13 13:45:02 2020 (r544810) +++ branches/2020Q3/security/tripwire/files/pkg-deinstall.in Thu Aug 13 13:46:33 2020 (r544811) @@ -6,25 +6,7 @@ POST-DEINSTALL) return 0 fi if [ -d %%TWCFG%% -o -d %%TWDB%% ]; then - unset ANS - echo - while [ -z "$ANS" ]; do - echo If permanently deleting this package, - echo %%TWCFG%% and %%TWDB%% may be removed. - echo Do you wish to delete %%TWCFG%% - echo -n and %%TWDB%%? '(yes/no) -: ' - read ANS - case $ANS in - [Yy]|[Yy][Ee][Ss]) - rm -rf %%TWCFG%% %%TWDB%% - ;; - [Nn]|[Nn][Oo]) - ;; - *) echo Answer must be yes or no. - echo - unset ANS - ;; - esac - done + echo If permanently deleting this package, + echo %%TWCFG%% and %%TWDB%% may be removed. fi esac