From c4b9503b3e3331c09712810910d2b36f52d98ada Mon Sep 17 00:00:00 2001 From: "@syxhe" Date: Wed, 14 Jan 2026 16:17:47 -0600 Subject: Change to the Simplified BSD License --- LICENSE | 24 +++++------------------- src/Makefile | 18 ++++++++++-------- src/encryption.c | 2 +- src/main.c | 2 +- src/shared.c | 2 +- src/tests.c | 2 +- src/threadpool.c | 2 +- 7 files changed, 20 insertions(+), 32 deletions(-) diff --git a/LICENSE b/LICENSE index 774d4f4..84881be 100644 --- a/LICENSE +++ b/LICENSE @@ -1,23 +1,9 @@ -MIT No Attribution +Copyright 2026 @syxhe -Copyright 2024 @syxhe +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - -AGAIN, THE CREATOR OF THE SOFTWARE IS IN NO WAY RESPOSIBLE FOR THE ACTIONS OF THOSE WHOM USE -IT, NOR ARE THEY RESPONSIBLE FOR ANY DAMMAGE TO SYSTEMS THAT MAY ARISE FROM THE USE -OF THIS SOFTWARE. PERSONS USING THIS SOFTWARE UNDERSTAND THAT, BY RUNNING THIS SOFTWARE, -THEY ACCEPT FULL RESPONSIBILITY FOR ANY DAMAGE THEY MAY CAUSE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index 5463c86..f1e4c61 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ CC = gcc SHELL := /usr/bin/env .SHELLFLAGS := -S bash -c -CFLAGS := -std=c2x $$(pkg-config --cflags libsodium) +CFLAGS := -std=c2x $$(pkg-config --cflags libsodium) $$(sdl2-config --cflags) DEBUG_CFLAGS := -Wall -Wextra -Wpedantic -fanalyzer -Wanalyzer-too-complex -ggdb -g3 -O0 RELEASE_CFLAGS := -O3 -fipa-pta -fipa-cp -fuse-linker-plugin -flto=auto @@ -10,7 +10,7 @@ DEFS := -D_GNU_SOURCE=1 DEBUG_DEFS := -DDEBUG=1 RELEASE_DEFS := -DRELEASE=1 -LDLIBS := $$(pkg-config --libs-only-l libsodium) +LDLIBS := $$(pkg-config --libs-only-l libsodium) $$(sdl2-config --libs) LDFLAGS := $$(pkg-config --libs-only-L libsodium) RELEASE_LDFLAGS := -fuse-linker-plugin -flto=auto @@ -19,17 +19,18 @@ SOURCES := $(wildcard *.c) TIMESTAMP_DIR := .timestamps TIMESTAMPS := $(patsubst %.c,$(TIMESTAMP_DIR)/%.t,$(SOURCES)) -.PHONY: debug release c clean v val t test test +.PHONY: deps debug release c clean v val t test .DELETE_ON_ERROR: .ONESHELL: +# Rule specific var redefs tests debug: CFLAGS += $(DEBUG_CFLAGS) tests debug: DEFS += $(DEBUG_DEFS) -debug: main - release: CFLAGS += $(RELEASE_CFLAGS) release: LDFLAGS += $(RELEASE_LDFLAGS) release: DEFS += $(RELEASE_DEFS) + +debug: main release: main clay.h: @@ -47,9 +48,7 @@ main: clay.h main tests: %: %.c $(TIMESTAMPS) $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ - # Phony rules - c clean: -rm -rvf main tests $(TIMESTAMP_DIR) $(wildcard *.test*) $(wildcard *.enc) @@ -57,4 +56,7 @@ v val: main valgrind --leak-check=yes ./main t test: tests - valgrind --leak-check=yes ./tests \ No newline at end of file + valgrind --leak-check=yes ./tests + +deps: + sudo apt install libsodium-dev libsdl2-dev libsdl2-ttf-dev \ No newline at end of file diff --git a/src/encryption.c b/src/encryption.c index 6db2c88..a81e6aa 100644 --- a/src/encryption.c +++ b/src/encryption.c @@ -5,7 +5,7 @@ * @version 0.1 * @date 2025-06-09 * - * @copyright Copyright (c) 2025 + * @copyright Copyright (c) 2026, [Simplified BSD License](../../LICENSE) * */ diff --git a/src/main.c b/src/main.c index 0b68a44..d0a7573 100755 --- a/src/main.c +++ b/src/main.c @@ -5,7 +5,7 @@ * @version 0.1 * @date 2025-06-09 * - * @copyright Copyright (c) 2025 + * @copyright Copyright (c) 2026, [Simplified BSD License](../../LICENSE) * */ diff --git a/src/shared.c b/src/shared.c index 5e425f0..4e3fa01 100644 --- a/src/shared.c +++ b/src/shared.c @@ -5,7 +5,7 @@ * @version 0.1 * @date 2025-06-09 * - * @copyright Copyright (c) 2025 + * @copyright Copyright (c) 2026, [Simplified BSD License](../../LICENSE) * */ diff --git a/src/tests.c b/src/tests.c index 251a580..f155930 100644 --- a/src/tests.c +++ b/src/tests.c @@ -5,7 +5,7 @@ * @version 0.1 * @date 2025-11-10 * - * @copyright Copyright (c) 2025 + * @copyright Copyright (c) 2026, [Simplified BSD License](../../LICENSE) * */ diff --git a/src/threadpool.c b/src/threadpool.c index 8c6b243..c345aef 100644 --- a/src/threadpool.c +++ b/src/threadpool.c @@ -5,7 +5,7 @@ * @version 0.1 * @date 2025-06-09 * - * @copyright Copyright (c) 2025 + * @copyright Copyright (c) 2026, [Simplified BSD License](../../LICENSE) * */ -- cgit v1.2.3