Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package element-web for openSUSE:Factory
checked in at 2023-01-31 16:09:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/element-web (Old)
and /work/SRC/openSUSE:Factory/.element-web.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "element-web"
Tue Jan 31 16:09:04 2023 rev:29 rq:1062076 version:1.11.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/element-web/element-web.changes 2023-01-21
19:10:50.577052440 +0100
+++ /work/SRC/openSUSE:Factory/.element-web.new.32243/element-web.changes
2023-01-31 16:26:04.392080154 +0100
@@ -1,0 +2,8 @@
+Fri Jan 27 12:21:26 UTC 2023 - Andreas Schneider <a...@cryptomilk.org>
+
+- Fixed webpack with OpenSSL3
+ * Added webpack-fix-openssl3.patch
+- Fixed building for Fedora
+- Some spec file cleanup
+
+-------------------------------------------------------------------
New:
----
webpack-fix-openssl3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ element-web.spec ++++++
--- /var/tmp/diff_new_pack.jNPzxt/_old 2023-01-31 16:26:05.432086139 +0100
+++ /var/tmp/diff_new_pack.jNPzxt/_new 2023-01-31 16:26:05.436086162 +0100
@@ -27,26 +27,27 @@
Source2: jitsi_external_api.min.js
Source3: prepare.sh
Patch0: fix-webpack-oom.patch
+Patch1: webpack-fix-openssl3.patch
BuildRequires: yarn
-BuildRequires: nodejs18
+BuildRequires: nodejs-packaging
+BuildRequires: fdupes
BuildArch: noarch
%description
A glossy Matrix collaboration client - web files
%prep
-%autosetup -n element-web-%{version} -p0
+%autosetup -n element-web-%{version} -a1 -p1
%build
echo 'yarn-offline-mirror "./npm-packages-offline-cache"' > .yarnrc
-tar xf %{SOURCE1}
-ls ./npm-packages-offline-cache | head
+ls -l ./npm-packages-offline-cache | head
# fix some strange dependency
-cd ./npm-packages-offline-cache
-cp matrix-analytics-events-0.0.1.tgz @matrix-analytics-events-0.0.1.tgz
-cd ..
-ls ./npm-packages-offline-cache | grep matrix-analytics-events
+cp npm-packages-offline-cache/matrix-analytics-events-0.0.1.tgz \
+ npm-packages-offline-cache/@matrix-analytics-events-0.0.1.tgz
+ls -l ./npm-packages-offline-cache/*matrix-analytics-events*
+
sed -i -e 's| matrix-analytics-events
"github:matrix-org/matrix-analytics-events.git#[^"]*"|
matrix-analytics-events "^0.0.1"|' yarn.lock
sed -i -e
's|"matrix-analytics-events@github:matrix-org/matrix-analytics-events#[^"]*"|matrix-analytics-events@^0.0.1|'
yarn.lock
@@ -58,24 +59,27 @@
DIST_VERSION=%{version} ./scripts/package.sh
-cd dist
+pushd dist || exit 1
tar xf element-%{version}.tar.gz
-cd element-%{version}
-cp ../../LICENSE ./
+popd
+cp LICENSE dist/element-%{version}/LICENSE
%install
-cd dist
-cd element-%{version}
-install -d %{buildroot}/{usr/share/webapps,etc/webapps}/element
+install -d -m 0755 %{buildroot}/usr/share/webapps/element
+
+cp -av dist/element-%{version}/* "%{buildroot}%{_datadir}/webapps/element/"
+
+install -d -m 0755 %{buildroot}%{_sysconfdir}/webapps/element/
+install -m 0644 config.sample.json
"%{buildroot}%{_sysconfdir}/webapps/element/config.sample.json"
-cp -r * "%{buildroot}%{_datadir}/webapps/element/"
-install -Dm644 config.sample.json -t
"%{buildroot}%{_sysconfdir}/webapps/element/"
+%fdupes %{buildroot}%{_datadir}/webapps/element/
%files
%license LICENSE
%dir %{_datadir}/webapps
-%dir %{_sysconfdir}/webapps
%{_datadir}/webapps/element
-%{_sysconfdir}/webapps/element
+%dir %{_sysconfdir}/webapps
+%dir %{_sysconfdir}/webapps/element
+%config %{_sysconfdir}/webapps/element/config.sample.json
%changelog
++++++ fix-webpack-oom.patch ++++++
--- /var/tmp/diff_new_pack.jNPzxt/_old 2023-01-31 16:26:05.484086438 +0100
+++ /var/tmp/diff_new_pack.jNPzxt/_new 2023-01-31 16:26:05.488086461 +0100
@@ -1,5 +1,7 @@
---- package.json 2022-09-28 15:22:49.000000000 +0200
-+++ package.json 2022-12-23 11:10:18.838569341 +0100
+Index: element-web-1.11.20/package.json
+===================================================================
+--- element-web-1.11.20.orig/package.json 2023-01-20 13:52:01.000000000
+0100
++++ element-web-1.11.20/package.json 2023-01-27 13:02:23.452017454 +0100
@@ -37,7 +37,7 @@
"build:res": "node scripts/copy-res.js",
"build:genfiles": "yarn build:res && yarn build:jitsi && yarn
build:module_system",
++++++ webpack-fix-openssl3.patch ++++++
Index: element-web-1.11.20/webpack.config.js
===================================================================
--- element-web-1.11.20.orig/webpack.config.js 2023-01-20 13:52:01.000000000
+0100
+++ element-web-1.11.20/webpack.config.js 2023-01-27 13:16:14.405927597
+0100
@@ -1,5 +1,11 @@
/* eslint-disable quote-props */
+// HACK: OpenSSL 3 does not support md4 any more, but webpack hardcodes it all
+// over the place: https://github.com/webpack/webpack/issues/13572
+const crypto = require("crypto");
+const crypto_orig_createHash = crypto.createHash;
+crypto.createHash = algorithm => crypto_orig_createHash(algorithm == "md4" ?
"sha256" : algorithm);
+
const dotenv = require("dotenv");
const path = require("path");
const webpack = require("webpack");
