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.

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

openssl: update to version 1.1.1h #4155

Merged
merged 19 commits into from
Oct 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/build_status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if [ -f "${BUILD_UNSUPPORTED_FILE}" ]; then
unsupported_packages=$(cat "${BUILD_UNSUPPORTED_FILE}" | grep -Po "\- \K.*:" | sort -u | tr '\n' '|' | sed -e 's/|$//')
# fix for packages with different name
if [ "$(echo ${unsupported_packages} | grep -ow nzbdrone)" != "" ]; then
unsupported_packages=$(echo "${unsupported_packages}|sonarr")
unsupported_packages=$(echo "${unsupported_packages}|sonarr:")
fi
cat "${BUILD_ERROR_FILE}" | grep -Pv "\- (${unsupported_packages}) " > "${BUILD_ERROR_FILE}.tmp"
rm -f "${BUILD_ERROR_FILE}"
Expand Down
29 changes: 16 additions & 13 deletions cross/boxbackup/Makefile
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
PKG_NAME = boxbackup
PKG_VERS = 0.11.1
PKG_NAME = BoxBackup
PKG_VERS = 0.12
PKG_VERS_DATE = 200326
PKG_VERS_BRANCH = master
PKG_VERS_COMMIT = 8e8b63c
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_VERS_BRANCH).$(PKG_VERS_DATE).$(PKG_VERS_COMMIT).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/boxbackup/boxbackup/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
PKG_DIR = boxbackup-$(PKG_NAME)-$(PKG_VERS).$(PKG_VERS_BRANCH).$(PKG_VERS_DATE).$(PKG_VERS_COMMIT)

DEPENDS = cross/openssl cross/readline cross/berkeleydb
DEPENDS = cross/openssl cross/berkeleydb

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

GNU_CONFIGURE = 1
CONFIGURE_ARGS = --with-random=/dev/urandom --enable-gnu-readline box_cv_have_large_file_support=yes
CONFIGURE_ARGS = --with-random=/dev/urandom box_cv_have_large_file_support=yes

PRE_CONFIGURE_TARGET = myPreConfigure
INSTALL_TARGET = myInstall
PRE_CONFIGURE_TARGET = boxbackup_pre_configure
INSTALL_TARGET = boxbackup_install

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

.PHONY: myPreConfigure
myPreConfigure:
.PHONY: boxbackup_pre_configure
boxbackup_pre_configure:
$(RUN) ./bootstrap

.PHONY: myInstall
myInstall:
.PHONY: boxbackup_install
boxbackup_install:
$(RUN) $(MAKE) install-backup-client DESTDIR=$(INSTALL_DIR)
$(RUN) $(MAKE) install-backup-server DESTDIR=$(INSTALL_DIR)
6 changes: 3 additions & 3 deletions cross/boxbackup/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
boxbackup-0.11.1.tar.gz SHA1 42cfc692220d97a22cf3cfd8413847122d061fa0
boxbackup-0.11.1.tar.gz SHA256 135da2be32f89a4dd4ea26569b9d422f938dee891fd2a54e4dfd93cfd81954b9
boxbackup-0.11.1.tar.gz MD5 358b1b6778b77c78e37774cbf7a9f0bb
BoxBackup-0.12.tar.gz SHA1 5fb67b6b8221d23485c41481968c49515873af77
BoxBackup-0.12.tar.gz SHA256 93a2e60906b575a8131f0e1fce534a5ed1a5f967cb8975eb472b79dcd777dec2
BoxBackup-0.12.tar.gz MD5 3b33f8af3333f38316c02f6a453e08b1
5 changes: 2 additions & 3 deletions cross/fossil-scm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = fossil-scm
PKG_VERS = 2.10
PKG_VERS = 2.12.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.fossil-scm.org/index.html/tarball/version-$(PKG_VERS)
Expand All @@ -15,7 +15,7 @@ LICENSE = BSD2
PRE_CONFIGURE_TARGET = fossil-scm_pre_configure

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

