src: four errors in the copyrights

* interfaces_assign.php: creation year addition for Jim McBeath
* filter_log.inc: spurious attribution via 96899e89f0c
* diag_traceroute.php: typo in split via d87c6ff556
* Manuel Kasper e-mail missing in a few pages
This commit is contained in:
Franco Fichtner 2017-08-05 20:29:52 +02:00
parent d87c6ff556
commit 968a3afc8e
8 changed files with 19 additions and 10 deletions

View File

@ -25,12 +25,13 @@ Copyright (c) 2010 Gabriel B. <gnoahb@gmail.com>
Copyright (c) 2016 IT-assistans Sverige AB
Copyright (c) 2009 Janne Enberg <janne.enberg@lietu.net>
Copyright (c) 2017 Jeffrey Gentes
Copyright (c) 2004 Jim McBeath
Copyright (c) 2009-2014 Jim Pingle <jimp@pfsense.org>
Copyright (c) 2012 Jonas von Andrian
Copyright (c) 2004-2005 Jonathan Watt <jwatt@jwatt.org>
Copyright (c) 2003-2004 Justin Ellison <justin@techadvise.com>
Copyright (c) 2015 Manuel Faux <mfaux@conf.at>
Copyright (c) 2003-2004 Manuel Kasper
Copyright (c) 2003-2009 Manuel Kasper <mk@neon1.net>
Copyright (c) 2012 Marcello Coutinho
Copyright (c) 2010-2015 Michael Bostock
Copyright (c) 2005-2006 Paul Taylor <paultaylor@winn-dixie.com>
@ -41,6 +42,7 @@ Copyright (c) 2013 Renato Botelho <garga@pfsense.org>
Copyright (c) 2015 S. Linke <dev@devsash.de>
Copyright (c) 2007 Sam Wenham
Copyright (c) 2007 Scott Dale
Copyright (c) 2004-2012 Scott Ullrich
Copyright (c) 2003-2010 Scott Ullrich <sullrich@gmail.com>
Copyright (c) 2007-2012 Seth Mos <seth.mos@dds.nl>
Copyright (c) 2008-2009 Shrew Soft Inc. <mgrooms@shrew.net>

View File

@ -67,9 +67,12 @@ my %copyrights = ();
sub process_file
{
my $filename = $File::Find::name;
return if not -f "$cwd/$filename";
my @lines = read_file( "$cwd/$filename" );
my $possibly_bsd;
for my $line ( @lines ) {
$possibly_bsd = 1 if $line =~ /Redistribution and use in source and binary forms/i;
if ( $line =~ /Apache License/i ) {
@ -77,15 +80,19 @@ sub process_file
last;
}
}
return if not $possibly_bsd;
for my $line ( @lines ) {
my $copy = $line;
chomp $copy;
next if $line !~ s/copyright\s+\(c\)\s+//i;
my ( $start, $end ) = ( 0, 9999 );
$line =~ s/(^[\*\\#\s]+|[\.\s]+$)//g;
$line =~ s/^[\*\\#\s]+//g;
$line =~ s/[\.\s]+$//g;
$line =~ s/Inc$/Inc./;
$line =~ s/B\.V$/B.V./;
chomp $copy;
$copy =~ s/^[\*\\#\s]+//g;
my ( $start, $end ) = ( 0, 9999 );
if ( $line =~ s/(\d\d\d\d\s*,?-?\s*)// ) {
$start = $1;
$start =~ s/[,\s\-]+//g;
@ -95,6 +102,7 @@ sub process_file
$end =~ s/[,\s]+//g;
}
$end = $start if $end == 9999;
say STDERR "Error in $filename: $copy" if $end == 0;
if ( exists $copyrights{$line} ) {
if ( $start > $copyrights{$line}[0] ) {
$start = $copyrights{$line}[0];

View File

@ -2,7 +2,6 @@
/*
Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) Scott Ullrich
Copyright (C) 2009 Jim Pingle <jimp@pfsense.org>
All rights reserved.

View File

@ -5,7 +5,7 @@
Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
Copyright (C) 2008 Ermal Luçi
Copyright (C) 2004-2007 Scott Ullrich
Copyright (C) 2003-2004 Manuel Kasper
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
All rights reserved.
Redistribution and use in source and binary forms, with or without

View File

@ -4,7 +4,7 @@
Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2004-2009 Scott Ullrich
Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
Copyright (C) 2003-2004 Manuel Kasper
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
All rights reserved.
Redistribution and use in source and binary forms, with or without

View File

@ -3,7 +3,7 @@
/*
Copyright (C) 2016 Deciso B.V.
Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>
Copyright (C) Manuel Kasper <mk@neon1.net>
Copyright (C) 2005 Manuel Kasper <mk@neon1.net>
All rights reserved.
Redistribution and use in source and binary forms, with or without

View File

@ -2,7 +2,7 @@
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) Jim McBeath
Copyright (C) 2004 Jim McBeath
Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>
All rights reserved.

View File

@ -4,7 +4,7 @@
Copyright (C) 2010 Ermal Luçi
Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
Copyright (C) 2003-2004 Manuel Kasper
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
All rights reserved.
Redistribution and use in source and binary forms, with or without