From 574bd308be8a54fc43bd2b815c8d34a79df2080d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 16 Sep 2018 11:44:13 +0200 Subject: [PATCH] src: remove trailing dot workaround by removing trailing dots --- Scripts/license | 4 +--- src/etc/inc/auth.inc | 4 ++-- src/etc/inc/plugins.inc.d/openssh.inc | 2 +- src/etc/inc/util.inc | 2 +- src/etc/inc/xmlparse.inc | 2 +- src/etc/rc.filter_synchronize | 2 +- src/etc/rc.linkup | 2 +- src/etc/rc.openvpn | 4 ++-- src/etc/rc.sshd | 2 +- src/opnsense/scripts/shell/ping.php | 2 +- src/www/diag_ipsec_sad.php | 2 +- src/www/diag_ipsec_spd.php | 2 +- src/www/diag_resetstate.php | 2 +- src/www/firewall_nat_1to1.php | 2 +- src/www/firewall_nat_1to1_edit.php | 2 +- src/www/firewall_nat_npt_edit.php | 2 +- src/www/firewall_nat_out.php | 2 +- src/www/firewall_nat_out_edit.php | 2 +- src/www/firewall_rules_edit.php | 2 +- src/www/firewall_schedule.php | 2 +- src/www/firewall_schedule_edit.php | 2 +- src/www/firewall_virtual_ip.php | 4 ++-- src/www/firewall_virtual_ip_edit.php | 4 ++-- src/www/guiconfig.inc | 2 +- src/www/interfaces_vlan_edit.php | 2 +- src/www/services_dhcp.php | 2 +- src/www/services_dhcp_edit.php | 2 +- src/www/services_dhcpv6_edit.php | 4 ++-- src/www/services_dhcpv6_relay.php | 2 +- src/www/status_dhcp_leases.php | 2 +- src/www/status_dhcpv6_leases.php | 2 +- src/www/status_graph.php | 2 +- src/www/system_groupmanager.php | 4 ++-- src/www/vpn_ipsec.php | 2 +- src/www/widgets/widgets/interface_statistics.widget.php | 2 +- 35 files changed, 41 insertions(+), 43 deletions(-) diff --git a/Scripts/license b/Scripts/license index f1afa3959..01d2d97d5 100755 --- a/Scripts/license +++ b/Scripts/license @@ -85,9 +85,7 @@ sub process_file my $copy = $line; next if $line !~ s/copyright\s+\(c\)\s+//i; $line =~ s/^[."\*\\#\s]+//g; - $line =~ s/[\.\s]+$//g; - $line =~ s/Inc$/Inc./; - $line =~ s/B\.V$/B.V./; + $line =~ s/\s+$//g; chomp $copy; $copy =~ s/^[\*\\#\s]+//g; my ( $start, $end ) = ( 0, 9999 ); diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 4709a864c..c0f2cff3f 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -5,8 +5,8 @@ Copyright (C) 2010 Ermal Luçi Copyright (C) 2007-2008 Scott Ullrich Copyright (C) 2005-2006 Bill Marquette - Copyright (C) 2006 Paul Taylor . - Copyright (C) 2003-2006 Manuel Kasper . + Copyright (C) 2006 Paul Taylor + Copyright (C) 2003-2006 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/inc/plugins.inc.d/openssh.inc b/src/etc/inc/plugins.inc.d/openssh.inc index e214fcd3a..2f99ceb92 100644 --- a/src/etc/inc/plugins.inc.d/openssh.inc +++ b/src/etc/inc/plugins.inc.d/openssh.inc @@ -2,7 +2,7 @@ /* * Copyright (C) 2004 Scott Ullrich - * Copyright (C) 2004 Fred Mol . + * Copyright (C) 2004 Fred Mol * Copyright (C) 2015-2018 Franco Fichtner * All rights reserved. * diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 3281843a9..04b2dccb5 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -3,7 +3,7 @@ /* * Copyright (C) 2015-2018 Franco Fichtner * Copyright (C) 2004-2007 Scott Ullrich - * Copyright (C) 2003-2004 Manuel Kasper . + * Copyright (C) 2003-2004 Manuel Kasper * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/etc/inc/xmlparse.inc b/src/etc/inc/xmlparse.inc index a98e0fe4b..ce46c3849 100644 --- a/src/etc/inc/xmlparse.inc +++ b/src/etc/inc/xmlparse.inc @@ -1,7 +1,7 @@ . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize index afbe9ba6c..f0d40b2c1 100755 --- a/src/etc/rc.filter_synchronize +++ b/src/etc/rc.filter_synchronize @@ -7,7 +7,7 @@ Copyright (C) 2005 Bill Marquette Copyright (C) 2006 Peter Allgeyer Copyright (C) 2008 Ermal Luçi - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup index fc81e9f05..111170969 100755 --- a/src/etc/rc.linkup +++ b/src/etc/rc.linkup @@ -2,7 +2,7 @@ . + Copyright (C) 2003-2005 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.openvpn b/src/etc/rc.openvpn index d1c5d5482..fd6b9236d 100755 --- a/src/etc/rc.openvpn +++ b/src/etc/rc.openvpn @@ -2,8 +2,8 @@ . - Copyright (C) 2009 Seth Mos . + Copyright (C) 2007 Manuel Kasper + Copyright (C) 2009 Seth Mos All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/etc/rc.sshd b/src/etc/rc.sshd index efbf2d847..258972891 100755 --- a/src/etc/rc.sshd +++ b/src/etc/rc.sshd @@ -3,7 +3,7 @@ /* * Copyright (C) 2004 Scott Ullrich - * Copyright (C) 2004 Fred Mol . + * Copyright (C) 2004 Fred Mol * Copyright (C) 2015-2017 Franco Fichtner * All rights reserved. * diff --git a/src/opnsense/scripts/shell/ping.php b/src/opnsense/scripts/shell/ping.php index c8ad875f0..ba868aed8 100755 --- a/src/opnsense/scripts/shell/ping.php +++ b/src/opnsense/scripts/shell/ping.php @@ -2,7 +2,7 @@ . + * Copyright (C) 2003-2004 Manuel Kasper * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_ipsec_sad.php b/src/www/diag_ipsec_sad.php index 9effdf1cf..92c96a523 100644 --- a/src/www/diag_ipsec_sad.php +++ b/src/www/diag_ipsec_sad.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_ipsec_spd.php b/src/www/diag_ipsec_spd.php index 9d065757a..83d7565f0 100644 --- a/src/www/diag_ipsec_spd.php +++ b/src/www/diag_ipsec_spd.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/diag_resetstate.php b/src/www/diag_resetstate.php index 6bfe724b4..c014ff75e 100644 --- a/src/www/diag_resetstate.php +++ b/src/www/diag_resetstate.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_nat_1to1.php b/src/www/firewall_nat_1to1.php index 8839f97d0..678a8c977 100644 --- a/src/www/firewall_nat_1to1.php +++ b/src/www/firewall_nat_1to1.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php index d22e6c5b7..ef7eb62bf 100644 --- a/src/www/firewall_nat_1to1_edit.php +++ b/src/www/firewall_nat_1to1_edit.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php index c981f5b7d..0ad4f9784 100644 --- a/src/www/firewall_nat_npt_edit.php +++ b/src/www/firewall_nat_npt_edit.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014 Deciso B.V. - Copyright (C) 2011 Seth Mos . + Copyright (C) 2011 Seth Mos All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php index af1f31f77..44b8d0600 100644 --- a/src/www/firewall_nat_out.php +++ b/src/www/firewall_nat_out.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014 Deciso B.V. Copyright (C) 2004 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php index 0e6175080..624f8a27a 100644 --- a/src/www/firewall_nat_out_edit.php +++ b/src/www/firewall_nat_out_edit.php @@ -3,7 +3,7 @@ /* * Copyright (C) 2014-2015 Deciso B.V. * Copyright (C) 2004 Scott Ullrich - * Copyright (C) 2003-2004 Manuel Kasper . + * Copyright (C) 2003-2004 Manuel Kasper * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php index 58037e9b4..13587478a 100644 --- a/src/www/firewall_rules_edit.php +++ b/src/www/firewall_rules_edit.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014 Deciso B.V. Copyright (C) 2005 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_schedule.php b/src/www/firewall_schedule.php index c00554a34..2d229627c 100644 --- a/src/www/firewall_schedule.php +++ b/src/www/firewall_schedule.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2004 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php index b73d5cf1d..e658c79a4 100644 --- a/src/www/firewall_schedule_edit.php +++ b/src/www/firewall_schedule_edit.php @@ -4,7 +4,7 @@ Copyright (C) 2018 Fabian Franz Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2004 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/firewall_virtual_ip.php b/src/www/firewall_virtual_ip.php index 4886a3866..8e90a903e 100644 --- a/src/www/firewall_virtual_ip.php +++ b/src/www/firewall_virtual_ip.php @@ -2,8 +2,8 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2005 Bill Marquette . - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2005 Bill Marquette + Copyright (C) 2003-2005 Manuel Kasper Copyright (C) 2004-2005 Scott Ullrich All rights reserved. diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php index 494f79ff6..1db9190ca 100644 --- a/src/www/firewall_virtual_ip_edit.php +++ b/src/www/firewall_virtual_ip_edit.php @@ -2,8 +2,8 @@ /* Copyright (C) 2014-2015 Deciso B.V. - Copyright (C) 2005 Bill Marquette . - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2005 Bill Marquette + Copyright (C) 2003-2005 Manuel Kasper Copyright (C) 2004-2005 Scott Ullrich All rights reserved. diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc index 1e9c5749e..877f80cf3 100644 --- a/src/www/guiconfig.inc +++ b/src/www/guiconfig.inc @@ -4,7 +4,7 @@ * Copyright (C) 2015-2018 Franco Fichtner * Copyright (C) 2014 Deciso B.V. * Copyright (C) 2004 Scott Ullrich - * Copyright (C) 2003-2004 Manuel Kasper . + * Copyright (C) 2003-2004 Manuel Kasper * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/www/interfaces_vlan_edit.php b/src/www/interfaces_vlan_edit.php index b9783d77e..92fce110e 100644 --- a/src/www/interfaces_vlan_edit.php +++ b/src/www/interfaces_vlan_edit.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php index 5477badd3..198b8c80e 100644 --- a/src/www/services_dhcp.php +++ b/src/www/services_dhcp.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php index 5fb6453f4..a6774c385 100644 --- a/src/www/services_dhcp_edit.php +++ b/src/www/services_dhcp_edit.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php index 0096ce051..20f29d5dd 100644 --- a/src/www/services_dhcpv6_edit.php +++ b/src/www/services_dhcpv6_edit.php @@ -2,8 +2,8 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Manuel Kasper . - Copyright (C) 2011 Seth Mos . + Copyright (C) 2003-2004 Manuel Kasper + Copyright (C) 2011 Seth Mos All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php index 88991bb1c..0de0c7e4a 100644 --- a/src/www/services_dhcpv6_relay.php +++ b/src/www/services_dhcpv6_relay.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2004 Justin Ellison . + Copyright (C) 2003-2004 Justin Ellison Copyright (C) 2010 Ermal Luçi Copyright (C) 2010 Seth Mos All rights reserved. diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php index 6902f14b2..4e043a2ca 100644 --- a/src/www/status_dhcp_leases.php +++ b/src/www/status_dhcp_leases.php @@ -3,7 +3,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php index d43bc09a9..ada0d84ab 100644 --- a/src/www/status_dhcpv6_leases.php +++ b/src/www/status_dhcpv6_leases.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2011 Seth Mos - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/status_graph.php b/src/www/status_graph.php index 16b61d05a..311e1ba2d 100644 --- a/src/www/status_graph.php +++ b/src/www/status_graph.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2017 Deciso B.V. Copyright (C) 2017 Jeffrey Gentes Copyright (C) 2004 Scott Ullrich - Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2003-2004 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php index 48d0371a2..70a8b7c7f 100644 --- a/src/www/system_groupmanager.php +++ b/src/www/system_groupmanager.php @@ -3,8 +3,8 @@ /* Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2008 Shrew Soft Inc. - Copyright (C) 2005 Paul Taylor . - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2005 Paul Taylor + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php index 783137839..fe6141a5c 100644 --- a/src/www/vpn_ipsec.php +++ b/src/www/vpn_ipsec.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2003-2005 Manuel Kasper Copyright (C) 2008 Shrew Soft Inc. All rights reserved. diff --git a/src/www/widgets/widgets/interface_statistics.widget.php b/src/www/widgets/widgets/interface_statistics.widget.php index 1477917d3..38ae9c4a3 100644 --- a/src/www/widgets/widgets/interface_statistics.widget.php +++ b/src/www/widgets/widgets/interface_statistics.widget.php @@ -5,7 +5,7 @@ * Copyright (C) 2007 Scott Dale * Copyright (C) 2004-2005 T. Lechat * Copyright (C) 2004-2005 Manuel Kasper - * Copyright (C) 2004-2005 Jonathan Watt . + * Copyright (C) 2004-2005 Jonathan Watt * All rights reserved. * * Redistribution and use in source and binary forms, with or without