From laszlof@main.vonostingroup.com Wed Oct 11 23:23:56 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA66016A412 for ; Wed, 11 Oct 2006 23:23:56 +0000 (UTC) (envelope-from laszlof@main.vonostingroup.com) Received: from main.vonostingroup.com (main.vonostingroup.com [216.32.84.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F56843D8F for ; Wed, 11 Oct 2006 23:23:10 +0000 (GMT) (envelope-from laszlof@main.vonostingroup.com) Received: from laszlof by main.vonostingroup.com with local (Exim 4.63 (FreeBSD)) (envelope-from ) id 1GXnPp-000AbZ-44 for FreeBSD-gnats-submit@freebsd.org; Wed, 11 Oct 2006 17:23:09 -0600 Message-Id: Date: Wed, 11 Oct 2006 17:23:09 -0600 From: Frank J. Laszlo Reply-To: Frank J. Laszlo To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [PATCH]: sysutils/comconsole: Fix files left behind X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 104312 >Category: ports >Synopsis: [PATCH]: sysutils/comconsole: Fix files left behind >Confidential: no >Severity: non-critical >Priority: medium >Responsible: alepulver >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 11 23:30:11 GMT 2006 >Closed-Date: Sat Oct 21 13:39:35 GMT 2006 >Last-Modified: Sat Oct 21 13:40:18 GMT 2006 >Originator: Frank J. Laszlo >Release: FreeBSD 5.4-RELEASE-p18 i386 >Organization: >Environment: System: FreeBSD main.vonostingroup.com 5.4-RELEASE-p18 FreeBSD 5.4-RELEASE-p18 #1: Sat Sep 16 18:56:42 UTC 2006 laszlof@main.vonostingroup.com:/usr/obj/usr/src/sys/MAIN i386 >Description: Fixed pkg-install and pkg-deinstall scripts to properly handle /boot.config and /etc/ttys. >How-To-Repeat: >Fix: --- comconsole-0.1.diff begins here --- diff -NrU3 comconsole.orig/Makefile comconsole/Makefile --- comconsole.orig/Makefile Wed Oct 11 16:48:56 2006 +++ comconsole/Makefile Wed Oct 11 16:49:07 2006 @@ -14,10 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Setup your PC to use serial port COM1 as its console device -BROKEN= Modifies files in / and does not undo upon deinstall -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2006-12-01 - NO_BUILD= yes NO_WRKSUBDIR= yes diff -NrU3 comconsole.orig/pkg-deinstall comconsole/pkg-deinstall --- comconsole.orig/pkg-deinstall Wed Oct 11 16:48:56 2006 +++ comconsole/pkg-deinstall Wed Oct 11 17:19:09 2006 @@ -1,29 +1,6 @@ #!/bin/sh [ "x$1" = "x" ] && exit 1 -if [ "x$2" = "xPOST-INSTALL" ]; then - cat <<'EOF' >/boot.config --P -EOF - mv -f /etc/ttys /etc/ttys.last - awk -f - /etc/ttys.last <<'EOF' >/etc/ttys -/^console/ { - print "console \"/usr/libexec/getty std.9600\" vt100 on secure" - next -} -{ - print -} -EOF -fi if [ "x$2" = "xDEINSTALL" ]; then - mv -f /etc/ttys /etc/ttys.last - awk -f - /etc/ttys.last <<'EOF' >/etc/ttys -/^console/ { - print "console none unknown off secure" - next -} -{ - print -} -EOF + sed -i '' "s|^console.*|console none unknown off secure|" /etc/ttys + rm -f /boot.config fi diff -NrU3 comconsole.orig/pkg-install comconsole/pkg-install --- comconsole.orig/pkg-install Wed Oct 11 16:48:56 2006 +++ comconsole/pkg-install Wed Oct 11 17:19:16 2006 @@ -1,29 +1,6 @@ #!/bin/sh [ "x$1" = "x" ] && exit 1 if [ "x$2" = "xPOST-INSTALL" ]; then - cat <<'EOF' >/boot.config --P -EOF - mv -f /etc/ttys /etc/ttys.last - awk -f - /etc/ttys.last <<'EOF' >/etc/ttys -/^console/ { - print "console \"/usr/libexec/getty std.9600\" vt100 on secure" - next -} -{ - print -} -EOF -fi -if [ "x$2" = "xDEINSTALL" ]; then - mv -f /etc/ttys /etc/ttys.last - awk -f - /etc/ttys.last <<'EOF' >/etc/ttys -/^console/ { - print "console none unknown off secure" - next -} -{ - print -} -EOF + echo "-P" > /boot.config + sed -i '' "s|^console.*|console \"/usr/libexec/getty std.9600\" vt100 on secure|" /etc/ttys fi --- comconsole-0.1.diff ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->alepulver Responsible-Changed-By: alepulver Responsible-Changed-When: Tue Oct 17 18:34:46 UTC 2006 Responsible-Changed-Why: Take PR. http://www.freebsd.org/cgi/query-pr.cgi?pr=104312 State-Changed-From-To: open->closed State-Changed-By: alepulver State-Changed-When: Sat Oct 21 13:39:16 UTC 2006 State-Changed-Why: Committed, thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=104312 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/104312: commit references a PR Date: Sat, 21 Oct 2006 13:39:12 +0000 (UTC) alepulver 2006-10-21 13:39:05 UTC FreeBSD ports repository Modified files: sysutils/comconsole Makefile pkg-deinstall pkg-install Log: - Fix pkg-install and pkg-deinstall scripts to properly handle /boot.config and /etc/ttys. - Remove BROKEN, DEPRECATED and EXPIRATION_DATE. PR: ports/104312 Submitted by: Frank J. Laszlo Approved by: portmgr (erwin) Revision Changes Path 1.10 +1 -5 ports/sysutils/comconsole/Makefile 1.2 +2 -25 ports/sysutils/comconsole/pkg-deinstall 1.2 +2 -25 ports/sysutils/comconsole/pkg-install _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: