diff --git a/trunk/libs/libcurl/Makefile b/trunk/libs/libcurl/Makefile index 19db94c42a7..9a659682f4b 100644 --- a/trunk/libs/libcurl/Makefile +++ b/trunk/libs/libcurl/Makefile @@ -1,5 +1,5 @@ -SRC_NAME=curl-7.75.0 -SRC_URL=https://github.com/curl/curl/releases/download/curl-7_75_0/curl-7.75.0.tar.xz +SRC_NAME=curl-7.79.1 +SRC_URL=https://github.com/curl/curl/releases/download/curl-7_79_1/curl-7.79.1.tar.xz LDFLAGS += -Wl,-rpath-link=$(STAGEDIR)/lib diff --git a/trunk/libs/libcurl/curl-7.75.0.tar.xz b/trunk/libs/libcurl/curl-7.75.0.tar.xz deleted file mode 100644 index aa0994bb5f4..00000000000 Binary files a/trunk/libs/libcurl/curl-7.75.0.tar.xz and /dev/null differ diff --git a/trunk/libs/libcurl/curl-7.79.1.tar.xz b/trunk/libs/libcurl/curl-7.79.1.tar.xz new file mode 100644 index 00000000000..bb9d086ae49 Binary files /dev/null and b/trunk/libs/libcurl/curl-7.79.1.tar.xz differ diff --git a/trunk/libs/libssl/Makefile b/trunk/libs/libssl/Makefile index c8d67c45c1d..dc7f5381b33 100644 --- a/trunk/libs/libssl/Makefile +++ b/trunk/libs/libssl/Makefile @@ -1,4 +1,4 @@ -SRC_NAME=openssl-1.1.1k +SRC_NAME=openssl-1.1.1l SRC_URL=https://www.openssl.org/source/$(SRC_NAME).tar.gz # openssl use CROSS_COMPILE prefix diff --git a/trunk/libs/libssl/openssl-1.1.1k.patch b/trunk/libs/libssl/openssl-1.1.1l.patch similarity index 100% rename from trunk/libs/libssl/openssl-1.1.1k.patch rename to trunk/libs/libssl/openssl-1.1.1l.patch diff --git a/trunk/libs/libssl/openssl-1.1.1k.tar.gz b/trunk/libs/libssl/openssl-1.1.1l.tar.gz similarity index 55% rename from trunk/libs/libssl/openssl-1.1.1k.tar.gz rename to trunk/libs/libssl/openssl-1.1.1l.tar.gz index 96dc100acb1..81be7f98f0c 100644 Binary files a/trunk/libs/libssl/openssl-1.1.1k.tar.gz and b/trunk/libs/libssl/openssl-1.1.1l.tar.gz differ diff --git a/trunk/user/htop/Makefile b/trunk/user/htop/Makefile index d51b3c3007a..3490f590ab4 100644 --- a/trunk/user/htop/Makefile +++ b/trunk/user/htop/Makefile @@ -1,18 +1,19 @@ -SRC_NAME = htop-3.0.2 -SRC_URL = https://bintray.com/htop/source/download_file?file_path=htop-3.0.2.tar.gz -THISDIR = $(shell pwd) +SRC_NAME = htop +SRC_VERSION = 3.1.1 +BIN_SOURCE = $(SRC_NAME)-$(SRC_VERSION) +SRC_URL = https://github.com/htop-dev/htop/archive/refs/tags/$(SRC_VERSION).tar.gz all: download_test extract_test config_test - $(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME) + $(MAKE) -j$(HOST_NCPU) -C $(BIN_SOURCE) download_test: - ( if [ ! -f $(SRC_NAME).tar.gz ]; then \ - wget -t5 --timeout=20 --no-check-certificate -O $(SRC_NAME).tar.gz $(SRC_URL); \ + ( if [ ! -f $(BIN_SOURCE).tar.gz ]; then \ + wget -t5 --timeout=20 --no-check-certificate -O $(BIN_SOURCE).tar.gz $(SRC_URL); \ fi ) extract_test: - ( if [ ! -d $(SRC_NAME) ]; then \ - tar -xzf $(SRC_NAME).tar.gz; \ + ( if [ ! -d $(BIN_SOURCE) ]; then \ + tar -xzf $(BIN_SOURCE).tar.gz; \ fi ) config_test: @@ -23,7 +24,8 @@ config_test: fi ) configure: - ( cd $(SRC_NAME) ; \ + ( cd $(BIN_SOURCE) ; \ + ./autogen.sh ; \ ./configure \ --prefix=/usr \ --enable-unicode \ @@ -33,10 +35,10 @@ configure: ) clean: - if [ -f $(SRC_NAME)/Makefile ] ; then \ - $(MAKE) -C $(SRC_NAME) distclean ; \ + if [ -f $(BIN_SOURCE)/Makefile ] ; then \ + $(MAKE) -C $(BIN_SOURCE) distclean ; \ fi ; \ rm -f config_done romfs: - $(ROMFSINST) -p +x $(THISDIR)/$(SRC_NAME)/htop /usr/bin/htop + $(ROMFSINST) -p +x $(THISDIR)/$(BIN_SOURCE)/htop /usr/bin/htop diff --git a/trunk/user/htop/htop-3.0.2.tar.gz b/trunk/user/htop/htop-3.0.2.tar.gz deleted file mode 100644 index 27029076284..00000000000 Binary files a/trunk/user/htop/htop-3.0.2.tar.gz and /dev/null differ diff --git a/trunk/user/htop/htop-3.1.1.tar.gz b/trunk/user/htop/htop-3.1.1.tar.gz new file mode 100644 index 00000000000..31c54226e53 Binary files /dev/null and b/trunk/user/htop/htop-3.1.1.tar.gz differ