summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-04-08 17:41:19 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-04-08 17:41:19 -0400
commit0b68f18e4416d04926ed1c6d9e55ddc6f59a8522 (patch)
treebe1c25abe8301a827666f45264aefba1d61a2e30
parent41bfc4bb5e1042ec9eca48ed645393b12978d703 (diff)
licensing
-rw-r--r--.gitignore1
-rw-r--r--COPYING20
-rw-r--r--Makefile15
-rw-r--r--src/freenect-server.c2
-rw-r--r--src/multipart-replace-http-server.c20
-rw-r--r--src/multipart-replace.c18
-rw-r--r--src/multipart-replace.h18
-rw-r--r--src/util.c18
-rw-r--r--src/util.h18
-rw-r--r--src/wg.c21
-rw-r--r--src/wg.h19
-rw-r--r--systemd/freenect-server-http.service.in15
-rw-r--r--systemd/freenect-server-http.socket.in15
-rw-r--r--systemd/freenect-server.service.in15
-rw-r--r--systemd/freenect-server@.socket.in15
15 files changed, 219 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index cc6f0bb..3335bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.var.*
.tmp.*
+/COPYING.GPL3
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..edeece9
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,20 @@
+This package is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+The reason you don't have the usual "(at your option) any later
+version." option is that the file `src/freenect-server.c` contains
+code from the freenect project, which is dual-licensed under the GPL
+2.0, and the Apache License 2.0. We can provide it under the GPL 3.0
+because the Apache License 2.0 is compatible with it. We can't know
+if this is true of later versions of the GPL until they are written.
+All other files are licensed under the GPL 3.0 with the option of
+using later versions. It is likely that you can use this under later
+versions of the GPL.
+
+freenect, as of the time I took code from it did NOT include a CONTRIB
+file.
+
+Unless you are getting the distribution from git, the full text of the
+GNU General public license should be included in the file
+`COPYING.GPL3`.
diff --git a/Makefile b/Makefile
index bfa2b30..5b2f684 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,17 @@
-# Copyright 2016 Luke Shumaker
+# Copyright (C) 2016 Luke Shumaker
+#
+# 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 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/>.
# The source is C99 written for GNU
CFLAGS += -std=c99
diff --git a/src/freenect-server.c b/src/freenect-server.c
index c5ed99a..7a4cebb 100644
--- a/src/freenect-server.c
+++ b/src/freenect-server.c
@@ -1,6 +1,4 @@
/*
- * This file is part of the OpenKinect Project. http://www.openkinect.org
- *
* Copyright (c) 2010 Brandyn White (bwhite@dappervision.com)
* Copyright (c) 2016 Luke Shumaker (lukeshu@sbcglobal.net)
*
diff --git a/src/multipart-replace-http-server.c b/src/multipart-replace-http-server.c
index 726714f..0541ff9 100644
--- a/src/multipart-replace-http-server.c
+++ b/src/multipart-replace-http-server.c
@@ -1,5 +1,21 @@
-/* Copyright 2016 Luke Shumaker */
-
+/* multipart-replace-http-server - A server to multiplex
+ * mixed/x-multipart-replace streams over HTTP
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
#include <errno.h>
#include <error.h>
#include <fcntl.h> /* for open */
diff --git a/src/multipart-replace.c b/src/multipart-replace.c
index 9a5e268..b1fe662 100644
--- a/src/multipart-replace.c
+++ b/src/multipart-replace.c
@@ -1,4 +1,20 @@
-/* Copyright 2016 Luke Shumaker */
+/* multipart-replace.c - handle mixed/x-multipart-replace streams
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
#include <errno.h>
#include <error.h>
diff --git a/src/multipart-replace.h b/src/multipart-replace.h
index 2aa5e61..502cecc 100644
--- a/src/multipart-replace.h
+++ b/src/multipart-replace.h
@@ -1,4 +1,20 @@
-/* Copyright 2016 Luke Shumaker */
+/* multipart-replace.h - handle mixed/x-multipart-replace streams
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
#pragma once
diff --git a/src/util.c b/src/util.c
index 772dbf8..46e6842 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,4 +1,20 @@
-/* Copyright 2016 Luke Shumaker */
+/* util.c - miscellaneous utility functions
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
#include <ctype.h> /* for isdigit */
#include <stdlib.h>
diff --git a/src/util.h b/src/util.h
index 0432a57..96b3293 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,4 +1,20 @@
-/* Copyright 2016 Luke Shumaker */
+/* util.h - miscellaneous utility functions
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
#pragma once
diff --git a/src/wg.c b/src/wg.c
index 4f60765..c326f53 100644
--- a/src/wg.c
+++ b/src/wg.c
@@ -1,3 +1,22 @@
+/* wg.c - Thread management tools modeled on
+ * https://golang.org/pkg/sync/#WaitGroup
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
+
#include <errno.h>
#include <error.h>
#include <stdlib.h> /* for EXIT_FAILURE */
@@ -5,8 +24,6 @@
#include "wg.h"
-/* Thread management tools modeled on https://golang.org/pkg/sync/#WaitGroup */
-
/* pthread_cond_t is overly complicated. Just use a self-pipe. */
void wg_init(struct wg *wg) {
diff --git a/src/wg.h b/src/wg.h
index 777e8a3..c7efcb2 100644
--- a/src/wg.h
+++ b/src/wg.h
@@ -1,3 +1,22 @@
+/* wg.h - Thread management tools modeled on
+ * https://golang.org/pkg/sync/#WaitGroup
+ *
+ * Copyright (C) 2016 Luke Shumaker
+ *
+ * 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 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/>.
+ */
+
#pragma once
#include <pthread.h>
diff --git a/systemd/freenect-server-http.service.in b/systemd/freenect-server-http.service.in
index 219e4f3..8bb5b44 100644
--- a/systemd/freenect-server-http.service.in
+++ b/systemd/freenect-server-http.service.in
@@ -1,3 +1,18 @@
+# Copyright (C) 2016 Luke Shumaker
+#
+# 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 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/>.
+
[Unit]
Description=Kinect HTTP media streamer
After=network.target
diff --git a/systemd/freenect-server-http.socket.in b/systemd/freenect-server-http.socket.in
index 938a0e8..c4bbb3c 100644
--- a/systemd/freenect-server-http.socket.in
+++ b/systemd/freenect-server-http.socket.in
@@ -1,3 +1,18 @@
+# Copyright (C) 2016 Luke Shumaker
+#
+# 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 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/>.
+
[Unit]
Description=Kinect HTTP media streamer socket
diff --git a/systemd/freenect-server.service.in b/systemd/freenect-server.service.in
index 5473f7d..c6a719e 100644
--- a/systemd/freenect-server.service.in
+++ b/systemd/freenect-server.service.in
@@ -1,3 +1,18 @@
+# Copyright (C) 2016 Luke Shumaker
+#
+# 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 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/>.
+
[Unit]
Description=Kinect media streamer backend
After=network.target
diff --git a/systemd/freenect-server@.socket.in b/systemd/freenect-server@.socket.in
index bcacd0a..8be3205 100644
--- a/systemd/freenect-server@.socket.in
+++ b/systemd/freenect-server@.socket.in
@@ -1,3 +1,18 @@
+# Copyright (C) 2016 Luke Shumaker
+#
+# 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 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/>.
+
[Unit]
Description=Kinect media streamer backend %I stream
After=network.target