U22 (#1104)

* syntax for qt compile * fix bracket * update deprecated functions update with new standards * update qt functions update deprecated qt functions * privkey -> seckey squash secp256k1 warning during compile * startofday update Fix 'QDateTime is deprecated' warnings * update qt functions update to std * replace deprecated return (0) squash warning using noitemflags * update qt and add patch * Update qt.mk update new qt config * Update qt.mk zlib from system * Update qt.mk fixes for win compile * Update qt.mk add linked openssl * ssl * qt make updates * modernize deps qt + ssl * update tor submodule * add info on with-openssl-dir to autoconf
vergecurrency · Jun 2, 2023 · 52a7ba4 · 52a7ba4
1 parent 6c86425
commit 52a7ba4
Show file tree

Hide file tree

Showing 39 changed files with 511 additions and 423 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,5 @@
 [submodule "src/tor"]
 	path = src/tor
-	url = https://github.com/torproject/tor/
-	branch = tor-0.4.7.10
+	url = https://github.com/torproject/tor
+	branch = tor-0.4.7.13
+
diff --git a/configure.ac b/configure.ac
@@ -1572,7 +1572,7 @@ AX_SUBDIRS_CONFIGURE([src/secp256k1], [[--disable-shared], [--with-pic], [--with
 
 ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery --disable-jni --disable-system-torrc --disable-systemd --disable-lzma --disable-zstd --disable-asciidoc"
 AC_CONFIG_SUBDIRS([src/tor])
-
+dnl you can add --with-openssl-dir to the above autoconfigure args if you want to use a specific openssl dir to compile tor from
 AC_OUTPUT
 
 dnl Taken from https://wiki.debian.org/RpathIssue

diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk
@@ -1,6 +1,6 @@
 package=bdb
 $(package)_version=4.8.30
-$(package)_download_path=http://download.oracle.com/berkeley-db
+$(package)_download_path=https://download.oracle.com/berkeley-db
 $(package)_file_name=db-$($(package)_version).NC.tar.gz
 $(package)_sha256_hash=12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef
 $(package)_build_subdir=build_unix
@@ -10,7 +10,7 @@ $(package)_config_opts=--disable-shared --enable-cxx --disable-replication
 $(package)_config_opts_mingw32=--enable-mingw
 $(package)_config_opts_linux=--with-pic
 $(package)_config_opts_android=--with-pic
-$(package)_cxxflags=-std=c++17
+$(package)_cxxflags=-std=c++1z
 
 endef
 
@@ -30,4 +30,4 @@ endef
 
 define $(package)_stage_cmds
   $(MAKE) DESTDIR=$($(package)_staging_dir) install_lib install_include
-endef
+endef
diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk
@@ -1,42 +1,96 @@
 package=openssl
-$(package)_version=1.0.1m
+$(package)_version=3.0.8
 $(package)_download_path=https://www.openssl.org/source
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
+$(package)_sha256_hash=6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
 
 define $(package)_set_vars
-$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
-$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl no-zlib no-shared no-dso
-$(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2
-$(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3
+$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" CFLAGS="$($(package)_cflags)"
+$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl --api=3.0 
+$(package)_config_opts+=no-shared
+$(package)_config_opts+=no-acvp-tests
+$(package)_config_opts+=no-afalgeng
+$(package)_config_opts+=no-async
+$(package)_config_opts+=no-bf
+$(package)_config_opts+=no-blake2
+$(package)_config_opts+=no-capieng
+$(package)_config_opts+=no-cast
+$(package)_config_opts+=no-cmac
+$(package)_config_opts+=no-cms
+$(package)_config_opts+=no-comp
+$(package)_config_opts+=no-ct
+$(package)_config_opts+=no-deprecated
+$(package)_config_opts+=no-des
+$(package)_config_opts+=no-dgram
+$(package)_config_opts+=no-dsa
+$(package)_config_opts+=no-dso
+$(package)_config_opts+=no-dtls
+$(package)_config_opts+=no-dynamic-engine
+$(package)_config_opts+=no-ec2m
+$(package)_config_opts+=no-engine
+$(package)_config_opts+=no-err
+$(package)_config_opts+=no-gost
+$(package)_config_opts+=no-idea
+$(package)_config_opts+=no-legacy
+$(package)_config_opts+=no-md4
+$(package)_config_opts+=no-mdc2
+$(package)_config_opts+=no-multiblock
+$(package)_config_opts+=no-nextprotoneg
+$(package)_config_opts+=no-ocb
+$(package)_config_opts+=no-ocsp
+$(package)_config_opts+=no-poly1305
+$(package)_config_opts+=no-posix-io
+$(package)_config_opts+=no-psk
+$(package)_config_opts+=no-rc2
+$(package)_config_opts+=no-rc4
+$(package)_config_opts+=no-rdrand
+$(package)_config_opts+=no-rfc3779
+$(package)_config_opts+=no-rmd160
+$(package)_config_opts+=no-scrypt
+$(package)_config_opts+=no-seed
+$(package)_config_opts+=no-sock
+$(package)_config_opts+=no-srp
+$(package)_config_opts+=no-srtp
+$(package)_config_opts+=no-ssl2
+$(package)_config_opts+=no-ssl3
+$(package)_config_opts+=no-ssl-trace
+$(package)_config_opts+=no-stdio
+$(package)_config_opts+=no-tests
+$(package)_config_opts+=no-tls
+$(package)_config_opts+=no-ts
+$(package)_config_opts+=no-whirlpool
+$(package)_config_opts+=no-zlib
+$(package)_config_opts+=no-zlib-dynamic
 $(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
-$(package)_config_opts_linux=-fPIC
+$(package)_config_opts+=-DPURIFY
+$(package)_config_opts_linux=-fPIC -Wa,--noexecstack
 $(package)_config_opts_x86_64_linux=linux-x86_64
 $(package)_config_opts_i686_linux=linux-generic32
 $(package)_config_opts_arm_linux=linux-generic32
 $(package)_config_opts_aarch64_linux=linux-generic64
 $(package)_config_opts_mipsel_linux=linux-generic32
 $(package)_config_opts_mips_linux=linux-generic32
+$(package)_config_opts_powerpc_linux=linux-generic32
 $(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc
 $(package)_config_opts_x86_64_mingw32=mingw64
 $(package)_config_opts_i686_mingw32=mingw
 endef
 
 define $(package)_preprocess_cmds
-  sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
-  sed -i.old "s|engines apps test|engines|" Makefile.org
+#  sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
+  sed -i.old "s|\"engines\", \"apps\", \"test\"|\"engines\"|" Configure
 endef
 
 define $(package)_config_cmds
   ./Configure $($(package)_config_opts)
 endef
 
 define $(package)_build_cmds
-  $(MAKE) -j1 build_libs libcrypto.pc libssl.pc openssl.pc
+  $(MAKE) -j1 build_libs
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) INSTALL_PREFIX=$($(package)_staging_dir) -j1 install_sw
+  $(MAKE) DESTDIR=$($(package)_staging_dir) -j$(JOBCOUNT) install_sw
 endef
 
 define $(package)_postprocess_cmds

diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
@@ -1,7 +1,7 @@
 packages:=boost openssl libevent libcap libseccomp zeromq
 
 qt_native_packages = native_protobuf
-qt_packages = qrencode protobuf zlib
+qt_packages = qrencode protobuf zlib 
 
 qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans