From owner-svn-ports-head@freebsd.org Wed Aug 12 08:53:50 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 907ED37A3A7; Wed, 12 Aug 2020 08:53:50 +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 4BRNly3Gh9z4cy8; Wed, 12 Aug 2020 08:53:50 +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 5465E97A3; Wed, 12 Aug 2020 08:53:50 +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 07C8roU8012498; Wed, 12 Aug 2020 08:53:50 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07C8roP0012497; Wed, 12 Aug 2020 08:53:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202008120853.07C8roP0012497@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 12 Aug 2020 08:53:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544738 - in head/security/tripwire: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/security/tripwire: . files X-SVN-Commit-Revision: 544738 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 12 Aug 2020 08:53:50 -0000 Author: cy Date: Wed Aug 12 08:53:49 2020 New Revision: 544738 URL: https://svnweb.freebsd.org/changeset/ports/544738 Log: 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. MFH: 2020Q3 (packaging bugfix) Modified: head/security/tripwire/Makefile (contents, props changed) head/security/tripwire/files/pkg-deinstall.in (contents, props changed) Modified: head/security/tripwire/Makefile ============================================================================== --- head/security/tripwire/Makefile Wed Aug 12 07:55:50 2020 (r544737) +++ head/security/tripwire/Makefile Wed Aug 12 08:53:49 2020 (r544738) @@ -3,6 +3,7 @@ PORTNAME= tripwire PORTVERSION= 2.4.3.7 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= cy@FreeBSD.org Modified: head/security/tripwire/files/pkg-deinstall.in ============================================================================== --- head/security/tripwire/files/pkg-deinstall.in Wed Aug 12 07:55:50 2020 (r544737) +++ head/security/tripwire/files/pkg-deinstall.in Wed Aug 12 08:53:49 2020 (r544738) @@ -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