From 21ead581354edb808d89043005ff029b5765de8e Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sun, 2 Jun 2024 19:09:28 +0200 Subject: [PATCH] Enable Openssl3, bump recipes that depend on it and are used by Haiku --- dev-libs/openssl/openssl3-3.0.13.recipe | 2 +- dev-vcs/git/git-2.45.2.recipe | 4 ++-- haiku-libs/haikuwebkit/haikuwebkit-1.9.11.recipe | 4 ++-- media-video/ffmpeg/ffmpeg6-6.1.1.recipe | 4 ++-- net-libs/libssh2/libssh2-1.9.0.recipe | 6 +++--- net-misc/curl/curl-8.8.0.recipe | 4 ++-- net-misc/wget/wget-1.24.5.recipe | 6 +++--- .../wpa_supplicant/wpa_supplicant-2.10.haiku.3.recipe | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dev-libs/openssl/openssl3-3.0.13.recipe b/dev-libs/openssl/openssl3-3.0.13.recipe index fc28ece8a..6b9c598b2 100644 --- a/dev-libs/openssl/openssl3-3.0.13.recipe +++ b/dev-libs/openssl/openssl3-3.0.13.recipe @@ -21,7 +21,7 @@ CHECKSUM_SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae31 SOURCE_DIR="openssl-$portVersion" PATCHES="openssl3-$portVersion.patchset" -ARCHITECTURES="?all" +ARCHITECTURES="all" SECONDARY_ARCHITECTURES="?x86" libVersion="3" diff --git a/dev-vcs/git/git-2.45.2.recipe b/dev-vcs/git/git-2.45.2.recipe index a585112dd..a98882619 100644 --- a/dev-vcs/git/git-2.45.2.recipe +++ b/dev-vcs/git/git-2.45.2.recipe @@ -10,7 +10,7 @@ workflows." HOMEPAGE="https://git-scm.com/" COPYRIGHT="2005-2023 Git Authors (see git web site for list)" LICENSE="GNU GPL v2" -REVISION="6" +REVISION="7" SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz" CHECKSUM_SHA256="51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" @@ -175,7 +175,7 @@ BUILD_REQUIRES=" devel:libintl$secondaryArchSuffix devel:libnghttp2$secondaryArchSuffix devel:libpcre2_8$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libz$secondaryArchSuffix vendor_perl >= 5.40 " diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.9.11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.9.11.recipe index 8d7ed77ea..610e46e5b 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.9.11.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.9.11.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1998-2024 Apple Inc., Google Inc., et al" LICENSE="GNU LGPL v2 GNU LGPL v2.1 MIT" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/haiku/haikuwebkit/archive/HaikuWebKit-$portVersion.tar.gz" CHECKSUM_SHA256="fc20fefc6ceb1ab9b269913f208ba142af75067860e99572da2401ca255098c9" SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz" @@ -74,7 +74,7 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:libpsl$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libtasn1$secondaryArchSuffix devel:libunistring$secondaryArchSuffix devel:libwebp$secondaryArchSuffix >= 7 diff --git a/media-video/ffmpeg/ffmpeg6-6.1.1.recipe b/media-video/ffmpeg/ffmpeg6-6.1.1.recipe index 9394d9860..dd43aaf76 100644 --- a/media-video/ffmpeg/ffmpeg6-6.1.1.recipe +++ b/media-video/ffmpeg/ffmpeg6-6.1.1.recipe @@ -6,7 +6,7 @@ HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard 2003-2024 the FFmpeg developers" LICENSE="GNU LGPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" CHECKSUM_SHA256="8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" PATCHES="ffmpeg-$portVersion.patchset" @@ -165,7 +165,7 @@ BUILD_REQUIRES=" devel:libopus$secondaryArchSuffix devel:libsdl2$secondaryArchSuffix devel:libspeex$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libtheora$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-libs/libssh2/libssh2-1.9.0.recipe b/net-libs/libssh2/libssh2-1.9.0.recipe index a3c9e3888..8a73b25f0 100644 --- a/net-libs/libssh2/libssh2-1.9.0.recipe +++ b/net-libs/libssh2/libssh2-1.9.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2004-2007 Sara Golemon 2009-2014 Daniel Stenberg 2008, 2009 Simon Josefsson" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="https://www.libssh2.org/download/libssh2-$portVersion.tar.gz" CHECKSUM_SHA256="d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" PATCHES="libssh2-$portVersion.patchset" @@ -38,8 +38,8 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 + devel:libssl$secondaryArchSuffix >= 3 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/net-misc/curl/curl-8.8.0.recipe b/net-misc/curl/curl-8.8.0.recipe index f6f0900ae..53c94de1c 100644 --- a/net-misc/curl/curl-8.8.0.recipe +++ b/net-misc/curl/curl-8.8.0.recipe @@ -9,7 +9,7 @@ busload of other useful tricks." HOMEPAGE="https://curl.haxx.se/" COPYRIGHT="1996-2023 Daniel Stenberg" LICENSE="Curl" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/curl/curl/releases/download/curl-${portVersion//\./_}/curl-$portVersion.tar.bz2" CHECKSUM_SHA256="40d3792d38cfa244d8f692974a567e9a5f3387c547579f1124e95ea2a1020d0d" ADDITIONAL_FILES="curl.rdef" @@ -43,7 +43,7 @@ PROVIDES_devel=" REQUIRES_devel=" curl$secondaryArchSuffix == $portVersion base devel:libnghttp2$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libz$secondaryArchSuffix " diff --git a/net-misc/wget/wget-1.24.5.recipe b/net-misc/wget/wget-1.24.5.recipe index ccfe66db5..ebef32736 100644 --- a/net-misc/wget/wget-1.24.5.recipe +++ b/net-misc/wget/wget-1.24.5.recipe @@ -5,7 +5,7 @@ called from scripts." HOMEPAGE="https://www.gnu.org/software/wget/" COPYRIGHT="1996-2018 Free Software Foundation" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" #SOURCE_URI="https://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz" SOURCE_URI="https://mirror.easyname.at/gnu/wget/wget-$portVersion.tar.gz" CHECKSUM_SHA256="fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" @@ -41,9 +41,9 @@ fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 devel:libiconv$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.haiku.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.haiku.3.recipe index dec3e7468..806cece78 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.haiku.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.haiku.3.recipe @@ -10,7 +10,7 @@ HOMEPAGE="https://w1.fi/wpa_supplicant/" COPYRIGHT="2003-2022 Jouni Malinen" LICENSE="BSD (2-clause) GNU GPL v2" -REVISION="2" +REVISION="3" srcGitRev="e952d309dfd57cf04cb9b461bd7f62d0537eaa3f" SOURCE_URI="https://github.com/haiku/wpa_supplicant/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="81dee45a229d8cd292c214101179c618798b0e1788229d2a9e341445900f6f25" @@ -29,7 +29,7 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libssl + devel:libssl >= 3 " BUILD_PREREQUIRES=" haiku_devel