diff options
| author | Rob Austein <sra@hactrn.net> | 2016-05-07 04:14:02 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-05-07 04:14:02 +0000 |
| commit | 383b0a0d20de4bf6674f7e852b804a9d91df3ea0 (patch) | |
| tree | fc4d4cab56df2129f58581cc38b7327835876b83 /rpki | |
| parent | da8998dc54696f9e0e2ee6d45b32fc3175c0ece3 (diff) | |
Oops, TeX-style "--" numeric ranges in copyright comments are bad fit
for XML. Apparently we were carefully changing just the XML files to
use a single "-" to work around this. Enough already, just convert
all copyright year ranges to single "-" and have done with this.
svn path=/branches/tk705/; revision=6427
Diffstat (limited to 'rpki')
45 files changed, 124 insertions, 123 deletions
diff --git a/rpki/POW/__init__.py b/rpki/POW/__init__.py index ba43e1ec..8e89981b 100644 --- a/rpki/POW/__init__.py +++ b/rpki/POW/__init__.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2006--2008 American Registry for Internet Numbers ("ARIN") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2006-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/adns.py b/rpki/adns.py index 4f8cf7ea..82fdd61d 100644 --- a/rpki/adns.py +++ b/rpki/adns.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2010--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2003--2007, 2009, 2010 Nominum, Inc. ("NOMINUM") +# Copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2010-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2003-2007, 2009, 2010 Nominum, Inc. ("NOMINUM") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/cli.py b/rpki/cli.py index 6d609466..99b511d4 100644 --- a/rpki/cli.py +++ b/rpki/cli.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2010--2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2010-2012 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/config.py b/rpki/config.py index c92e63cd..d18f69bd 100644 --- a/rpki/config.py +++ b/rpki/config.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/csv_utils.py b/rpki/csv_utils.py index d354da9a..8b940075 100644 --- a/rpki/csv_utils.py +++ b/rpki/csv_utils.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/django_settings/common.py b/rpki/django_settings/common.py index 3ec387ed..cbc1cb4a 100644 --- a/rpki/django_settings/common.py +++ b/rpki/django_settings/common.py @@ -1,6 +1,6 @@ # $Id$ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/django_settings/gui.py b/rpki/django_settings/gui.py index c66cda4f..926c7dee 100644 --- a/rpki/django_settings/gui.py +++ b/rpki/django_settings/gui.py @@ -1,6 +1,6 @@ # $Id$ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/django_settings/irdb.py b/rpki/django_settings/irdb.py index c64c1208..2a3e9ed8 100644 --- a/rpki/django_settings/irdb.py +++ b/rpki/django_settings/irdb.py @@ -1,6 +1,6 @@ # $Id$ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/django_settings/pubd.py b/rpki/django_settings/pubd.py index 85c124eb..1686a945 100644 --- a/rpki/django_settings/pubd.py +++ b/rpki/django_settings/pubd.py @@ -1,6 +1,6 @@ # $Id$ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/django_settings/rcynic.py b/rpki/django_settings/rcynic.py index cba1e022..f2264378 100644 --- a/rpki/django_settings/rcynic.py +++ b/rpki/django_settings/rcynic.py @@ -1,6 +1,6 @@ # $Id$ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/django_settings/rpkid.py b/rpki/django_settings/rpkid.py index 1b66dcc0..38209069 100644 --- a/rpki/django_settings/rpkid.py +++ b/rpki/django_settings/rpkid.py @@ -1,6 +1,6 @@ # $Id$ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/exceptions.py b/rpki/exceptions.py index d66ad00c..78ad30f4 100644 --- a/rpki/exceptions.py +++ b/rpki/exceptions.py @@ -1,8 +1,8 @@ # $Id$ # # Copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/fields.py b/rpki/fields.py index 30cf57c7..0b76d7fa 100644 --- a/rpki/fields.py +++ b/rpki/fields.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2011--2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2011-2012 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/http_simple.py b/rpki/http_simple.py index 4211267c..9e41c48e 100644 --- a/rpki/http_simple.py +++ b/rpki/http_simple.py @@ -1,6 +1,6 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/ipaddrs.py b/rpki/ipaddrs.py index 5117585c..fefb3acb 100644 --- a/rpki/ipaddrs.py +++ b/rpki/ipaddrs.py @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/irdb/models.py b/rpki/irdb/models.py index d28665f5..d2b630c2 100644 --- a/rpki/irdb/models.py +++ b/rpki/irdb/models.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2011--2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2011-2012 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py index d0c36a17..fc35b753 100644 --- a/rpki/irdb/zookeeper.py +++ b/rpki/irdb/zookeeper.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/irdbd.py b/rpki/irdbd.py index 2bd726f1..811c05c7 100644 --- a/rpki/irdbd.py +++ b/rpki/irdbd.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/left_right.py b/rpki/left_right.py index 7d2c7da2..eb1bc0be 100644 --- a/rpki/left_right.py +++ b/rpki/left_right.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/log.py b/rpki/log.py index 9fe995d1..8d8f593d 100644 --- a/rpki/log.py +++ b/rpki/log.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/mysql_import.py b/rpki/mysql_import.py index bbb7ac22..b0929a34 100644 --- a/rpki/mysql_import.py +++ b/rpki/mysql_import.py @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/oids.py b/rpki/oids.py index b27be6f3..2ac2d1bb 100644 --- a/rpki/oids.py +++ b/rpki/oids.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/old_irdbd.py b/rpki/old_irdbd.py index e296bfdd..d74e252f 100644 --- a/rpki/old_irdbd.py +++ b/rpki/old_irdbd.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/pubd.py b/rpki/pubd.py index 53b452fa..56a840d4 100644 --- a/rpki/pubd.py +++ b/rpki/pubd.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/pubdb/models.py b/rpki/pubdb/models.py index 583dd912..20c6e0d8 100644 --- a/rpki/pubdb/models.py +++ b/rpki/pubdb/models.py @@ -1,6 +1,6 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") # # Permission to use, copy, modify, and distribute this software for any diff --git a/rpki/publication.py b/rpki/publication.py index 4d95ff9b..b947ea9e 100644 --- a/rpki/publication.py +++ b/rpki/publication.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/publication_control.py b/rpki/publication_control.py index 8340bdee..afdea730 100644 --- a/rpki/publication_control.py +++ b/rpki/publication_control.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rcynicdb/iterator.py b/rpki/rcynicdb/iterator.py index a0131dc8..6152b925 100644 --- a/rpki/rcynicdb/iterator.py +++ b/rpki/rcynicdb/iterator.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rcynicdb/models.py b/rpki/rcynicdb/models.py index 23caceff..d8207251 100644 --- a/rpki/rcynicdb/models.py +++ b/rpki/rcynicdb/models.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/relaxng.py b/rpki/relaxng.py index 9a01306c..b8b8134a 100644 --- a/rpki/relaxng.py +++ b/rpki/relaxng.py @@ -12,22 +12,23 @@ left_right = RelaxNGParser(r'''<?xml version="1.0" encoding="UTF-8"?> RelaxNG schema for RPKI left-right protocol. - Copyright (C) 2012- -2014 Dragon Research Labs ("DRL") - Portions copyright (C) 2009- -2011 Internet Systems Consortium ("ISC") - Portions copyright (C) 2007- -2008 American Registry for Internet Numbers ("ARIN") + Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") + Portions copyright (C) 2012-2014 Dragon Research Labs ("DRL") + Portions copyright (C) 2009-2011 Internet Systems Consortium ("ISC") + Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notices and this permission notice appear in all copies. - THE SOFTWARE IS PROVIDED "AS IS" AND DRL, ISC, AND ARIN DISCLAIM ALL - WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DRL, - ISC, OR ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + THE SOFTWARE IS PROVIDED "AS IS" AND PARSONS, DRL, ISC, AND ARIN + DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT + SHALL PARSONS, DRL, ISC, OR ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> <grammar ns="http://www.hactrn.net/uris/rpki/left-right-spec/" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <define name="version"> @@ -1688,13 +1689,13 @@ oob_setup = RelaxNGParser(r'''<?xml version="1.0" encoding="UTF-8"?> ## Parsed RelaxNG publication_control schema publication_control = RelaxNGParser(r'''<?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: publication-control.rnc 5903 2014-07-18 17:08:13Z sra $ + $Id$ RelaxNG schema for RPKI publication protocol. - Copyright (C) 2012- -2014 Dragon Research Labs ("DRL") - Portions copyright (C) 2009- -2011 Internet Systems Consortium ("ISC") - Portions copyright (C) 2007- -2008 American Registry for Internet Numbers ("ARIN") + Copyright (C) 2012-2014 Dragon Research Labs ("DRL") + Portions copyright (C) 2009-2011 Internet Systems Consortium ("ISC") + Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/resource_set.py b/rpki/resource_set.py index 0a3c2e49..21624b98 100644 --- a/rpki/resource_set.py +++ b/rpki/resource_set.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rootd.py b/rpki/rootd.py index 49667205..56c5984a 100644 --- a/rpki/rootd.py +++ b/rpki/rootd.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rpkic.py b/rpki/rpkic.py index dfc9e061..6b9fd786 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rpkid.py b/rpki/rpkid.py index e09cfb78..cc595af1 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index d80e9013..7137c973 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2012--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2012-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py index b734db7a..d5264dad 100644 --- a/rpki/rpkidb/models.py +++ b/rpki/rpkidb/models.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rtr/bgpdump.py b/rpki/rtr/bgpdump.py index 99b1222b..190fdb60 100755 --- a/rpki/rtr/bgpdump.py +++ b/rpki/rtr/bgpdump.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rtr/channels.py b/rpki/rtr/channels.py index 15d2545f..3146d2ff 100644 --- a/rpki/rtr/channels.py +++ b/rpki/rtr/channels.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rtr/generator.py b/rpki/rtr/generator.py index e3f65cdb..f486a96d 100644 --- a/rpki/rtr/generator.py +++ b/rpki/rtr/generator.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rtr/main.py b/rpki/rtr/main.py index 97640207..86685241 100644 --- a/rpki/rtr/main.py +++ b/rpki/rtr/main.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rtr/pdus.py b/rpki/rtr/pdus.py index 96fe7d9e..1776bc61 100644 --- a/rpki/rtr/pdus.py +++ b/rpki/rtr/pdus.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/rtr/server.py b/rpki/rtr/server.py index c47b01c1..7f7416a6 100644 --- a/rpki/rtr/server.py +++ b/rpki/rtr/server.py @@ -1,8 +1,8 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/sundial.py b/rpki/sundial.py index b788940d..bbb44934 100644 --- a/rpki/sundial.py +++ b/rpki/sundial.py @@ -1,6 +1,6 @@ # $Id$ # -# Copyright (C) 2009--2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2009-2012 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/up_down.py b/rpki/up_down.py index 67b3106b..c617c0d0 100644 --- a/rpki/up_down.py +++ b/rpki/up_down.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") -# Portions copyright (C) 2013--2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") +# Portions copyright (C) 2013-2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/rpki/x509.py b/rpki/x509.py index 1c1d9551..323c94a1 100644 --- a/rpki/x509.py +++ b/rpki/x509.py @@ -1,9 +1,9 @@ # $Id$ # -# Copyright (C) 2015--2016 Parsons Government Services ("PARSONS") +# Copyright (C) 2015-2016 Parsons Government Services ("PARSONS") # Portions copyright (C) 2014 Dragon Research Labs ("DRL") -# Portions copyright (C) 2009--2013 Internet Systems Consortium ("ISC") -# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +# Portions copyright (C) 2009-2013 Internet Systems Consortium ("ISC") +# Portions copyright (C) 2007-2008 American Registry for Internet Numbers ("ARIN") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above |