Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SynoCommunity/spksrc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7ecdd18dba11450484141b186c5fe4da8c7f6a9a
Choose a base ref
..
head repository: SynoCommunity/spksrc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44bf283a127cb385f551e3edb7e04ea9c908157a
Choose a head ref
Showing 597 changed files with 6,992 additions and 3,523 deletions.
5 changes: 4 additions & 1 deletion .github/actions/build.sh
Original file line number Diff line number Diff line change
@@ -95,7 +95,10 @@ do

if [ "$(echo ${PACKAGES_TO_KEEP} | grep -ow ${package})" = "" ]; then
# free disk space (but not for packages to keep)
make -C ./spk/${package} clean
make -C ./spk/${package} clean |& tee >(tail -15 >>build.log)
else
# free disk space by removing source and staging directories (for packages to keep)
make arch-${GH_ARCH%%-*}-${GH_ARCH##*-} -C ./spk/${package} clean-source |& tee >(tail -15 >>build.log)
fi

echo "::endgroup::"
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ jobs:
SPK_TO_BUILD: ${{ github.event.inputs.package }}

- name: Cache downloaded files
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: distrib
# use run_id in key to cache within workflow only.
@@ -90,13 +90,13 @@ jobs:
uses: actions/checkout@v4

- name: Cache toolchains
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: toolchain/*/work
key: toolchain-${{ matrix.arch }}-v3-${{ hashFiles('toolchain/*/digests') }}

- name: Use cache of downloaded files
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: distrib
key: distrib-${{ github.run_id }}
@@ -136,7 +136,7 @@ jobs:

- name: Upload artifacts
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Packages for ${{ matrix.arch }}
path: packages/*.spk
2 changes: 1 addition & 1 deletion cross/bat/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = bat
PKG_VERS = 0.23.0
PKG_VERS = 0.24.0
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/sharkdp/bat/archive
6 changes: 3 additions & 3 deletions cross/bat/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bat-0.23.0.tar.gz SHA1 467b68e3302c7aca185472e8ccc67d5604be8ff0
bat-0.23.0.tar.gz SHA256 30b6256bea0143caebd08256e0a605280afbbc5eef7ce692f84621eb232a9b31
bat-0.23.0.tar.gz MD5 678e13187ba4202fd3588a72f3e2bc9e
bat-0.24.0.tar.gz SHA1 3ea9cf471484f520b58f699e4790bc3dadb3d5cb
bat-0.24.0.tar.gz SHA256 907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb
bat-0.24.0.tar.gz MD5 29835f4ae789902ef0db3a39024d6016
2 changes: 1 addition & 1 deletion cross/bazarr/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = bazarr
PKG_VERS = 1.3.0
PKG_VERS = 1.4.0
PKG_EXT = zip
PKG_DIST_NAME = $(PKG_NAME).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
6 changes: 3 additions & 3 deletions cross/bazarr/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bazarr-1.3.0.zip SHA1 19c0745e3e9e8dfb223b8085cf8b41cd21a9dbac
bazarr-1.3.0.zip SHA256 7fd2ca2595fe7594541aafa0fcf1ef0b337c5290e2069115bea10ee8264fa001
bazarr-1.3.0.zip MD5 74d0d31dd880fa8c6b6f79009cc2c593
bazarr-1.4.0.zip SHA1 382f96afa748842647cd3f9d31338a8b205dbcae
bazarr-1.4.0.zip SHA256 b023f5239ec54974dfe624259942101ccad218d3b11bf47669a854dc3f31e56c
bazarr-1.4.0.zip MD5 b6faa26c117cfaf807f2ad022963062f
9 changes: 5 additions & 4 deletions cross/bicbucstriim/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
PKG_NAME = BicBucStriim
PKG_VERS = 1.3.6
PKG_VERS = 1.5.3
PKG_EXT = zip
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://projekte.textmulch.de/bicbucstriim/downloads
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rvolz/$(PKG_NAME)/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://rvolz.github.com/BicBucStriim/
HOMEPAGE = https://github.com/rvolz/BicBucStriim
COMMENT = BicBucStriim streams books, digital books. It fills a gap in the functionality of current NAS devices, which provide access to your collection of music, videos and photos -- but not books. BicBucStriim covers that area and provides web-based access to your e-book collection.
LICENSE = MIT

6 changes: 3 additions & 3 deletions cross/bicbucstriim/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BicBucStriim-1.3.6.zip SHA1 2185c9a707691aabafc93d56523b7a8b48051528
BicBucStriim-1.3.6.zip SHA256 3e8a9e96575bf95842d7c468504afd85e398c5137038c8e6f3cd63ae360afed2
BicBucStriim-1.3.6.zip MD5 7f85c0190e08900dadfe4d950baf84fb
BicBucStriim-1.5.3.zip SHA1 4f9e1f7b5080fc21c278e790ce17328d95c439d2
BicBucStriim-1.5.3.zip SHA256 32b922c2d385a15ba71e1f2935017cc9269f95c60038c5e1b62caecbe4fa5bca
BicBucStriim-1.5.3.zip MD5 e67ab25cf601d394653c64e8c2516e9c
2 changes: 1 addition & 1 deletion cross/boost/Makefile
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ PRE_COMPILE_TARGET = boost_pre_compile
COMPILE_TARGET = boost_compile
INSTALL_TARGET = boost_install

# Build all if not told otherwise (we exclude python library when "all" selected)
# Build all if not told otherwise (we exclude python library when "all" selected)
BOOST_LIBRARIES ?= all

# Expect already built python when python library selected
10 changes: 8 additions & 2 deletions cross/cloudflared/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = cloudflared
PKG_VERS = 2023.7.1
PKG_VERS = 2024.1.5
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/cloudflare/cloudflared/archive
@@ -20,4 +20,10 @@ include ../../mk/spksrc.cross-go.mk

.PHONY: cloudflared_compile
cloudflared_compile:
@$(RUN) $(MAKE) VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
ifeq (,$(wildcard /tmp/go))
@$(MSG) " Call install-cloudflare-go.sh"
@$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/ \
.teamcity/install-cloudflare-go.sh
endif
@$(MSG) " Build cloudflared"
@$(RUN) $(MAKE) PATH="/tmp/go/bin:${PATH}" VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
6 changes: 3 additions & 3 deletions cross/cloudflared/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cloudflared-2023.7.1.tar.gz SHA1 0aec1a1e9509b830181577700badf4bc4d8d2a62
cloudflared-2023.7.1.tar.gz SHA256 0863eadade6c6ac5838510d8fb514ec2332bb79bf54edc34e90cc79652b6c816
cloudflared-2023.7.1.tar.gz MD5 5ca3cdf330f00a5b10e200a4dd3f710b
cloudflared-2024.1.5.tar.gz SHA1 863e69aa29ba4f77954d5bd5b2a92f418953a746
cloudflared-2024.1.5.tar.gz SHA256 0a0da188e162680927ebafcef32c3366aed26661273dc63c540bbebee435bd4e
cloudflared-2024.1.5.tar.gz MD5 6143597dac66081d65d862be6521f4d4
4 changes: 2 additions & 2 deletions cross/cloudflared/patches/001-disable-buildvcs.patch
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@
$(info Building cloudflared with go-fips)
cp -f fips/fips.go.linux-amd64 cmd/cloudflared/fips.go
endif
- GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -v -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
+ GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -v -buildvcs=false -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
- GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
+ GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -buildvcs=false -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
ifeq ($(FIPS), true)
rm -f cmd/cloudflared/fips.go
./check-fips.sh cloudflared
2 changes: 1 addition & 1 deletion cross/cops/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = cops
PKG_VERS = 1.4.2
PKG_VERS = 1.5.4
PKG_EXT = zip
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/mikespub-org/seblucas-cops/releases/download/$(PKG_VERS)
6 changes: 3 additions & 3 deletions cross/cops/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cops-1.4.2.zip SHA1 841183a5038f8f012d6c413ebb9c9e54b1cf176d
cops-1.4.2.zip SHA256 60542faade68764667ec142d1606c52f79d9b4818fa2407d40607d0abfd2d99b
cops-1.4.2.zip MD5 ed35a750fc449a52fb7e5229754426d2
cops-1.5.4.zip SHA1 6fc653f9b7b83766547c420875579bd02503c98e
cops-1.5.4.zip SHA256 7fc18946c003d91e77c4a189f0b752f021224187d86e93f8813b165d9ac306c9
cops-1.5.4.zip MD5 17cb2d4ce02f7ddbd51baa27fcc26a0d
4 changes: 0 additions & 4 deletions cross/cryptography/Makefile
Original file line number Diff line number Diff line change
@@ -11,10 +11,6 @@ HOMEPAGE = https://github.com/pyca/cryptography
COMMENT = Provide cryptographic recipes and primitives to Python developers
LICENSE = BSD/ASL2

# Unsupported due to lack of libatomic
# being mandatory with OpenSSL >= 3.x
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)

###
### This cross/cryptography is needed to generate python-limited abi3 wheels
### Ref: https://github.com/pyca/cryptography/issues/7671
2 changes: 1 addition & 1 deletion cross/curl/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = curl
PKG_VERS = 8.1.2
PKG_VERS = 8.4.0
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://curl.se/download
6 changes: 3 additions & 3 deletions cross/curl/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
curl-8.1.2.tar.xz SHA1 bba5bcc82cb46bb20e31dc094d01ab40dbd40920
curl-8.1.2.tar.xz SHA256 31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6
curl-8.1.2.tar.xz MD5 1f7f6678b1342ad78f30e1dedd015fe2
curl-8.4.0.tar.xz SHA1 893985fa820b25d41141eb318c0c2e3bf00f0ae5
curl-8.4.0.tar.xz SHA256 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
curl-8.4.0.tar.xz MD5 8424597f247da68b6041dd7f9ca367fe
72 changes: 39 additions & 33 deletions cross/curl/patches/002-prefer-gnutls-for-http3.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# To use GNUTLS for http3 (ngtcp2) when USE_OPENSSL is defined too,
# we must first check for USE_GNUTLS and apply code for.
#
--- lib/vquic/curl_ngtcp2.h.orig 2023-05-15 10:55:59.000000000 +0000
+++ lib/vquic/curl_ngtcp2.h 2023-06-11 07:37:17.255309500 +0000
--- lib/vquic/curl_ngtcp2.h.orig 2023-10-05 07:58:50.000000000 +0000
+++ lib/vquic/curl_ngtcp2.h 2023-11-24 12:41:56.051202200 +0000
@@ -34,7 +34,9 @@

#include <ngtcp2/ngtcp2_crypto.h>
@@ -14,8 +14,8 @@
#include <openssl/ssl.h>
#elif defined(USE_WOLFSSL)
#include <wolfssl/options.h>
--- lib/vquic/curl_ngtcp2.c.orig 2023-05-26 06:37:58.000000000 +0000
+++ lib/vquic/curl_ngtcp2.c 2023-06-11 08:00:26.210096152 +0000
--- lib/vquic/curl_ngtcp2.c.orig 2023-10-10 09:34:20.000000000 +0000
+++ lib/vquic/curl_ngtcp2.c 2023-11-25 11:45:17.635886120 +0000
@@ -28,7 +28,10 @@
#include <ngtcp2/ngtcp2.h>
#include <nghttp3/nghttp3.h>
@@ -26,10 +26,10 @@
+#include "vtls/gtls.h"
+#elif defined(USE_OPENSSL)
#include <openssl/err.h>
#ifdef OPENSSL_IS_BORINGSSL
#if defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC)
#include <ngtcp2/ngtcp2_crypto_boringssl.h>
@@ -36,9 +39,6 @@
#include <ngtcp2/ngtcp2_crypto_openssl.h>
#include <ngtcp2/ngtcp2_crypto_quictls.h>
#endif
#include "vtls/openssl.h"
-#elif defined(USE_GNUTLS)
@@ -38,7 +38,7 @@
#elif defined(USE_WOLFSSL)
#include <ngtcp2/ngtcp2_crypto_wolfssl.h>
#include "vtls/wolfssl.h"
@@ -101,17 +101,17 @@
@@ -102,17 +102,17 @@
(H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE)


@@ -58,11 +58,11 @@
+#define QUIC_CIPHERS \
+ "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_" \
+ "POLY1305_SHA256:TLS_AES_128_CCM_SHA256"
+#define QUIC_GROUPS "P-256:P-384:P-521"
+#define QUIC_GROUPS "P-256:X25519:P-384:P-521"
#elif defined(USE_WOLFSSL)
#define QUIC_CIPHERS \
"TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_" \
@@ -142,11 +142,11 @@
@@ -143,11 +143,11 @@
ngtcp2_transport_params transport_params;
ngtcp2_ccerr last_error;
ngtcp2_crypto_conn_ref conn_ref;
@@ -77,7 +77,7 @@
#elif defined(USE_WOLFSSL)
WOLFSSL_CTX *sslctx;
WOLFSSL *ssl;
@@ -331,13 +331,7 @@
@@ -360,13 +360,7 @@
}
}

@@ -92,7 +92,7 @@
static int keylog_callback(gnutls_session_t session, const char *label,
const gnutls_datum_t *secret)
{
@@ -352,6 +346,13 @@
@@ -381,6 +375,12 @@
Curl_tls_keylog_write(label, crandom.data, secret->data, secret->size);
return 0;
}
@@ -102,11 +102,10 @@
+ (void)ssl;
+ Curl_tls_keylog_write_line(line);
+}
+
#elif defined(USE_WOLFSSL)
#if defined(HAVE_SECRET_CALLBACK)
static void keylog_callback(const WOLFSSL *ssl, const char *line)
@@ -364,7 +365,60 @@
@@ -393,7 +393,60 @@

static int init_ngh3_conn(struct Curl_cfilter *cf);

@@ -136,15 +135,15 @@
+ gnutls_session_set_ptr(ctx->gtls->session, &ctx->conn_ref);
+
+ if(ngtcp2_crypto_gnutls_configure_client_session(ctx->gtls->session) != 0) {
+ DEBUGF(LOG_CF(data, cf,
+ "ngtcp2_crypto_gnutls_configure_client_session failed\n"));
+ CURL_TRC_CF(data, cf,
+ "ngtcp2_crypto_gnutls_configure_client_session failed\n");
+ return CURLE_QUIC_CONNECT_ERROR;
+ }
+
+ rc = gnutls_priority_set_direct(ctx->gtls->session, QUIC_PRIORITY, NULL);
+ if(rc < 0) {
+ DEBUGF(LOG_CF(data, cf, "gnutls_priority_set_direct failed: %s\n",
+ gnutls_strerror(rc)));
+ CURL_TRC_CF(data, cf, "gnutls_priority_set_direct failed: %s\n",
+ gnutls_strerror(rc));
+ return CURLE_QUIC_CONNECT_ERROR;
+ }
+
@@ -168,8 +167,8 @@
static CURLcode quic_ssl_ctx(SSL_CTX **pssl_ctx,
struct Curl_cfilter *cf, struct Curl_easy *data)
{
@@ -495,59 +549,6 @@
SSL_set_tlsext_host_name(ctx->ssl, cf->conn->host.name);
@@ -544,59 +597,6 @@
}
return CURLE_OK;
}
-#elif defined(USE_GNUTLS)
@@ -197,15 +196,15 @@
- gnutls_session_set_ptr(ctx->gtls->session, &ctx->conn_ref);
-
- if(ngtcp2_crypto_gnutls_configure_client_session(ctx->gtls->session) != 0) {
- DEBUGF(LOG_CF(data, cf,
- "ngtcp2_crypto_gnutls_configure_client_session failed\n"));
- CURL_TRC_CF(data, cf,
- "ngtcp2_crypto_gnutls_configure_client_session failed\n");
- return CURLE_QUIC_CONNECT_ERROR;
- }
-
- rc = gnutls_priority_set_direct(ctx->gtls->session, QUIC_PRIORITY, NULL);
- if(rc < 0) {
- DEBUGF(LOG_CF(data, cf, "gnutls_priority_set_direct failed: %s\n",
- gnutls_strerror(rc)));
- CURL_TRC_CF(data, cf, "gnutls_priority_set_direct failed: %s\n",
- gnutls_strerror(rc));
- return CURLE_QUIC_CONNECT_ERROR;
- }
-
@@ -228,7 +227,7 @@
#elif defined(USE_WOLFSSL)

static CURLcode quic_ssl_ctx(WOLFSSL_CTX **pssl_ctx,
@@ -1730,7 +1731,14 @@
@@ -1902,7 +1902,14 @@
cf->conn->bundle->multiuse = BUNDLE_MULTIPLEX;

if(cf->conn->ssl_config.verifyhost) {
@@ -244,7 +243,7 @@
X509 *server_cert;
server_cert = SSL_get_peer_certificate(ctx->ssl);
if(!server_cert) {
@@ -1740,13 +1748,6 @@
@@ -1912,13 +1919,6 @@
X509_free(server_cert);
if(result)
return result;
@@ -258,17 +257,25 @@
#elif defined(USE_WOLFSSL)
if(wolfSSL_check_domain_name(ctx->ssl, snihost) == SSL_FAILURE)
return CURLE_PEER_FAILED_VERIFICATION;
@@ -1755,7 +1756,8 @@
@@ -1927,7 +1927,7 @@
}
else
infof(data, "Skipped certificate verification");
-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
+#elif defined(USE_OPENSSL)
+#if defined(USE_OPENSSL) && !defined(USE_GNUTLS)
if(data->set.ssl.certinfo)
/* asked to gather certificate info */
(void)Curl_ossl_certchain(data, ctx->ssl);
@@ -2170,12 +2172,7 @@
@@ -1996,7 +1996,7 @@
pktx->ts = timestamp();
}

