diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | README.txt | 2 | ||||
-rw-r--r-- | contrib/build-env-setup/README.md | 28 | ||||
-rw-r--r-- | mingw64-include/regex.h | 2 | ||||
-rw-r--r-- | src/array/array.c | 2 | ||||
-rw-r--r-- | src/array/array.h | 2 | ||||
-rw-r--r-- | src/common/commonbase.c | 2 | ||||
-rw-r--r-- | src/common/commonbase.h | 2 | ||||
-rw-r--r-- | src/entrypoint/gateleenResclone.c | 2 | ||||
-rw-r--r-- | src/gateleen_resclone/gateleen_resclone.c | 2 | ||||
-rw-r--r-- | src/gateleen_resclone/gateleen_resclone.h | 2 | ||||
-rw-r--r-- | src/mime/mime.c | 2 | ||||
-rw-r--r-- | src/mime/mime.h | 2 | ||||
-rw-r--r-- | src/util_string/util_string.h | 2 | ||||
-rw-r--r-- | src/util_term/util_term.c | 2 | ||||
-rw-r--r-- | src/util_term/util_term.h | 2 |
16 files changed, 32 insertions, 26 deletions
@@ -1,4 +1,4 @@ -# By using this work you agree to the terms and conditions in 'LICENCE.txt' +# By using this work you agree to the terms and conditions in 'LICENSE.txt' CC ?=gcc LD ?=ld @@ -1,4 +1,4 @@ -# By using this work you agree to the terms and conditions in 'LICENCE.txt' +# By using this work you agree to the terms and conditions in 'LICENSE.txt' Gateleen Resclone ================= diff --git a/contrib/build-env-setup/README.md b/contrib/build-env-setup/README.md index ec41e9a..5512108 100644 --- a/contrib/build-env-setup/README.md +++ b/contrib/build-env-setup/README.md @@ -74,7 +74,7 @@ true \ true \ && PKGS_TO_ADD="git make mingw-w64-gcc curl tar musl-dev cmake autoconf automake libtool m4" \ && PKGS_TO_DEL="cmake autoconf automake libtool m4" \ - && SUDO="/home/$USER/mysudo" \ + && SUDO="/home/$USER/.local/bin/sudo" \ && PKGINIT=true \ && PKGADD="$SUDO apk add" \ && PKGDEL="$SUDO apk del" \ @@ -95,6 +95,7 @@ true \ && PCRE_VERSION="8.45" \ \ && WORKDIR="/home/${USER}/work" \ + && CACHE_DIR="/var/tmp" \ && INSTALL_ROOT="/usr/${HOST:-local}" \ && if test -n "$HOST"; then HOST_="${HOST:?}-" ;fi \ && CJSON_URL="https://github.com/DaveGamble/cJSON/archive/refs/tags/v${CJSON_VERSION:?}.tar.gz" \ @@ -104,8 +105,8 @@ true \ && CURL_URL="https://github.com/curl/curl/archive/refs/tags/curl-${CURL_VERSION_UGLY:?}.tar.gz" \ && CURL_SRCTGZ="/var/tmp/curl-${CURL_VERSION:?}.tgz" \ && CURL_BINTGZ="${CURL_SRCTGZ%.*}-bin.tgz" \ - && LIBARCHIVE_URL="https://github.com/libarchive/libarchive/archive/refs/tags/v${LIBARCHIVE_VERSION:?}.tar.gz" \ - && LIBARCHIVE_SRCTGZ="/var/tmp/libarchive-${LIBARCHIVE_VERSION:?}.tgz" \ + && LIBARCHIVE_URL="https://github.com/libarchive/libarchive/releases/download/v${LIBARCHIVE_VERSION:?}/libarchive-${LIBARCHIVE_VERSION:?}.tar.gz" \ + && LIBARCHIVE_SRCTGZ="${CACHE_DIR:?}/libarchive-${LIBARCHIVE_VERSION:?}.tgz" \ && LIBARCHIVE_BINTGZ="${LIBARCHIVE_SRCTGZ%.*}-bin.tgz" \ && PCRE_URL="https://sourceforge.net/projects/pcre/files/pcre/${PCRE_VERSION:?}/pcre-${PCRE_VERSION:?}.tar.gz/download" \ && PCRE_SRCTGZ="/var/tmp/pcre-${PCRE_VERSION:?}.tgz" \ @@ -155,15 +156,20 @@ true \ );fi \ && if test ! -e "${LIBARCHIVE_BINTGZ}"; then (true \ && printf '\n Build libarchive\n\n' \ - && cd /tmp \ && tar xf "${LIBARCHIVE_SRCTGZ:?}" \ && cd "libarchive-${LIBARCHIVE_VERSION:?}" \ - && if test -n "$HOST"; then HORSCHT="-D CC=$HOST-cc" ;fi \ - && cmake -D CMAKE_INSTALL_PREFIX="${PWD:?}/build/usr_local" $HORSCHT . \ - && make -j$(nproc) && make install \ - && rm -rf build/usr_local/lib/pkgconfig \ - && (cd build/usr_local && tar --owner=0 --group=0 -czf "${LIBARCHIVE_BINTGZ:?}" *) \ - && cd /tmp && rm -rf "libarchive-${LIBARCHIVE_VERSION:?}" \ + && ./configure --prefix="${PWD:?}/build/usr_local" --host=${HOST} \ + --enable-bsdtar=static --enable-bsdcat=static --enable-bsdcpio=static \ + --disable-rpath --enable-posix-regex-lib \ + CC=${HOST_}gcc \ + CPP=${HOST_}cpp \ + && make clean && make -j$(nproc) && make install \ + && (cd build/usr_local \ + && rm -rf lib/pkgconfig lib/libarchive.la \ + && tar --owner=0 --group=0 -czf "${LIBARCHIVE_BINTGZ:?}" * \ + && md5sum -b "${LIBARCHIVE_BINTGZ:?}" > "${LIBARCHIVE_BINTGZ:?}.md5" \ + ) \ + && cd .. && rm -rf "libarchive-${LIBARCHIVE_VERSION:?}" \ && $SUDO tar -C "${INSTALL_ROOT:?}" -xzf "${LIBARCHIVE_BINTGZ:?}" \ );fi \ && if test ! -e "${CURL_BINTGZ:?}"; then (true \ @@ -183,7 +189,7 @@ true \ && $SUDO tar -C "${INSTALL_ROOT:?}" -xzf "${CURL_BINTGZ:?}" \ );fi \ && if test -n "$HOST" -a ! -e "${PCRE_BINTGZ:?}"; then (true \ - && printf '\n Build curl\n\n' \ + && printf '\n Build pcre\n\n' \ && cd /tmp \ && tar xf "${PCRE_SRCTGZ:?}" \ && cd "pcre-${PCRE_VERSION:?}" \ diff --git a/mingw64-include/regex.h b/mingw64-include/regex.h index 21d6cc4..8692182 100644 --- a/mingw64-include/regex.h +++ b/mingw64-include/regex.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_4271049675ab4024740579a2e97a9704 #define INCGUARD_4271049675ab4024740579a2e97a9704 diff --git a/src/array/array.c b/src/array/array.c index d936851..083249b 100644 --- a/src/array/array.c +++ b/src/array/array.c @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ /* This */ #include "array.h" diff --git a/src/array/array.h b/src/array/array.h index faad036..b50d3a4 100644 --- a/src/array/array.h +++ b/src/array/array.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_6dff7e511be9d0848804e8d1e2dc23a4 #define INCGUARD_6dff7e511be9d0848804e8d1e2dc23a4 diff --git a/src/common/commonbase.c b/src/common/commonbase.c index 87314a8..45bb5cb 100644 --- a/src/common/commonbase.c +++ b/src/common/commonbase.c @@ -1,2 +1,2 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ diff --git a/src/common/commonbase.h b/src/common/commonbase.h index 23f0418..fba00bf 100644 --- a/src/common/commonbase.h +++ b/src/common/commonbase.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_0835dec38b8927b0daeba484a1eb21e7 #define INCGUARD_0835dec38b8927b0daeba484a1eb21e7 diff --git a/src/entrypoint/gateleenResclone.c b/src/entrypoint/gateleenResclone.c index 152740c..76c8175 100644 --- a/src/entrypoint/gateleenResclone.c +++ b/src/entrypoint/gateleenResclone.c @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ /* Project */ #include "gateleen_resclone.h" diff --git a/src/gateleen_resclone/gateleen_resclone.c b/src/gateleen_resclone/gateleen_resclone.c index 7f8c65f..c7ff07c 100644 --- a/src/gateleen_resclone/gateleen_resclone.c +++ b/src/gateleen_resclone/gateleen_resclone.c @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ /* This Unit */ #include "gateleen_resclone.h" diff --git a/src/gateleen_resclone/gateleen_resclone.h b/src/gateleen_resclone/gateleen_resclone.h index 6f92f8b..779f6ad 100644 --- a/src/gateleen_resclone/gateleen_resclone.h +++ b/src/gateleen_resclone/gateleen_resclone.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_d16bcf26aca7174fb8aae7641c828007 #define INCGUARD_d16bcf26aca7174fb8aae7641c828007 diff --git a/src/mime/mime.c b/src/mime/mime.c index 38e0668..22ccf15 100644 --- a/src/mime/mime.c +++ b/src/mime/mime.c @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #include "mime.h" diff --git a/src/mime/mime.h b/src/mime/mime.h index c3367a1..97c8b36 100644 --- a/src/mime/mime.h +++ b/src/mime/mime.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_569e6cc3cc7a72f544dd00fb071f0a17 #define INCGUARD_569e6cc3cc7a72f544dd00fb071f0a17 diff --git a/src/util_string/util_string.h b/src/util_string/util_string.h index d180dbb..348a61f 100644 --- a/src/util_string/util_string.h +++ b/src/util_string/util_string.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_7af1eceb805a30c68adec1fd0ccc15c4 #define INCGUARD_7af1eceb805a30c68adec1fd0ccc15c4 diff --git a/src/util_term/util_term.c b/src/util_term/util_term.c index 4d01022..e921ecc 100644 --- a/src/util_term/util_term.c +++ b/src/util_term/util_term.c @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #include "commonbase.h" diff --git a/src/util_term/util_term.h b/src/util_term/util_term.h index 84894f4..d9b31ab 100644 --- a/src/util_term/util_term.h +++ b/src/util_term/util_term.h @@ -1,4 +1,4 @@ -/* By using this work you agree to the terms and conditions in 'LICENCE.txt' */ +/* By using this work you agree to the terms and conditions in 'LICENSE.txt' */ #ifndef INCGUARD_559e64ee2a3c96a09c7c046f15fe0b1b #define INCGUARD_559e64ee2a3c96a09c7c046f15fe0b1b |