bump version openssl-1.1.1o; fix and bump version rtmpdump-2.4+

diff --git a/make/archives.mk b/make/archives.mk
index 84285e46dadb3abc17ad99cb7965e93965bf8e75..727e86409dcb6b34ed11cdd1a5699897434212cd 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -354,8 +354,8 @@ $(ARCHIVE)/links-$(LINKS_VER).tar.bz2:
 $(ARCHIVE)/pugixml-$(PUGIXML_VER).$(PUGIXML_MIC).tar.gz:
        $(WGET) http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER).$(PUGIXML_MIC)/pugixml-$(PUGIXML_VER).$(PUGIXML_MIC).tar.gz
 
-$(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz:
-       $(WGET) http://crux.ster.zone/distfiles/rtmpdump-$(LIBRTMP_VER).tar.gz
+$(ARCHIVE)/rtmpdump-git-$(LIBRTMP_GIT).tar.bz2:
+       get-git-archive.sh http://git.webhop.me/pub/rtmpdump.git $(LIBRTMP_GIT) $(notdir $@) $(ARCHIVE)
 
 $(ARCHIVE)/parted-$(PARTED_VER).tar.xz:
        $(WGET) https://ftp.gnu.org/gnu/parted/parted-$(PARTED_VER).tar.xz

diff --git a/make/libraries.mk b/make/libraries.mk
index 657ddc868e1cd0e9d0d7cfaea1a5276498925951..0992e0518dbc44c605f7ce599cec6d2e266dc3e5 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -441,37 +441,49 @@ $(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.gz | $(TARGETPREFIX)
        $(REMOVE)/giflib-$(GIFLIB_VER)
        $(TOUCH)
 
+OPENSSL_ASYNC =
+ifeq ($(BOXSERIES), (filter $(BOXMODEL), hd2))
+  OPENSSL_ASYNC = no-async
+endif
+OPENSSL_COMPATIBILITY_VERSIONS = 0.9.7 0.9.8 1.0.0 1.0.2 1.1.0
+
 $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
+       $(REMOVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER)
        $(UNTAR)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
        pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER) && \
-               $(PATCH)/openssl-1.0.x-optimize-for-size.patch && \
-               CC=$(TARGET)-gcc \
-               ./Configure shared no-hw no-engine linux-generic32 --prefix=/ --openssldir=/.remove && \
+               CFLAGS="-Os -pipe" \
+               CXXFLAGS="-Os -pipe" \
+               ./Configure \
+                       --cross-compile-prefix=$(TARGET)- \
+                       --prefix=$(TARGETPREFIX) \
+                       --openssldir=/etc/ssl \
+                       linux-generic32 \
+                       $(OPENSSL_ASYNC) \
+                       shared \
+                       threads \
+                       no-hw \
+                       no-engine \
+                       no-sse2 \
+                       no-tests \
+                       no-fuzz-afl \
+                       no-fuzz-libfuzzer \
+                       -DTERMIOS -fomit-frame-pointer \
+                       -DOPENSSL_SMALL_FOOTPRINT; \
                $(MAKE) depend && \
                $(MAKE) all && \
                $(MAKE) install_sw INSTALL_PREFIX=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libssl.pc
-       rm -r $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash $(TARGETPREFIX)/lib/engines
+       rm -rf $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash $(TARGETLIB)/engines-1.1
+       rm -rf $(TARGETPREFIX)/etc/ssl/ct_log_list.cnf*
+       rm -rf $(TARGETPREFIX)/etc/ssl/misc/{CA.pl,tsget*}
+       rm -rf $(TARGETPREFIX)/etc/ssl/openssl.cnf.dist
+       pushd $(TARGETLIB) && \
+               $(foreach v,$(OPENSSL_COMPATIBILITY_VERSIONS), ln -sf libcrypto.so.1.1 libcrypto.so.$(v)$(sep);) \
+               $(foreach v,$(OPENSSL_COMPATIBILITY_VERSIONS), ln -sf libssl.so.1.1 libssl.so.$(v)$(sep);)
        $(REMOVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER)
-       pushd $(TARGETPREFIX)/lib && \
-               if [ "$(OPENSSL_VER)" = "1.0.1" -o "$(OPENSSL_VER)" = "1.0.2" ]; then \
-                       OPENSSL_VER_X=1.0.0; \
-               else \
-                       OPENSSL_VER_X=$(OPENSSL_VER); \
-               fi; \
-               ln -sf libcrypto.so.$$OPENSSL_VER_X libcrypto.so.0.9.7; \
-               ln -sf libssl.so.$$OPENSSL_VER_X libssl.so.0.9.7; \
-               if [ ! "$(OPENSSL_VER)" = "0.9.8" ]; then \
-                       ln -sf libcrypto.so.$$OPENSSL_VER_X libcrypto.so.0.9.8; \
-                       ln -sf libssl.so.$$OPENSSL_VER_X libssl.so.0.9.8; \
-               else \
-                       ln -sf libcrypto.so.$$OPENSSL_VER_X libcrypto.so.1.0.0; \
-                       ln -sf libssl.so.$$OPENSSL_VER_X libssl.so.1.0.0; \
-               fi;
-       chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.*
        $(TOUCH)
 
 CA_URL = https://curl.se/ca/cacert.pem
@@ -527,24 +539,24 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)
        $(REMOVE)/curl-$(CURL_VER)
        $(TOUCH)
 
