From owner-svn-src-all@FreeBSD.ORG Fri Dec 28 09:19:51 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2F03959; Fri, 28 Dec 2012 09:19:51 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 85A018FC0A; Fri, 28 Dec 2012 09:19:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS9Jpwo094570; Fri, 28 Dec 2012 09:19:51 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS9JnvH094555; Fri, 28 Dec 2012 09:19:49 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201212280919.qBS9JnvH094555@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 28 Dec 2012 09:19:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r244769 - head/sys/netpfil/pf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Dec 2012 09:19:51 -0000 Author: glebius Date: Fri Dec 28 09:19:49 2012 New Revision: 244769 URL: http://svnweb.freebsd.org/changeset/base/244769 Log: In netpfil/pf: - Add my copyright to files I've touched a lot this year. - Add dash in front of all copyright notices according to style(9). - Move $OpenBSD$ down below copyright notices. - Remove extra line between cdefs.h and __FBSDID. Modified: head/sys/netpfil/pf/if_pflog.c head/sys/netpfil/pf/if_pfsync.c head/sys/netpfil/pf/pf.c head/sys/netpfil/pf/pf_if.c head/sys/netpfil/pf/pf_ioctl.c head/sys/netpfil/pf/pf_lb.c head/sys/netpfil/pf/pf_norm.c head/sys/netpfil/pf/pf_osfp.c head/sys/netpfil/pf/pf_ruleset.c head/sys/netpfil/pf/pf_table.c Modified: head/sys/netpfil/pf/if_pflog.c ============================================================================== --- head/sys/netpfil/pf/if_pflog.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/if_pflog.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,5 +1,4 @@ -/* $OpenBSD: if_pflog.c,v 1.26 2007/10/18 21:58:18 mpf Exp $ */ -/* +/*- * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and * Niels Provos (provos@physnet.uni-hamburg.de). @@ -31,6 +30,8 @@ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR * PURPOSE. + * + * $OpenBSD: if_pflog.c,v 1.26 2007/10/18 21:58:18 mpf Exp $ */ #include Modified: head/sys/netpfil/pf/if_pfsync.c ============================================================================== --- head/sys/netpfil/pf/if_pfsync.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/if_pfsync.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,7 +1,6 @@ -/* $OpenBSD: if_pfsync.c,v 1.110 2009/02/24 05:39:19 dlg Exp $ */ - -/* +/*- * Copyright (c) 2002 Michael Shalayeff + * Copyright (c) 2012 Gleb Smirnoff * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +25,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Copyright (c) 2009 David Gwynne * * Permission to use, copy, modify, and distribute this software for any @@ -43,6 +42,8 @@ */ /* + * $OpenBSD: if_pfsync.c,v 1.110 2009/02/24 05:39:19 dlg Exp $ + * * Revisions picked from OpenBSD after revision 1.110 import: * 1.119 - don't m_copydata() beyond the len of mbuf in pfsync_input() * 1.118, 1.124, 1.148, 1.149, 1.151, 1.171 - fixes to bulk updates Modified: head/sys/netpfil/pf/pf.c ============================================================================== --- head/sys/netpfil/pf/pf.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,8 +1,7 @@ -/* $OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $ */ - -/* +/*- * Copyright (c) 2001 Daniel Hartmeier * Copyright (c) 2002 - 2008 Henning Brauer + * Copyright (c) 2012 Gleb Smirnoff * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,10 +32,10 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F30602-01-2-0537. * + * $OpenBSD: pf.c,v 1.634 2009/02/27 12:37:45 henning Exp $ */ #include - __FBSDID("$FreeBSD$"); #include "opt_inet.h" Modified: head/sys/netpfil/pf/pf_if.c ============================================================================== --- head/sys/netpfil/pf/pf_if.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_if.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,10 +1,9 @@ -/* $OpenBSD: pf_if.c,v 1.54 2008/06/14 16:55:28 mk Exp $ */ - -/* - * Copyright 2005 Henning Brauer - * Copyright 2005 Ryan McBride +/*- * Copyright (c) 2001 Daniel Hartmeier * Copyright (c) 2003 Cedric Berger + * Copyright (c) 2005 Henning Brauer + * Copyright (c) 2005 Ryan McBride + * Copyright (c) 2012 Gleb Smirnoff * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,10 +29,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $OpenBSD: pf_if.c,v 1.54 2008/06/14 16:55:28 mk Exp $ */ #include - __FBSDID("$FreeBSD$"); #include "opt_inet.h" Modified: head/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- head/sys/netpfil/pf/pf_ioctl.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_ioctl.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,8 +1,7 @@ -/* $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $ */ - -/* +/*- * Copyright (c) 2001 Daniel Hartmeier * Copyright (c) 2002,2003 Henning Brauer + * Copyright (c) 2012 Gleb Smirnoff * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,6 +32,7 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F30602-01-2-0537. * + * $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $ */ #include Modified: head/sys/netpfil/pf/pf_lb.c ============================================================================== --- head/sys/netpfil/pf/pf_lb.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_lb.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,6 +1,4 @@ -/* $OpenBSD: pf_lb.c,v 1.2 2009/02/12 02:13:15 sthen Exp $ */ - -/* +/*- * Copyright (c) 2001 Daniel Hartmeier * Copyright (c) 2002 - 2008 Henning Brauer * All rights reserved. @@ -33,6 +31,7 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F30602-01-2-0537. * + * $OpenBSD: pf_lb.c,v 1.2 2009/02/12 02:13:15 sthen Exp $ */ #include Modified: head/sys/netpfil/pf/pf_norm.c ============================================================================== --- head/sys/netpfil/pf/pf_norm.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_norm.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,6 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.114 2009/01/29 14:11:45 henning Exp $ */ - -/* +/*- * Copyright 2001 Niels Provos * All rights reserved. * @@ -23,6 +21,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $OpenBSD: pf_norm.c,v 1.114 2009/01/29 14:11:45 henning Exp $ */ #include Modified: head/sys/netpfil/pf/pf_osfp.c ============================================================================== --- head/sys/netpfil/pf/pf_osfp.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_osfp.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,6 +1,4 @@ -/* $OpenBSD: pf_osfp.c,v 1.14 2008/06/12 18:17:01 henning Exp $ */ - -/* +/*- * Copyright (c) 2003 Mike Frantzen * * Permission to use, copy, modify, and distribute this software for any @@ -15,6 +13,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * + * $OpenBSD: pf_osfp.c,v 1.14 2008/06/12 18:17:01 henning Exp $ */ #include Modified: head/sys/netpfil/pf/pf_ruleset.c ============================================================================== --- head/sys/netpfil/pf/pf_ruleset.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_ruleset.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,6 +1,4 @@ -/* $OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $ */ - -/* +/*- * Copyright (c) 2001 Daniel Hartmeier * Copyright (c) 2002,2003 Henning Brauer * All rights reserved. @@ -33,6 +31,7 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F30602-01-2-0537. * + * $OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $ */ #include Modified: head/sys/netpfil/pf/pf_table.c ============================================================================== --- head/sys/netpfil/pf/pf_table.c Fri Dec 28 08:00:31 2012 (r244768) +++ head/sys/netpfil/pf/pf_table.c Fri Dec 28 09:19:49 2012 (r244769) @@ -1,6 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $ */ - -/* +/*- * Copyright (c) 2002 Cedric Berger * All rights reserved. * @@ -28,6 +26,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * + * $OpenBSD: pf_table.c,v 1.79 2008/10/08 06:24:50 mcbride Exp $ */ #include