summaryrefslogtreecommitdiff
path: root/package/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'package/openssl')
-rw-r--r--package/openssl/Makefile124
-rw-r--r--package/openssl/files/openssl-util.conffiles1
-rw-r--r--package/openssl/patches/patch-Configure10
-rw-r--r--package/openssl/patches/patch-Makefile_org11
-rw-r--r--package/openssl/patches/patch-Makefile_shared18
-rw-r--r--package/openssl/patches/patch-util_shlib_wrap_sh16
6 files changed, 70 insertions, 110 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 22a411a16..c397e6dce 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -1,77 +1,98 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openssl
-PKG_VERSION:= 1.0.0e
+PKG_VERSION:= 3.5.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 7040b89c4c58c7a1016c0dfa6e821c86
-PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
-PKG_SECTION:= libs
+PKG_HASH:= 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99
+PKG_DESCR:= ssl/tls library
+PKG_SECTION:= libs/crypto
+PKG_URL:= https://openssl-library.org/
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
-PKG_URL:= http://www.openssl.org/
-PKG_SITES:= http://www.openssl.org/source/
+PKG_SITES:= https://github.com/openssl/openssl/releases/download/openssl-$(PKG_VERSION)/
+PKG_LIBNAME:= libopenssl
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBOPENSSL LIBOPENSSL_DEV OPENSSL_UTIL
-PKGSD_OPENSSL_UTIL:= OpenSSL command line tool
-PKGSC_OPENSSL_UTIL:= crypto
-PKGSS_OPENSSL_UTIL:= libopenssl
-PKGSD_LIBOPENSSL_DEV:= development files for openssl
-PKGSC_LIBOPENSSL_DEV:= devel
-PKGSS_LIBOPENSSL_DEV:= libopenssl
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_FLAVOURS_LIBOPENSSL:= WITH_EC
-PKGFD_WITH_EC:= enable Elliptic Curve crypto
+PKG_SUBPKGS:= LIBOPENSSL OPENSSL_UTIL
+PKGSD_OPENSSL_UTIL:= openssl command line tool
+PKGSC_OPENSSL_UTIL:= app/crypto
+PKGSS_OPENSSL_UTIL:= libopenssl
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
-endif
-include ${TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,OPENSSL,openssl,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
-$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV}))
$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL}))
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+OPENSSL_OPTIONS:= no-shared zlib no-dso
+else
+OPENSSL_OPTIONS:= shared zlib-dynamic
+endif
+
+OPENSSL_OPTIONS+= threads no-err no-tests no-fuzz-libfuzzer no-fuzz-afl
+OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea no-docs
+
+HOST_STYLE:= manual
CONFIG_STYLE:= manual
-BUILD_STYLE:= manual
INSTALL_TARGET:= install_sw
FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST}
-OPENSSL_OPTIONS:= shared no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+ifeq ($(ADK_TARGET_ARCH_MICROBLAZE),y)
+TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS))
+endif
+ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
+TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS))
+endif
+ifeq ($(ADK_TARGET_ARCH_PPC),y)
+TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS))
+endif
-ifeq ($(ADK_PACKAGE_LIBOPENSSL_WITH_EC),)
-OPENSSL_OPTIONS+= no-ec
+CONFIG:= linux-generic32
+ifeq ($(ADK_TARGET_ARCH_X86_64),y)
+CONFIG:= linux-x86_64
endif
+ifeq ($(ADK_TARGET_ARCH_AARCH64),y)
+CONFIG:= linux-aarch64
+OPENSSL_OPTIONS+= no-asm
+endif
+
+host-configure:
+ (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl no-docs no-tests)
+
+host-build:
+ (cd $(WRKBUILD); $(MAKE))
+
+openssl-hostinstall:
+ (cd $(WRKBUILD); $(MAKE) install)
do-configure:
(cd $(WRKBUILD); \
- PATH=$(TARGET_PATH) \
- OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
- ./Configure linux-embedded \
- --prefix=/usr \
- --openssldir=/etc/ssl \
- -I$(STAGING_TARGET_DIR)/usr/include \
- -L$(STAGING_TARGET_DIR)/usr/lib -ldl \
- -DHAVE_CRYPTODEV \
- -DOPENSSL_SMALL_FOOTPRINT \
- $(OPENSSL_OPTIONS) \
- );
-
-do-build:
- $(MAKE) -C $(WRKBUILD) \
- CC="$(TARGET_CC)" \
- AR="$(TARGET_CROSS)ar r" \
- RANLIB="$(TARGET_CROSS)ranlib" \
- OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
- all build-shared
-
-post-install:
+ PATH='$(TARGET_PATH)' \
+ CROSS_COMPILE='' \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS) -latomic" \
+ ./Configure $(CONFIG) \
+ --prefix=/usr \
+ --openssldir=/etc/ssl \
+ -I$(STAGING_TARGET_DIR)/usr/include \
+ -L$(STAGING_TARGET_DIR)/usr/lib \
+ -DOPENSSL_SMALL_FOOTPRINT \
+ -DOPENSSL_NO_ASYNC \
+ $(OPENSSL_OPTIONS) \
+ );
+
+libopenssl-install:
${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
- ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
+ ${CP} ${WRKINST}/usr/lib*/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
openssl-util-install:
@@ -81,10 +102,5 @@ openssl-util-install:
${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/
chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private
-libopenssl-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include
- $(CP) $(STAGING_TARGET_DIR)/usr/include/crypto/cryptodev.h \
- $(IDIR_LIBOPENSSL_DEV)/usr/include
-
-include ${TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/openssl/files/openssl-util.conffiles b/package/openssl/files/openssl-util.conffiles
deleted file mode 100644
index 6d068e66c..000000000
--- a/package/openssl/files/openssl-util.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/ssl/openssl.cnf
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
deleted file mode 100644
index 9275cd530..000000000
--- a/package/openssl/patches/patch-Configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- openssl-1.0.0.orig/Configure 2010-01-19 22:40:54.000000000 +0100
-+++ openssl-1.0.0/Configure 2010-05-29 15:58:43.561613735 +0200
-@@ -379,6 +379,7 @@ my %table=(
- "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
-+"linux-embedded","gcc:-DTERMIO \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
- #### *BSD [do see comment about ${BSDthreads} above!]
- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org
deleted file mode 100644
index f72030d14..000000000
--- a/package/openssl/patches/patch-Makefile_org
+++ /dev/null
@@ -1,11 +0,0 @@
---- openssl-1.0.0d.orig/Makefile.org 2010-01-27 17:06:58.000000000 +0100
-+++ openssl-1.0.0d/Makefile.org 2011-10-12 06:07:40.993200000 +0200
-@@ -109,7 +109,7 @@ LIBKRB5=
- ZLIB_INCLUDE=
- LIBZLIB=
-
--DIRS= crypto ssl engines apps test tools
-+DIRS= crypto ssl engines apps tools
- ENGDIRS= ccgost
- SHLIBDIRS= crypto ssl
-
diff --git a/package/openssl/patches/patch-Makefile_shared b/package/openssl/patches/patch-Makefile_shared
deleted file mode 100644
index 76b1cf71a..000000000
--- a/package/openssl/patches/patch-Makefile_shared
+++ /dev/null
@@ -1,18 +0,0 @@
---- openssl-1.0.0a.orig/Makefile.shared 2009-10-16 01:44:11.000000000 +0200
-+++ openssl-1.0.0a/Makefile.shared 2010-07-09 16:19:54.623017943 +0200
-@@ -95,7 +95,6 @@ LINK_APP= \
- LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
- LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
- LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
- $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
-
- LINK_SO= \
-@@ -105,7 +104,6 @@ LINK_SO= \
- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
- LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
- LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
- $${SHAREDCMD} $${SHAREDFLAGS} \
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
- $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
diff --git a/package/openssl/patches/patch-util_shlib_wrap_sh b/package/openssl/patches/patch-util_shlib_wrap_sh
deleted file mode 100644
index 1e8a30bf6..000000000
--- a/package/openssl/patches/patch-util_shlib_wrap_sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- openssl-1.0.0a.orig/util/shlib_wrap.sh 2009-11-15 20:06:21.000000000 +0100
-+++ openssl-1.0.0a/util/shlib_wrap.sh 2010-07-09 16:19:21.211017427 +0200
-@@ -57,11 +57,10 @@ SunOS|IRIX*)
- eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
- unset rld_var
- ;;
--*) LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH" # Linux, ELF HP-UX
-- DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH" # MacOS X
-+*) DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH" # MacOS X
- SHLIB_PATH="${THERE}:$SHLIB_PATH" # legacy HP-UX
- LIBPATH="${THERE}:$LIBPATH" # AIX, OS/2
-- export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
-+ export DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
- # Even though $PATH is adjusted [for Windows sake], it doesn't
- # necessarily does the trick. Trouble is that with introduction
- # of SafeDllSearchMode in XP/2003 it's more appropriate to copy
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-09 04:33:26 +0000