Merge branch 'lukeshu/license'

9 files changed, 64 insertions, 54 deletions

diff --git a/COPYING.txt b/COPYING.txt
deleted file mode 100644
index d8b9862..0000000
--- a/COPYING.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-btrfs-progs-ng - Better btrfs userspace tools
-Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
-
-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.  Individual source files may be
-available (at your option) under an alternative license.
-
-Most of the source code is licensed under the terms of the GNU General
-Public License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.  A
-small minority of the source code is licensed under the terms of the
-Apache License, version 2.0.  Refer to the "SPDX-License-Identifier"
-comment in each file to see which license it is made available under.
-
- > The terms of the GNU General Public License version 2 and terms of
- > the Apache License version 2.0 are contradictory--they cannot both
- > be fulfilled at the same time; but the terms of the GNU General
- > Public License version 3 and the Apache License version 2.0 are not
- > contradictory and can be fulfilled at the same time.  Because of
- > this one must take the "or (at your option) any later version" on
- > the General Public License and treat the combined work as being
- > under the GNU General Public License version 3 or later.  This is
- > why the opening paragraph identified the program as being available
- > under this 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.
-
-Along with this program, you should have received a copy of the GNU
-General Public License (in the COPYING.gpl-2.0.txt and
-COPYING.gpl-3.0.txt files) and the Apache License (in the
-COPYING.apache-2.0.txt file).  If not, see
-<https://www.gnu.org/licenses/> and
-<http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/COPYING.apache-2.0.txt b/LICENSE.apache-2.0.txt
index d645695..d645695 100644
--- a/COPYING.apache-2.0.txt
+++ b/LICENSE.apache-2.0.txt
diff --git a/COPYING.gpl-2.0.txt b/LICENSE.gpl-2.0.txt
index d159169..d159169 100644
--- a/COPYING.gpl-2.0.txt
+++ b/LICENSE.gpl-2.0.txt
diff --git a/COPYING.gpl-3.0.txt b/LICENSE.gpl-3.0.txt
index f288702..f288702 100644
--- a/COPYING.gpl-3.0.txt
+++ b/LICENSE.gpl-3.0.txt
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..61f1929
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,56 @@
+btrfs-progs-ng - Better btrfs userspace tools
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License (GPL) 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
+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 <https://www.gnu.org/licenses/>.
+
+Individual files are available (at your option) under alternative
+licenses as specified in the following copyright statements; refer to
+the "SPDX-License-Identifier" comment in each file to see which
+license that file is made available under.  The combined work is
+effectively under the GPL-3.0-or-later because the terms of the
+GPL-2.0 and Apache-2.0 licenses are contradictory (they cannot both be
+fulfilled at the same time), but the GPL-3.0 and Apache-2.0 are not;
+forcing the "or-later" option on the GPL-2.0-or-later files.
+
+======================================================================
+
+Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
+
+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 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
+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 <https://www.gnu.org/licenses/>.
+
+======================================================================
+
+Copyright (C) 2019-2022  Ambassador Labs
+
+Licensed under the Apache License, Version 2.0 (the "License"); you
+may not use this file except in compliance with the License.  You may
+obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.  See the License for the specific language governing
+permissions and limitations under the License.
diff --git a/Makefile b/Makefile
index c413091..b3bcdd8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+# Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -18,9 +18,9 @@ lint: tools/bin/golangci-lint
 
 # generate
 
-generate/files  = COPYING.gpl-2.0.txt
-generate/files += COPYING.gpl-3.0.txt
-generate/files += COPYING.apache-2.0.txt
+generate/files  = LICENSE.gpl-2.0.txt
+generate/files += LICENSE.gpl-3.0.txt
+generate/files += LICENSE.apache-2.0.txt
 
 generate: generate-clean
 	$(MAKE) -C lib/btrfs
@@ -32,11 +32,11 @@ generate-clean:
 	rm -f $(generate/files)
 .PHONY: generate-clean
 
-COPYING.gpl-2.0.txt:
+LICENSE.gpl-2.0.txt:
 	curl https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt > $@
-COPYING.gpl-3.0.txt:
+LICENSE.gpl-3.0.txt:
 	curl https://www.gnu.org/licenses/gpl-3.0.txt > $@
-COPYING.apache-2.0.txt:
+LICENSE.apache-2.0.txt:
 	curl https://apache.org/licenses/LICENSE-2.0.txt > $@
 
 # tools
diff --git a/lib/btrfs/Makefile b/lib/btrfs/Makefile
index f7f1422..cbcaf9e 100644
--- a/lib/btrfs/Makefile
+++ b/lib/btrfs/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+# Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -20,8 +20,6 @@ btrfsitem/items_gen.go: btrfsitem/items.txt $(MAKEFILE_LIST)
 	{ \
 	  echo '// Code generated by Make.  DO NOT EDIT.'; \
 	  echo; \
-	  echo '// SPDX-License-Identifier: GPL-2.0-or-later'; \
-	  echo; \
 	  echo 'package $(@D)'; \
 	  echo 'import ('; \
 	  echo   '"reflect"'; \
@@ -45,8 +43,6 @@ btrfsprim/itemtype.go: btrfsitem/items.txt $(MAKEFILE_LIST)
 	{ \
 	  echo '// Code generated by Make.  DO NOT EDIT.'; \
 	  echo; \
-	  echo '// SPDX-License-Identifier: GPL-2.0-or-later'; \
-	  echo; \
 	  echo 'package $(@D)'; \
 	  echo 'import "fmt"'; \
 	  echo 'type ItemType uint8'; \
diff --git a/lib/btrfs/btrfsitem/items_gen.go b/lib/btrfs/btrfsitem/items_gen.go
index 89bc171..0ae69d4 100644
--- a/lib/btrfs/btrfsitem/items_gen.go
+++ b/lib/btrfs/btrfsitem/items_gen.go
@@ -1,7 +1,5 @@
 // Code generated by Make.  DO NOT EDIT.
 
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 package btrfsitem
 
 import (
diff --git a/lib/btrfs/btrfsprim/itemtype.go b/lib/btrfs/btrfsprim/itemtype.go
index 89cff21..5c7d0e8 100644
--- a/lib/btrfs/btrfsprim/itemtype.go
+++ b/lib/btrfs/btrfsprim/itemtype.go
@@ -1,7 +1,5 @@
 // Code generated by Make.  DO NOT EDIT.
 
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 package btrfsprim
 
 import "fmt"