Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package appx-util for openSUSE:Factory checked in at 2022-11-10 14:19:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/appx-util (Old) and /work/SRC/openSUSE:Factory/.appx-util.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "appx-util" Thu Nov 10 14:19:22 2022 rev:2 rq:1034832 version:0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/appx-util/appx-util.changes 2021-07-01 07:05:40.003461953 +0200 +++ /work/SRC/openSUSE:Factory/.appx-util.new.1597/appx-util.changes 2022-11-10 14:19:24.461379163 +0100 @@ -1,0 +2,6 @@ +Wed Nov 9 10:39:54 UTC 2022 - Pedro Monreal <pmonr...@suse.com> + +- Add OpenSSL 3.0 support [bsc#1205042] + * Add appx-util-openssl3-support.patch + +------------------------------------------------------------------- New: ---- appx-util-openssl3-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ appx-util.spec ++++++ --- /var/tmp/diff_new_pack.3JS9Bg/_old 2022-11-10 14:19:25.069382514 +0100 +++ /var/tmp/diff_new_pack.3JS9Bg/_new 2022-11-10 14:19:25.073382537 +0100 @@ -1,6 +1,7 @@ # # spec file for package appx-util # +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2021 Neal Gompa <ngomp...@gmail.com>. # # All modifications and additions to the file contributed by third parties @@ -22,10 +23,11 @@ Summary: Utility to create Microsoft .appx packages # See LICENSING.md for details -License: MPL-2.0 and BSD-3-Clause +License: BSD-3-Clause AND MPL-2.0 URL: https://github.com/OSInside/appx-util Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz - +#PATCH-FIX-UPSTREAM bsc#1205042 Add OpenSSL 3.0 support +Patch0: https://github.com/OSInside/appx-util/commit/504dad8ca52a44eb6f3a656368f6708b63f73c10.patch#/appx-util-openssl3-support.patch BuildRequires: cmake >= 3.11 BuildRequires: gcc-c++ BuildRequires: make @@ -42,28 +44,22 @@ appx is a tool which creates and optionally signs Microsoft Windows APPX packages. - %prep %autosetup -p1 - %build %cmake %cmake_build - %install %cmake_install - %check %ctest - %files %license LICENSE* LICENSING.md %doc README.md CONTRIBUTING.md %{_bindir}/appx - %changelog ++++++ appx-util-openssl3-support.patch ++++++ >From 504dad8ca52a44eb6f3a656368f6708b63f73c10 Mon Sep 17 00:00:00 2001 From: Igor Raits <igor.ra...@gmail.com> Date: Thu, 30 Dec 2021 16:29:07 +0100 Subject: [PATCH] Add support for OpenSSL 3.0 Signed-off-by: Igor Raits <igor.ra...@gmail.com> --- Sources/Sign.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Sources/Sign.cpp b/Sources/Sign.cpp index 414bedf..ee3b14e 100644 --- a/Sources/Sign.cpp +++ b/Sources/Sign.cpp @@ -13,6 +13,7 @@ #include <cassert> #include <cstdint> #include <openssl/asn1t.h> +#include <openssl/opensslv.h> #include <vector> namespace osinside { @@ -139,7 +140,11 @@ namespace appx { class EncodedASN1 { public: +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + template <typename T, int (*TEncode)(const T *, std::uint8_t **)> +#else template <typename T, int (*TEncode)(T *, std::uint8_t **)> +#endif static EncodedASN1 FromItem(T *item) { std::uint8_t *dataRaw = nullptr;
