From owner-p4-projects@FreeBSD.ORG  Tue Jul  3 23:05:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1E2116A469; Tue,  3 Jul 2007 23:05:29 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6E6B716A421
	for <perforce@freebsd.org>; Tue,  3 Jul 2007 23:05:29 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F4C813C4CE
	for <perforce@freebsd.org>; Tue,  3 Jul 2007 23:05:29 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l63N5TnB038002
	for <perforce@freebsd.org>; Tue, 3 Jul 2007 23:05:29 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l63N5TLC037999
	for perforce@freebsd.org; Tue, 3 Jul 2007 23:05:29 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 3 Jul 2007 23:05:29 GMT
Message-Id: <200707032305.l63N5TLC037999@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122812 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2007 23:05:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=122812

Change 122812 by peter@peter_daintree on 2007/07/03 23:05:25

	IFC @122807

Affected files ...

.. //depot/projects/hammer/contrib/pf/pflogd/pidfile.c#5 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pidfile.h#2 integrate

Differences ...

==== //depot/projects/hammer/contrib/pf/pflogd/pidfile.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 

==== //depot/projects/hammer/contrib/pf/pflogd/pidfile.h#2 (text+ko) ====

@@ -1,1 +1,3 @@
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
+
 int pidfile(const char *);