Convert from VPL 1.0 to GPLv2

Glendale release is licensed under GPL version 2.

11 files changed, 160 insertions, 128 deletions

diff --git a/debian/copyright b/debian/copyright
index 4c6e7e6..b7da607 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,21 +14,22 @@ Copyright:
 
 License:
 
- The contents of this package are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
-
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
-
- This code was originally developed by Vyatta, Inc.
- Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+A copy of the GNU General Public License is available as
+`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+You can also obtain it by writing to the Free Software Foundation,
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 The Debian packaging is (C) 2007, An-Cheng Huang <ancheng@vyatta.com> and
 is licensed under the GPL, see above.
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index 5966e18..5c683f4 100644
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -1,22 +1,21 @@
 # **** License ****
-# Version: VPL 1.0
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
 # 
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2006, 2007 Vyatta, Inc.
-# All Rights Reserved.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# A copy of the GNU General Public License is available as
+# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+# You can also obtain it by writing to the Free Software Foundation,
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 # 
 # Author: An-Cheng Huang
-# Date: 2007
 # Description: bash completion for Vyatta configuration commands
 # 
 # **** End License ****
diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 89914c4..b1e7a69 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -9,21 +9,21 @@
 # Description:       Debian init script for the Vyatta Router
 ### END INIT INFO
 # **** License ****
-# Version: VPL 1.0
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
-# All Rights Reserved.
+# A copy of the GNU General Public License is available as
+# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+# You can also obtain it by writing to the Free Software Foundation,
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 # Author:	Tom Grennan <tgrennan@vyatta.com>
 # **** End License ****
diff --git a/scripts/VyattaConfigDOMTree.pm b/scripts/VyattaConfigDOMTree.pm
index 86aabf8..68b58bb 100644
--- a/scripts/VyattaConfigDOMTree.pm
+++ b/scripts/VyattaConfigDOMTree.pm
@@ -2,17 +2,21 @@
 # Module: serial
 #
 # **** License ****
-# Version: VPL 1.0
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# A copy of the GNU General Public License is available as
+# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+# You can also obtain it by writing to the Free Software Foundation,
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 # This code was originally developed by Vyatta, Inc.
 # Portions created by Vyatta are Copyright (C) 2005, 2006, 2007 Vyatta, Inc.
diff --git a/scripts/VyattaMisc.pm b/scripts/VyattaMisc.pm
index 3a083ec..e81852f 100755
--- a/scripts/VyattaMisc.pm
+++ b/scripts/VyattaMisc.pm
@@ -2,17 +2,21 @@
 # Module: VyattaMisc.pm
 #
 # **** License ****
-# Version: VPL 1.0
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# A copy of the GNU General Public License is available as
+# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+# You can also obtain it by writing to the Free Software Foundation,
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 # This code was originally developed by Vyatta, Inc.
 # Portions created by Vyatta are Copyright (C) 2005, 2006, 2007 Vyatta, Inc.
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index 482faa8..1cad719 100644
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -3,17 +3,21 @@
 # Module: vyatta-interfaces.pl
 # 
 # **** License ****
-# Version: VPL 1.0
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
 # 
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# A copy of the GNU General Public License is available as
+# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+# You can also obtain it by writing to the Free Software Foundation,
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 # 
 # This code was originally developed by Vyatta, Inc.
 # Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
diff --git a/scripts/vyatta-irqaffin b/scripts/vyatta-irqaffin
index 8be98b2..91cf082 100644
--- a/scripts/vyatta-irqaffin
+++ b/scripts/vyatta-irqaffin
@@ -2,17 +2,21 @@
 #!/bin/bash
 #
 # **** License ****
-# Version: VPL 1.0
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
-# The contents of this file are subject to the Vyatta Public License
-# Version 1.0 ("License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.vyatta.com/vpl
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# A copy of the GNU General Public License is available as
+# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+# You can also obtain it by writing to the Free Software Foundation,
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 # This code was originally developed by Vyatta, Inc.
 # Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc.
diff --git a/src/cli_path_utils.c b/src/cli_path_utils.c
index 84a2bc0..642b5ae 100644
--- a/src/cli_path_utils.c
+++ b/src/cli_path_utils.c
@@ -4,17 +4,21 @@
  Module: cli
  
  **** License ****
- Version: VPL 1.0
- 
- The contents of this file are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ A copy of the GNU General Public License is available as
+ `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+ or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+ You can also obtain it by writing to the Free Software Foundation,
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
  
  This code was originally developed by Vyatta, Inc.
  Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
diff --git a/src/cli_path_utils.h b/src/cli_path_utils.h
index 6cc3be8..6716b22 100644
--- a/src/cli_path_utils.h
+++ b/src/cli_path_utils.h
@@ -4,17 +4,21 @@
  Module: cli
  
  **** License ****
- Version: VPL 1.0
- 
- The contents of this file are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ A copy of the GNU General Public License is available as
+ `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+ or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+ You can also obtain it by writing to the Free Software Foundation,
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
  
  This code was originally developed by Vyatta, Inc.
  Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
diff --git a/src/cli_val_engine.c b/src/cli_val_engine.c
index 50a02df..adf40a4 100644
--- a/src/cli_val_engine.c
+++ b/src/cli_val_engine.c
@@ -4,17 +4,21 @@
  Module: cli
  
  **** License ****
- Version: VPL 1.0
- 
- The contents of this file are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ A copy of the GNU General Public License is available as
+ `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+ or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+ You can also obtain it by writing to the Free Software Foundation,
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
  
  This code was originally developed by Vyatta, Inc.
  Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
diff --git a/src/cli_val_engine.h b/src/cli_val_engine.h
index 0f32276..6315dac 100644
--- a/src/cli_val_engine.h
+++ b/src/cli_val_engine.h
@@ -4,17 +4,21 @@
  Module: cli
  
  **** License ****
- Version: VPL 1.0
- 
- The contents of this file are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ A copy of the GNU General Public License is available as
+ `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+ or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+ You can also obtain it by writing to the Free Software Foundation,
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
  
  This code was originally developed by Vyatta, Inc.
  Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.