-$(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz | $(TARGETPREFIX)
+$(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-git-$(LIBRTMP_GIT).tar.bz2 | $(TARGETPREFIX)
        $(START_BUILD)
-       mkdir $(BUILD_TMP)/rtmpdump-$(LIBRTMP_VER);\
-       cd $(BUILD_TMP)/rtmpdump-$(LIBRTMP_VER);\
-       tar -xf $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz ;\
-       set -e; cd $(BUILD_TMP)/rtmpdump-$(LIBRTMP_VER); \
+       $(REMOVE)/rtmpdump-git-$(LIBRTMP_GIT)
+       $(UNTAR)/rtmpdump-git-$(LIBRTMP_GIT).tar.bz2
+       set -e; cd $(BUILD_TMP)/rtmpdump-git-$(LIBRTMP_GIT); \
                sed -i "s!^prefix=.*!prefix=/!;" Makefile; \
                sed -i "s!^prefix=.*!prefix=/!;" librtmp/Makefile; \
                $(MAKE) \
                        CROSS_COMPILE=$(TARGET)- \
-                       XCFLAGS="-I$(TARGETPREFIX)/include" \
-                       LDFLAGS="-L$(TARGETPREFIX)/lib" \
+                       XCFLAGS="$(TARGET_CFLAGS)" \
+                       XLDFLAGS="$(TARGET_LDFLAGS)" \
                        ; \
-               $(MAKE) install DESTDIR=$(TARGETPREFIX) prefix="" \
+               $(MAKE) install DESTDIR=$(TARGETPREFIX) \
                        sbindir=/.remove \
                        mandir=/.remove
+       rm -rf $(addprefix $(TARGETPREFIX)/sbin/,rtmpgw rtmpsrv rtmpsuck)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc
-       $(REMOVE)/rtmpdump-$(LIBRTMP_VER)
+       $(REMOVE)/rtmpdump-git-$(LIBRTMP_GIT)
        $(TOUCH)
 
 $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.xz | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index bcd90e6ed89d87443458f221dcf7bb188e95688c..07a857f167f0c7695154523da376d7fbf8abf7cb 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -148,7 +148,8 @@ LIBUSB_COMPAT_VER = 0.1.7
 
 # rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported,
 # including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.
-LIBRTMP_VER = 2.4_p20131018
+#LIBRTMP_VER = 2.4_p20131018
+LIBRTMP_GIT = master
 
 # This library is minimum, easy-to-use, C implementation for xml file parsing
 LIBROXML_VER = 3.0.2
@@ -203,8 +204,8 @@ NTP_VER=4.2.8p15
 OFGWRITE_VER = b2823ee
 
 # openssl; toolkit for the SSL v2/v3 and TLS v1 protocol
-OPENSSL_VER=1.0.2
-OPENSSL_SUBVER=u
+OPENSSL_VER=1.1.1
+OPENSSL_SUBVER=o
 
 # OpenVPN -- A Secure tunneling daemon
 OPENVPN_VER = 2.5.6