From owner-freebsd-hackers@FreeBSD.ORG  Mon Sep 20 14:05:50 2004
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A979516A4CE
	for <freebsd-hackers@freebsd.org>;
	Mon, 20 Sep 2004 14:05:50 +0000 (GMT)
Received: from aiolos.otenet.gr (aiolos.otenet.gr [195.170.0.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DF4EE43D49
	for <freebsd-hackers@freebsd.org>;
	Mon, 20 Sep 2004 14:05:49 +0000 (GMT)
	(envelope-from keramida@freebsd.org)
Received: from orion.daedalusnetworks.priv (host5.bedc.ondsl.gr
	[62.103.39.229])i8KE5Vm2001690
	for <freebsd-hackers@freebsd.org>; Mon, 20 Sep 2004 17:05:42 +0300
Received: from orion.daedalusnetworks.priv (orion [127.0.0.1])
	i8KE5EA6000997	for <freebsd-hackers@freebsd.org>;
	Mon, 20 Sep 2004 17:05:15 +0300 (EEST)
	(envelope-from keramida@freebsd.org)
Received: (from keramida@localhost)i8KE5ENS000996
	for freebsd-hackers@freebsd.org;
	Mon, 20 Sep 2004 17:05:14 +0300 (EEST)
	(envelope-from keramida@freebsd.org)
Date: Mon, 20 Sep 2004 17:05:14 +0300
From: Giorgos Keramidas <keramida@freebsd.org>
To: freebsd-hackers@freebsd.org
Message-ID: <20040920140514.GB700@orion.daedalusnetworks.priv>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: Unified diffs in periodic/security email
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Sep 2004 14:05:50 -0000

I've been running my systems at home and work with the following diff
for some time.  I tend to prefer the unified diff output format than the
default diff -b output.

Does anyone else like this?  Any ideas for making the diff format
configurable in periodic.conf (i.e. to making it easy to switch between
diff -u and diff -c output)?

% Index: security.functions
% ===================================================================
% RCS file: /home/ncvs/src/etc/periodic/security/security.functions,v
% retrieving revision 1.3
% diff -u -r1.3 security.functions
% --- security.functions  30 Jun 2003 22:06:26 -0000      1.3
% +++ security.functions  7 Sep 2004 07:50:35 -0000
% @@ -67,7 +67,7 @@
%      [ $rc -lt 1 ] && rc=1
%      echo ""
%      echo "${msg}"
% -    diff -b ${LOG}/${label}.today ${tmpf} | eval "${filter}"
% +    diff -u -b ${LOG}/${label}.today ${tmpf} | eval "${filter}"
%      mv ${LOG}/${label}.today ${LOG}/${label}.yesterday || rc=3
%      mv ${tmpf} ${LOG}/${label}.today || rc=3
%    fi