diff options
66 files changed, 565 insertions, 5 deletions
@@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/config.h.in b/config.h.in index 0a93079..d0f028b 100644 --- a/config.h.in +++ b/config.h.in @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Autogenerated */ #pragma once diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..a6f1d8c --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +minecproxy for Debian +-------------------- + +<possible notes regarding this package - if none, delete this file> + + -- David Härdeman <david@hardeman.nu> Sun, 05 Jul 2020 19:10:44 +0200 diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e0a9fb2 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,10 @@ +minecproxy for Debian +-------------------- + +<this file describes information about the source package, see Debian policy +manual section 4.14. You WILL either need to modify or delete this file> + + + + -- David Härdeman <david@hardeman.nu> Sun, 05 Jul 2020 19:10:44 +0200 + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4e40878 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +minecproxy (1-1) unstable; urgency=medium + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + + -- David Härdeman <david@hardeman.nu> Sun, 05 Jul 2020 19:10:44 +0200 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..6eb6e4d --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: minecproxy +Section: net +Priority: optional +Maintainer: David Härdeman <david@hardeman.nu> +Build-Depends: debhelper-compat (= 12), + libcap-ng-dev, + libedit-dev, + libsystemd-dev, + liburing-dev, + meson, + pkg-config +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Homepage: <insert the upstream URL, if relevant> +#Vcs-Browser: https://salsa.debian.org/debian/minecproxy +#Vcs-Git: https://salsa.debian.org/debian/minecproxy.git + +Package: minecproxy +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Minecraft server proxy and announce daemon + minecproxy is a simple daemon which can announce Minecraft servers on the + local network and also monitor the status of servers in order to automatically + start/stop them as necessary. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7b2c652 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,28 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: minecproxy +Upstream-Contact: <preferred name and address to reach the upstream project> +Source: <url://example.com> + +Files: * +Copyright: © 2020 David Härdeman <david@hardeman.nu> +License: GPL-2.0 + +Files: shared/list.h +Copyright: © 2007-2020 Linus Torvalds <torvalds@osdl.org> et al +License: GPL-2.0 + +License: GPL-2.0 + This package 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 2 dated June, 1991. + . + This package 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/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..74af31b --- /dev/null +++ b/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +%: + dh $@ + + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/make-deb.sh b/make-deb.sh new file mode 100755 index 0000000..2b460dc --- /dev/null +++ b/make-deb.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash + +set -x +set -e + + +base="$(realpath -e "$(dirname "$0")")" +deb_dir="${1:-$(realpath "${base}/../deb")}" + +rm -rf "${deb_dir}" +mkdir "${deb_dir}" + +version="1" +target="minecproxy-${version}" +otarget="$(echo "${target}" | tr '-' '_')" +build_dir="${deb_dir}/${target}" + +cp -arf "${base}" "${build_dir}" +cd "${build_dir}" +git clean -dxf + +cd .. +tar cvzf "${otarget}.orig.tar.gz" "${target}" + +cd - +debuild -us -uc + +exit 0 + + + +base=${1:-/tmp/release} +codename=$(lsb_release -sc) +releasedir=$base/$(lsb_release -si)/liburing +rm -rf $releasedir +mkdir -p $releasedir + +src_dir=$(readlink -e `basename $0`) +liburing_dir=$(dirname $src_dir) +basename=$(basename $liburing_dir) +dirname=$(dirname $liburing_dir) +version=$(git describe --match "lib*" | cut -d '-' -f 2) +outfile="liburing-$version" +orgfile=$(echo $outfile | tr '-' '_') + +# Prepare source code +cp -arf ${dirname}/${basename} ${releasedir}/${outfile} +cd ${releasedir}/${outfile} +git clean -dxf + +# Change changelog if it's needed +cur_ver=`head -l debian/changelog | sed -n -e 's/.* (\(.*\)) .*/\1/p'` +if [ "$cur_ver" != "$version-1" ]; then + dch -D $codename --force-distribution -b -v "$version-1" "new version" +fi + +# Create tar archieve +cd ../ +tar cvzf ${outfile}.tar.gz ${outfile} +ln -s ${outfile}.tar.gz ${orgfile}.orig.tar.gz + +# Build debian package +cd - +debuild diff --git a/meson.build b/meson.build index 902b5a9..7c7a09c 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 project('minecproxy', 'c', version: '0.1.0', - license: 'GPL2+', + license: 'GPL2', default_options : [ 'c_std=gnu18', 'sysconfdir=/etc', diff --git a/minecctl/mc-commands.c b/minecctl/mc-commands.c index 49fea30..133bfc0 100644 --- a/minecctl/mc-commands.c +++ b/minecctl/mc-commands.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <unistd.h> #include "shared/utils.h" diff --git a/minecctl/mc-commands.h b/minecctl/mc-commands.h index 3140a73..c6e2e6f 100644 --- a/minecctl/mc-commands.h +++ b/minecctl/mc-commands.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foomccommandshfoo #define foomccomanndshfoo diff --git a/minecctl/meson.build b/minecctl/meson.build index 7a41203..a4a1620 100644 --- a/minecctl/meson.build +++ b/minecctl/meson.build @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 minecctl_sources = [ 'minecctl.c', 'server.c', @@ -7,7 +8,7 @@ minecctl_sources = [ 'misc.c', ] -dep_readline = dependency('readline') +dep_readline = dependency('libedit') minecctl_deps = [ dep_libshared, @@ -19,5 +20,6 @@ executable( minecctl_sources, link_args: [ '-lanl' ], dependencies: minecctl_deps, + install: true, ) diff --git a/minecctl/minecctl-commands.h b/minecctl/minecctl-commands.h index b1729f0..b946271 100644 --- a/minecctl/minecctl-commands.h +++ b/minecctl/minecctl-commands.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foominecctlcommandshfoo #define foominecctlcommandshfoo diff --git a/minecctl/minecctl.c b/minecctl/minecctl.c index dd4e9e8..a12d3ce 100644 --- a/minecctl/minecctl.c +++ b/minecctl/minecctl.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <stdlib.h> #include <stdint.h> diff --git a/minecctl/minecctl.h b/minecctl/minecctl.h index 5025cc4..14243c6 100644 --- a/minecctl/minecctl.h +++ b/minecctl/minecctl.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foominecctlhfoo #define foominecctlhfoo diff --git a/minecctl/misc-commands.c b/minecctl/misc-commands.c index a880e15..f89afb6 100644 --- a/minecctl/misc-commands.c +++ b/minecctl/misc-commands.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include "shared/utils.h" #include "minecctl.h" #include "server.h" diff --git a/minecctl/misc-commands.h b/minecctl/misc-commands.h index eb03fd9..8ea4127 100644 --- a/minecctl/misc-commands.h +++ b/minecctl/misc-commands.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foomisccommandshfoo #define foomisccommandshfoo diff --git a/minecctl/misc.c b/minecctl/misc.c index 143b0cc..525b09a 100644 --- a/minecctl/misc.c +++ b/minecctl/misc.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/minecctl/misc.h b/minecctl/misc.h index c91271d..3182ef8 100644 --- a/minecctl/misc.h +++ b/minecctl/misc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foomischfoo #define foomischfoo diff --git a/minecctl/rcon-commands.c b/minecctl/rcon-commands.c index 5e4ea08..f18f082 100644 --- a/minecctl/rcon-commands.c +++ b/minecctl/rcon-commands.c @@ -1,9 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <unistd.h> #include <errno.h> #include <ctype.h> -#include <readline/readline.h> -#include <readline/history.h> +#include <editline/readline.h> #include <alloca.h> #include <inttypes.h> #include <string.h> diff --git a/minecctl/rcon-commands.h b/minecctl/rcon-commands.h index c77e6fe..b2720b4 100644 --- a/minecctl/rcon-commands.h +++ b/minecctl/rcon-commands.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foorconcommandshfoo #define foorconcommandshfoo diff --git a/minecctl/server.c b/minecctl/server.c index e7d9e7b..fb59d35 100644 --- a/minecctl/server.c +++ b/minecctl/server.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/minecctl/server.h b/minecctl/server.h index 2bfb3e8..ace1943 100644 --- a/minecctl/server.h +++ b/minecctl/server.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooserverhfoo #define fooserverhfoo diff --git a/minecproxy/announce.c b/minecproxy/announce.c index 78a7ccd..4193a75 100644 --- a/minecproxy/announce.c +++ b/minecproxy/announce.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <inttypes.h> #include <sys/socket.h> #include <netinet/ip.h> diff --git a/minecproxy/announce.h b/minecproxy/announce.h index 77a36f2..78d1a9e 100644 --- a/minecproxy/announce.h +++ b/minecproxy/announce.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooannouncehfoo #define fooannouncehfoo diff --git a/minecproxy/idle.c b/minecproxy/idle.c index e237533..b4f804f 100644 --- a/minecproxy/idle.c +++ b/minecproxy/idle.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <inttypes.h> #include <sys/socket.h> #include <netinet/ip.h> diff --git a/minecproxy/idle.h b/minecproxy/idle.h index d7e4ab0..2ab39b0 100644 --- a/minecproxy/idle.h +++ b/minecproxy/idle.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooidlehfoo #define fooidlehfoo diff --git a/minecproxy/igmp.c b/minecproxy/igmp.c index ae9ed10..591ac4f 100644 --- a/minecproxy/igmp.c +++ b/minecproxy/igmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <unistd.h> #include <string.h> #include <stdint.h> diff --git a/minecproxy/igmp.h b/minecproxy/igmp.h index 80875b0..46247ce 100644 --- a/minecproxy/igmp.h +++ b/minecproxy/igmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooigmphfoo #define fooigmphfoo diff --git a/minecproxy/main.c b/minecproxy/main.c index 3a06a8c..238b612 100644 --- a/minecproxy/main.c +++ b/minecproxy/main.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/minecproxy/main.h b/minecproxy/main.h index b49cd72..12b16df 100644 --- a/minecproxy/main.h +++ b/minecproxy/main.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foomainhfoo #define foomainhfoo diff --git a/minecproxy/meson.build b/minecproxy/meson.build index 7023f10..959b975 100644 --- a/minecproxy/meson.build +++ b/minecproxy/meson.build @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 minecproxy_sources = [ 'main.c', 'uring.c', @@ -31,5 +32,7 @@ executable( minecproxy_sources, link_args: [ '-lanl' ], dependencies: minecproxy_deps, + install: true, + install_dir: get_option('sbindir'), ) diff --git a/minecproxy/misc.c b/minecproxy/misc.c index 0f0da00..5687a3b 100644 --- a/minecproxy/misc.c +++ b/minecproxy/misc.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdlib.h> #include <errno.h> #include <stdint.h> diff --git a/minecproxy/misc.h b/minecproxy/misc.h index 559c1d7..fe3a947 100644 --- a/minecproxy/misc.h +++ b/minecproxy/misc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foomischfoo #define foomischfoo diff --git a/minecproxy/ptimer.c b/minecproxy/ptimer.c index 6ed405d..1ef7609 100644 --- a/minecproxy/ptimer.c +++ b/minecproxy/ptimer.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <inttypes.h> #include <sys/timerfd.h> #include <string.h> diff --git a/minecproxy/ptimer.h b/minecproxy/ptimer.h index 3481ba4..3d6afd4 100644 --- a/minecproxy/ptimer.h +++ b/minecproxy/ptimer.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooptimerhfoo #define fooptimerhfoo diff --git a/minecproxy/server-config.c b/minecproxy/server-config.c index d4f52b1..575661a 100644 --- a/minecproxy/server-config.c +++ b/minecproxy/server-config.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <ctype.h> #include <string.h> diff --git a/minecproxy/server-config.h b/minecproxy/server-config.h index ced3777..f8dfde8 100644 --- a/minecproxy/server-config.h +++ b/minecproxy/server-config.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooserverconfighfoo #define fooserverconfighfoo diff --git a/minecproxy/server-proxy.c b/minecproxy/server-proxy.c index 814b1a9..9d7b59e 100644 --- a/minecproxy/server-proxy.c +++ b/minecproxy/server-proxy.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <unistd.h> #include <time.h> diff --git a/minecproxy/server-proxy.h b/minecproxy/server-proxy.h index 877ae9a..be37a3c 100644 --- a/minecproxy/server-proxy.h +++ b/minecproxy/server-proxy.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooserverproxyhfoo #define fooserverproxyhfoo diff --git a/minecproxy/server-rcon.c b/minecproxy/server-rcon.c index 4c9da48..c8a91c3 100644 --- a/minecproxy/server-rcon.c +++ b/minecproxy/server-rcon.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/minecproxy/server-rcon.h b/minecproxy/server-rcon.h index 6625f25..77f7c91 100644 --- a/minecproxy/server-rcon.h +++ b/minecproxy/server-rcon.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooserverrconhfoo #define fooserverrconhfoo diff --git a/minecproxy/server.c b/minecproxy/server.c index 85019b4..d24c0ad 100644 --- a/minecproxy/server.c +++ b/minecproxy/server.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdlib.h> #include <string.h> #include <arpa/inet.h> diff --git a/minecproxy/server.h b/minecproxy/server.h index da2a336..8058d42 100644 --- a/minecproxy/server.h +++ b/minecproxy/server.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooserverhfoo #define fooserverhfoo diff --git a/minecproxy/signal-handler.c b/minecproxy/signal-handler.c index 7e297a3..56d016f 100644 --- a/minecproxy/signal-handler.c +++ b/minecproxy/signal-handler.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <sys/signalfd.h> #include <signal.h> #include <fcntl.h> diff --git a/minecproxy/signal-handler.h b/minecproxy/signal-handler.h index e0140b3..1b43e8e 100644 --- a/minecproxy/signal-handler.h +++ b/minecproxy/signal-handler.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foosignalhfoo #define foosignalhfoo diff --git a/minecproxy/systemd.c b/minecproxy/systemd.c index 3351f1c..94d5b8b 100644 --- a/minecproxy/systemd.c +++ b/minecproxy/systemd.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <string.h> #include <stdlib.h> #include <systemd/sd-bus.h> diff --git a/minecproxy/systemd.h b/minecproxy/systemd.h index fb9e3a4..f3f96e4 100644 --- a/minecproxy/systemd.h +++ b/minecproxy/systemd.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foosystemdhfoo #define foosystemdhfoo diff --git a/minecproxy/uring.c b/minecproxy/uring.c index dd0d28a..0e90914 100644 --- a/minecproxy/uring.c +++ b/minecproxy/uring.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <liburing.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/minecproxy/uring.h b/minecproxy/uring.h index c465904..d5db725 100644 --- a/minecproxy/uring.h +++ b/minecproxy/uring.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foouringhfoo #define foouringhfoo diff --git a/shared/ansi-colors.h b/shared/ansi-colors.h index 6e07e1e..8969c22 100644 --- a/shared/ansi-colors.h +++ b/shared/ansi-colors.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooansicolorshfoo #define fooansicolorshfoo diff --git a/shared/config-parser.c b/shared/config-parser.c index 6b91f3f..f249cda 100644 --- a/shared/config-parser.c +++ b/shared/config-parser.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdio.h> #include <ctype.h> #include <string.h> diff --git a/shared/config-parser.h b/shared/config-parser.h index 4e3cbca..7d0595d 100644 --- a/shared/config-parser.h +++ b/shared/config-parser.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooconfigparserhfoo #define fooconfigparserhfoo diff --git a/shared/debug.h b/shared/debug.h index 2b1eba0..18f9f0e 100644 --- a/shared/debug.h +++ b/shared/debug.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foodebughfoo #define foodebughfoo diff --git a/shared/external.h b/shared/external.h index 738e460..2031937 100644 --- a/shared/external.h +++ b/shared/external.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooexternalhfoo #define fooexternalhfoo diff --git a/shared/list.h b/shared/list.h index 25f4219..08e8d1b 100644 --- a/shared/list.h +++ b/shared/list.h @@ -4,7 +4,7 @@ * kernel (26 June 2020). * * The only modifications are the ones necessary to make it compile - * outside the kernel tree, and remove some functions which are not + * outside the kernel tree, and to remove some functions which are not * necessary (like hlist*). */ diff --git a/shared/mc-protocol.c b/shared/mc-protocol.c index 03a2dcd..c62f5bc 100644 --- a/shared/mc-protocol.c +++ b/shared/mc-protocol.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdint.h> #include <inttypes.h> #include <strings.h> diff --git a/shared/mc-protocol.h b/shared/mc-protocol.h index 8e62aeb..e233e28 100644 --- a/shared/mc-protocol.h +++ b/shared/mc-protocol.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foomcprotocolhfoo #define foomcprotocolhfoo diff --git a/shared/meson.build b/shared/meson.build index f0ef635..021fe11 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 srcs_libshared = [ 'rcon-protocol.c', 'mc-protocol.c', diff --git a/shared/rcon-protocol.c b/shared/rcon-protocol.c index 1941662..b7c9a7e 100644 --- a/shared/rcon-protocol.c +++ b/shared/rcon-protocol.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdint.h> #include <stdbool.h> #include <stddef.h> diff --git a/shared/rcon-protocol.h b/shared/rcon-protocol.h index 593a43f..d6c2a4a 100644 --- a/shared/rcon-protocol.h +++ b/shared/rcon-protocol.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef foorconprotocolhfoo #define foorconprotocolhfoo diff --git a/shared/server-config-options.h b/shared/server-config-options.h index 78f9598..dd1a485 100644 --- a/shared/server-config-options.h +++ b/shared/server-config-options.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooserverconfigoptionshfoo #define fooserverconfigoptionshfoo diff --git a/shared/utils.c b/shared/utils.c index b870716..6474e30 100644 --- a/shared/utils.c +++ b/shared/utils.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdlib.h> #include <errno.h> #include <stdint.h> diff --git a/shared/utils.h b/shared/utils.h index 36c642c..9404323 100644 --- a/shared/utils.h +++ b/shared/utils.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef fooutilshfoo #define fooutilshfoo |