add support ubuntu focal

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 060a6a48bc2096ffe54f3d00d24e1d9be52bcba7..c161fac2a29d316a633edcb9b03ac933d2cab2be 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25.1)
+cmake_minimum_required(VERSION 3.16.3)
 
 set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type")
 

diff --git a/builder/Containerfile.template b/builder/Containerfile.template
index 34ce7291cddafbb51b746af98abc48ce3807ba03..78958571e371307addb6588377cc34bdc16bee57 100644 (file)
--- a/builder/Containerfile.template
+++ b/builder/Containerfile.template
@@ -1,9 +1,15 @@
 FROM $distro
 RUN apt-get update \
-    && apt-get install -y build-essential cmake file \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    build-essential \
+    cmake \
+    file \
     && apt-get clean
 RUN apt-get update \
-    && apt-get install -y libxml2-dev libcmocka-dev cppcheck \
+    && apt-get install -y \
+    libxml2-dev \
+    libcmocka-dev \
+    cppcheck \
     && apt-get clean
 COPY run /app/run
 RUN chmod 755 /app/run

diff --git a/builder/builder b/builder/builder
index c73759405a66e30ed239048ba3d50238568cebf4..b7379978824a958e204d703251c1c88ab4ed3865 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -33,7 +33,7 @@ run_build_container()
 
 main()
 {
-       local distros="debian:oldstable debian:stable debian:testing ubuntu:latest ubuntu:rolling"
+       local distros="debian:oldstable debian:stable debian:testing ubuntu:focal ubuntu:latest ubuntu:rolling"
        mkdir -p build
        cp builder/run build/run
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5088f8f641a07610afa290bce150f9ce1155700..0d55422b631c39b82dcdea2311290d6ff8e765f1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25.1)
+cmake_minimum_required(VERSION 3.16.3)
 
 project(feierabend VERSION 1.3.19)
 

diff --git a/src/time_format.c b/src/time_format.c
index d0c15d68d66f7f0aae72184fcf40684252e2d392..51d0df08208df854e214c485f3e39182d3838312 100644 (file)
--- a/src/time_format.c
+++ b/src/time_format.c
@@ -38,7 +38,7 @@ char* _strdup(const char* str)
        if (new_str == NULL)
                return NULL;
 
-       strncpy(new_str, str, size);
+       memcpy(new_str, str, size);
        return new_str;
 }
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4237ae802784697dadfbb5abfa36b4eda4c55329..c3a24a7124d6e68487a32bcddc2a8e314a1691d3 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25.1)
+cmake_minimum_required(VERSION 3.16.3)
 
 find_library(CMOCKA cmocka REQUIRED)
 find_program(CPPCHECK cppcheck REQUIRED)