From 49f52b1571216a4bae3a4df9944c978e3a1fb854 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 28 Oct 2018 12:33:36 +0100 Subject: [PATCH] Relicense the code under OpenBSD style ISC license Signed-off-by: David Oberhollenzer --- LICENSE | 13 +++++++++++++ Makefile.am | 2 +- klogd.c | 21 +-------------------- logfile.c | 18 +----------------- mksock.c | 18 +----------------- proto.c | 18 +----------------- protomap.c | 18 +----------------- syslogd.c | 21 +-------------------- syslogd.h | 18 +----------------- 9 files changed, 21 insertions(+), 126 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..77dfedb --- /dev/null +++ b/LICENSE @@ -0,0 +1,13 @@ +Copyright (c) 2018 David Oberhollenzer + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/Makefile.am b/Makefile.am index 99a455e..ccfe661 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,4 +8,4 @@ klogd_SOURCES = klogd.c bin_PROGRAMS = sbin_PROGRAMS = usyslogd klogd -# EXTRA_DIST = README LICENSE +EXTRA_DIST = LICENSE diff --git a/klogd.c b/klogd.c index 39f7454..8db1d50 100644 --- a/klogd.c +++ b/klogd.c @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #include #include #include @@ -58,12 +42,9 @@ static const char *helptext = " -h, --help Print this help text and exit\n" " -V, --version Print version information and exit\n\n"; -#define GPL_URL "https://gnu.org/licenses/gpl.html" - static const char *version_string = "klogd (usyslog) " PACKAGE_VERSION "\n" "Copyright (C) 2018 David Oberhollenzer\n\n" -"License GPLv3+: GNU GPL version 3 or later <" GPL_URL ">.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n"; diff --git a/logfile.c b/logfile.c index ca8c983..d43e5c8 100644 --- a/logfile.c +++ b/logfile.c @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #include #include #include diff --git a/mksock.c b/mksock.c index f274608..18a6d67 100644 --- a/mksock.c +++ b/mksock.c @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #include #include #include diff --git a/proto.c b/proto.c index 4ab2f47..acbc251 100644 --- a/proto.c +++ b/proto.c @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #include #include #include diff --git a/protomap.c b/protomap.c index 34dac7f..1ace2bb 100644 --- a/protomap.c +++ b/protomap.c @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #include "syslogd.h" typedef struct { diff --git a/syslogd.c b/syslogd.c index 98c7aba..4db7060 100644 --- a/syslogd.c +++ b/syslogd.c @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #include #include #include @@ -114,12 +98,9 @@ static int handle_data(int fd) return logmgr->write(logmgr, &msg); } -#define GPL_URL "https://gnu.org/licenses/gpl.html" - static const char *version_string = "usyslogd (usyslog) " PACKAGE_VERSION "\n" "Copyright (C) 2018 David Oberhollenzer\n\n" -"License GPLv3+: GNU GPL version 3 or later <" GPL_URL ">.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n"; diff --git a/syslogd.h b/syslogd.h index 5ba3fd2..740d90e 100644 --- a/syslogd.h +++ b/syslogd.h @@ -1,20 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * Copyright (C) 2018 - David Oberhollenzer - * - * 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 . - */ +/* SPDX-License-Identifier: ISC */ #ifndef SYSLOGD_H #define SYSLOGD_H