6 changes: 3 additions & 3 deletions cross/fossil-scm/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fossil-scm-v2.10.tar.gz SHA1 56e64cc7e0ff4773a61bc06c17a31bf020a077ff
fossil-scm-v2.10.tar.gz SHA256 c58cb721c4738301801420c0435a0f2dab68a81e381d5f811d6b4143f8cec151
fossil-scm-v2.10.tar.gz MD5 ada146d97e57d9ec6d7545826b817110
fossil-scm-v2.12.1.tar.gz SHA1 95fe8c7bceb58c8bc6b1e8a815b1d4fd26c6fa83
fossil-scm-v2.12.1.tar.gz SHA256 fd65fbb73ceb84601adbdcff6e2e5819ba1f2eea963c9d6e6a36452b3860c55d
fossil-scm-v2.12.1.tar.gz MD5 8040c3101d9aaeaeaf7e4758399356f6
2 changes: 1 addition & 1 deletion cross/git/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = git
PKG_VERS = 2.26.2
PKG_VERS = 2.28.0
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://kernel.org/pub/software/scm/$(PKG_NAME)
Expand Down
6 changes: 3 additions & 3 deletions cross/git/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
git-2.26.2.tar.xz SHA1 bdb5eb6c014d7c372be70782a5155d964abe2c08
git-2.26.2.tar.xz SHA256 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848
git-2.26.2.tar.xz MD5 f9a832256032e711973dd7be4981ab4c
git-2.28.0.tar.xz SHA1 29a70cd3e7bccbbc4233e9c948b036e0b7b6d46a
git-2.28.0.tar.xz SHA256 dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d
git-2.28.0.tar.xz MD5 5fde0206768ed70092d1fcc8f447251a
45 changes: 32 additions & 13 deletions cross/haproxy/Makefile
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@
PKG_NAME = haproxy
PKG_VERS = 1.5.14
PKG_VERS = 1.8.26
PKG_MAIN_VERS=$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.haproxy.org/download/1.5/src
PKG_DIST_SITE = http://www.haproxy.org/download/$(PKG_MAIN_VERS)/src
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/openssl cross/zlib
DEPENDS = cross/zlib cross/openssl cross/lua cross/pcre

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

CONFIGURE_TARGET = nop
COMPILE_TARGET = myCompile
INSTALL_TARGET = myInstall
OFLAG = -O3
INSTALL_TARGET = haproxy_install

include ../../mk/spksrc.cross-cc.mk
BUILD_OPTIONS = USE_TPROXY=1 USE_PTHREAD_PSHARED=1 USE_OPENSSL=1 USE_ZLIB=1
BUILD_OPTIONS += USE_PCRE=1 USE_STATIC_PCRE=1 PCRE_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include
BUILD_OPTIONS += USE_LUA=1 LUA_INC=$(INSTALL_DIR)$(INSTALL_PREFIX)/include LUA_LIB=$(INSTALL_DIR)$(INSTALL_PREFIX)/lib

include ../../mk/spksrc.common.mk

ARCH_OPTIONS =

ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH))
# ARM5_ARCHES and PPC_ARCHES (except QorIQ) have older kernels and need rt library for clock_gettime()
BUILD_OPTIONS += USE_RT=1
ADDITIONAL_CFLAGS += -DLUA_32BITS
endif
ifeq ($(findstring $(ARCH), qoriq),$(ARCH))
BUILD_OPTIONS += ADDLIB=-latomic
endif

.PHONY: myCompile
myCompile:
$(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)"
ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
ARCH_OPTIONS = ARCH=x86_64
endif

COMPILE_MAKE_OPTIONS += TARGET=generic $(ARCH_OPTIONS) $(BUILD_OPTIONS) SPKSRC_CFLAGS="$(CFLAGS)" SPKSRC_LDFLAGS="$(LDFLAGS)"

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

myInstall:
.PHONY: haproxy_install
haproxy_install:
$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)
Comment on lines +44 to 46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks look like standard default "make install" target. May you please confirm by discarding its replacement?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ymartin59 disagree, the small difference is prefix vs PREFIX

6 changes: 3 additions & 3 deletions cross/haproxy/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
haproxy-1.5.14.tar.gz SHA1 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f
haproxy-1.5.14.tar.gz SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99
haproxy-1.5.14.tar.gz MD5 ad9d7262b96ba85a0f8c6acc6cb9edde
haproxy-1.8.26.tar.gz SHA1 9a512b101d1bc94213528b59d0c67176cba85a46
haproxy-1.8.26.tar.gz SHA256 e3c2a81b6f26dcb736a34ebb5f134d3251ceccf30386214655fa7ed6d3afa400
haproxy-1.8.26.tar.gz MD5 67e0c11997c05826996dba80fdceef2c
4 changes: 2 additions & 2 deletions cross/htop/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = htop
PKG_VERS = 2.2.0
PKG_VERS = 3.0.2
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://hisham.hm/htop/releases/$(PKG_VERS)
PKG_DIST_SITE = https://bintray.com/htop/source/download_file?file_path=
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

UNSUPPORTED_ARCHS = powerpc ppc824x
Expand Down
6 changes: 3 additions & 3 deletions cross/htop/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
htop-2.2.0.tar.gz SHA1 5da790e6addf495edc4d8ed7d69d1f0de085c7ad
htop-2.2.0.tar.gz SHA256 d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57
htop-2.2.0.tar.gz MD5 0d816b6beed31edc75babcfbf863ffa8
htop-3.0.2.tar.gz SHA1 e1d37ccd590cb8345c7b518ef56192d4f1cd8cd4
htop-3.0.2.tar.gz SHA256 6471d9505daca5c64073fc37dbab4d012ca4fc6a7040a925dad4a7553e3349c4
htop-3.0.2.tar.gz MD5 fb848a1c91871d134c785bccb560ca8d
8 changes: 4 additions & 4 deletions cross/libevent/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PKG_NAME = libevent
PKG_VERS_MAJOR = 2.0
PKG_VERS_MINOR = 22-stable
PKG_VERS_MAJOR = 2.1
PKG_VERS_MINOR = 12-stable
PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://sourceforge.net/projects/levent/files/release-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)
PKG_DIST_SITE = https://github.com/libevent/libevent/releases/download/release-$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS_MAJOR).$(PKG_VERS_MINOR)

DEPENDS = cross/openssl

HOMEPAGE = http://libevent.org
COMMENT = An event notification library
COMMENT = Event notification library
LICENSE = http://libevent.org/LICENSE.txt

GNU_CONFIGURE = 1
Expand Down
20 changes: 10 additions & 10 deletions cross/libevent/PLIST
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
rsc:bin/event_rpcgen.py
lnk:lib/libevent.so
lnk:lib/libevent-2.0.so.5
lib:lib/libevent-2.0.so.5.1.9
lnk:lib/libevent-2.1.so.7
lib:lib/libevent-2.1.so.7.0.1
lnk:lib/libevent_core.so
lnk:lib/libevent_core-2.0.so.5
lib:lib/libevent_core-2.0.so.5.1.9
lnk:lib/libevent_core-2.1.so.7
lib:lib/libevent_core-2.1.so.7.0.1
lnk:lib/libevent_extra.so
lnk:lib/libevent_extra-2.0.so.5
lib:lib/libevent_extra-2.0.so.5.1.9
lnk:lib/libevent_extra-2.1.so.7
lib:lib/libevent_extra-2.1.so.7.0.1
lnk:lib/libevent_openssl.so
lnk:lib/libevent_openssl-2.0.so.5
lib:lib/libevent_openssl-2.0.so.5.1.9
lnk:lib/libevent_openssl-2.1.so.7
lib:lib/libevent_openssl-2.1.so.7.0.1
lnk:lib/libevent_pthreads.so
lnk:lib/libevent_pthreads-2.0.so.5
lib:lib/libevent_pthreads-2.0.so.5.1.9
lnk:lib/libevent_pthreads-2.1.so.7
lib:lib/libevent_pthreads-2.1.so.7.0.1
6 changes: 3 additions & 3 deletions cross/libevent/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libevent-2.0.22-stable.tar.gz SHA1 a586882bc93a208318c70fc7077ed8fca9862864
libevent-2.0.22-stable.tar.gz SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3
libevent-2.0.22-stable.tar.gz MD5 c4c56f986aa985677ca1db89630a2e11
libevent-2.1.12-stable.tar.gz SHA1 cd55656a9b5bed630b08f05495230affb7996b21
libevent-2.1.12-stable.tar.gz SHA256 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
libevent-2.1.12-stable.tar.gz MD5 b5333f021f880fe76490d8a799cd79f4
3 changes: 3 additions & 0 deletions cross/libwebsockets/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/openssl

# ppc except qoriq
UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x

HOMEPAGE = https://libwebsockets.org/
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.
LICENSE = MIT
Expand Down
8 changes: 1 addition & 7 deletions cross/links/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = links
PKG_VERS = 2.12
PKG_VERS = 2.21
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://links.twibright.com/download
Expand All @@ -14,10 +14,4 @@ LICENSE = GPLv2
GNU_CONFIGURE = 1
CONFIGURE_ARGS = --with-ssl=openssl

INSTALL_TARGET = myInstall

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

.PHONY: myInstall
myInstall:
$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)
6 changes: 3 additions & 3 deletions cross/links/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
links-2.12.tar.bz2 SHA1 952dfecded9496ff1a73184ce538d08dbbb5152b
links-2.12.tar.bz2 SHA256 98411811ded1e8028f5aed708dd7d8ec0ae63ce24c2991a0241a989b7d09d84e
links-2.12.tar.bz2 MD5 5d763ab72dc57bbc310feb95679c9d14
links-2.21.tar.bz2 SHA1 58b10c61de1c416f9869da491ae70d117b04ba1d
links-2.21.tar.bz2 SHA256 285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63
links-2.21.tar.bz2 MD5 b88a46733d6932442ed8a6b751aac6b4
17 changes: 8 additions & 9 deletions cross/lua/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,29 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.lua.org/ftp/
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/ncurses cross/readline
DEPENDS = cross/ncursesw cross/readline

HOMEPAGE = https://www.lua.org/
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.
LICENSE = MIT

CONFIGURE_TARGET = nop
COMPILE_TARGET = lua_custom_compile
INSTALL_TARGET = lua_custom_install
COMPILE_TARGET = lua_compile
INSTALL_TARGET = lua_install

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

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

.PHONY: lua_custom_install
lua_custom_install:
.PHONY: lua_install
lua_install:
@$(RUN) $(MAKE) install INSTALL_TOP=$(STAGING_INSTALL_PREFIX)

2 changes: 1 addition & 1 deletion cross/m2crypto/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = M2Crypto
PKG_VERS = 0.25.1
PKG_VERS = 0.36.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/M/$(PKG_NAME)
Expand Down
6 changes: 3 additions & 3 deletions cross/m2crypto/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
M2Crypto-0.25.1.tar.gz SHA1 44a24c03b9f56aad7c6a9278aa9436ac967bc7e9
M2Crypto-0.25.1.tar.gz SHA256 ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef
M2Crypto-0.25.1.tar.gz MD5 040234289fbef5bed4029f0f7d1dae35
M2Crypto-0.36.0.tar.gz SHA1 666735839ad0d9b414cc39937ffad2675297bb02
M2Crypto-0.36.0.tar.gz SHA256 1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1
M2Crypto-0.36.0.tar.gz MD5 b8b34c5b83892096a8676b6f2e8f4e7e
13 changes: 13 additions & 0 deletions cross/m2crypto/patches/001-fix-openssl-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# fix the include path for openssl
--- setup.org.py 2020-07-02 15:36:45.000000000 +0000
+++ setup.py 2020-09-26 14:36:57.276855700 +0000
@@ -111,7 +111,7 @@
def initialize_options(self):
"""Overload to enable custom openssl settings to be picked up."""
build.build.initialize_options(self)
- self.openssl = None
+ self.openssl = os.environ.get('STAGING_INSTALL_PREFIX')
self.bundledlls = None



11 changes: 0 additions & 11 deletions cross/m2crypto/patches/001-fix-paths.patch

This file was deleted.

2 changes: 1 addition & 1 deletion cross/mc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = mc
PKG_VERS = 4.8.23
PKG_VERS = 4.8.25
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.midnight-commander.org/downloads
Expand Down
6 changes: 3 additions & 3 deletions cross/mc/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mc-4.8.23.tar.xz SHA1 021a33828922b45d18daa23189d6c86d17e61e09
mc-4.8.23.tar.xz SHA256 dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c
mc-4.8.23.tar.xz MD5 466c3135f727f8ac2102d060a080ace3
mc-4.8.25.tar.xz SHA1 4082ae830f09e919112aa3fc1d7e5333921a6a33
mc-4.8.25.tar.xz SHA256 ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a
mc-4.8.25.tar.xz MD5 19f14d368001aac454c28a2ddd2e851b
12 changes: 11 additions & 1 deletion cross/monit/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = monit
PKG_VERS = 5.17.1
PKG_VERS = 5.27.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://mmonit.com/monit/dist
Expand All @@ -14,4 +14,14 @@ LICENSE = AGPL
GNU_CONFIGURE = 1
CONFIGURE_ARGS = --without-pam libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes --with-ssl-incl-dir=$(STAGING_INSTALL_PREFIX)/include


include ../../mk/spksrc.common.mk

ifeq ($(findstring $(ARCH),$(PPC_ARCHES)),$(ARCH))
CONFIGURE_ARGS += ac_cv_c_bigendian=yes
else
CONFIGURE_ARGS += ac_cv_c_bigendian=no
endif


include ../../mk/spksrc.cross-cc.mk
Loading