From c14c3c0173d7bebeb3ccac687e49909164845d57 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 23 Nov 2018 13:13:23 +0100 Subject: Relicense what is left of the init system under OpenBSD style ISC license Signed-off-by: David Oberhollenzer --- lib/include/libcfg.h | 18 +----------------- lib/include/service.h | 19 +------------------ lib/include/util.h | 19 +------------------ lib/init/del_svc_list.c | 18 +----------------- lib/init/delsvc.c | 18 +----------------- lib/init/rdsvc.c | 18 +----------------- lib/init/svc_tsort.c | 18 +----------------- lib/init/svcmap.c | 18 +----------------- lib/init/svcscan.c | 18 +----------------- lib/libcfg/pack_argv.c | 18 +----------------- lib/libcfg/rdcfg.c | 18 +----------------- lib/libcfg/rdline.c | 18 +----------------- lib/libcfg/unescape.c | 18 +----------------- lib/util/argv_exec.c | 18 +----------------- lib/util/enum_by_name.c | 18 +----------------- lib/util/enum_to_name.c | 18 +----------------- lib/util/fopenat.c | 18 +----------------- lib/util/print_version.c | 21 +-------------------- 18 files changed, 18 insertions(+), 311 deletions(-) (limited to 'lib') diff --git a/lib/include/libcfg.h b/lib/include/libcfg.h index 3e631d1..01a014c 100644 --- a/lib/include/libcfg.h +++ b/lib/include/libcfg.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 LIBCONFIG_H #define LIBCONFIG_H diff --git a/lib/include/service.h b/lib/include/service.h index ca96e58..594f8ca 100644 --- a/lib/include/service.h +++ b/lib/include/service.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 SERVICE_H #define SERVICE_H @@ -120,4 +104,3 @@ const char *svc_target_to_string(int target); int svc_target_from_string(const char *target); #endif /* SERVICE_H */ - diff --git a/lib/include/util.h b/lib/include/util.h index ce96ffe..90ca902 100644 --- a/lib/include/util.h +++ b/lib/include/util.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 UTIL_H #define UTIL_H @@ -81,4 +65,3 @@ NORETURN void argv_exec(exec_t *e); FILE *fopenat(int fd, const char *filename, const char *mode); #endif /* UTIL_H */ - diff --git a/lib/init/del_svc_list.c b/lib/init/del_svc_list.c index 553a701..ad624a8 100644 --- a/lib/init/del_svc_list.c +++ b/lib/init/del_svc_list.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 "service.h" diff --git a/lib/init/delsvc.c b/lib/init/delsvc.c index 9ab51f1..f453db6 100644 --- a/lib/init/delsvc.c +++ b/lib/init/delsvc.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 "service.h" diff --git a/lib/init/rdsvc.c b/lib/init/rdsvc.c index e8cb530..b86a27b 100644 --- a/lib/init/rdsvc.c +++ b/lib/init/rdsvc.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/lib/init/svc_tsort.c b/lib/init/svc_tsort.c index 5f83fa0..37f3eb8 100644 --- a/lib/init/svc_tsort.c +++ b/lib/init/svc_tsort.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/lib/init/svcmap.c b/lib/init/svcmap.c index 41fb950..fa2932d 100644 --- a/lib/init/svcmap.c +++ b/lib/init/svcmap.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 "service.h" #include "util.h" diff --git a/lib/init/svcscan.c b/lib/init/svcscan.c index f4c7ef1..840d819 100644 --- a/lib/init/svcscan.c +++ b/lib/init/svcscan.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/lib/libcfg/pack_argv.c b/lib/libcfg/pack_argv.c index 4d90171..789b0b5 100644 --- a/lib/libcfg/pack_argv.c +++ b/lib/libcfg/pack_argv.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/lib/libcfg/rdcfg.c b/lib/libcfg/rdcfg.c index ccbcf7b..d3fc947 100644 --- a/lib/libcfg/rdcfg.c +++ b/lib/libcfg/rdcfg.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 "libcfg.h" #include diff --git a/lib/libcfg/rdline.c b/lib/libcfg/rdline.c index 87d431e..ab7b101 100644 --- a/lib/libcfg/rdline.c +++ b/lib/libcfg/rdline.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/lib/libcfg/unescape.c b/lib/libcfg/unescape.c index e2b450c..ca10c9d 100644 --- a/lib/libcfg/unescape.c +++ b/lib/libcfg/unescape.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/lib/util/argv_exec.c b/lib/util/argv_exec.c index 384a64d..d39b35a 100644 --- a/lib/util/argv_exec.c +++ b/lib/util/argv_exec.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 "service.h" #include diff --git a/lib/util/enum_by_name.c b/lib/util/enum_by_name.c index 95f306f..fa0131b 100644 --- a/lib/util/enum_by_name.c +++ b/lib/util/enum_by_name.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 "util.h" diff --git a/lib/util/enum_to_name.c b/lib/util/enum_to_name.c index 43fd4dc..70e3c2f 100644 --- a/lib/util/enum_to_name.c +++ b/lib/util/enum_to_name.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 "util.h" diff --git a/lib/util/fopenat.c b/lib/util/fopenat.c index 6bb9dd8..d47c002 100644 --- a/lib/util/fopenat.c +++ b/lib/util/fopenat.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/lib/util/print_version.c b/lib/util/print_version.c index cda2742..47508b5 100644 --- a/lib/util/print_version.c +++ b/lib/util/print_version.c @@ -1,32 +1,13 @@ -/* 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 "config.h" #include "util.h" -#define GPL_URL "https://gnu.org/licenses/gpl.html" - static const char *version_string = "%s (pygos init) " 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"; -- cgit v1.2.3