From 6a7fd14e789afd0ec8f773824068c693e443ccfb Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 16 Sep 2018 11:50:54 +0200 Subject: [PATCH] *: no more trailing dots, Shrew Soft complete copyright (cherry picked from commit 94f4b165b11f1ae37082cc0e52c04a871fad9072) --- Scripts/license | 4 +--- net-mgmt/snmp/src/www/services_snmp.php | 2 +- net/igmp-proxy/src/www/services_igmpproxy.php | 2 +- net/igmp-proxy/src/www/services_igmpproxy_edit.php | 2 +- net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc | 2 +- net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc | 2 +- net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc | 2 +- net/pptp/src/www/vpn_pptp.php | 2 +- net/pptp/src/www/vpn_pptp_users.php | 2 +- net/pptp/src/www/vpn_pptp_users_edit.php | 2 +- net/upnp/src/www/status_upnp.php | 2 +- .../src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php | 2 +- 12 files changed, 12 insertions(+), 14 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/net-mgmt/snmp/src/www/services_snmp.php b/net-mgmt/snmp/src/www/services_snmp.php index 415efcfaa..03bdf9f4b 100644 --- a/net-mgmt/snmp/src/www/services_snmp.php +++ b/net-mgmt/snmp/src/www/services_snmp.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/net/igmp-proxy/src/www/services_igmpproxy.php b/net/igmp-proxy/src/www/services_igmpproxy.php index e2575be89..2d5f7830a 100644 --- a/net/igmp-proxy/src/www/services_igmpproxy.php +++ b/net/igmp-proxy/src/www/services_igmpproxy.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2009 Ermal Luçi 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/net/igmp-proxy/src/www/services_igmpproxy_edit.php b/net/igmp-proxy/src/www/services_igmpproxy_edit.php index e8452813d..c6237f578 100644 --- a/net/igmp-proxy/src/www/services_igmpproxy_edit.php +++ b/net/igmp-proxy/src/www/services_igmpproxy_edit.php @@ -4,7 +4,7 @@ Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2009 Ermal Luçi 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/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc index 4ffbd5380..f6282fb0e 100644 --- a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc +++ b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc @@ -2,7 +2,7 @@ /* * Coypright (C) 2016-2017 Franco Fichtner - * Copyright (C) 2008 Shrew Soft Inc + * Copyright (C) 2008 Shrew Soft Inc. * Copyright (C) 2008 Ermal Luçi * Copyright (C) 2004 Scott Ullrich * Copyright (C) 2003-2004 Manuel Kasper diff --git a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc index 58fe791f0..976a44b03 100644 --- a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc +++ b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc @@ -2,7 +2,7 @@ /* * Coypright (C) 2016-2017 Franco Fichtner - * Copyright (C) 2008 Shrew Soft Inc + * Copyright (C) 2008 Shrew Soft Inc. * Copyright (C) 2008 Ermal Luçi * Copyright (C) 2004 Scott Ullrich * Copyright (C) 2003-2004 Manuel Kasper diff --git a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc index b0efbaf2a..6c01ec5ed 100644 --- a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc +++ b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc @@ -2,7 +2,7 @@ /* * Coypright (C) 2016-2017 Franco Fichtner - * Copyright (C) 2008 Shrew Soft Inc + * Copyright (C) 2008 Shrew Soft Inc. * Copyright (C) 2008 Ermal Luçi * Copyright (C) 2004 Scott Ullrich * Copyright (C) 2003-2004 Manuel Kasper diff --git a/net/pptp/src/www/vpn_pptp.php b/net/pptp/src/www/vpn_pptp.php index f991342b1..243f997be 100644 --- a/net/pptp/src/www/vpn_pptp.php +++ b/net/pptp/src/www/vpn_pptp.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/net/pptp/src/www/vpn_pptp_users.php b/net/pptp/src/www/vpn_pptp_users.php index ef38b03ea..3631a993a 100644 --- a/net/pptp/src/www/vpn_pptp_users.php +++ b/net/pptp/src/www/vpn_pptp_users.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/net/pptp/src/www/vpn_pptp_users_edit.php b/net/pptp/src/www/vpn_pptp_users_edit.php index 0d530e6fe..bdf7d6456 100644 --- a/net/pptp/src/www/vpn_pptp_users_edit.php +++ b/net/pptp/src/www/vpn_pptp_users_edit.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2003-2005 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/net/upnp/src/www/status_upnp.php b/net/upnp/src/www/status_upnp.php index 19975583c..0444772a5 100644 --- a/net/upnp/src/www/status_upnp.php +++ b/net/upnp/src/www/status_upnp.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2016 Deciso B.V. - Copyright (C) 2010 Seth Mos . + Copyright (C) 2010 Seth Mos All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php index 5f56fd534..2b4170d2e 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php @@ -7,7 +7,7 @@ * Copyright (C) 2017-2018 Frank Wall * Copyright (C) 2015 Deciso B.V. * Copyright (C) 2010 Jim Pingle - * Copyright (C) 2008 Shrew Soft Inc + * Copyright (C) 2008 Shrew Soft Inc. * * All rights reserved. *