From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 14 06:30:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14904BCE for ; Thu, 14 Nov 2013 06:30:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E8FBB201F for ; Thu, 14 Nov 2013 06:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE6U04p011682 for ; Thu, 14 Nov 2013 06:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAE6U0IN011680; Thu, 14 Nov 2013 06:30:00 GMT (envelope-from gnats) Resent-Date: Thu, 14 Nov 2013 06:30:00 GMT Resent-Message-Id: <201311140630.rAE6U0IN011680@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Horia Racoviceanu Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED9D0A84 for ; Thu, 14 Nov 2013 06:22:49 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CDBB42FD9 for ; Thu, 14 Nov 2013 06:22:49 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rAE6Mn5s098446 for ; Thu, 14 Nov 2013 06:22:49 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rAE6MnG6098431; Thu, 14 Nov 2013 06:22:49 GMT (envelope-from nobody) Message-Id: <201311140622.rAE6MnG6098431@oldred.freebsd.org> Date: Thu, 14 Nov 2013 06:22:49 GMT From: Horia Racoviceanu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/183947: news/inn [PATCH] to avoid destroying any user data during package upgrades X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 06:30:01 -0000 >Number: 183947 >Category: ports >Synopsis: news/inn [PATCH] to avoid destroying any user data during package upgrades >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 14 06:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Horia Racoviceanu >Release: 9.1-RELEASE amd64 >Organization: >Environment: FreeBSD horia.lan 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:34:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: >How-To-Repeat: >Fix: - Change all `rm -Rf` and `rm -R` to `rmdir` in pkg-plist to avoid destroying any user data during package upgrades. measured plist-ok in tinderbox and portupgrades on a working system preserved data. Build log: https://redports.org/buildarchive/20131114045333-10834/ Patch attached with submission follows: Index: news/inn/pkg-plist =================================================================== --- news/inn/pkg-plist (revision 333132) +++ news/inn/pkg-plist (working copy) @@ -222,7 +222,7 @@ @comment -------------------------------------------------------------- @dirrm %%EXAMPLESDIR%%/db @dirrm %%EXAMPLESDIR%% -@unexec rm -Rf %%TMPDIR%% 2>/dev/null || true +@unexec rmdir %%TMPDIR%% 2>/dev/null || true @unexec rmdir %%SHAREDIR%% 2>/dev/null || true @unexec rmdir %%NEWSSPOOL%%/overview 2>/dev/null || true @unexec rmdir %%NEWSSPOOL%%/outgoing 2>/dev/null || true @@ -231,21 +231,23 @@ @unexec rmdir %%NEWSSPOOL%%/incoming 2>/dev/null || true @unexec rmdir %%NEWSSPOOL%%/articles 2>/dev/null || true @unexec rmdir %%NEWSSPOOL%%/archive 2>/dev/null || true -@unexec rm -Rf %%NEWSSPOOL%%/tmp 2>/dev/null || true +@unexec rmdir %%NEWSSPOOL%%/tmp 2>/dev/null || true @unexec rmdir %%NEWSSPOOL%% 2>/dev/null || true -@unexec rm -Rf %%RUNDIR%% 2>/dev/null || true -@unexec rm -R %%NEWSBASE%%/http -@unexec rm -R %%NEWSBASE%%/lib -@unexec rm -R %%NEWSBASE%%/include/inn -@unexec rm -R %%NEWSBASE%%/include +@unexec rmdir %%RUNDIR%% 2>/dev/null || true +@unexec rmdir %%NEWSBASE%%/http +@unexec rmdir %%NEWSBASE%%/lib/perl/INN +@unexec rmdir %%NEWSBASE%%/lib/perl +@unexec rmdir %%NEWSBASE%%/lib +@unexec rmdir %%NEWSBASE%%/include/inn +@unexec rmdir %%NEWSBASE%%/include @unexec rmdir %%ETCDIR%% 2>/dev/null || true -@unexec rm -Rf %%NEWSBASE%%/doc +@unexec rmdir %%NEWSBASE%%/doc @unexec rmdir %%DBDIR%% 2>/dev/null || true -@unexec rm -Rf %%NEWSBASE%%/bin/rnews.libexec -@unexec rm -Rf %%NEWSBASE%%/bin/filter -@unexec rm -Rf %%NEWSBASE%%/bin/control -@unexec rm -Rf %%NEWSBASE%%/bin/auth/resolv -@unexec rm -Rf %%NEWSBASE%%/bin/auth/passwd -@unexec rm -Rf %%NEWSBASE%%/bin/auth -@unexec rm -Rf %%NEWSBASE%%/bin +@unexec rmdir %%NEWSBASE%%/bin/rnews.libexec +@unexec rmdir %%NEWSBASE%%/bin/filter +@unexec rmdir %%NEWSBASE%%/bin/control +@unexec rmdir %%NEWSBASE%%/bin/auth/resolv +@unexec rmdir %%NEWSBASE%%/bin/auth/passwd +@unexec rmdir %%NEWSBASE%%/bin/auth +@unexec rmdir %%NEWSBASE%%/bin @unexec rmdir %%NEWSBASE%% 2>/dev/null ||( echo "===> If you don't plan to use inn later, you can safely remove %%NEWSBASE%%. Deinstall process kept these files intact:" | fmt && for i in $(find %D/news -type f); do echo " - $i"; done) >Release-Note: >Audit-Trail: >Unformatted: