Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nodejs-electron for openSUSE:Factory
checked in at 2022-02-24 18:21:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-electron (Old)
and /work/SRC/openSUSE:Factory/.nodejs-electron.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-electron"
Thu Feb 24 18:21:01 2022 rev:19 rq:957272 version:16.0.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-electron/nodejs-electron.changes
2022-02-17 23:41:24.939700473 +0100
+++
/work/SRC/openSUSE:Factory/.nodejs-electron.new.1958/nodejs-electron.changes
2022-02-24 18:24:23.586643795 +0100
@@ -1,0 +2,12 @@
+Thu Feb 17 08:45:42 UTC 2022 - Andreas Schneider <[email protected]>
+
+- Fix webpack-4 with OpenSSL 3.0
+ * Added electron-16-webpack-fix-openssl-3.patch
+
+-------------------------------------------------------------------
+Thu Feb 17 08:24:23 UTC 2022 - Andreas Schneider <[email protected]>
+
+- Add missing #include <utility>
+ * Added electron-16-third_party-symbolize-missing-include.patch
+
+-------------------------------------------------------------------
New:
----
electron-16-third_party-symbolize-missing-include.patch
electron-16-webpack-fix-openssl-3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-electron.spec ++++++
--- /var/tmp/diff_new_pack.g38xew/_old 2022-02-24 18:24:29.638642220 +0100
+++ /var/tmp/diff_new_pack.g38xew/_new 2022-02-24 18:24:29.642642219 +0100
@@ -121,6 +121,8 @@
Patch26: electron-16-node-fix-python3.10-import.patch
%endif
Patch27: electron-16-freetype-visibility-list.patch
+Patch28: electron-16-third_party-symbolize-missing-include.patch
+Patch29: electron-16-webpack-fix-openssl-3.patch
BuildRequires: SDL-devel
BuildRequires: binutils-gold
BuildRequires: bison
@@ -201,7 +203,7 @@
BuildRequires: pkgconfig(kadm-client)
BuildRequires: pkgconfig(kdb)
BuildRequires: pkgconfig(krb5)
-%if 0%{?suse_version}
+%if %{with system_ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat) >= 58
++++++ create_tarball.sh ++++++
--- /var/tmp/diff_new_pack.g38xew/_old 2022-02-24 18:24:29.718642200 +0100
+++ /var/tmp/diff_new_pack.g38xew/_new 2022-02-24 18:24:29.722642198 +0100
@@ -1,12 +1,13 @@
#!/bin/bash
-
+# shellcheck disable=2181
+#
# Copyright (c) 2021 Andreas Schneider <[email protected]>
# License: GPLv3
-ELECTRON_PKGVERSION=$(rpmspec -P *.spec | grep Version | sed -e 's/Version:[
]*//g')
+ELECTRON_PKGVERSION="$(rpmspec -P ./*.spec | grep Version | sed -e
's/Version:[ ]*//g')"
ELECTRON_PKGNAME="electron"
ELECTRON_PKGDIR="$(pwd)"
-ELECTRON_TMPDIR=$(mktemp --tmpdir -d electron-XXXXXXXX)
+ELECTRON_TMPDIR="$(mktemp --tmpdir -d electron-XXXXXXXX)"
ELECTRON_PATH="${ELECTRON_TMPDIR}/${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}"
echo "NAME: $ELECTRON_PKGNAME"
@@ -14,8 +15,8 @@
echo "PATH: $ELECTRON_PATH"
cleanup_tmpdir() {
- popd 2>/dev/null
- rm -rf $ELECTRON_TMPDIR
+ popd 2>/dev/null || true
+ rm -rf "$ELECTRON_TMPDIR"
}
trap cleanup_tmpdir SIGINT
@@ -24,7 +25,7 @@
if test "$1" = 0 -o -z "$1" ; then
exit 0
else
- exit $1
+ exit "$1"
fi
}
@@ -53,7 +54,7 @@
EOF
echo ">>>>>> Downloading electron-${ELECTRON_PKGVERSION}"
-gclient sync --jobs 4 --nohooks --with_branch_heads --with_tags
--revision=v${ELECTRON_PKGVERSION}
+gclient sync --jobs 4 --nohooks --with_branch_heads --with_tags
--revision=v"${ELECTRON_PKGVERSION}"
if [ $? -ne 0 ]; then
echo "ERROR: gclient sync failed"
cleanup_and_exit 1
@@ -119,8 +120,9 @@
echo ">>>>>> Create LASTCHANGE(.committime) file"
echo -n "LASTCHANGE=$(git log -1 --format=format:%H HEAD)" >
build/util/LASTCHANGE
+# shellcheck disable=1091
source build/util/LASTCHANGE
-echo -n "$(git log -1 --date=unix --format=format:%cd $LASTCHANGE)" >
build/util/LASTCHANGE.committime
+echo -n "$(git log -1 --date=unix --format=format:%cd "$LASTCHANGE")" >
build/util/LASTCHANGE.committime
echo ">>>>>> Remove bundled libs"
keeplibs=(
@@ -371,7 +373,7 @@
popd || cleanup_and_exit 1
echo ">>>>>> Create tarball"
-XZ_OPT="-T$(nproc)" tar cJf
$ELECTRON_PKGDIR/$ELECTRON_PKGNAME-$ELECTRON_PKGVERSION.tar.xz
$ELECTRON_PKGNAME-$ELECTRON_PKGVERSION
+XZ_OPT="-T$(nproc)" tar cJf
"${ELECTRON_PKGDIR}/${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}.tar.xz"
"${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}"
if [ $? -ne 0 ]; then
echo "ERROR: tar cJf failed"
cleanup_and_exit 1
++++++ electron-16-third_party-symbolize-missing-include.patch ++++++
Index: electron-16.0.9/base/third_party/symbolize/symbolize.h
===================================================================
--- electron-16.0.9.orig/base/third_party/symbolize/symbolize.h 2022-02-16
17:58:59.209168086 +0100
+++ electron-16.0.9/base/third_party/symbolize/symbolize.h 2022-02-17
08:39:25.070959581 +0100
@@ -54,6 +54,8 @@
#ifndef BASE_SYMBOLIZE_H_
#define BASE_SYMBOLIZE_H_
+#include <utility>
+
#include "utilities.h"
#include "config.h"
#include "glog/logging.h"
++++++ electron-16-webpack-fix-openssl-3.patch ++++++
Index: electron-16.0.9/electron/build/webpack/webpack.config.base.js
===================================================================
--- electron-16.0.9.orig/electron/build/webpack/webpack.config.base.js
2022-02-16 16:41:24.767092075 +0100
+++ electron-16.0.9/electron/build/webpack/webpack.config.base.js
2022-02-17 11:10:51.379512377 +0100
@@ -1,5 +1,12 @@
const fs = require('fs');
const path = require('path');
+
+// 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 webpack = require('webpack');
const TerserPlugin = require('terser-webpack-plugin');
const WrapperPlugin = require('wrapper-webpack-plugin');
