Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

openssl: bump to 1.1.1l #726

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

openssl: bump to 1.1.1l #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8beb11e
openssl: bump to 1.1.1l
Yh793 Nov 4, 2021
1721603
curl: bump to 7.79.1
Yh793 Nov 4, 2021
02ff670
htop: bump to 3.1.1
Yh793 Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trunk/libs/libcurl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Binary file removed trunk/libs/libcurl/curl-7.75.0.tar.xz
View file
Open in desktop
Binary file not shown.
Binary file added trunk/libs/libcurl/curl-7.79.1.tar.xz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion trunk/libs/libssl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 trunk/libs/libssl/openssl-1.1.1k.patch → trunk/libs/libssl/openssl-1.1.1l.patch
View file
Open in desktop
File renamed without changes.
Binary file renamed trunk/libs/libssl/openssl-1.1.1k.tar.gz → trunk/libs/libssl/openssl-1.1.1l.tar.gz
View file
Open in desktop
Binary file not shown.
26 changes: 14 additions & 12 deletions trunk/user/htop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -23,7 +24,8 @@ config_test:
fi )

configure:
( cd $(SRC_NAME) ; \
( cd $(BIN_SOURCE) ; \
./autogen.sh ; \
./configure \
--prefix=/usr \
--enable-unicode \
Expand All @@ -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
Binary file removed trunk/user/htop/htop-3.0.2.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added trunk/user/htop/htop-3.1.1.tar.gz
View file
Open in desktop
Binary file not shown.