Skip to content

Commit 367a6ed

Browse files
th0ma7hgy59
th0ma7
and
hgy59
authored
openssl: update to version 1.1.1h (SynoCommunity#4155)
* update openssl to 1.1.1h * update openssl dependents * fix python - add patch to fix openssl path in m2crypto * fix build of haproxy * update spk versions/revisions * fix package builds - update htop to 3.0.2 (older versions are not available) - include htop in synocli-monitor for all DSM versions - remove REQUIRED_DSM in sonarr/Makefile for armv7-1.2 (rely on dependency of mono) - cleanup umurmur/Makefile - fix c-ares/Makefile * fix gh status for skipped sonar (nzbdrone) package * fix slang build - add .NOTPARALLEL target to disable parallel make * incorporate codereview * add unsupported ppc853x-5.2 - libwebsockets fails to build for ppc (except qoriq) since update to openssl 1.1. Co-authored-by: hgy59 <[email protected]>
1 parent 49a30a9 commit 367a6ed

File tree

69 files changed

+294
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+294
-283
lines changed

‎.github/actions/build_status.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [ -f "${BUILD_UNSUPPORTED_FILE}" ]; then
4444
unsupported_packages=$(cat "${BUILD_UNSUPPORTED_FILE}" | grep -Po "\- \K.*:" | sort -u | tr '\n' '|' | sed -e 's/|$//')
4545
# fix for packages with different name
4646
if [ "$(echo ${unsupported_packages} | grep -ow nzbdrone)" != "" ]; then
47-
unsupported_packages=$(echo "${unsupported_packages}|sonarr")
47+
unsupported_packages=$(echo "${unsupported_packages}|sonarr:")
4848
fi
4949
cat "${BUILD_ERROR_FILE}" | grep -Pv "\- (${unsupported_packages}) " > "${BUILD_ERROR_FILE}.tmp"
5050
rm -f "${BUILD_ERROR_FILE}"

‎cross/boxbackup/Makefile

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
1-
PKG_NAME = boxbackup
2-
PKG_VERS = 0.11.1
1+
PKG_NAME = BoxBackup
2+
PKG_VERS = 0.12
3+
PKG_VERS_DATE = 200326
4+
PKG_VERS_BRANCH = master
5+
PKG_VERS_COMMIT = 8e8b63c
36
PKG_EXT = tar.gz
4-
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
7+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_VERS_BRANCH).$(PKG_VERS_DATE).$(PKG_VERS_COMMIT).$(PKG_EXT)
58
PKG_DIST_SITE = https://github.com/boxbackup/boxbackup/archive
69
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
7-
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
10+
PKG_DIR = boxbackup-$(PKG_NAME)-$(PKG_VERS).$(PKG_VERS_BRANCH).$(PKG_VERS_DATE).$(PKG_VERS_COMMIT)
811

9-
DEPENDS = cross/openssl cross/readline cross/berkeleydb
12+
DEPENDS = cross/openssl cross/berkeleydb
1013

11-
HOMEPAGE = http://www.boxbackup.org/
14+
HOMEPAGE = https://www.boxbackup.org/
1215
COMMENT = Box Backup is an open source, completely automatic, on-line backup system
1316
LICENSE = BSD/GPL
1417

1518
GNU_CONFIGURE = 1
16-
CONFIGURE_ARGS = --with-random=/dev/urandom --enable-gnu-readline box_cv_have_large_file_support=yes
19+
CONFIGURE_ARGS = --with-random=/dev/urandom box_cv_have_large_file_support=yes
1720

18-
PRE_CONFIGURE_TARGET = myPreConfigure
19-
INSTALL_TARGET = myInstall
21+
PRE_CONFIGURE_TARGET = boxbackup_pre_configure
22+
INSTALL_TARGET = boxbackup_install
2023

2124
include ../../mk/spksrc.cross-cc.mk
2225

23-
.PHONY: myPreConfigure
24-
myPreConfigure:
26+
.PHONY: boxbackup_pre_configure
27+
boxbackup_pre_configure:
2528
$(RUN) ./bootstrap
2629

27-
.PHONY: myInstall
28-
myInstall:
30+
.PHONY: boxbackup_install
31+
boxbackup_install:
2932
$(RUN) $(MAKE) install-backup-client DESTDIR=$(INSTALL_DIR)
3033
$(RUN) $(MAKE) install-backup-server DESTDIR=$(INSTALL_DIR)

‎cross/boxbackup/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
boxbackup-0.11.1.tar.gz SHA1 42cfc692220d97a22cf3cfd8413847122d061fa0
2-
boxbackup-0.11.1.tar.gz SHA256 135da2be32f89a4dd4ea26569b9d422f938dee891fd2a54e4dfd93cfd81954b9
3-
boxbackup-0.11.1.tar.gz MD5 358b1b6778b77c78e37774cbf7a9f0bb
1+
BoxBackup-0.12.tar.gz SHA1 5fb67b6b8221d23485c41481968c49515873af77
2+
BoxBackup-0.12.tar.gz SHA256 93a2e60906b575a8131f0e1fce534a5ed1a5f967cb8975eb472b79dcd777dec2
3+
BoxBackup-0.12.tar.gz MD5 3b33f8af3333f38316c02f6a453e08b1

‎cross/fossil-scm/Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = fossil-scm
2-
PKG_VERS = 2.10
2+
PKG_VERS = 2.12.1
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = http://www.fossil-scm.org/index.html/tarball/version-$(PKG_VERS)
@@ -15,7 +15,7 @@ LICENSE = BSD2
1515
PRE_CONFIGURE_TARGET = fossil-scm_pre_configure
1616

1717
GNU_CONFIGURE = 1
18-
CONFIGURE_ARGS = --static --json
18+
CONFIGURE_ARGS = --json
1919
CONFIGURE_ARGS += --disable-fusefs
2020
CONFIGURE_ARGS += --with-th1-docs --with-th1-hooks
2121
CONFIGURE_ARGS += --with-openssl=auto
@@ -25,4 +25,3 @@ include ../../mk/spksrc.cross-cc.mk
2525
.PHONY: fossil-scm_pre_configure
2626
fossil-scm_pre_configure:
2727
sed -i.orig -e "s|^BCCFLAGS.*$$|BCCFLAGS = |" $(WORK_DIR)/$(PKG_DIR)/Makefile.in
28-

‎cross/fossil-scm/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
fossil-scm-v2.10.tar.gz SHA1 56e64cc7e0ff4773a61bc06c17a31bf020a077ff
2-
fossil-scm-v2.10.tar.gz SHA256 c58cb721c4738301801420c0435a0f2dab68a81e381d5f811d6b4143f8cec151
3-
fossil-scm-v2.10.tar.gz MD5 ada146d97e57d9ec6d7545826b817110
1+
fossil-scm-v2.12.1.tar.gz SHA1 95fe8c7bceb58c8bc6b1e8a815b1d4fd26c6fa83
2+
fossil-scm-v2.12.1.tar.gz SHA256 fd65fbb73ceb84601adbdcff6e2e5819ba1f2eea963c9d6e6a36452b3860c55d
3+
fossil-scm-v2.12.1.tar.gz MD5 8040c3101d9aaeaeaf7e4758399356f6

‎cross/git/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = git
2-
PKG_VERS = 2.26.2
2+
PKG_VERS = 2.28.0
33
PKG_EXT = tar.xz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://kernel.org/pub/software/scm/$(PKG_NAME)

‎cross/git/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
git-2.26.2.tar.xz SHA1 bdb5eb6c014d7c372be70782a5155d964abe2c08
2-
git-2.26.2.tar.xz SHA256 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848
3-
git-2.26.2.tar.xz MD5 f9a832256032e711973dd7be4981ab4c
1+
git-2.28.0.tar.xz SHA1 29a70cd3e7bccbbc4233e9c948b036e0b7b6d46a
2+
git-2.28.0.tar.xz SHA256 dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d
3+
git-2.28.0.tar.xz MD5 5fde0206768ed70092d1fcc8f447251a

‎cross/haproxy/Makefile

+32-13
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,46 @@
11
PKG_NAME = haproxy
2-
PKG_VERS = 1.5.14
2+
PKG_VERS = 1.8.26
3+
PKG_MAIN_VERS=$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
34
PKG_EXT = tar.gz
45
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
5-
PKG_DIST_SITE = http://www.haproxy.org/download/1.5/src
6+
PKG_DIST_SITE = http://www.haproxy.org/download/$(PKG_MAIN_VERS)/src
67
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
78

8-
DEPENDS = cross/openssl cross/zlib
9+
DEPENDS = cross/zlib cross/openssl cross/lua cross/pcre
910

1011
MAINTAINER = SynoCommunity
11-
HOMEPAGE = http://www.haproxy.org
12+
HOMEPAGE = https://www.haproxy.org
1213
COMMENT = HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.
13-
LICENSE = GNU GPL 2
14+
LICENSE = GPLv2
1415

1516
CONFIGURE_TARGET = nop
16-
COMPILE_TARGET = myCompile
17-
INSTALL_TARGET = myInstall
18-
OFLAG = -O3
17+
INSTALL_TARGET = haproxy_install
1918

20-
include ../../mk/spksrc.cross-cc.mk
19+
BUILD_OPTIONS = USE_TPROXY=1 USE_PTHREAD_PSHARED=1 USE_OPENSSL=1 USE_ZLIB=1
20+
BUILD_OPTIONS += USE_PCRE=1 USE_STATIC_PCRE=1 PCRE_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include
21+
BUILD_OPTIONS += USE_LUA=1 LUA_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include LUA_LIB=$(INSTALL_DIR)$(INSTALL_PREFIX)/lib
22+
23+
include ../../mk/spksrc.common.mk
24+
25+
ARCH_OPTIONS =
26+
27+
ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH))
28+
# ARM5_ARCHES and PPC_ARCHES (except QorIQ) have older kernels and need rt library for clock_gettime()
29+
BUILD_OPTIONS += USE_RT=1
30+
ADDITIONAL_CFLAGS += -DLUA_32BITS
31+
endif
32+
ifeq ($(findstring $(ARCH), qoriq),$(ARCH))
33+
BUILD_OPTIONS += ADDLIB=-latomic
34+
endif
2135

22-
.PHONY: myCompile
23-
myCompile:
24-
$(RUN) $(MAKE) TARGET=generic CPU=generic ARCH= USE_OPENSSL=1 USE_TPROXY=1 USE_PTHREAD_PSHARED=1 USE_ZLIB=1 SPKSRC_CFLAGS="$(CFLAGS) $(OFLAG)" SPKSRC_LDFLAGS="$(LDFLAGS)"
36+
ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
37+
ARCH_OPTIONS = ARCH=x86_64
38+
endif
39+
40+
COMPILE_MAKE_OPTIONS += TARGET=generic $(ARCH_OPTIONS) $(BUILD_OPTIONS) SPKSRC_CFLAGS="$(CFLAGS)" SPKSRC_LDFLAGS="$(LDFLAGS)"
41+
42+
include ../../mk/spksrc.cross-cc.mk
2543

26-
myInstall:
44+
.PHONY: haproxy_install
45+
haproxy_install:
2746
$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)

‎cross/haproxy/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
haproxy-1.5.14.tar.gz SHA1 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f
2-
haproxy-1.5.14.tar.gz SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99
3-
haproxy-1.5.14.tar.gz MD5 ad9d7262b96ba85a0f8c6acc6cb9edde
1+
haproxy-1.8.26.tar.gz SHA1 9a512b101d1bc94213528b59d0c67176cba85a46
2+
haproxy-1.8.26.tar.gz SHA256 e3c2a81b6f26dcb736a34ebb5f134d3251ceccf30386214655fa7ed6d3afa400
3+
haproxy-1.8.26.tar.gz MD5 67e0c11997c05826996dba80fdceef2c

‎cross/htop/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PKG_NAME = htop
2-
PKG_VERS = 2.2.0
2+
PKG_VERS = 3.0.2
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
5-
PKG_DIST_SITE = http://hisham.hm/htop/releases/$(PKG_VERS)
5+
PKG_DIST_SITE = https://bintray.com/htop/source/download_file?file_path=
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

88
UNSUPPORTED_ARCHS = powerpc ppc824x

‎cross/htop/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
htop-2.2.0.tar.gz SHA1 5da790e6addf495edc4d8ed7d69d1f0de085c7ad
2-
htop-2.2.0.tar.gz SHA256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57
3-
htop-2.2.0.tar.gz MD5 0d816b6beed31edc75babcfbf863ffa8
1+
htop-3.0.2.tar.gz SHA1 e1d37ccd590cb8345c7b518ef56192d4f1cd8cd4
2+
htop-3.0.2.tar.gz SHA256 6471d9505daca5c64073fc37dbab4d012ca4fc6a7040a925dad4a7553e3349c4
3+
htop-3.0.2.tar.gz MD5 fb848a1c91871d134c785bccb560ca8d

‎cross/libevent/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PKG_NAME = libevent
2-
PKG_VERS_MAJOR = 2.0
3-
PKG_VERS_MINOR = 22-stable
2+
PKG_VERS_MAJOR = 2.1
3+
PKG_VERS_MINOR = 12-stable
44
PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
55
PKG_EXT = tar.gz
66
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
7-
PKG_DIST_SITE = https://sourceforge.net/projects/levent/files/release-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
7+
PKG_DIST_SITE = https://github.com/libevent/libevent/releases/download/release-$(PKG_VERS)
88
PKG_DIR = $(PKG_NAME)-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
99

1010
DEPENDS = cross/openssl
1111

1212
HOMEPAGE = http://libevent.org
13-
COMMENT = An event notification library
13+
COMMENT = Event notification library
1414
LICENSE = http://libevent.org/LICENSE.txt
1515

1616
GNU_CONFIGURE = 1

‎cross/libevent/PLIST

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
rsc:bin/event_rpcgen.py
22
lnk:lib/libevent.so
3-
lnk:lib/libevent-2.0.so.5
4-
lib:lib/libevent-2.0.so.5.1.9
3+
lnk:lib/libevent-2.1.so.7
4+
lib:lib/libevent-2.1.so.7.0.1
55
lnk:lib/libevent_core.so
6-
lnk:lib/libevent_core-2.0.so.5
7-
lib:lib/libevent_core-2.0.so.5.1.9
6+
lnk:lib/libevent_core-2.1.so.7
7+
lib:lib/libevent_core-2.1.so.7.0.1
88
lnk:lib/libevent_extra.so
9-
lnk:lib/libevent_extra-2.0.so.5
10-
lib:lib/libevent_extra-2.0.so.5.1.9
9+
lnk:lib/libevent_extra-2.1.so.7
10+
lib:lib/libevent_extra-2.1.so.7.0.1
1111
lnk:lib/libevent_openssl.so
12-
lnk:lib/libevent_openssl-2.0.so.5
13-
lib:lib/libevent_openssl-2.0.so.5.1.9
12+
lnk:lib/libevent_openssl-2.1.so.7
13+
lib:lib/libevent_openssl-2.1.so.7.0.1
1414
lnk:lib/libevent_pthreads.so
15-
lnk:lib/libevent_pthreads-2.0.so.5
16-
lib:lib/libevent_pthreads-2.0.so.5.1.9
15+
lnk:lib/libevent_pthreads-2.1.so.7
16+
lib:lib/libevent_pthreads-2.1.so.7.0.1

‎cross/libevent/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
libevent-2.0.22-stable.tar.gz SHA1 a586882bc93a208318c70fc7077ed8fca9862864
2-
libevent-2.0.22-stable.tar.gz SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3
3-
libevent-2.0.22-stable.tar.gz MD5 c4c56f986aa985677ca1db89630a2e11
1+
libevent-2.1.12-stable.tar.gz SHA1 cd55656a9b5bed630b08f05495230affb7996b21
2+
libevent-2.1.12-stable.tar.gz SHA256 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
3+
libevent-2.1.12-stable.tar.gz MD5 b5333f021f880fe76490d8a799cd79f4

‎cross/libwebsockets/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
88

99
DEPENDS = cross/openssl
1010

11+
# ppc except qoriq
12+
UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x
13+
1114
HOMEPAGE = https://libwebsockets.org/
1215
COMMENT = Libwebsockets (LWS) is a flexible, lightweight pure C library for implementing modern network protocols easily with a tiny footprint, using a nonblocking event loop.
1316
LICENSE = MIT

‎cross/links/Makefile

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = links
2-
PKG_VERS = 2.12
2+
PKG_VERS = 2.21
33
PKG_EXT = tar.bz2
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = http://links.twibright.com/download
@@ -14,10 +14,4 @@ LICENSE = GPLv2
1414
GNU_CONFIGURE = 1
1515
CONFIGURE_ARGS = --with-ssl=openssl
1616

17-
INSTALL_TARGET = myInstall
18-
1917
include ../../mk/spksrc.cross-cc.mk
20-
21-
.PHONY: myInstall
22-
myInstall:
23-
$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)

‎cross/links/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
links-2.12.tar.bz2 SHA1 952dfecded9496ff1a73184ce538d08dbbb5152b
2-
links-2.12.tar.bz2 SHA256 98411811ded1e8028f5aed708dd7d8ec0ae63ce24c2991a0241a989b7d09d84e
3-
links-2.12.tar.bz2 MD5 5d763ab72dc57bbc310feb95679c9d14
1+
links-2.21.tar.bz2 SHA1 58b10c61de1c416f9869da491ae70d117b04ba1d
2+
links-2.21.tar.bz2 SHA256 285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63
3+
links-2.21.tar.bz2 MD5 b88a46733d6932442ed8a6b751aac6b4

‎cross/lua/Makefile

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,29 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.lua.org/ftp/
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

8-
DEPENDS = cross/ncurses cross/readline
8+
DEPENDS = cross/ncursesw cross/readline
99

1010
HOMEPAGE = https://www.lua.org/
1111
COMMENT = Lua is a powerful, efficient, lightweight, embeddable scripting language. It supports procedural programming, object-oriented programming, functional programming, data-driven programming, and data description.
1212
LICENSE = MIT
1313

1414
CONFIGURE_TARGET = nop
15-
COMPILE_TARGET = lua_custom_compile
16-
INSTALL_TARGET = lua_custom_install
15+
COMPILE_TARGET = lua_compile
16+
INSTALL_TARGET = lua_install
1717

1818
include ../../mk/spksrc.cross-cc.mk
1919

20-
.PHONY: lua_custom_compile
21-
lua_custom_compile:
20+
.PHONY: lua_compile
21+
lua_compile:
2222
@$(RUN) $(MAKE) linux \
2323
CC="$(TC_PATH)$(TC_PREFIX)gcc -fPIC \$$(ALLFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/readline" \
2424
CXX="$(TC_PATH)$(TC_PREFIX)g++ \$$(ALLFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/readline" \
2525
AR="$(TC_PATH)$(TC_PREFIX)ar rcu \$$(ALLFLAGS)" \
2626
RANLIB="$(TC_PATH)$(TC_PREFIX)ranlib \$$(ALLFLAGS)" \
2727
CPPFLAGS="$(CPPFLAGS)" \
2828
LDFLAGS="$(LDFLAGS) -Wl,--rpath,$(INSTALL_PREFIX)/lib" \
29-
MYLIBS="-lncurses"
29+
MYLIBS="-lncursesw"
3030

31-
.PHONY: lua_custom_install
32-
lua_custom_install:
31+
.PHONY: lua_install
32+
lua_install:
3333
@$(RUN) $(MAKE) install INSTALL_TOP=$(STAGING_INSTALL_PREFIX)
34-

‎cross/m2crypto/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = M2Crypto
2-
PKG_VERS = 0.25.1
2+
PKG_VERS = 0.36.0
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/M/$(PKG_NAME)

‎cross/m2crypto/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
M2Crypto-0.25.1.tar.gz SHA1 44a24c03b9f56aad7c6a9278aa9436ac967bc7e9
2-
M2Crypto-0.25.1.tar.gz SHA256 ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef
3-
M2Crypto-0.25.1.tar.gz MD5 040234289fbef5bed4029f0f7d1dae35
1+
M2Crypto-0.36.0.tar.gz SHA1 666735839ad0d9b414cc39937ffad2675297bb02
2+
M2Crypto-0.36.0.tar.gz SHA256 1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1
3+
M2Crypto-0.36.0.tar.gz MD5 b8b34c5b83892096a8676b6f2e8f4e7e

‎cross/m2crypto/patches/001-fix-openssl-path.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# fix the include path for openssl
2+
--- setup.org.py 2020-07-02 15:36:45.000000000 +0000
3+
+++ setup.py 2020-09-26 14:36:57.276855700 +0000
4+
@@ -111,7 +111,7 @@
5+
def initialize_options(self):
6+
"""Overload to enable custom openssl settings to be picked up."""
7+
build.build.initialize_options(self)
8+
- self.openssl = None
9+
+ self.openssl = os.environ.get('STAGING_INSTALL_PREFIX')
10+
self.bundledlls = None
11+
12+
13+

‎cross/m2crypto/patches/001-fix-paths.patch

-11
This file was deleted.

‎cross/mc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = mc
2-
PKG_VERS = 4.8.23
2+
PKG_VERS = 4.8.25
33
PKG_EXT = tar.xz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = http://www.midnight-commander.org/downloads

‎cross/mc/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
mc-4.8.23.tar.xz SHA1 021a33828922b45d18daa23189d6c86d17e61e09
2-
mc-4.8.23.tar.xz SHA256 dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c
3-
mc-4.8.23.tar.xz MD5 466c3135f727f8ac2102d060a080ace3
1+
mc-4.8.25.tar.xz SHA1 4082ae830f09e919112aa3fc1d7e5333921a6a33
2+
mc-4.8.25.tar.xz SHA256 ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a
3+
mc-4.8.25.tar.xz MD5 19f14d368001aac454c28a2ddd2e851b

‎cross/monit/Makefile

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = monit
2-
PKG_VERS = 5.17.1
2+
PKG_VERS = 5.27.0
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = http://mmonit.com/monit/dist
@@ -14,4 +14,14 @@ LICENSE = AGPL
1414
GNU_CONFIGURE = 1
1515
CONFIGURE_ARGS = --without-pam libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes --with-ssl-incl-dir=$(STAGING_INSTALL_PREFIX)/include
1616

17+
18+
include ../../mk/spksrc.common.mk
19+
20+
ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH))
21+
CONFIGURE_ARGS += ac_cv_c_bigendian=yes
22+
else
23+
CONFIGURE_ARGS += ac_cv_c_bigendian=no
24+
endif
25+
26+
1727
include ../../mk/spksrc.cross-cc.mk

0 commit comments

Comments
 (0)