From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 19 13:40:14 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E52516A4CE for ; Mon, 19 Jul 2004 13:40:14 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64EA243D1F for ; Mon, 19 Jul 2004 13:40:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6JDeEPf059172 for ; Mon, 19 Jul 2004 13:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6JDeEwR059171; Mon, 19 Jul 2004 13:40:14 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jul 2004 13:40:14 GMT Resent-Message-Id: <200407191340.i6JDeEwR059171@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, Hideyuki KURASHINA Received: from localhost (hub.freebsd.org [216.136.204.18]) by hub.freebsd.org (Postfix) with ESMTP id D93A716A4CE; Mon, 19 Jul 2004 13:33:31 +0000 (GMT) Message-Id: <20040719.223232.71185611.rushani@FreeBSD.org> Date: Mon, 19 Jul 2004 22:32:32 +0900 (JST) From: Hideyuki KURASHINA To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: mharo@FreeBSD.org Subject: ports/69288: [PATCH] security/sudo: Fix deinstall X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2004 13:40:14 -0000 >Number: 69288 >Category: ports >Synopsis: [PATCH] security/sudo: Fix deinstall >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: Mon Jul 19 13:40:13 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Hideyuki KURASHINA >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD ***.*******.jp 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Jul 4 13:40:24 JST 2004 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/*** i386 >Description: Fix deinstall. In previous PR, I've introduced a bug into ports/security/sudo/pkg-plist... At @unexec, if cmp -s %D/etc/sudoers %%EXAMPLESDIR%%/sudoers does not work because 2nd argument of cmp is not ``%D/%%EXAMPLESDIR%%/sudoers''. On the other hand, ${WRKSRC}/sample.sudoers is different from ${PREFIX}/etc/sudoers which is copied from ${${WRKSRC}/sudoers. I think it is good to prepare both default config file and sample file in EXAMPLESDIR. One more thing to fix is installing via pkg_add. The ``+INSTALL'' file in package which derived from ports/security/sudo/pkg-install does not accept environmental variable EXAMPLESDIR, so use PKG_PREFIX-based approach. >How-To-Repeat: # cd /usr/ports/security/sudo # if [ -e /usr/local/etc/sudoers ]; then \ ? mv /usr/local/etc/sudoers /usr/local/etc/sudoers.bak; \ ? fi # make install # diff /usr/local/etc/sudoers /usr/local/share/examples/sudo/sudoers To confirm there is no difference between those files # make deinstall To confirm both files are removed or not. >Fix: Apply following patch (pkg-plist part was inspired by recent comit by @ume). Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/sudo/Makefile,v retrieving revision 1.62 diff -u -r1.62 Makefile --- Makefile 19 Jul 2004 08:15:33 -0000 1.62 +++ Makefile 19 Jul 2004 12:53:34 -0000 @@ -56,6 +56,7 @@ post-install: @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EXAMPLESDIR}/sudoers + ${INSTALL_DATA} ${WRKSRC}/sudoers ${EXAMPLESDIR}/sudoers + ${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EXAMPLESDIR}/sudoers.sample .include Index: pkg-install =================================================================== RCS file: /home/ncvs/ports/security/sudo/pkg-install,v retrieving revision 1.3 diff -u -r1.3 pkg-install --- pkg-install 19 Jul 2004 08:15:33 -0000 1.3 +++ pkg-install 19 Jul 2004 13:21:57 -0000 @@ -5,6 +5,6 @@ if [ -e ${PKG_PREFIX}/etc/sudoers ]; then echo "Will not overwrite existing ${PKG_PREFIX}/etc/sudoers file." else - cp -p ${EXAMPLESDIR}/sudoers ${PKG_PREFIX}/etc/sudoers + cp -p ${PKG_PREFIX}/share/examples/sudo/sudoers ${PKG_PREFIX}/etc/sudoers chmod 440 ${PKG_PREFIX}/etc/sudoers fi Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/sudo/pkg-plist,v retrieving revision 1.8 diff -u -r1.8 pkg-plist --- pkg-plist 19 Jul 2004 08:15:33 -0000 1.8 +++ pkg-plist 19 Jul 2004 12:51:14 -0000 @@ -1,5 +1,6 @@ -@unexec if cmp -s %D/etc/sudoers %%EXAMPLESDIR%%/sudoers; then rm -f %D/etc/sudoers; fi +@unexec if cmp -s %D/etc/sudoers %D/%%EXAMPLESDIR%%/sudoers; then rm -f %D/etc/sudoers; fi bin/sudo sbin/visudo %%EXAMPLESDIR%%/sudoers +%%EXAMPLESDIR%%/sudoers.sample @dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted: