Update copyright for files with 'and Others' copyright.

These files were previously modified and had their copyright updated to 2010 xorp-inc & others. They have been modified again since last release, so update the copyright. Signed-off-by: Ben Greear <greearb@candelatech.com>
schintan · Mar 16, 2011 · d13fe6e · d13fe6e
1 parent ff91995
commit d13fe6e
Show file tree

Hide file tree

Showing 401 changed files with 408 additions and 400 deletions.
diff --git a/xorp/LICENSE.other b/xorp/LICENSE.other
@@ -537,7 +537,7 @@ docs/snmp/talks/PPRfyma.sty :
 ========================================================================
 docs/user_manual/ :
 
-Copyright (c) 2004-2010 XORP, Inc and Others
+Copyright (c) 2004-2011 XORP, Inc and Others
 Copyright (c) 2004-2005 University College London
 
 Permission is hereby granted, free of charge, to any person obtaining a

diff --git a/xorp/SConscript b/xorp/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/SConstruct b/xorp/SConstruct
@@ -1,4 +1,4 @@
-#Copyright (c) 2009-2010 XORP, Inc and Others
+#Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/bgp.cc b/xorp/bgp/bgp.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/bgp.hh b/xorp/bgp/bgp.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/crash_dump.hh b/xorp/bgp/crash_dump.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2006-2010 XORP, Inc and Others
+// Copyright (c) 2006-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/damping.hh b/xorp/bgp/damping.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/harness/SConscript b/xorp/bgp/harness/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/next_hop_resolver.cc b/xorp/bgp/next_hop_resolver.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/path_attribute.hh b/xorp/bgp/path_attribute.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/peer.cc b/xorp/bgp/peer.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/peer_handler.cc b/xorp/bgp/peer_handler.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/peer_handler.hh b/xorp/bgp/peer_handler.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/plumbing.cc b/xorp/bgp/plumbing.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/plumbing.hh b/xorp/bgp/plumbing.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/process_watch.cc b/xorp/bgp/process_watch.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/profile_vars.hh b/xorp/bgp/profile_vars.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/rib_ipc_handler.cc b/xorp/bgp/rib_ipc_handler.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/rib_ipc_handler.hh b/xorp/bgp/rib_ipc_handler.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/route_table_nhlookup.cc b/xorp/bgp/route_table_nhlookup.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/route_table_ribout.cc b/xorp/bgp/route_table_ribout.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/socket.cc b/xorp/bgp/socket.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/tools/print_routes.cc b/xorp/bgp/tools/print_routes.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/tools/xorpsh_print_routes.cc b/xorp/bgp/tools/xorpsh_print_routes.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/xrl_target.cc b/xorp/bgp/xrl_target.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/bgp/xrl_target.hh b/xorp/bgp/xrl_target.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/cli/SConscript b/xorp/cli/SConscript
@@ -1,4 +1,4 @@
-	# Copyright (c) 2009-2010 XORP, Inc and Others
+	# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/cli/cli_command.cc b/xorp/cli/cli_command.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/cli/xrl_cli_node.hh b/xorp/cli/xrl_cli_node.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/SConscript b/xorp/contrib/olsr/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/neighbor.cc b/xorp/contrib/olsr/neighbor.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/neighbor.hh b/xorp/contrib/olsr/neighbor.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/neighborhood.cc b/xorp/contrib/olsr/neighborhood.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/neighborhood.hh b/xorp/contrib/olsr/neighborhood.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/route_manager.cc b/xorp/contrib/olsr/route_manager.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/tools/SConscript b/xorp/contrib/olsr/tools/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/twohop.cc b/xorp/contrib/olsr/twohop.cc
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/twohop.hh b/xorp/contrib/olsr/twohop.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/contrib/olsr/xrl_target.hh b/xorp/contrib/olsr/xrl_target.hh
@@ -1,7 +1,7 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 // vim:set sts=4 ts=8 sw=4:
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/devnotes/update_changed_copyright.bash b/xorp/devnotes/update_changed_copyright.bash
@@ -10,7 +10,8 @@ for i in `git diff --name-only $START $END`
 do
   if [ -f $i ]
       then
-      ./xorp/devnotes/update_copyright.sh 2009 2011 $i
+      # ./xorp/devnotes/update_copyright.sh 2009 2011 $i
+      ./xorp/devnotes/update_copyright.sh 2010 2011 $i
   fi
 done
 
diff --git a/xorp/devnotes/update_copyright.sh b/xorp/devnotes/update_copyright.sh
@@ -17,7 +17,14 @@
 #
 # COPYRIGHT_HOLDER: The name of the copyright holder
 #
+
+# For files not changed since 2009:
 OLD_COPYRIGHT_HOLDER="XORP, Inc."
+
+# For files already updated to new 'and Others'
+# copyright notice.
+#OLD_COPYRIGHT_HOLDER="XORP, Inc and Others"
+
 COPYRIGHT_HOLDER="XORP, Inc and Others"
 
 #

diff --git a/xorp/etc/templates/SConscript b/xorp/etc/templates/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/SConscript b/xorp/fea/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/data_plane/SConscript b/xorp/fea/data_plane/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/data_plane/control_socket/SConscript b/xorp/fea/data_plane/control_socket/SConscript
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010 XORP, Inc and Others
+# Copyright (c) 2009-2011 XORP, Inc and Others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/data_plane/control_socket/click_socket.cc b/xorp/fea/data_plane/control_socket/click_socket.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/data_plane/control_socket/click_socket.hh b/xorp/fea/data_plane/control_socket/click_socket.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/data_plane/control_socket/netlink_socket.cc b/xorp/fea/data_plane/control_socket/netlink_socket.cc
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June

diff --git a/xorp/fea/data_plane/control_socket/netlink_socket.hh b/xorp/fea/data_plane/control_socket/netlink_socket.hh
@@ -1,6 +1,6 @@
 // -*- c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t -*-
 
-// Copyright (c) 2001-2010 XORP, Inc and Others
+// Copyright (c) 2001-2011 XORP, Inc and Others
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, Version 2, June