-#ifdef USE_OPENSSL
+#if defined(USE_OPENSSL) && !defined(USE_GNUTLS)
if(!ctx->x509_store_setup) {
result = Curl_ssl_setup_x509_store(cf, data, ctx->sslctx);
if(result)
@@ -2319,12 +2319,7 @@
if(ctx->qlogfd != -1) {
close(ctx->qlogfd);
}
@@ -282,7 +289,7 @@
if(ctx->gtls) {
if(ctx->gtls->cred)
gnutls_certificate_free_credentials(ctx->gtls->cred);
@@ -2183,6 +2180,11 @@
@@ -2332,6 +2327,11 @@
gnutls_deinit(ctx->gtls->session);
free(ctx->gtls);
}
@@ -294,13 +301,12 @@
#elif defined(USE_WOLFSSL)
if(ctx->ssl)
wolfSSL_free(ctx->ssl);
@@ -2264,7 +2266,8 @@
@@ -2414,7 +2414,7 @@
Curl_bufcp_init(&ctx->stream_bufcp, H3_STREAM_CHUNK_SIZE,
H3_STREAM_POOL_SPARES);

-#ifdef USE_OPENSSL
+#ifdef USE_GNUTLS
+#elif defined(USE_OPENSSL)
+#if defined(USE_OPENSSL) && !defined(USE_GNUTLS)
result = quic_ssl_ctx(&ctx->sslctx, cf, data);
if(result)
return result;
Loading