aboutsummaryrefslogtreecommitdiff
path: root/rp
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-05-07 04:14:02 +0000
committerRob Austein <sra@hactrn.net>2016-05-07 04:14:02 +0000
commit383b0a0d20de4bf6674f7e852b804a9d91df3ea0 (patch)
treefc4d4cab56df2129f58581cc38b7327835876b83 /rp
parentda8998dc54696f9e0e2ee6d45b32fc3175c0ece3 (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 'rp')
-rwxr-xr-xrp/config/rpki-confgen2
-rw-r--r--rp/config/rpki-confgen.xml4
-rwxr-xr-xrp/config/rpki-generate-root-certificate2
-rwxr-xr-xrp/config/rpki-sql-backup4
-rwxr-xr-xrp/config/rpki-sql-setup4
-rwxr-xr-xrp/rcynic/rcynic-cron2
-rwxr-xr-xrp/rcynic/rcynic-dump2
-rwxr-xr-xrp/rcynic/rcynic-html4
-rw-r--r--rp/rcynic/rcynic.c6
-rwxr-xr-xrp/rcynic/rcynicng2
-rw-r--r--rp/rcynic/rpki-torrent.py2
-rwxr-xr-xrp/utils/find_roa2
-rwxr-xr-xrp/utils/hashdir2
-rwxr-xr-xrp/utils/print_roa2
-rwxr-xr-xrp/utils/print_rpki_manifest2
-rwxr-xr-xrp/utils/scan_roas2
-rwxr-xr-xrp/utils/scan_routercerts2
-rwxr-xr-xrp/utils/uri2
18 files changed, 24 insertions, 24 deletions
diff --git a/rp/config/rpki-confgen b/rp/config/rpki-confgen
index 9ab00eab..b25f9083 100755
--- a/rp/config/rpki-confgen
+++ b/rp/config/rpki-confgen
@@ -2,7 +2,7 @@
# $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) 2013 Internet Systems Consortium ("ISC")
#
diff --git a/rp/config/rpki-confgen.xml b/rp/config/rpki-confgen.xml
index 378a22f7..bc1458ea 100644
--- a/rp/config/rpki-confgen.xml
+++ b/rp/config/rpki-confgen.xml
@@ -4,9 +4,9 @@
Documented option definitions for rpki-confgen to use in generating
rpki.conf and TracWiki documentation.
- 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/rp/config/rpki-generate-root-certificate b/rp/config/rpki-generate-root-certificate
index aa0b300d..8b2c8824 100755
--- a/rp/config/rpki-generate-root-certificate
+++ b/rp/config/rpki-generate-root-certificate
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# 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/rp/config/rpki-sql-backup b/rp/config/rpki-sql-backup
index 8097f899..cf90e0d0 100755
--- a/rp/config/rpki-sql-backup
+++ b/rp/config/rpki-sql-backup
@@ -2,9 +2,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) 2010--2013 Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2010-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/rp/config/rpki-sql-setup b/rp/config/rpki-sql-setup
index 521f1e18..1a133e0b 100755
--- a/rp/config/rpki-sql-setup
+++ b/rp/config/rpki-sql-setup
@@ -2,9 +2,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) 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/rp/rcynic/rcynic-cron b/rp/rcynic/rcynic-cron
index 6f57d2df..6bc9d165 100755
--- a/rp/rcynic/rcynic-cron
+++ b/rp/rcynic/rcynic-cron
@@ -2,7 +2,7 @@
#
# $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) 2013 Internet Systems Consortium ("ISC")
#
diff --git a/rp/rcynic/rcynic-dump b/rp/rcynic/rcynic-dump
index 96436859..44e4d000 100755
--- a/rp/rcynic/rcynic-dump
+++ b/rp/rcynic/rcynic-dump
@@ -2,7 +2,7 @@
# $Id$
-# 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/rp/rcynic/rcynic-html b/rp/rcynic/rcynic-html
index 154193b2..d893fbd3 100755
--- a/rp/rcynic/rcynic-html
+++ b/rp/rcynic/rcynic-html
@@ -2,8 +2,8 @@
#
# $Id$
#
-# Copyright (C) 2013--2014 Dragon Research Labs ("DRL")
-# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC")
+# 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/rp/rcynic/rcynic.c b/rp/rcynic/rcynic.c
index 36c1950f..dcf8603c 100644
--- a/rp/rcynic/rcynic.c
+++ b/rp/rcynic/rcynic.c
@@ -1,7 +1,7 @@
/*
- * Copyright (C) 2013--2014 Dragon Research Labs ("DRL")
- * Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC")
- * Portions copyright (C) 2006--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) 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/rp/rcynic/rcynicng b/rp/rcynic/rcynicng
index b1d9d0d1..57930cb4 100755
--- a/rp/rcynic/rcynicng
+++ b/rp/rcynic/rcynicng
@@ -2,7 +2,7 @@
# $Id$
-# 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/rp/rcynic/rpki-torrent.py b/rp/rcynic/rpki-torrent.py
index f9a3d620..b310d06d 100644
--- a/rp/rcynic/rpki-torrent.py
+++ b/rp/rcynic/rpki-torrent.py
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Copyright (C) 2013--2014 Dragon Research Labs ("DRL")
+# Copyright (C) 2013-2014 Dragon Research Labs ("DRL")
# Portions copyright (C) 2012 Internet Systems Consortium ("ISC")
#
# Permission to use, copy, modify, and distribute this software for any
diff --git a/rp/utils/find_roa b/rp/utils/find_roa
index 4bf1d047..bd33d339 100755
--- a/rp/utils/find_roa
+++ b/rp/utils/find_roa
@@ -2,7 +2,7 @@
#
# $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/rp/utils/hashdir b/rp/utils/hashdir
index 329034b4..aa5cf261 100755
--- a/rp/utils/hashdir
+++ b/rp/utils/hashdir
@@ -2,7 +2,7 @@
#
# $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/rp/utils/print_roa b/rp/utils/print_roa
index dfa9d65e..453105fe 100755
--- a/rp/utils/print_roa
+++ b/rp/utils/print_roa
@@ -2,7 +2,7 @@
#
# $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/rp/utils/print_rpki_manifest b/rp/utils/print_rpki_manifest
index 4e690364..04e841b9 100755
--- a/rp/utils/print_rpki_manifest
+++ b/rp/utils/print_rpki_manifest
@@ -2,7 +2,7 @@
#
# $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/rp/utils/scan_roas b/rp/utils/scan_roas
index 07dbfe0a..957918bc 100755
--- a/rp/utils/scan_roas
+++ b/rp/utils/scan_roas
@@ -2,7 +2,7 @@
#
# $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/rp/utils/scan_routercerts b/rp/utils/scan_routercerts
index 17a20375..a21b0705 100755
--- a/rp/utils/scan_routercerts
+++ b/rp/utils/scan_routercerts
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# $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/rp/utils/uri b/rp/utils/uri
index 0a15296d..1292b396 100755
--- a/rp/utils/uri
+++ b/rp/utils/uri
@@ -2,7 +2,7 @@
#
# $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