Most of my desired re-licensings were authorized on the dev list

14 files changed, 138 insertions, 22 deletions

diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup
index 60a4e22..a72f951 100755
--- a/src/chroot-tools/chcleanup
+++ b/src/chroot-tools/chcleanup
@@ -2,11 +2,12 @@
 # Copyright (C) 2011-2012 Nicolás Reynolds <fauno@parabola.nu>
 # Copyright (C) 2012-2013 Luke Shumaker <lukeshu@sbcglobal.net>
 #
-# License: GNU GPLv3
+# License: GNU GPLv3+
 #
 # 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; version 3 of the License.
+# the Free Software Foundation, either version 3 of the License, 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
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index bb82bd2..d8e76ac 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -7,13 +7,13 @@ set -euE
 # Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu>
 # Copyright (C) 2012-2014 Luke Shumaker <lukeshu@sbcglobal.net>
 #
-# License: GNU GPLv3+
+# License: GNU GPLv2+
 #
 # This file is part of Parabola.
 #
 # Parabola 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #
 # Parabola is distributed in the hope that it will be useful,
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 1ed4eaf..aad4217 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -7,13 +7,13 @@ set -euE
 # Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu>
 # Copyright (C) 2012-2014 Luke Shumaker <lukeshu@sbcglobal.net>
 #
-# License: GNU GPLv3+
+# License: GNU GPLv2+
 #
 # This file is part of Parabola.
 #
 # Parabola 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #
 # Parabola is distributed in the hope that it will be useful,
diff --git a/src/fullpkg/fullpkg b/src/fullpkg/fullpkg
index 0572ddb..8e87e46 100755
--- a/src/fullpkg/fullpkg
+++ b/src/fullpkg/fullpkg
@@ -5,7 +5,20 @@
 # Copyright (C) 2011 Nicolás Reynolds <fauno@parabola.nu>
 # Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 usage() {
 	print "Usage: %s [OPTIONS] [BUILD_DIR]" "${0##*/}"
diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build
index 715f505..06d0d50 100755
--- a/src/fullpkg/fullpkg-build
+++ b/src/fullpkg/fullpkg-build
@@ -7,7 +7,20 @@
 # Copyright (C) 2011 Nicolás Reynolds <fauno@parabola.nu>
 # Copyright (C) 2013 Luke Shumaker <lukeshu@sbcglobal.net>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # TODO move __build to chroot
 
diff --git a/src/lib/libremessages b/src/lib/libremessages
index cb3d883..b89e2bc 100755
--- a/src/lib/libremessages
+++ b/src/lib/libremessages
@@ -15,11 +15,11 @@
 #   Copyright (C) 2006 Andras Voroskoi <voroskoi@frugalware.org>
 #   Copyright (C) 2006 Miklos Vajna <vmiklos@frugalware.org>
 #
-# License: GNU GPLv3+
+# License: GNU GPLv2+
 #
 # 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 3 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -30,9 +30,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# setup_traps() is based on pacman:makepkg, which is GPLv2+,
-# so we take the '+' to combine it with our GPLv3+.
-
 ################################################################################
 # Inherit most functions from devtools                                         #
 ################################################################################
diff --git a/src/mips64el-tools/add-mips64el b/src/mips64el-tools/add-mips64el
index bf04663..bb1bb69 100755
--- a/src/mips64el-tools/add-mips64el
+++ b/src/mips64el-tools/add-mips64el
@@ -3,7 +3,20 @@
 
 # Copyright (C) 2011 Nicolás Reynolds <fauno@parabola.nu>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 find -name 'PKGBUILD' -exec sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" '{}' \;
 
diff --git a/src/mips64el-tools/mips-add b/src/mips64el-tools/mips-add
index 11f6a74..ef708ec 100755
--- a/src/mips64el-tools/mips-add
+++ b/src/mips64el-tools/mips-add
@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
 # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . libremessages
 if ! grep mips64el PKGBUILD >/dev/null; then  # Add mips64el in ${arch} array if it isn't 'any'
diff --git a/src/repo-diff b/src/repo-diff
index d25983a..e36edad 100755
--- a/src/repo-diff
+++ b/src/repo-diff
@@ -3,7 +3,20 @@
 
 # Copyright (C) 2013 Nicolás Reynolds <fauno@parabola.nu>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . libremessages
 
diff --git a/src/toru/toru b/src/toru/toru
index 16ec4af..142e9e4 100755
--- a/src/toru/toru
+++ b/src/toru/toru
@@ -6,11 +6,12 @@
 # Copyright (C) 2012-2013 Michał Masłowski <mtjm@mtjm.eu>
 # Copyright (C) 2013 Luke Shumaker <lukeshu@sbcglobal.net>
 #
-# License: GNU GPLv3
+# License: GNU GPLv3+
 #
 # 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; version 3 of the License.
+# the Free Software Foundation, either version 3 of the License, 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
diff --git a/src/toru/toru-info b/src/toru/toru-info
index aa84fcf..a427050 100755
--- a/src/toru/toru-info
+++ b/src/toru/toru-info
@@ -3,7 +3,20 @@
 
 # Copyright (C) 2012 Nicolás Reynolds <fauno@parabola.nu>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . libremessages
 . $(librelib conf)
diff --git a/src/toru/toru-path b/src/toru/toru-path
index 8674d53..32ddc24 100755
--- a/src/toru/toru-path
+++ b/src/toru/toru-path
@@ -3,7 +3,20 @@
 # Copyright (C) 2011-2012 Nicolás Reynolds <fauno@parabola.nu>
 # Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 source toru-utils
 
diff --git a/src/toru/toru-utils b/src/toru/toru-utils
index 2fecfc2..164f418 100755
--- a/src/toru/toru-utils
+++ b/src/toru/toru-utils
@@ -3,7 +3,20 @@
 # Copyright (C) 2011-2012 Nicolás Reynolds <fauno@parabola.nu>
 # Copyright (C) 2012 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . libremessages
 . $(librelib conf.sh)
diff --git a/src/toru/toru-where b/src/toru/toru-where
index 9d90972..e70d135 100755
--- a/src/toru/toru-where
+++ b/src/toru/toru-where
@@ -3,7 +3,20 @@
 
 # Copyright (C) 2012 Nicolás Reynolds <fauno@parabola.nu>
 #
-# License: Unspecified
+# License: GNU GPLv3+
+#
+# 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 3 of the License, 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . $(librelib conf.sh)
 load_files libretools