diff --git a/packages/_/_project/_attribute b/packages/_/_project/_attribute
index 70ecdaa..36997f1 100644
--- a/packages/_/_project/_attribute
+++ b/packages/_/_project/_attribute
@@ -260,7 +260,7 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin
s/openSUSE-/openSUSE-Staging:$LETTER-/
- 20230201
+ 20230202
arch: x86_64
@@ -592,8 +592,8 @@ set_snapshot_number: True
failed: ''
-published: '20230131'
-publishing: '20230131'
+published: '20230201'
+publishing: '20230201'
testing: '20230201'
diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow
index 2f2f7ca..d151a60 100644
--- a/packages/_/_project/_staging_workflow
+++ b/packages/_/_project/_staging_workflow
@@ -16,7 +16,6 @@
-
@@ -28,31 +27,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/a/actkbd/.files b/packages/a/actkbd/.files
index 1dc84f5..7baa5b5 100644
Binary files a/packages/a/actkbd/.files and b/packages/a/actkbd/.files differ
diff --git a/packages/a/actkbd/.rev b/packages/a/actkbd/.rev
index 05146f3..e030c22 100644
--- a/packages/a/actkbd/.rev
+++ b/packages/a/actkbd/.rev
@@ -39,4 +39,12 @@
925510
+
+ 095edb708326bd88a25a8e92d8f558aa
+ 0.2.8
+
+ dimstar_suse
+
+ 1062599
+
diff --git a/packages/a/actkbd/actkbd.changes b/packages/a/actkbd/actkbd.changes
index 8df802a..88fd400 100644
--- a/packages/a/actkbd/actkbd.changes
+++ b/packages/a/actkbd/actkbd.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Feb 1 23:36:42 UTC 2023 - malcolmlewis@opensuse.org
+
+- Spec file cleanup to fix build errors.
+
+-------------------------------------------------------------------
Fri Oct 15 12:10:29 UTC 2021 - Johannes Segitz
- Drop ProtectClock hardening, can cause issues if other device acceess is needed
diff --git a/packages/a/actkbd/actkbd.spec b/packages/a/actkbd/actkbd.spec
index 6ba19c0..e14a5ab 100644
--- a/packages/a/actkbd/actkbd.spec
+++ b/packages/a/actkbd/actkbd.spec
@@ -1,7 +1,7 @@
#
# spec file for package actkbd
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,8 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
- %define _fillupdir /var/adm/fillup-templates
+ %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
-
Name: actkbd
Version: 0.2.8
Release: 0
@@ -35,7 +34,6 @@ Source3: actkbd.sysconfig
Patch0: actkbd-0.2.7-amd64.patch
BuildRequires: systemd-rpm-macros
Requires(post): %fillup_prereq
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_ordering}
%description
@@ -44,24 +42,25 @@ commands. It can be used to utilize multimedia keys on simple setups, or
assigned custom actions to rarely used keys.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
%build
-make CFLAGS="%{optflags}" %{?_smp_mflags}
+%make_build CFLAGS="%{optflags}"
%install
-install -Dm 644 %{SOURCE1} %{buildroot}%{_unitdir}/actkbd.service
-mkdir -p %{buildroot}%{_sbindir}/
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcactkbd
+install -d -m 0755 %{buildroot}%{_unitdir} \
+ %{buildroot}%{_sbindir} \
+ %{buildroot}%{_sysconfdir} \
+ %{buildroot}%{_fillupdir} \
+ %{buildroot}%{_docdir}/%{name}/samples
-install -Dm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/actkbd.conf
-install -Dm 644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.actkbd
-
-install -Dm 755 actkbd %{buildroot}%{_sbindir}/actkbd
+install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/actkbd.service
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcactkbd
-install -d %{buildroot}%{_docdir}/%{name}/samples
-install -dm 644 samples %{buildroot}%{_docdir}/%{name}/samples
+install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/actkbd.conf
+install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.actkbd
+install -m 0755 actkbd %{buildroot}%{_sbindir}/actkbd
+install -m 0644 samples/* %{buildroot}%{_docdir}/%{name}/samples/
%pre
%service_add_pre actkbd.service
@@ -77,7 +76,6 @@ install -dm 644 samples %{buildroot}%{_docdir}/%{name}/samples
%service_del_postun actkbd.service
%files
-%defattr(-,root,root)
%doc README NEWS FAQ AUTHORS
%config %{_sysconfdir}/actkbd.conf
%{_fillupdir}/*
diff --git a/packages/c/cherrytree/.files b/packages/c/cherrytree/.files
index c6fb280..6b8948d 100644
Binary files a/packages/c/cherrytree/.files and b/packages/c/cherrytree/.files differ
diff --git a/packages/c/cherrytree/.rev b/packages/c/cherrytree/.rev
index 9559e48..8151dea 100644
--- a/packages/c/cherrytree/.rev
+++ b/packages/c/cherrytree/.rev
@@ -1474,4 +1474,12 @@
1038439
+
+ 12f176fb6ae114d14f34a472b3df082f
+ 0.99.54+1
+
+ dimstar_suse
+
+ 1062485
+
diff --git a/packages/c/cherrytree/.servicemark b/packages/c/cherrytree/.servicemark
index 302eb5f..0983869 100644
--- a/packages/c/cherrytree/.servicemark
+++ b/packages/c/cherrytree/.servicemark
@@ -1 +1 @@
-09b2f7db0433a4d815b083fef5d92090
+d814b6df99f3df23533097a9cd93a617
diff --git a/packages/c/cherrytree/_servicedata b/packages/c/cherrytree/_servicedata
index 0f12e1a..1f9be1b 100644
--- a/packages/c/cherrytree/_servicedata
+++ b/packages/c/cherrytree/_servicedata
@@ -1,4 +1,4 @@
https://github.com/giuspen/cherrytree.git
- 91c933996fc3f30d31e4cc79f12ed6ea84793c6e
\ No newline at end of file
+ 00abc015b855f8167a4c004d68bb6804aca6c9be
\ No newline at end of file
diff --git a/packages/c/cherrytree/cherrytree-0.99.52.obscpio b/packages/c/cherrytree/cherrytree-0.99.52.obscpio
deleted file mode 120000
index 873fda1..0000000
--- a/packages/c/cherrytree/cherrytree-0.99.52.obscpio
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeibyskcosd2jyd2ewyngoh4ap5skz42ymje7uimzosj6yvwv7doo7y
\ No newline at end of file
diff --git a/packages/c/cherrytree/cherrytree-0.99.54+1.obscpio b/packages/c/cherrytree/cherrytree-0.99.54+1.obscpio
new file mode 120000
index 0000000..a868ae9
--- /dev/null
+++ b/packages/c/cherrytree/cherrytree-0.99.54+1.obscpio
@@ -0,0 +1 @@
+/ipfs/bafybeiffe64iqo7ldnjky7agwjfr4d32t4ogndych7hrdtojtsias7dbmy
\ No newline at end of file
diff --git a/packages/c/cherrytree/cherrytree.changes b/packages/c/cherrytree/cherrytree.changes
index 7d0da45..c3226a3 100644
--- a/packages/c/cherrytree/cherrytree.changes
+++ b/packages/c/cherrytree/cherrytree.changes
@@ -1,4 +1,50 @@
-------------------------------------------------------------------
+Wed Feb 01 02:11:14 UTC 2023 - malcolmlewis@opensuse.org
+
+- Update to version 0.99.54+1:
+ * Fixed crash when creating lightweight table,
+ (gh#giuspen/cherrytree#2204).
+ * Added menu item action to toggle focus between text and
+ integrated terminal with default shortcut Ctrl+Shift+T,
+ (gh#giuspen/cherrytree#1772).
+ * Added search dialog option to override search exclusions,
+ (gh#giuspen/cherrytree#2174).
+ * Added menu item action to insert today's node under the
+ selected node rather than under the tree root,
+ (gh#giuspen/cherrytree#40).
+ * Implemented option to keep cherrytree always on top, under top
+ menu 'view', (gh#giuspen/cherrytree#2145).
+ * Number of table cells to use as threshold for light mode made
+ configurable (default 25).
+ * Integrated terminal shell configurable in preferences dialog.
+ * Fixed issue with integrated terminal when using zsh as default
+ shell, (gh#giuspen/cherrytree#2199).
+ * Lightweight variant of tables support Ctrl+Space to navigate in
+ and out.
+ * Lightweight variant of tables entering newline in table cell
+ with Ctrl+Enter or Alt+Enter.
+ * Dialog all matches improved to show also the node tags and the
+ pattern searched.
+ * Dialog search with regexp, added help button to display
+ reference web page.
+ * Fixed searching for regexp everything (.*) freeze,
+ (gh#giuspen/cherrytree#2190).
+ * Fix title not shown on taskbar button in cinnamon when menubar
+ in titlebar.
+ * Implementing lightweight variant of tables,
+ (gh#giuspen/cherrytree#2140).
+ * Updated translations.
+- Changes from version 0.99.53:
+ * Fixed crash when changing terminal font in preferences dialog
+ and terminal never shown in the session,
+ (gh#giuspen/cherrytree#2177).
+ * Fixed issue of growing encrypted document size when configured
+ with no backups, (gh#giuspen/cherrytree#2178).
+ * Implementing lightweight variant of tables,
+ (gh#giuspen/cherrytree#2140).
+ * Updated translations.
+
+-------------------------------------------------------------------
Sat Nov 26 22:23:52 UTC 2022 - malcolmlewis@opensuse.org
- Update to version 0.99.52:
diff --git a/packages/c/cherrytree/cherrytree.obsinfo b/packages/c/cherrytree/cherrytree.obsinfo
index e3f9d70..bda55b8 100644
--- a/packages/c/cherrytree/cherrytree.obsinfo
+++ b/packages/c/cherrytree/cherrytree.obsinfo
@@ -1,4 +1,4 @@
name: cherrytree
-version: 0.99.52
-mtime: 1669323626
-commit: 91c933996fc3f30d31e4cc79f12ed6ea84793c6e
+version: 0.99.54+1
+mtime: 1675113438
+commit: 00abc015b855f8167a4c004d68bb6804aca6c9be
diff --git a/packages/c/cherrytree/cherrytree.spec b/packages/c/cherrytree/cherrytree.spec
index 0441f53..9d0a727 100644
--- a/packages/c/cherrytree/cherrytree.spec
+++ b/packages/c/cherrytree/cherrytree.spec
@@ -1,7 +1,7 @@
#
# spec file for package cherrytree
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cherrytree
-Version: 0.99.52
+Version: 0.99.54+1
Release: 0
Summary: A hierarchical note taking application
License: GPL-3.0-or-later AND LGPL-2.1-only
diff --git a/packages/c/cli11/.files b/packages/c/cli11/.files
index 12f7fe0..ad09d14 100644
Binary files a/packages/c/cli11/.files and b/packages/c/cli11/.files differ
diff --git a/packages/c/cli11/.rev b/packages/c/cli11/.rev
index a0316e9..6d4c8a2 100644
--- a/packages/c/cli11/.rev
+++ b/packages/c/cli11/.rev
@@ -31,4 +31,12 @@
1040457
+
+ 07010b0186092d502098217087931a27
+ 2.3.2
+
+ dimstar_suse
+
+ 1062638
+
diff --git a/packages/c/cli11/.servicemark b/packages/c/cli11/.servicemark
index 844db4c..081a239 100644
--- a/packages/c/cli11/.servicemark
+++ b/packages/c/cli11/.servicemark
@@ -1 +1 @@
-a98cba53441bcfcb57cbddfe8eba42f6
+06a761c4fcc5cfee12e6f6e5a8e716b3
diff --git a/packages/c/cli11/CLI11-2.3.0.tar.gz b/packages/c/cli11/CLI11-2.3.0.tar.gz
deleted file mode 120000
index b0a05c0..0000000
--- a/packages/c/cli11/CLI11-2.3.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicce76dqdbtmqi2fzui25yqu7oay3wlt5iykj63bk27elhbw7cvqe
\ No newline at end of file
diff --git a/packages/c/cli11/CLI11-2.3.2.tar.gz b/packages/c/cli11/CLI11-2.3.2.tar.gz
new file mode 120000
index 0000000..012b0bd
--- /dev/null
+++ b/packages/c/cli11/CLI11-2.3.2.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeib6taheaisoocrzuuvoojzqxtyvpnwq65keq35zekhvldx3v3cieq
\ No newline at end of file
diff --git a/packages/c/cli11/cli11.changes b/packages/c/cli11/cli11.changes
index 2747617..f394177 100644
--- a/packages/c/cli11/cli11.changes
+++ b/packages/c/cli11/cli11.changes
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Sat Jan 7 14:41:10 UTC 2023 - Haochuan Chen
+
+- Update to version 2.3.2:
+ * Bugfix: Consistently use ADL for lexical_cast, making it easier to extend for custom template types #820
+ * Bugfix: Tweak the parsing of files for flags with disable_flag_override #800]
+ * Bugfix: Handle out of bounds long long #807
+ * Bugfix: Spacing of make_description min option output #808
+ * Bugfix: Print last parsed subcommand's help message #822
+ * Bugfix: Avoid floating point warning in GCC 12 #803
+ * Bugfix: Fix a few gcc warnings #813
+ * Backend: Max CMake tested 3.22 -> 3.24 #823
+
+- Update to version 2.3.1:
+ * Bugfix: App::get_option_group implementation missing #793
+ * Bugfix: Fix spacing when setting an empty footer #796
+ * Bugfix: Address Klocwork static analysis checking issues #785
+
+-------------------------------------------------------------------
Mon Oct 24 09:57:11 UTC 2022 - Haochuan Chen
- Disable tests for %{?sle_version} <= 150300 due to possible issues of old
diff --git a/packages/c/cli11/cli11.spec b/packages/c/cli11/cli11.spec
index a905722..dca9d58 100644
--- a/packages/c/cli11/cli11.spec
+++ b/packages/c/cli11/cli11.spec
@@ -1,7 +1,7 @@
#
# spec file for package cli11
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define upstream_name CLI11
Name: cli11
-Version: 2.3.0
+Version: 2.3.2
Release: 0
Summary: Command line parser for C++11
License: BSD-3-Clause
diff --git a/packages/c/csvprintf/.files b/packages/c/csvprintf/.files
index 1c944ae..2414d9c 100644
Binary files a/packages/c/csvprintf/.files and b/packages/c/csvprintf/.files differ
diff --git a/packages/c/csvprintf/.rev b/packages/c/csvprintf/.rev
index 4254757..93684ae 100644
--- a/packages/c/csvprintf/.rev
+++ b/packages/c/csvprintf/.rev
@@ -88,4 +88,12 @@
Automatic submission by obs-autosubmit
941990
+
+ fd685d6b01b34b7be080d1809a627307
+ 1.3.2
+
+ dimstar_suse
+ Automatic submission by obs-autosubmit
+ 1062537
+
diff --git a/packages/c/csvprintf/.servicemark b/packages/c/csvprintf/.servicemark
index d5ebf84..dcaa465 100644
--- a/packages/c/csvprintf/.servicemark
+++ b/packages/c/csvprintf/.servicemark
@@ -1 +1 @@
-17fff805f29be35a524e38a8301b7214
+b51a90cf7544a8325afbfabd8c4afcd0
diff --git a/packages/c/csvprintf/_service b/packages/c/csvprintf/_service
index 9aceb07..6d3cb9a 100644
--- a/packages/c/csvprintf/_service
+++ b/packages/c/csvprintf/_service
@@ -2,8 +2,8 @@
git
https://github.com/archiecobbs/csvprintf
- 1.3.1
- 1.3.1
+ 1.3.2
+ 1.3.2
csvprintf
diff --git a/packages/c/csvprintf/csvprintf-1.3.1.obscpio b/packages/c/csvprintf/csvprintf-1.3.1.obscpio
deleted file mode 120000
index 045c23c..0000000
--- a/packages/c/csvprintf/csvprintf-1.3.1.obscpio
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreih6mf2t2e3daf27dhsr7iocmu4uqa3zqdmaxuk34ylh7zvr57bkiy
\ No newline at end of file
diff --git a/packages/c/csvprintf/csvprintf-1.3.2.obscpio b/packages/c/csvprintf/csvprintf-1.3.2.obscpio
new file mode 120000
index 0000000..f4f45b4
--- /dev/null
+++ b/packages/c/csvprintf/csvprintf-1.3.2.obscpio
@@ -0,0 +1 @@
+/ipfs/bafkreigtclrupnuzb47bachmptc5qdgcpgjhz5amp4fp7p7gbx6tbcvhee
\ No newline at end of file
diff --git a/packages/c/csvprintf/csvprintf.changes b/packages/c/csvprintf/csvprintf.changes
index d15e158..a97ac9c 100644
--- a/packages/c/csvprintf/csvprintf.changes
+++ b/packages/c/csvprintf/csvprintf.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Jan 25 19:14:29 UTC 2023 - Archie Cobbs
+
+- Update to release 1.3.2
+ - Fixed bug where we could emit empty XML tag names
+ - Fixed bug in man page examples for "-b" flag
+
+-------------------------------------------------------------------
Tue Dec 14 21:16:11 UTC 2021 - Archie Cobbs
- Update to release 1.3.1
diff --git a/packages/c/csvprintf/csvprintf.obsinfo b/packages/c/csvprintf/csvprintf.obsinfo
index d262cad..4b8e063 100644
--- a/packages/c/csvprintf/csvprintf.obsinfo
+++ b/packages/c/csvprintf/csvprintf.obsinfo
@@ -1,5 +1,4 @@
name: csvprintf
-version: 1.3.1
-mtime: 1639516291
-commit: 5d84b997c8ce5f1946a7df6c29cc4bc799e53f1b
-
+version: 1.3.2
+mtime: 1674673888
+commit: 1e24bae7118cba71954f7f71f67ab34f6b5f58ed
diff --git a/packages/c/csvprintf/csvprintf.spec b/packages/c/csvprintf/csvprintf.spec
index 324acd9..3aaa954 100644
--- a/packages/c/csvprintf/csvprintf.spec
+++ b/packages/c/csvprintf/csvprintf.spec
@@ -1,7 +1,7 @@
#
# spec file for package csvprintf
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: csvprintf
-Version: 1.3.1
+Version: 1.3.2
Release: 0
Summary: Simple CSV file parser for the UNIX command line
License: Apache-2.0
diff --git a/packages/d/docker/.files b/packages/d/docker/.files
index 8a3e549..653b0ff 100644
Binary files a/packages/d/docker/.files and b/packages/d/docker/.files differ
diff --git a/packages/d/docker/.rev b/packages/d/docker/.rev
index a18c05c..d6a049f 100644
--- a/packages/d/docker/.rev
+++ b/packages/d/docker/.rev
@@ -1232,4 +1232,15 @@ delete request for docker-image-migrator was submitted in parallel.
tleroy
trigger service run
+
+ 5c29ced55d2f5b320923091d4b36dd40
+ 20.10.23_ce
+
+ dimstar_suse
+ - update to 20.10.23-ce
+ * see upstream changelog at https://docs.docker.com/engine/release-notes/#201023
+- drop kubic flavor as kubic is EOL. this removes:
+ kubelet.env docker-kubic-service.conf 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
+ 1062476
+
diff --git a/packages/d/docker/.servicemark b/packages/d/docker/.servicemark
index 9b32e96..d59b8bc 100644
--- a/packages/d/docker/.servicemark
+++ b/packages/d/docker/.servicemark
@@ -1 +1 @@
-f146a37b9302c93c28fe5cffdfb4f87c
+7de77a73ffc1f237127dc135939ba047
diff --git a/packages/d/docker/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch b/packages/d/docker/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
deleted file mode 100644
index 071b1d8..0000000
--- a/packages/d/docker/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
+++ /dev/null
@@ -1,1155 +0,0 @@
-From 0fe6aba9612d2b483b29192c0605b1311b77a92b Mon Sep 17 00:00:00 2001
-From: Valentin Rothberg
-Date: Mon, 2 Jul 2018 13:37:34 +0200
-Subject: [PATCH 3/7] PRIVATE-REGISTRY: add private-registry mirror support
-
-NOTE: This is a backport/downstream patch of the upstream pull-request
- for Moby, which is still subject to changes. Please visit
- for the current status.
-
-Add support for mirroring private registries. The daemon.json config
-can now be configured as exemplified below:
-
-```json
-{
-"registries": [
- {
- "Prefix": "docker.io/library/alpine",
- "Mirrors": [
- {
- "URL": "http://local-alpine-mirror.lan"
- }
- ]
- },
- {
- "Prefix": "registry.suse.com",
- "Mirrors": [
- {
- "URL": "https://remote.suse.mirror.com"
- }
- ]
- },
- {
- "Prefix": "http://insecure.registry.org:5000"
- }
-],
-"registry-mirrors": ["https://deprecated-mirror.com"]
-}
-```
-
-With the new semantics, a mirror will be selected as an endpoint if the
-specified prefix matches the prefix of the requested resource (e.g., an
-image reference). In the upper example, "local-alpine-mirror" will only
-serve as a mirror for docker.io if the requested resource matches the
-"alpine" prefix, such as "alpine:latest" or "alpine-foo/bar".
-
-Furthermore, private registries can now be mirrored as well. In the
-example above, "remote.suse.mirror.com" will serve as a mirror for all
-requests to "registry.suse.com". Notice that if no http{s,} scheme is
-specified, the URI will always default to https without fallback to
-http. An insecure registry can now be specified by adding the "http://"
-scheme to the corresponding prefix.
-
-Note that the configuration is sanity checked, so that a given mirror
-can serve multiple prefixes if they all point to the same registry,
-while a registry cannot simultaneously serve as a mirror. The daemon
-will warn in case the URI schemes of a registry and one of its mirrors
-do not correspond.
-
-This change deprecates the "insecure-regestries" and "registry-mirrors"
-options, while the "insecure-registries" cannot be used simultaneously
-with the new "registries", which doesn't allow a fallback from https to
-http for security reasons.
-
-Signed-off-by: Flavio Castelli
-Signed-off-by: Valentin Rothberg
-Signed-off-by: Aleksa Sarai
----
- api/types/registry/registry.go | 144 +++++++++++++++++++++++++++++++++
- daemon/config/config.go | 4 +
- daemon/reload.go | 33 ++++++++
- daemon/reload_test.go | 95 ++++++++++++++++++++++
- distribution/pull.go | 2 +-
- distribution/pull_v2.go | 2 +-
- distribution/push.go | 2 +-
- registry/config.go | 133 +++++++++++++++++++++++++++++-
- registry/config_test.go | 142 ++++++++++++++++++++++++++++++++
- registry/registry_test.go | 99 ++++++++++++++++++++---
- registry/service.go | 43 +++++++---
- registry/service_v2.go | 63 +++++++++++----
- 12 files changed, 716 insertions(+), 46 deletions(-)
-
-diff --git a/api/types/registry/registry.go b/api/types/registry/registry.go
-index 53e47084c8d5..b4bb9ef805d3 100644
---- a/api/types/registry/registry.go
-+++ b/api/types/registry/registry.go
-@@ -2,7 +2,10 @@ package registry // import "github.com/docker/docker/api/types/registry"
-
- import (
- "encoding/json"
-+ "fmt"
- "net"
-+ "net/url"
-+ "strings"
-
- v1 "github.com/opencontainers/image-spec/specs-go/v1"
- )
-@@ -14,6 +17,147 @@ type ServiceConfig struct {
- InsecureRegistryCIDRs []*NetIPNet `json:"InsecureRegistryCIDRs"`
- IndexConfigs map[string]*IndexInfo `json:"IndexConfigs"`
- Mirrors []string
-+ Registries map[string]Registry
-+}
-+
-+// Registry holds information for a registry and its mirrors.
-+type Registry struct {
-+ // Prefix is used for the lookup of endpoints, where the given registry
-+ // is selected when its Prefix is a prefix of the passed reference, for
-+ // instance, Prefix:"docker.io/opensuse" will match a `docker pull
-+ // opensuse:tumleweed`.
-+ URL RegURL `json:"Prefix"`
-+ // The mirrors will be selected prior to the registry during lookup of
-+ // endpoints.
-+ Mirrors []Mirror `json:"Mirrors,omitempty"`
-+}
-+
-+// NewRegistry returns a Registry and interprets input as a URL.
-+func NewRegistry(input string) (Registry, error) {
-+ reg := Registry{}
-+ err := reg.URL.Parse(input)
-+ return reg, err
-+}
-+
-+// AddMirror interprets input as a URL and adds it as a new mirror.
-+func (r *Registry) AddMirror(input string) error {
-+ mir, err := NewMirror(input)
-+ if err != nil {
-+ return err
-+ }
-+ r.Mirrors = append(r.Mirrors, mir)
-+ return nil
-+}
-+
-+// ContainsMirror returns true if the URL of any mirror equals input.
-+func (r *Registry) ContainsMirror(input string) bool {
-+ for _, m := range r.Mirrors {
-+ if m.URL.String() == input {
-+ return true
-+ }
-+ }
-+ return false
-+}
-+
-+// Mirror holds information for a given registry mirror.
-+type Mirror struct {
-+ // The URL of the mirror.
-+ URL RegURL `json:"URL,omitempty"`
-+}
-+
-+// NewMirror returns a Registry and interprets input as a URL.
-+func NewMirror(input string) (Mirror, error) {
-+ mir := Mirror{}
-+ err := mir.URL.Parse(input)
-+ return mir, err
-+}
-+
-+// RegURL is a wrapper for url.URL to unmarshal it from the JSON config and to
-+// make it an embedded type for its users.
-+type RegURL struct {
-+ // rURL is a simple url.URL. Notice it is no pointer to avoid potential
-+ // null pointer dereferences.
-+ rURL url.URL
-+}
-+
-+// UnmarshalJSON unmarshals the byte array into the RegURL pointer.
-+func (r *RegURL) UnmarshalJSON(b []byte) error {
-+ var input string
-+ if err := json.Unmarshal(b, &input); err != nil {
-+ return err
-+ }
-+ return r.Parse(input)
-+}
-+
-+// MarshalJSON marshals the RegURL.
-+func (r *RegURL) MarshalJSON() ([]byte, error) {
-+ return json.Marshal(r.String())
-+}
-+
-+// Parse parses input as a URL.
-+func (r *RegURL) Parse(input string) error {
-+ input = strings.ToLower(input)
-+ uri, err := url.Parse(input)
-+ if err == nil {
-+ r.rURL = *uri
-+ } else {
-+ return err
-+ }
-+ // default to https if no URI scheme is specified
-+ if uri.Scheme == "" {
-+ // we have to parse again to update all associated data
-+ return r.Parse("https://" + input)
-+ }
-+
-+ // sanity checks
-+ if uri.Scheme != "http" && uri.Scheme != "https" {
-+ return fmt.Errorf("invalid url: unsupported scheme %q in %q", uri.Scheme, uri)
-+ }
-+ if uri.Host == "" {
-+ return fmt.Errorf("invalid url: unspecified hostname in %s", uri)
-+ }
-+ if uri.User != nil {
-+ // strip password from output
-+ uri.User = url.UserPassword(uri.User.Username(), "xxxxx")
-+ return fmt.Errorf("invalid url: username/password not allowed in URI %q", uri)
-+ }
-+
-+ return nil
-+}
-+
-+// Host returns the host:port of the URL.
-+func (r *RegURL) Host() string {
-+ return r.rURL.Host
-+}
-+
-+// Prefix returns the host:port/path of the URL.
-+func (r *RegURL) Prefix() string {
-+ return r.rURL.Host + r.rURL.Path
-+}
-+
-+// IsOfficial returns true if the URL points to an official "docker.io" host.
-+func (r *RegURL) IsOfficial() bool {
-+ return r.rURL.Hostname() == "docker.io"
-+}
-+
-+// IsSecure returns true if the URI scheme of the URL is "https".
-+func (r *RegURL) IsSecure() bool {
-+ return r.Scheme() == "https"
-+}
-+
-+// Scheme returns the URI scheme.
-+func (r *RegURL) Scheme() string {
-+ return r.rURL.Scheme
-+}
-+
-+// URL return URL of the RegURL.
-+func (r *RegURL) URL() url.URL {
-+ return r.rURL
-+}
-+
-+// String return URL as a string.
-+func (r *RegURL) String() string {
-+ return r.rURL.String()
- }
-
- // NetIPNet is the net.IPNet type, which can be marshalled and
-diff --git a/daemon/config/config.go b/daemon/config/config.go
-index 4990727597c9..f3a53c692d73 100644
---- a/daemon/config/config.go
-+++ b/daemon/config/config.go
-@@ -482,6 +482,10 @@ func findConfigurationConflicts(config map[string]interface{}, flags *pflag.Flag
- // 1. Search keys from the file that we don't recognize as flags.
- unknownKeys := make(map[string]interface{})
- for key, value := range config {
-+ // skip complex config-only options (daemon.json)
-+ if key == "registries" {
-+ continue
-+ }
- if flag := flags.Lookup(key); flag == nil && !skipValidateOptions[key] {
- unknownKeys[key] = value
- }
-diff --git a/daemon/reload.go b/daemon/reload.go
-index 72379c054ef6..1e4afe9b3b03 100644
---- a/daemon/reload.go
-+++ b/daemon/reload.go
-@@ -22,8 +22,14 @@ import (
- // - Daemon labels
- // - Insecure registries
- // - Registry mirrors
-+// - Registries
- // - Daemon live restore
- func (daemon *Daemon) Reload(conf *config.Config) (err error) {
-+ // check for incompatible options
-+ if err := conf.ServiceOptions.CompatCheck(); err != nil {
-+ return err
-+ }
-+
- daemon.configStore.Lock()
- attributes := map[string]string{}
-
-@@ -69,6 +75,9 @@ func (daemon *Daemon) Reload(conf *config.Config) (err error) {
- if err := daemon.reloadLiveRestore(conf, attributes); err != nil {
- return err
- }
-+ if err := daemon.reloadRegistries(conf, attributes); err != nil {
-+ return err
-+ }
- return daemon.reloadNetworkDiagnosticPort(conf, attributes)
- }
-
-@@ -320,6 +329,30 @@ func (daemon *Daemon) reloadRegistryMirrors(conf *config.Config, attributes map[
- return nil
- }
-
-+// reloadRegistries updates the registries configuration and the passed attributes
-+func (daemon *Daemon) reloadRegistries(conf *config.Config, attributes map[string]string) error {
-+ // update corresponding configuration
-+ if conf.IsValueSet("registries") {
-+ daemon.configStore.Registries = conf.Registries
-+ if err := daemon.RegistryService.LoadRegistries(conf.Registries); err != nil {
-+ return err
-+ }
-+ }
-+
-+ // prepare reload event attributes with updatable configurations
-+ if daemon.configStore.Registries != nil {
-+ registries, err := json.Marshal(daemon.configStore.Registries)
-+ if err != nil {
-+ return err
-+ }
-+ attributes["registries"] = string(registries)
-+ } else {
-+ attributes["registries"] = "[]"
-+ }
-+
-+ return nil
-+}
-+
- // reloadLiveRestore updates configuration with live restore option
- // and updates the passed attributes
- func (daemon *Daemon) reloadLiveRestore(conf *config.Config, attributes map[string]string) error {
-diff --git a/daemon/reload_test.go b/daemon/reload_test.go
-index 4a8466616dee..46664f4b1eda 100644
---- a/daemon/reload_test.go
-+++ b/daemon/reload_test.go
-@@ -7,6 +7,7 @@ import (
- "testing"
- "time"
-
-+ registrytypes "github.com/docker/docker/api/types/registry"
- "github.com/docker/docker/daemon/config"
- "github.com/docker/docker/daemon/images"
- "github.com/docker/docker/pkg/discovery"
-@@ -211,6 +212,100 @@ func TestDaemonReloadMirrors(t *testing.T) {
- }
- }
-
-+func TestDaemonReloadRegistries(t *testing.T) {
-+ daemon := &Daemon{
-+ imageService: images.NewImageService(images.ImageServiceConfig{}),
-+ }
-+
-+ // create registries: note that this is done implicitly when loading
-+ // daemon.json file.
-+ var (
-+ err error
-+ regA registrytypes.Registry // no change
-+ regB registrytypes.Registry // will be changed
-+ regC registrytypes.Registry // will be added
-+ )
-+
-+ regA, err = registrytypes.NewRegistry("https://registry-a.com")
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if err := regA.AddMirror("https://mirror-a.com"); err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // we'll add a 2nd mirror before reloading
-+ regB, err = registrytypes.NewRegistry("https://registry-b.com")
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if err := regB.AddMirror("https://mirror1-b.com"); err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // insecure regC will be added before reloading
-+ regC, err = registrytypes.NewRegistry("http://registry-c.com")
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ daemon.RegistryService, err = registry.NewService(registry.ServiceOptions{
-+ Registries: []registrytypes.Registry{regA, regB},
-+ })
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ daemon.configStore = &config.Config{}
-+
-+ if err := regB.AddMirror("https://mirror2-b.com"); err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ registries := []registrytypes.Registry{regA, regB, regC}
-+
-+ valuesSets := make(map[string]interface{})
-+ valuesSets["registries"] = registries
-+
-+ newConfig := &config.Config{
-+ CommonConfig: config.CommonConfig{
-+ ServiceOptions: registry.ServiceOptions{
-+ Registries: registries,
-+ },
-+ ValuesSet: valuesSets,
-+ },
-+ }
-+
-+ if err := daemon.Reload(newConfig); err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ registryService := daemon.RegistryService.ServiceConfig()
-+
-+ if reg, exists := registryService.Registries["registry-a.com"]; !exists {
-+ t.Fatal("registry should exist but doesn't")
-+ } else {
-+ if !reg.ContainsMirror("https://mirror-a.com") {
-+ t.Fatal("registry should contain mirror but doesn't")
-+ }
-+ }
-+
-+ if reg, exists := registryService.Registries["registry-b.com"]; !exists {
-+ t.Fatal("registry should exist but doesn't")
-+ } else {
-+ if !reg.ContainsMirror("https://mirror1-b.com") {
-+ t.Fatal("registry should contain mirror but doesn't")
-+ }
-+ if !reg.ContainsMirror("https://mirror2-b.com") {
-+ t.Fatal("registry should contain mirror but doesn't")
-+ }
-+ }
-+
-+ if _, exists := registryService.Registries["registry-c.com"]; !exists {
-+ t.Fatal("registry should exist but doesn't")
-+ }
-+}
-+
- func TestDaemonReloadInsecureRegistries(t *testing.T) {
- daemon := &Daemon{
- imageService: images.NewImageService(images.ImageServiceConfig{}),
-diff --git a/distribution/pull.go b/distribution/pull.go
-index c8ddd4c5cfcd..b17e9d25d6c2 100644
---- a/distribution/pull.go
-+++ b/distribution/pull.go
-@@ -61,7 +61,7 @@ func Pull(ctx context.Context, ref reference.Named, imagePullConfig *ImagePullCo
- return err
- }
-
-- endpoints, err := imagePullConfig.RegistryService.LookupPullEndpoints(reference.Domain(repoInfo.Name))
-+ endpoints, err := imagePullConfig.RegistryService.LookupPullEndpoints(ref.Name())
- if err != nil {
- return err
- }
-diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go
-index 5abd18b6cf7c..0796e7ea1d52 100644
---- a/distribution/pull_v2.go
-+++ b/distribution/pull_v2.go
-@@ -433,7 +433,7 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named, platform
- // the other side speaks the v2 protocol.
- p.confirmedV2 = true
-
-- logrus.Debugf("Pulling ref from V2 registry: %s", reference.FamiliarString(ref))
-+ logrus.Infof("Pulling ref %s from V2 registry %s", reference.FamiliarString(ref), p.endpoint.URL)
- progress.Message(p.config.ProgressOutput, tagOrDigest, "Pulling from "+reference.FamiliarName(p.repo.Named()))
-
- var (
-diff --git a/distribution/push.go b/distribution/push.go
-index 5617a4c95f49..0a24aebed968 100644
---- a/distribution/push.go
-+++ b/distribution/push.go
-@@ -58,7 +58,7 @@ func Push(ctx context.Context, ref reference.Named, imagePushConfig *ImagePushCo
- return err
- }
-
-- endpoints, err := imagePushConfig.RegistryService.LookupPushEndpoints(reference.Domain(repoInfo.Name))
-+ endpoints, err := imagePushConfig.RegistryService.LookupPushEndpoints(ref.Name())
- if err != nil {
- return err
- }
-diff --git a/registry/config.go b/registry/config.go
-index 54b83fa40aab..5adc913e4344 100644
---- a/registry/config.go
-+++ b/registry/config.go
-@@ -14,11 +14,12 @@ import (
- "github.com/sirupsen/logrus"
- )
-
--// ServiceOptions holds command line options.
-+// ServiceOptions holds the user-specified configuration options.
- type ServiceOptions struct {
-- AllowNondistributableArtifacts []string `json:"allow-nondistributable-artifacts,omitempty"`
-- Mirrors []string `json:"registry-mirrors,omitempty"`
-- InsecureRegistries []string `json:"insecure-registries,omitempty"`
-+ AllowNondistributableArtifacts []string `json:"allow-nondistributable-artifacts,omitempty"`
-+ Mirrors []string `json:"registry-mirrors,omitempty"`
-+ InsecureRegistries []string `json:"insecure-registries,omitempty"`
-+ Registries []registrytypes.Registry `json:"registries,omitempty"`
- }
-
- // serviceConfig holds daemon configuration for the registry service.
-@@ -59,8 +60,21 @@ var (
- lookupIP = net.LookupIP
- )
-
-+// CompatCheck performs some compatibility checks among the config options and
-+// returns an error in case of conflicts.
-+func (options *ServiceOptions) CompatCheck() error {
-+ if len(options.InsecureRegistries) > 0 && len(options.Registries) > 0 {
-+ return fmt.Errorf("usage of \"registries\" with deprecated option \"insecure-registries\" is not supported")
-+ }
-+ return nil
-+}
-+
- // newServiceConfig returns a new instance of ServiceConfig
- func newServiceConfig(options ServiceOptions) (*serviceConfig, error) {
-+ if err := options.CompatCheck(); err != nil {
-+ panic(fmt.Sprintf("error loading config: %v", err))
-+ }
-+
- config := &serviceConfig{
- ServiceConfig: registrytypes.ServiceConfig{
- InsecureRegistryCIDRs: make([]*registrytypes.NetIPNet, 0),
-@@ -78,10 +92,113 @@ func newServiceConfig(options ServiceOptions) (*serviceConfig, error) {
- if err := config.LoadInsecureRegistries(options.InsecureRegistries); err != nil {
- return nil, err
- }
-+ if err := config.LoadRegistries(options.Registries); err != nil {
-+ return nil, fmt.Errorf("error loading registries: %v", err)
-+ }
-
- return config, nil
- }
-
-+// checkRegistries makes sure that no mirror serves more than one registry and
-+// that no host is used as a registry and as a mirror simultaneously. Notice
-+// that different registry prefixes can share a mirror as long as they point to
-+// the same registry. It also warns if the URI schemes of a given registry and
-+// one of its mirrors differ.
-+func (config *serviceConfig) checkRegistries() error {
-+ inUse := make(map[string]string) // key: host, value: user
-+
-+ if len(config.Registries) > 0 {
-+ logrus.Errorf("[SUSE] You are currently using an unsupported and out-of-tree Docker feature intended for internal SUSE only.")
-+ logrus.Errorf("[SUSE] If you see this warning (and you are not using CaaSP) please open a SUSE bug report to alert us of this.")
-+ logrus.Errorf("[SUSE] This feature (registry mirrors) will be removed in a future Docker release on SUSE.")
-+ logrus.Errorf("[SUSE] Please DO NOT submit an upstream bug report about this warning!")
-+ }
-+
-+ // make sure that each mirror serves only one registry
-+ for _, reg := range config.Registries {
-+ for _, mirror := range reg.Mirrors {
-+ if used, conflict := inUse[mirror.URL.Host()]; conflict {
-+ if used != reg.URL.Host() {
-+ return fmt.Errorf("mirror '%s' can only serve one registry host", mirror.URL.Host())
-+ }
-+ }
-+ // docker.io etc. is reserved
-+ if mirror.URL.IsOfficial() {
-+ return fmt.Errorf("mirror '%s' cannot be used (reserved host)", mirror.URL.Host())
-+ }
-+ inUse[mirror.URL.Host()] = reg.URL.Host()
-+ // also warnf if seucurity levels differ
-+ if reg.URL.IsSecure() != mirror.URL.IsSecure() {
-+ regURL := reg.URL.URL()
-+ mirrorURL := mirror.URL.URL()
-+ logrus.Warnf("registry '%s' and mirror '%s' have different security levels", ®URL, &mirrorURL)
-+ }
-+ }
-+ if reg.URL.IsSecure() && len(reg.Mirrors) == 0 {
-+ logrus.Warnf("specifying secure registry '%s' without mirrors has no effect", reg.URL.Prefix())
-+ }
-+ }
-+
-+ // make sure that no registry host is used as a mirror
-+ for _, reg := range config.Registries {
-+ if _, conflict := inUse[reg.URL.Host()]; conflict {
-+ return fmt.Errorf("registry '%s' cannot simultaneously serve as a mirror for '%s'", reg.URL.Host(), inUse[reg.URL.Host()])
-+ }
-+ }
-+ return nil
-+}
-+
-+// FindRegistry returns a Registry pointer based on the passed reference. If
-+// more than one index-prefix match the reference, the longest index is
-+// returned. In case of no match, nil is returned.
-+func (config *serviceConfig) FindRegistry(reference string) *registrytypes.Registry {
-+ prefixStr := ""
-+ prefixLen := 0
-+ for _, reg := range config.Registries {
-+ if strings.HasPrefix(reference, reg.URL.Prefix()) {
-+ length := len(reg.URL.Prefix())
-+ if length > prefixLen {
-+ prefixStr = reg.URL.Prefix()
-+ prefixLen = length
-+ }
-+ }
-+ }
-+ if prefixLen > 0 {
-+ reg := config.Registries[prefixStr]
-+ return ®
-+ }
-+ return nil
-+}
-+
-+// LoadRegistries loads the user-specified configuration options for registries.
-+func (config *serviceConfig) LoadRegistries(registries []registrytypes.Registry) error {
-+ config.Registries = make(map[string]registrytypes.Registry)
-+
-+ for _, reg := range registries {
-+ config.Registries[reg.URL.Prefix()] = reg
-+ }
-+
-+ // backwards compatability to the "registry-mirrors" config
-+ if len(config.Mirrors) > 0 {
-+ reg := registrytypes.Registry{}
-+ if officialReg, exists := config.Registries[IndexName]; exists {
-+ reg = officialReg
-+ } else {
-+ var err error
-+ reg, err = registrytypes.NewRegistry(IndexName)
-+ if err != nil {
-+ return err
-+ }
-+ }
-+ for _, mirrorStr := range config.Mirrors {
-+ reg.AddMirror(mirrorStr)
-+ }
-+ config.Registries[IndexName] = reg
-+ }
-+
-+ return config.checkRegistries()
-+}
-+
- // LoadAllowNondistributableArtifacts loads allow-nondistributable-artifacts registries into config.
- func (config *serviceConfig) LoadAllowNondistributableArtifacts(registries []string) error {
- cidrs := map[string]*registrytypes.NetIPNet{}
-@@ -122,6 +239,10 @@ func (config *serviceConfig) LoadAllowNondistributableArtifacts(registries []str
- // LoadMirrors loads mirrors to config, after removing duplicates.
- // Returns an error if mirrors contains an invalid mirror.
- func (config *serviceConfig) LoadMirrors(mirrors []string) error {
-+ if len(mirrors) > 0 {
-+ logrus.Infof("usage of deprecated 'registry-mirrors' option: please use 'registries' instead")
-+ }
-+
- mMap := map[string]struct{}{}
- unique := []string{}
-
-@@ -151,6 +272,10 @@ func (config *serviceConfig) LoadMirrors(mirrors []string) error {
-
- // LoadInsecureRegistries loads insecure registries to config
- func (config *serviceConfig) LoadInsecureRegistries(registries []string) error {
-+ if len(registries) > 0 {
-+ logrus.Info("usage of deprecated 'insecure-registries' option: please use 'registries' instead")
-+ }
-+
- // Localhost is by default considered as an insecure registry
- // This is a stop-gap for people who are running a private registry on localhost (especially on Boot2docker).
- //
-diff --git a/registry/config_test.go b/registry/config_test.go
-index ae8cb23f94b6..7f31b1eb2bf4 100644
---- a/registry/config_test.go
-+++ b/registry/config_test.go
-@@ -6,10 +6,152 @@ import (
- "strings"
- "testing"
-
-+ registrytypes "github.com/docker/docker/api/types/registry"
- "gotest.tools/v3/assert"
- is "gotest.tools/v3/assert/cmp"
- )
-
-+func TestLoadValidRegistries(t *testing.T) {
-+ var (
-+ secReg registrytypes.Registry
-+ insecReg registrytypes.Registry
-+ config *serviceConfig
-+ err error
-+ )
-+ // secure with mirrors
-+ secReg, err = registrytypes.NewRegistry("https://secure.registry.com")
-+ secMirrors := []string{"https://secure.mirror1.com", "https://secure.mirror2.com"}
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if err := secReg.AddMirror(secMirrors[0]); err != nil {
-+ t.Fatal(err)
-+ }
-+ if err := secReg.AddMirror(secMirrors[1]); err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // insecure without mirrors
-+ insecReg, err = registrytypes.NewRegistry("http://insecure.registry.com")
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // docker.io mirrors to test backwards compatibility
-+ officialMirrors := []string{"https://official.mirror1.com", "https://official.mirror2.com"}
-+
-+ // create serciveConfig
-+ config, err = newServiceConfig(
-+ ServiceOptions{
-+ Mirrors: officialMirrors,
-+ Registries: []registrytypes.Registry{secReg, insecReg},
-+ })
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // now test if the config looks as expected
-+ getMirrors := func(reg registrytypes.Registry) []string {
-+ mirrors := []string{}
-+ for _, mir := range reg.Mirrors {
-+ mirrors = append(mirrors, mir.URL.String())
-+ }
-+ return mirrors
-+ }
-+
-+ if reg, loaded := config.Registries["secure.registry.com"]; !loaded {
-+ t.Fatalf("registry not loaded")
-+ } else {
-+ assert.Equal(t, true, reg.URL.IsSecure())
-+ assert.Equal(t, false, reg.URL.IsOfficial())
-+ mirrors := getMirrors(reg)
-+ assert.Equal(t, len(secMirrors), len(mirrors))
-+ sort.Strings(mirrors)
-+ sort.Strings(secMirrors)
-+ assert.Equal(t, secMirrors[0], mirrors[0])
-+ assert.Equal(t, secMirrors[1], mirrors[1])
-+ }
-+
-+ if reg, loaded := config.Registries["insecure.registry.com"]; !loaded {
-+ t.Fatalf("registry not loaded")
-+ } else {
-+ assert.Equal(t, false, reg.URL.IsSecure())
-+ assert.Equal(t, false, reg.URL.IsOfficial())
-+ mirrors := getMirrors(reg)
-+ assert.Equal(t, 0, len(mirrors))
-+ }
-+
-+ // backwards compatibility: "docker.io" will be loaded due to the config.Mirrors
-+ if reg, loaded := config.Registries["docker.io"]; !loaded {
-+ t.Fatalf("registry not loaded")
-+ } else {
-+ assert.Equal(t, true, reg.URL.IsSecure())
-+ assert.Equal(t, true, reg.URL.IsOfficial())
-+ mirrors := getMirrors(reg)
-+ assert.Equal(t, len(officialMirrors), len(mirrors))
-+ sort.Strings(mirrors)
-+ sort.Strings(officialMirrors)
-+ // append '/' (see ValidateMirror())
-+ assert.Equal(t, officialMirrors[0]+"/", mirrors[0])
-+ assert.Equal(t, officialMirrors[1]+"/", mirrors[1])
-+ }
-+}
-+
-+//func TestLoadInvalidRegistries(t *testing.T) {
-+// XXX: this has to be tested manually as the v17.09.X doesn't have a proper
-+// error handling for service configs (errors are silently ignored), so
-+// the backported patch panics() instead.
-+//}
-+
-+func TestFindRegistry(t *testing.T) {
-+ var (
-+ regA registrytypes.Registry
-+ regB registrytypes.Registry
-+ config *serviceConfig
-+ err error
-+ )
-+
-+ regA, err = registrytypes.NewRegistry("https://registry-a.com/my-prefix")
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ regB, err = registrytypes.NewRegistry("http://registry-b.com")
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // create serciveConfig
-+ config, err = newServiceConfig(
-+ ServiceOptions{
-+ Registries: []registrytypes.Registry{regA, regB},
-+ })
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+
-+ // no match -> nil
-+ reg := config.FindRegistry("foo")
-+ assert.Assert(t, is.Nil(reg))
-+
-+ // prefix match -> registry
-+ reg = config.FindRegistry("registry-a.com/my-prefix/image:latest")
-+ assert.Assert(t, reg != nil)
-+ assert.Equal(t, "registry-a.com", reg.URL.Host())
-+ // no prefix match -> nil
-+ reg = config.FindRegistry("registry-a.com/not-my-prefix/image:42")
-+ assert.Assert(t, is.Nil(reg))
-+
-+ // prefix match -> registry
-+ reg = config.FindRegistry("registry-b.com/image:latest")
-+ assert.Assert(t, reg != nil)
-+ assert.Equal(t, "registry-b.com", reg.URL.Host())
-+ // prefix match -> registry
-+ reg = config.FindRegistry("registry-b.com/also-in-namespaces/image:latest")
-+ assert.Assert(t, reg != nil)
-+ assert.Equal(t, "registry-b.com", reg.URL.Host())
-+}
-+
- func TestLoadAllowNondistributableArtifacts(t *testing.T) {
- testCases := []struct {
- registries []string
-diff --git a/registry/registry_test.go b/registry/registry_test.go
-index 417c9574bc5d..b3a978474ec1 100644
---- a/registry/registry_test.go
-+++ b/registry/registry_test.go
-@@ -507,40 +507,119 @@ func TestNewIndexInfo(t *testing.T) {
- }
-
- func TestMirrorEndpointLookup(t *testing.T) {
-- skip.If(t, os.Getuid() != 0, "skipping test that requires root")
-- containsMirror := func(endpoints []APIEndpoint) bool {
-+ var (
-+ registries []registrytypes.Registry
-+ secReg registrytypes.Registry
-+ pushAPIEndpoints []APIEndpoint
-+ pullAPIEndpoints []APIEndpoint
-+ err error
-+ )
-+
-+ // secure with mirrors
-+ secReg, err = registrytypes.NewRegistry("https://secure.registry.com/test-prefix/")
-+ secMirrors := []string{"https://secure.mirror1.com/", "https://secure.mirror2.com/"}
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if err := secReg.AddMirror(secMirrors[0]); err != nil {
-+ t.Fatal(err)
-+ }
-+ if err := secReg.AddMirror(secMirrors[1]); err != nil {
-+ t.Fatal(err)
-+ }
-+ registries = append(registries, secReg)
-+
-+ // docker.io mirrors to test backwards compatibility
-+ officialMirrors := []string{"https://official.mirror1.com/", "https://official.mirror2.com/"}
-+
-+ containsMirror := func(needle string, endpoints []APIEndpoint) bool {
- for _, pe := range endpoints {
-- if pe.URL.Host == "my.mirror" {
-+ if pe.URL.String() == needle {
- return true
- }
- }
- return false
- }
-- cfg, err := makeServiceConfig([]string{"https://my.mirror"}, nil)
-+ cfg, err := newServiceConfig(ServiceOptions{
-+ Mirrors: officialMirrors,
-+ Registries: registries,
-+ })
- if err != nil {
- t.Fatal(err)
- }
- s := DefaultService{config: cfg}
-
-- imageName, err := reference.WithName(IndexName + "/test/image")
-+ // lookups for "docker.io"
-+ officialRef := "docker.io/test/image:latest"
-+ pushAPIEndpoints, err = s.LookupPushEndpoints(officialRef)
- if err != nil {
-- t.Error(err)
-+ t.Fatal(err)
-+ }
-+ if containsMirror(officialMirrors[0], pushAPIEndpoints) {
-+ t.Fatal("Push endpoint should not contain mirror")
-+ }
-+ if containsMirror(officialMirrors[1], pushAPIEndpoints) {
-+ t.Fatal("Push endpoint should not contain mirror")
-+ }
-+
-+ pullAPIEndpoints, err = s.LookupPullEndpoints(officialRef)
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if !containsMirror(officialMirrors[0], pullAPIEndpoints) {
-+ t.Fatal("Pull endpoint should contain mirror")
- }
-- pushAPIEndpoints, err := s.LookupPushEndpoints(reference.Domain(imageName))
-+ if !containsMirror(officialMirrors[1], pullAPIEndpoints) {
-+ t.Fatal("Pull endpoint should contain mirror")
-+ }
-+
-+ // prefix lookups
-+ prefixRef := "secure.registry.com/test-prefix/foo:latest"
-+ pushAPIEndpoints, err = s.LookupPushEndpoints(prefixRef)
- if err != nil {
- t.Fatal(err)
- }
-- if containsMirror(pushAPIEndpoints) {
-+ if containsMirror(secMirrors[0], pushAPIEndpoints) {
-+ t.Fatal("Push endpoint should not contain mirror")
-+ }
-+ if containsMirror(secMirrors[1], pushAPIEndpoints) {
- t.Fatal("Push endpoint should not contain mirror")
- }
-
-- pullAPIEndpoints, err := s.LookupPullEndpoints(reference.Domain(imageName))
-+ pullAPIEndpoints, err = s.LookupPullEndpoints(prefixRef)
- if err != nil {
- t.Fatal(err)
- }
-- if !containsMirror(pullAPIEndpoints) {
-+ if !containsMirror(secMirrors[0], pullAPIEndpoints) {
- t.Fatal("Pull endpoint should contain mirror")
- }
-+ if !containsMirror(secMirrors[1], pullAPIEndpoints) {
-+ t.Fatal("Pull endpoint should contain mirror")
-+ }
-+
-+ // lookups without matching prefix -> no mirrors
-+ noPrefixRef := "secure.registry.com/no-matching-prefix/foo:latest"
-+ pushAPIEndpoints, err = s.LookupPushEndpoints(noPrefixRef)
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if containsMirror(secMirrors[0], pushAPIEndpoints) {
-+ t.Fatal("Push endpoint should not contain mirror")
-+ }
-+ if containsMirror(secMirrors[1], pushAPIEndpoints) {
-+ t.Fatal("Push endpoint should not contain mirror")
-+ }
-+
-+ pullAPIEndpoints, err = s.LookupPullEndpoints(noPrefixRef)
-+ if err != nil {
-+ t.Fatal(err)
-+ }
-+ if containsMirror(secMirrors[0], pullAPIEndpoints) {
-+ t.Fatal("Pull endpoint should not contain mirror")
-+ }
-+ if containsMirror(secMirrors[1], pullAPIEndpoints) {
-+ t.Fatal("Pull endpoint should not contain mirror")
-+ }
- }
-
- func TestSearchRepositories(t *testing.T) {
-diff --git a/registry/service.go b/registry/service.go
-index 3b08e39da2c2..62556ba1ba70 100644
---- a/registry/service.go
-+++ b/registry/service.go
-@@ -8,7 +8,7 @@ import (
- "strings"
- "sync"
-
-- "github.com/docker/distribution/reference"
-+ dref "github.com/docker/distribution/reference"
- "github.com/docker/distribution/registry/client/auth"
- "github.com/docker/docker/api/types"
- registrytypes "github.com/docker/docker/api/types/registry"
-@@ -25,14 +25,15 @@ const (
- // Service is the interface defining what a registry service should implement.
- type Service interface {
- Auth(ctx context.Context, authConfig *types.AuthConfig, userAgent string) (status, token string, err error)
-- LookupPullEndpoints(hostname string) (endpoints []APIEndpoint, err error)
-- LookupPushEndpoints(hostname string) (endpoints []APIEndpoint, err error)
-- ResolveRepository(name reference.Named) (*RepositoryInfo, error)
-+ LookupPullEndpoints(reference string) (endpoints []APIEndpoint, err error)
-+ LookupPushEndpoints(reference string) (endpoints []APIEndpoint, err error)
-+ ResolveRepository(name dref.Named) (*RepositoryInfo, error)
- Search(ctx context.Context, term string, limit int, authConfig *types.AuthConfig, userAgent string, headers map[string][]string) (*registrytypes.SearchResults, error)
- ServiceConfig() *registrytypes.ServiceConfig
- TLSConfig(hostname string) (*tls.Config, error)
- LoadAllowNondistributableArtifacts([]string) error
- LoadMirrors([]string) error
-+ LoadRegistries([]registrytypes.Registry) error
- LoadInsecureRegistries([]string) error
- }
-
-@@ -61,6 +62,7 @@ func (s *DefaultService) ServiceConfig() *registrytypes.ServiceConfig {
- AllowNondistributableArtifactsHostnames: make([]string, 0),
- InsecureRegistryCIDRs: make([]*(registrytypes.NetIPNet), 0),
- IndexConfigs: make(map[string]*(registrytypes.IndexInfo)),
-+ Registries: make(map[string]registrytypes.Registry),
- Mirrors: make([]string, 0),
- }
-
-@@ -76,6 +78,10 @@ func (s *DefaultService) ServiceConfig() *registrytypes.ServiceConfig {
-
- servConfig.Mirrors = append(servConfig.Mirrors, s.config.ServiceConfig.Mirrors...)
-
-+ for key, value := range s.config.ServiceConfig.Registries {
-+ servConfig.Registries[key] = value
-+ }
-+
- return &servConfig
- }
-
-@@ -103,6 +109,14 @@ func (s *DefaultService) LoadInsecureRegistries(registries []string) error {
- return s.config.LoadInsecureRegistries(registries)
- }
-
-+// LoadRegistries loads registries for Service
-+func (s *DefaultService) LoadRegistries(registries []registrytypes.Registry) error {
-+ s.mu.Lock()
-+ defer s.mu.Unlock()
-+
-+ return s.config.LoadRegistries(registries)
-+}
-+
- // Auth contacts the public registry with the provided credentials,
- // and returns OK if authentication was successful.
- // It can be used to verify the validity of a client's credentials.
-@@ -230,7 +244,7 @@ func (s *DefaultService) Search(ctx context.Context, term string, limit int, aut
-
- // ResolveRepository splits a repository name into its components
- // and configuration of the associated registry.
--func (s *DefaultService) ResolveRepository(name reference.Named) (*RepositoryInfo, error) {
-+func (s *DefaultService) ResolveRepository(name dref.Named) (*RepositoryInfo, error) {
- s.mu.Lock()
- defer s.mu.Unlock()
- return newRepositoryInfo(s.config, name)
-@@ -270,22 +284,25 @@ func (s *DefaultService) tlsConfigForMirror(mirrorURL *url.URL) (*tls.Config, er
- return s.tlsConfig(mirrorURL.Host)
- }
-
--// LookupPullEndpoints creates a list of v2 endpoints to try to pull from, in order of preference.
--// It gives preference to mirrors over the actual registry, and HTTPS over plain HTTP.
--func (s *DefaultService) LookupPullEndpoints(hostname string) (endpoints []APIEndpoint, err error) {
-+// LookupPullEndpoints creates a list of endpoints based on the provided
-+// reference to try to pull from, in order of preference. It gives preference
-+// to v2 endpoints over v1, mirrors over the actual registry, and HTTPS over
-+// plain HTTP.
-+func (s *DefaultService) LookupPullEndpoints(reference string) (endpoints []APIEndpoint, err error) {
- s.mu.Lock()
- defer s.mu.Unlock()
-
-- return s.lookupV2Endpoints(hostname)
-+ return s.lookupV2Endpoints(reference)
- }
-
--// LookupPushEndpoints creates a list of v2 endpoints to try to push to, in order of preference.
--// It gives preference to HTTPS over plain HTTP. Mirrors are not included.
--func (s *DefaultService) LookupPushEndpoints(hostname string) (endpoints []APIEndpoint, err error) {
-+// LookupPushEndpoints creates a list of endpoints based on the provided
-+// reference to try to push to, in order of preference. It gives preference to
-+// v2 endpoints over v1, and HTTPS over plain HTTP. Mirrors are not included.
-+func (s *DefaultService) LookupPushEndpoints(reference string) (endpoints []APIEndpoint, err error) {
- s.mu.Lock()
- defer s.mu.Unlock()
-
-- allEndpoints, err := s.lookupV2Endpoints(hostname)
-+ allEndpoints, err := s.lookupV2Endpoints(reference)
- if err == nil {
- for _, endpoint := range allEndpoints {
- if !endpoint.Mirror {
-diff --git a/registry/service_v2.go b/registry/service_v2.go
-index 154ac7c93e80..06f7d20de8f9 100644
---- a/registry/service_v2.go
-+++ b/registry/service_v2.go
-@@ -1,42 +1,73 @@
- package registry // import "github.com/docker/docker/registry"
-
- import (
-+ "fmt"
- "net/url"
- "strings"
-
-+ registrytypes "github.com/docker/docker/api/types/registry"
- "github.com/docker/go-connections/tlsconfig"
- )
-
--func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndpoint, err error) {
-+func (s *DefaultService) lookupV2Endpoints(reference string) (endpoints []APIEndpoint, err error) {
- tlsConfig := tlsconfig.ServerDefault()
-
-+ // extraxt the hostname from the reference
-+ refURL := reference
-+ if !strings.HasPrefix(refURL, "http://") && !strings.HasPrefix(refURL, "https://") {
-+ refURL = "https://" + refURL
-+ }
-+ u, err := url.Parse(refURL)
-+ if err != nil {
-+ return nil, fmt.Errorf("SUSE PATCH [lookupV2Endpoints]: error parsing reference %s: %s", reference, err)
-+ }
-+ hostname := u.Host // hostname + port (if present)
-+ if hostname == "" {
-+ return nil, fmt.Errorf("SUSE PATCH [lookupV2Endpoints]: cannot determine hostname of reference %s", reference)
-+ }
-+
- ana := allowNondistributableArtifacts(s.config, hostname)
-
-- if hostname == DefaultNamespace || hostname == IndexHostname {
-- for _, mirror := range s.config.Mirrors {
-- if !strings.HasPrefix(mirror, "http://") && !strings.HasPrefix(mirror, "https://") {
-- mirror = "https://" + mirror
-- }
-- mirrorURL, err := url.Parse(mirror)
-- if err != nil {
-- return nil, err
-- }
-- mirrorTLSConfig, err := s.tlsConfigForMirror(mirrorURL)
-+ // create endpoints for official and configured registries
-+ official := false
-+ if hostname == "docker.io" {
-+ official = true
-+ }
-+ reg := s.config.FindRegistry(reference)
-+
-+ if reg != nil || official {
-+ if reg == nil {
-+ reg = ®istrytypes.Registry{}
-+ }
-+ // if present, add mirrors prior to the registry
-+ for _, mirror := range reg.Mirrors {
-+ mURL := mirror.URL.URL()
-+ mirrorTLSConfig, err := s.tlsConfigForMirror(&mURL)
- if err != nil {
-- return nil, err
-+ return nil, fmt.Errorf("SUSE PATCH [lookupV2Endpoints]: %s", err)
- }
- endpoints = append(endpoints, APIEndpoint{
-- URL: mirrorURL,
-+ URL: &mURL,
- Version: APIVersion2,
- Mirror: true,
- TrimHostname: true,
- TLSConfig: mirrorTLSConfig,
- })
- }
-+ // add the registry
-+ var endpointURL *url.URL
-+ if official {
-+ endpointURL = DefaultV2Registry
-+ } else {
-+ endpointURL = &url.URL{
-+ Scheme: reg.URL.Scheme(),
-+ Host: reg.URL.Host(),
-+ }
-+ }
- endpoints = append(endpoints, APIEndpoint{
-- URL: DefaultV2Registry,
-+ URL: endpointURL,
- Version: APIVersion2,
-- Official: true,
-+ Official: official,
- TrimHostname: true,
- TLSConfig: tlsConfig,
-
-@@ -48,7 +79,7 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp
-
- tlsConfig, err = s.tlsConfig(hostname)
- if err != nil {
-- return nil, err
-+ return nil, fmt.Errorf("SUSE PATCH [lookupV2Enpoints]: %s", err)
- }
-
- endpoints = []APIEndpoint{
---
-2.38.1
-
diff --git a/packages/d/docker/_multibuild b/packages/d/docker/_multibuild
deleted file mode 100644
index 3860733..0000000
--- a/packages/d/docker/_multibuild
+++ /dev/null
@@ -1,3 +0,0 @@
-
- kubic
-
diff --git a/packages/d/docker/_service b/packages/d/docker/_service
index 647ec25..aee6024 100644
--- a/packages/d/docker/_service
+++ b/packages/d/docker/_service
@@ -3,16 +3,16 @@
https://github.com/moby/moby.git
git
.git
- 20.10.21_ce_%h
- v20.10.21
+ 20.10.23_ce_%h
+ v20.10.23
docker
https://github.com/docker/cli.git
git
.git
- 20.10.21_ce
- v20.10.21
+ 20.10.23_ce
+ v20.10.23
docker-cli
@@ -20,7 +20,7 @@
git
.git
%H
- 0dde5c895075df6e3630e76f750a447cf63f4789
+ 05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
docker-libnetwork
diff --git a/packages/d/docker/docker-20.10.21_ce_3056208812eb.tar.xz b/packages/d/docker/docker-20.10.21_ce_3056208812eb.tar.xz
deleted file mode 120000
index 9ef30ae..0000000
--- a/packages/d/docker/docker-20.10.21_ce_3056208812eb.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiavq4tt4rlwp5ow24vep3ozjhl2exc3twjejkpysgkxthuulzawtm
\ No newline at end of file
diff --git a/packages/d/docker/docker-20.10.23_ce_6051f1429.tar.xz b/packages/d/docker/docker-20.10.23_ce_6051f1429.tar.xz
new file mode 120000
index 0000000..c31fef1
--- /dev/null
+++ b/packages/d/docker/docker-20.10.23_ce_6051f1429.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeictmo3znlv4h5r35ith5hn7nqdsicgcr7lllmgfb6ittg6xrcsojq
\ No newline at end of file
diff --git a/packages/d/docker/docker-cli-20.10.21_ce.tar.xz b/packages/d/docker/docker-cli-20.10.21_ce.tar.xz
deleted file mode 120000
index 5b99de7..0000000
--- a/packages/d/docker/docker-cli-20.10.21_ce.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeic7ld6xw6bauxrog2qgcyddbzg52yqgudjqb56u6ybsjysdurzyou
\ No newline at end of file
diff --git a/packages/d/docker/docker-cli-20.10.23_ce.tar.xz b/packages/d/docker/docker-cli-20.10.23_ce.tar.xz
new file mode 120000
index 0000000..7675b94
--- /dev/null
+++ b/packages/d/docker/docker-cli-20.10.23_ce.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeih7dtbuuuj2mrsv2spoki3mlp3fyuqofjoiq2cozypd2zzgn3urjy
\ No newline at end of file
diff --git a/packages/d/docker/docker-kubic-service.conf b/packages/d/docker/docker-kubic-service.conf
deleted file mode 100644
index 2f3b189..0000000
--- a/packages/d/docker/docker-kubic-service.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-# Put docker under the podruntime slice. This the recommended
-# deployment to allow fine resource control on Kubernetes.
-Slice=podruntime.slice
diff --git a/packages/d/docker/docker-libnetwork-05b93e0d3a95952f70c113b0bc5bdb538d7afdd7.tar.xz b/packages/d/docker/docker-libnetwork-05b93e0d3a95952f70c113b0bc5bdb538d7afdd7.tar.xz
new file mode 120000
index 0000000..b26f009
--- /dev/null
+++ b/packages/d/docker/docker-libnetwork-05b93e0d3a95952f70c113b0bc5bdb538d7afdd7.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiaay3hndpd7xd2msykiemwqiem463pfw5taquyze2gesbkctc67aa
\ No newline at end of file
diff --git a/packages/d/docker/docker-libnetwork-0dde5c895075df6e3630e76f750a447cf63f4789.tar.xz b/packages/d/docker/docker-libnetwork-0dde5c895075df6e3630e76f750a447cf63f4789.tar.xz
deleted file mode 120000
index 4415d72..0000000
--- a/packages/d/docker/docker-libnetwork-0dde5c895075df6e3630e76f750a447cf63f4789.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeifeipaweb5mpfrmwmafwdep2qlboxfgt22oxia4g2uljaq45lfxcy
\ No newline at end of file
diff --git a/packages/d/docker/docker-rpmlintrc b/packages/d/docker/docker-rpmlintrc
index 33752d8..fd006ad 100644
--- a/packages/d/docker/docker-rpmlintrc
+++ b/packages/d/docker/docker-rpmlintrc
@@ -1,9 +1,6 @@
-# This is intentional, since we use _multibuild for the flavours.
-addFilter ("^docker-kubic.src: W: invalid-spec-name")
-
# The #! comes from upstream.
-addFilter ("^docker(-kubic)?-bash-completion.noarch: W: sourced-script-with-shebang /etc/bash_completion.d/docker bash")
-addFilter ("^docker(-kubic)?-zsh-completion.noarch: W: sourced-script-with-shebang /etc/zsh_completion.d/docker zsh")
+addFilter ("^docker-bash-completion.noarch: W: sourced-script-with-shebang /etc/bash_completion.d/docker bash")
+addFilter ("^docker-zsh-completion.noarch: W: sourced-script-with-shebang /etc/zsh_completion.d/docker zsh")
# -test is something that is used internally and isn't actually shipped -- it's a pseduo-source package.
-addFilter ("^docker(-kubic)?-test.*")
+addFilter ("^docker-test.*")
diff --git a/packages/d/docker/docker.changes b/packages/d/docker/docker.changes
index 308c0fe..10f81ea 100644
--- a/packages/d/docker/docker.changes
+++ b/packages/d/docker/docker.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Feb 1 14:33:19 UTC 2023 - Dirk Müller
+
+- update to 20.10.23-ce
+ * see upstream changelog at https://docs.docker.com/engine/release-notes/#201023
+
+- drop kubic flavor as kubic is EOL. this removes:
+ kubelet.env docker-kubic-service.conf 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
+
+-------------------------------------------------------------------
Tue Dec 6 11:49:32 UTC 2022 - Aleksa Sarai
- Update to Docker 20.10.21-ce. See upstream changelog online at
diff --git a/packages/d/docker/docker.spec b/packages/d/docker/docker.spec
index 6ed1d00..e9eca3a 100644
--- a/packages/d/docker/docker.spec
+++ b/packages/d/docker/docker.spec
@@ -42,15 +42,15 @@
# helpfully injects into our build environment from the changelog). If you want
# to generate a new git_commit_epoch, use this:
# $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
-%define real_version 20.10.21
-%define git_version 3056208812eb
-%define git_commit_epoch 1666698255
+%define real_version 20.10.23
+%define git_version 6051f1429
+%define git_commit_epoch 1674059068
# We require a specific pin of libnetwork because it doesn't really do
# versioning and minor version mismatches in libnetwork can break Docker
# networking. All other key runtime dependencies (containerd, runc) are stable
# enough that this isn't necessary.
-%define libnetwork_version 0dde5c895075df6e3630e76f750a447cf63f4789
+%define libnetwork_version 05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
%define dist_builddir %{_builddir}/dist-suse
%define cli_builddir %{dist_builddir}/src/github.com/docker/cli
@@ -78,10 +78,6 @@ Source103: README_SUSE.md
Source104: docker-audit.rules
Source105: docker-daemon.json
Source106: docker.sysusers
-# Kubelet-specific sources.
-# bsc#1086185 -- but we only apply this on Kubic.
-Source900: docker-kubic-service.conf
-Source901: kubelet.env
# NOTE: All of these patches are maintained in
# in the suse- branch. Make sure you update the patches in that
# branch and then git-format-patch the patch here.
@@ -91,8 +87,6 @@ Patch100: 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
Patch101: 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
# SUSE-FEATURE: Add support to mirror unofficial/private registries
# .
-Patch200: 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
-# SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1073877 bsc#1099277
Patch300: 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
# SUSE-BACKPORT: Backport of https://github.com/moby/moby/pull/42273. bsc#1183855 bsc#1175081
Patch301: 0005-bsc1183855-btrfs-Do-not-disable-quota-on-cleanup.patch
@@ -117,9 +111,7 @@ BuildRequires: fish
BuildRequires: go-go-md2man
BuildRequires: pkgconfig(libsystemd)
BuildRequires: sysuser-tools
-# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
-# for 'golang(API) >= 1.18' here, so just require 1.18 exactly. bsc#1172608
-BuildRequires: go1.18
+BuildRequires: golang(API) = 1.18
Requires: (apparmor-parser or container-selinux)
Requires: ca-certificates-mozilla
# The docker-proxy binary used to be in a separate package. We obsolete it,
@@ -157,26 +149,6 @@ Recommends: lvm2 >= 2.2.89
Recommends: git-core >= 1.7
ExcludeArch: s390 ppc
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-# packaging, when everything was renamed to -kubic. It also is
-# used to ensure that nothing complains too much when using
-# -kubic packages. Hopfully it can be removed one day.
-%if "%flavour" == "kubic"
-# Obsolete old packege without the -kubic suffix
-Obsoletes: %{realname} = 1.12.6
-Obsoletes: %{realname}_1_12_6
-# Conflict with non-kubic package, and provide equivalent
-Conflicts: %{realname}
-Provides: %{realname} = %{version}
-# Kubernetes requires cri-runtime, which should be provided only by the -kubic flavour of this package
-Provides: cri-runtime
-# No i586 Kubernetes, so docker-kubic must not be built for i586 also
-ExcludeArch: i586
-# Disable leap based builds for kubic flavor (bsc#1121412)
-%if 0%{?suse_version} == 1500 && 0%{?is_opensuse}
-ExclusiveArch: do_not_build
-%endif
-%endif
%description
Docker complements LXC with a high-level API which operates at the process
@@ -194,17 +166,6 @@ Requires: %{name} = %{version}
Requires: bash-completion
Supplements: packageand(%{name}:bash-completion)
BuildArch: noarch
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-# packaging, when everything was renamed to -kubic. It also is
-# used to ensure that nothing complains too much when using
-# -kubic packages. Hopfully it can be removed one day.
-%if "%flavour" == "kubic"
-# Obsolete old packege without the -kubic suffix
-Obsoletes: %{realname}-bash-completion = 1.12.6
-# Conflict with non-kubic package, and provide equivalent
-Conflicts: %{realname}-bash-completion > 1.12.6
-Provides: %{realname}-bash-completion = %{version}
-%endif
%description bash-completion
Bash command line completion support for %{name}.
@@ -216,17 +177,6 @@ Requires: %{name} = %{version}
Requires: zsh
Supplements: packageand(%{name}:zsh)
BuildArch: noarch
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-# packaging, when everything was renamed to -kubic. It also is
-# used to ensure that nothing complains too much when using
-# -kubic packages. Hopfully it can be removed one day.
-%if "%flavour" == "kubic"
-# Obsolete old packege without the -kubic suffix
-Obsoletes: %{realname}-zsh-completion = 1.12.6
-# Conflict with non-kubic package, and provide equivalent
-Conflicts: %{realname}-zsh-completion > 1.12.6
-Provides: %{realname}-zsh-completion = %{version}
-%endif
%description zsh-completion
Zsh command line completion support for %{name}.
@@ -238,29 +188,10 @@ Requires: %{name} = %{version}
Requires: fish
Supplements: packageand(%{name}:fish)
BuildArch: noarch
-%if "%flavour" == "kubic"
-# Conflict with non-kubic package, and provide equivalent
-Conflicts: %{realname}-fish-completion
-Provides: %{realname}-fish-completion = %{version}
-%endif
%description fish-completion
Fish command line completion support for %{name}.
-%if "%flavour" == "kubic"
-%package kubeadm-criconfig
-Summary: docker container runtime configuration for kubeadm
-Group: System/Management
-Requires: kubernetes-kubeadm
-Requires(post): %fillup_prereq
-Supplements: docker-kubic
-Provides: kubernetes-kubeadm-criconfig
-Conflicts: cri-o-kubeadm-criconfig
-
-%description kubeadm-criconfig
-docker container runtime configuration for kubeadm
-%endif
-
%prep
%setup -q -n %{realname}-%{version}_%{git_version}
@@ -271,10 +202,6 @@ docker container runtime configuration for kubeadm
%patch100 -p1
%patch101 -p1
%endif
-%if "%flavour" == "kubic"
-# PATCH-SUSE: Mirror patch.
-%patch200 -p1
-%endif
# bsc#1099277
%patch300 -p1
# bsc#1183855 bsc#1175081
@@ -395,9 +322,6 @@ install -D -m0755 %{proxy_builddir}/docker-proxy %{buildroot}/%{_bindir}/docker-
# systemd service
install -D -m0644 %{SOURCE100} %{buildroot}%{_unitdir}/%{realname}.service
-%if "%flavour" == "kubic"
-install -D -m0644 %{SOURCE900} %{buildroot}%{_unitdir}/%{realname}.service.d/90-kubic.conf
-%endif
ln -sf service %{buildroot}%{_sbindir}/rcdocker
# udev rules that prevents dolphin to show all docker devices and slows down
@@ -421,12 +345,6 @@ install -p -m0644 %{cli_builddir}/man/man8/*.8 %{buildroot}%{_mandir}/man8
# sysusers.d
install -D -m0644 %{SOURCE106} %{buildroot}%{_sysusersdir}/%{name}.conf
-%if "%flavour" == "kubic"
-# place kubelet.env in fillupdir (for kubeadm-criconfig)
-sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE901}
-install -D -m0644 %{SOURCE901} %{buildroot}%{_fillupdir}/sysconfig.kubelet
-%endif
-
%fdupes %{buildroot}
%pre -f %{name}.pre
@@ -451,11 +369,6 @@ grep -q '^dockremap:' /etc/subgid || \
%service_add_post %{realname}.service
%{fillup_only -n docker}
-%if "%flavour" == "kubic"
-%post kubeadm-criconfig
-%fillup_only -n kubelet
-%endif
-
%preun
%service_del_preun %{realname}.service
@@ -474,10 +387,6 @@ grep -q '^dockremap:' /etc/subgid || \
%{_unitdir}/%{realname}.service
%{_sysusersdir}/%{name}.conf
-%if "%flavour" == "kubic"
-%dir %{_unitdir}/%{realname}.service.d/
-%{_unitdir}/%{realname}.service.d/90-kubic.conf
-%endif
%dir %{_sysconfdir}/docker
%config(noreplace) %{_sysconfdir}/docker/daemon.json
@@ -503,10 +412,4 @@ grep -q '^dockremap:' /etc/subgid || \
%defattr(-,root,root)
%{_datadir}/fish/vendor_completions.d/%{realname}.fish
-%if "%flavour" == "kubic"
-%files kubeadm-criconfig
-%defattr(-,root,root)
-%{_fillupdir}/sysconfig.kubelet
-%endif
-
%changelog
diff --git a/packages/d/docker/kubelet.env b/packages/d/docker/kubelet.env
deleted file mode 100644
index 331bc64..0000000
--- a/packages/d/docker/kubelet.env
+++ /dev/null
@@ -1 +0,0 @@
-KUBELET_EXTRA_ARGS="--cni-bin-dir=@LIBEXECDIR@/cni"
diff --git a/packages/e/eth-ff/.files b/packages/e/eth-ff/.files
index 375f6b1..86b08be 100644
Binary files a/packages/e/eth-ff/.files and b/packages/e/eth-ff/.files differ
diff --git a/packages/e/eth-ff/.rev b/packages/e/eth-ff/.rev
index e4ef577..d0c7d75 100644
--- a/packages/e/eth-ff/.rev
+++ b/packages/e/eth-ff/.rev
@@ -15,4 +15,12 @@
1007037
+
+ 45e4d22444b25dd859bdcf73b552ab4d
+ 11.3.0.0
+
+ dimstar_suse
+
+ 1062637
+
diff --git a/packages/e/eth-ff/.servicemark b/packages/e/eth-ff/.servicemark
index 4200839..e2b1ec6 100644
--- a/packages/e/eth-ff/.servicemark
+++ b/packages/e/eth-ff/.servicemark
@@ -1 +1 @@
-ddba538a20c07cfb79db96d63abcbf61
+1274852f4a0a08ed8e48e4f9ee138d1e
diff --git a/packages/e/eth-ff/eth-ff.changes b/packages/e/eth-ff/eth-ff.changes
index fb9cc1e..34e6549 100644
--- a/packages/e/eth-ff/eth-ff.changes
+++ b/packages/e/eth-ff/eth-ff.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jan 27 09:16:29 UTC 2023 - Nicolas Morey
+
+- Add topology-fix-support-for-disabled-MD5-authentication.patch to fix
+ compilation issues with net-snmp with disabled MD5 authentication.
+
+-------------------------------------------------------------------
Thu Sep 15 07:30:22 UTC 2022 - Nicolas Morey-Chaisemartin
- Update to v11.3.0.0-130 (jsc#PED-349)
diff --git a/packages/e/eth-ff/eth-ff.spec b/packages/e/eth-ff/eth-ff.spec
index 0deca96..5f49769 100644
--- a/packages/e/eth-ff/eth-ff.spec
+++ b/packages/e/eth-ff/eth-ff.spec
@@ -1,7 +1,7 @@
#
# spec file for package eth-ff
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,7 @@ Source0: %{name}-%{version}%{git_ver}.tar.gz
Source1: eth-ff.rpmlintrc
Patch1: eth-ff-suse-build-fixes.patch
Patch2: eth-ff-add-shebang-for-exp-files.patch
+Patch3: topology-fix-support-for-disabled-MD5-authentication.patch
BuildRequires: gcc-c++
BuildRequires: infiniband-diags-devel
BuildRequires: libexpat-devel
@@ -71,6 +72,7 @@ Contains tools for managing fabric on a management node.
%setup -q -n %{name}-%{version}%{git_ver}
%patch1
%patch2
+%patch3
%build
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-address-of-packed-member"
diff --git a/packages/e/eth-ff/topology-fix-support-for-disabled-MD5-authentication.patch b/packages/e/eth-ff/topology-fix-support-for-disabled-MD5-authentication.patch
new file mode 100644
index 0000000..49d35eb
--- /dev/null
+++ b/packages/e/eth-ff/topology-fix-support-for-disabled-MD5-authentication.patch
@@ -0,0 +1,27 @@
+commit ba2486d3f78e2292e2b057ea37763c9c658cbcee
+Author: Nicolas Morey
+Date: Fri Jan 27 10:13:12 2023 +0100
+
+ topology: fix support for disabled MD5 authentication
+
+ Signed-off-by: Nicolas Morey
+
+diff --git Topology/hpnmgt_snmp.c Topology/hpnmgt_snmp.c
+index e5bd84b9a6cb..b6a7b29d276d 100644
+--- Topology/hpnmgt_snmp.c
++++ Topology/hpnmgt_snmp.c
+@@ -2139,9 +2139,14 @@ HMGT_STATUS_T collect_data(SNMPHost *hosts, SNMPOid *sw_oids, SNMPOid *nic_oids,
+ //Authentication Protocol
+ if ( (secLevel == SNMP_SEC_LEVEL_AUTHNOPRIV) || (secLevel == SNMP_SEC_LEVEL_AUTHPRIV) ) {
+ if (strcmp(fabric->SnmpAuthenticationProtocol, "MD5") == 0) {
++#ifndef NETSNMP_DISABLE_MD5
+ authProtocol = usmHMACMD5AuthProtocol;
+ authProtocolLength = USM_AUTH_PROTO_MD5_LEN;
+ DBGPRINT("Running MD5 authentication \n");
++#else
++ fprintf(stderr, "%s: MD5 authentication selected but disabled in net-snmp\n", __func__);
++ configParseError = 1;
++#endif
+ } else if (strcmp(fabric->SnmpAuthenticationProtocol, "SHA") == 0) {
+ authProtocol = usmHMACSHA1AuthProtocol;
+ authProtocolLength = USM_AUTH_PROTO_SHA_LEN;
diff --git a/packages/e/exiv2/.files b/packages/e/exiv2/.files
index 89d0d25..5d22c80 100644
Binary files a/packages/e/exiv2/.files and b/packages/e/exiv2/.files differ
diff --git a/packages/e/exiv2/.rev b/packages/e/exiv2/.rev
index 507c55d..6deea36 100644
--- a/packages/e/exiv2/.rev
+++ b/packages/e/exiv2/.rev
@@ -769,4 +769,12 @@
* Treat Exif.Sony1.PreviewImage as undefined tag
1060107
+
+ 61375c304109e89f9b72b5eb5e743afb
+ 0.27.6
+
+ dimstar_suse
+ Automatic submission by obs-autosubmit
+ 1062320
+
diff --git a/packages/e/exiv2/always-use-signed-char-for-conversion.patch b/packages/e/exiv2/always-use-signed-char-for-conversion.patch
new file mode 100644
index 0000000..2a35851
--- /dev/null
+++ b/packages/e/exiv2/always-use-signed-char-for-conversion.patch
@@ -0,0 +1,23 @@
+Treat std::string characters always as signed char
+even on architectures where char is unsigned.
+
+Fixes missing testsuite exceptions.
+
+--- a/src/value.cpp
++++ b/src/value.cpp
+@@ -352,13 +352,13 @@ namespace Exiv2 {
+ long StringValueBase::toLong(long n) const
+ {
+ ok_ = true;
+- return value_.at(n);
++ return static_cast(static_cast(value_.at(n)));
+ }
+
+ float StringValueBase::toFloat(long n) const
+ {
+ ok_ = true;
+- return value_.at(n);
++ return static_cast(static_cast(value_.at(n)));
+ }
+
+ Rational StringValueBase::toRational(long n) const
diff --git a/packages/e/exiv2/exiv2.changes b/packages/e/exiv2/exiv2.changes
index 673f228..8ea9546 100644
--- a/packages/e/exiv2/exiv2.changes
+++ b/packages/e/exiv2/exiv2.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 24 17:42:24 UTC 2023 - Dirk Müller
+
+- add always-use-signed-char-for-conversion.patch for test suite
+ fixes on non-x86_64
+
+-------------------------------------------------------------------
Sat Jan 21 09:21:41 UTC 2023 - Dirk Müller
- update to 0.27.6:
diff --git a/packages/e/exiv2/exiv2.spec b/packages/e/exiv2/exiv2.spec
index f7e0171..5da0280 100644
--- a/packages/e/exiv2/exiv2.spec
+++ b/packages/e/exiv2/exiv2.spec
@@ -28,6 +28,7 @@ Source0: https://github.com/Exiv2/%{name}/archive/v%{version}/%{name}-%{v
Source1: baselibs.conf
Patch0: exiv2-build-date.patch
Patch1: CVE-2022-3953.patch
+Patch2: always-use-signed-char-for-conversion.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
diff --git a/packages/f/fontconfig/.files b/packages/f/fontconfig/.files
index c8b3854..fc08f4d 100644
Binary files a/packages/f/fontconfig/.files and b/packages/f/fontconfig/.files differ
diff --git a/packages/f/fontconfig/.rev b/packages/f/fontconfig/.rev
index 3619204..41b627b 100644
--- a/packages/f/fontconfig/.rev
+++ b/packages/f/fontconfig/.rev
@@ -820,4 +820,19 @@ As we probably don't want a prerelease in 13.1, please checkin there also (forwa
1034672
+
+ a3db619fb38250682606e9be78cbaf3d
+ 2.14.2
+
+ dimstar_suse
+ - update to 2.14.2:
+ * Adjust indentation between programlisting in fontconfig-user.sgml
+ * Add some missing constant names for weight
+ * Report more detailed logs instead of assertion
+ * Fix a typo in description for HAVE_STDATOMIC_PRIMITIVES
+ * Ignore LC_CTYPE if set to "UTF-8"
+ * add --with-default-sub-pixel-rendering option
+ * Add FC_DESKTOP_NAME property
+ 1062384
+
diff --git a/packages/f/fontconfig/fontconfig-2.14.1.tar.xz b/packages/f/fontconfig/fontconfig-2.14.1.tar.xz
deleted file mode 120000
index b346f53..0000000
--- a/packages/f/fontconfig/fontconfig-2.14.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicdnyi4mpfnp4m2ruqmeauvo7kfbrvf74seqw7hnmu7megw4sdqhq
\ No newline at end of file
diff --git a/packages/f/fontconfig/fontconfig-2.14.2.tar.xz b/packages/f/fontconfig/fontconfig-2.14.2.tar.xz
new file mode 120000
index 0000000..ba057ce
--- /dev/null
+++ b/packages/f/fontconfig/fontconfig-2.14.2.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeicop3nuc6zftm2gnyj7i35fcgo226dupvmahpcbaxuphqhiiwemeu
\ No newline at end of file
diff --git a/packages/f/fontconfig/fontconfig.changes b/packages/f/fontconfig/fontconfig.changes
index b3293c2..bec74db 100644
--- a/packages/f/fontconfig/fontconfig.changes
+++ b/packages/f/fontconfig/fontconfig.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Sat Jan 28 21:23:49 UTC 2023 - Dirk Müller
+
+- update to 2.14.2:
+ * Adjust indentation between programlisting in fontconfig-user.sgml
+ * Add some missing constant names for weight
+ * Report more detailed logs instead of assertion
+ * Fix a typo in description for HAVE_STDATOMIC_PRIMITIVES
+ * Ignore LC_CTYPE if set to "UTF-8"
+ * add --with-default-sub-pixel-rendering option
+ * Add FC_DESKTOP_NAME property
+
+-------------------------------------------------------------------
Tue Nov 8 23:10:23 UTC 2022 - Dirk Müller
- update to 2.14.1:
diff --git a/packages/f/fontconfig/fontconfig.spec b/packages/f/fontconfig/fontconfig.spec
index e98adb6..14b2e91 100644
--- a/packages/f/fontconfig/fontconfig.spec
+++ b/packages/f/fontconfig/fontconfig.spec
@@ -1,7 +1,7 @@
#
# spec file for package fontconfig
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: fontconfig
%define lname libfontconfig1
-Version: 2.14.1
+Version: 2.14.2
Release: 0
Summary: Library for Font Configuration
License: MIT
diff --git a/packages/g/gnome-maps/.files b/packages/g/gnome-maps/.files
index e166025..4a420cb 100644
Binary files a/packages/g/gnome-maps/.files and b/packages/g/gnome-maps/.files differ
diff --git a/packages/g/gnome-maps/.rev b/packages/g/gnome-maps/.rev
index faada14..a78fa37 100644
--- a/packages/g/gnome-maps/.rev
+++ b/packages/g/gnome-maps/.rev
@@ -630,4 +630,12 @@
+ Updated translations. (forwarded request 1056771 from iznogood)
1057049
+
+ 42745ec2a6a9fcc5e4d023b98750e56b
+ 43.4
+
+ dimstar_suse
+
+ 1062457
+
diff --git a/packages/g/gnome-maps/gnome-maps-43.3.tar.xz b/packages/g/gnome-maps/gnome-maps-43.3.tar.xz
deleted file mode 120000
index 5e6c1c6..0000000
--- a/packages/g/gnome-maps/gnome-maps-43.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeice5msveif22jn5ecwwb4lhhhcivubiiyyxqcfmd5p5hktyxngnhy
\ No newline at end of file
diff --git a/packages/g/gnome-maps/gnome-maps-43.4.tar.xz b/packages/g/gnome-maps/gnome-maps-43.4.tar.xz
new file mode 120000
index 0000000..fe20e3f
--- /dev/null
+++ b/packages/g/gnome-maps/gnome-maps-43.4.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeibkb23y3mvpmros53lzmnku4iocdav5z4ct4qp6dfxjvjocalffze
\ No newline at end of file
diff --git a/packages/g/gnome-maps/gnome-maps.changes b/packages/g/gnome-maps/gnome-maps.changes
index 5f886f6..d4fa4d6 100644
--- a/packages/g/gnome-maps/gnome-maps.changes
+++ b/packages/g/gnome-maps/gnome-maps.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Feb 1 08:56:09 UTC 2023 - Bjørn Lie
+
+- Update to version 43.4:
+ + Prevent the scale to cover the sidebar when the window is
+ narrow.
+
+-------------------------------------------------------------------
Sat Jan 7 12:45:35 UTC 2023 - Bjørn Lie
- Update to version 43.3:
diff --git a/packages/g/gnome-maps/gnome-maps.spec b/packages/g/gnome-maps/gnome-maps.spec
index e904e23..337b9d0 100644
--- a/packages/g/gnome-maps/gnome-maps.spec
+++ b/packages/g/gnome-maps/gnome-maps.spec
@@ -17,7 +17,7 @@
Name: gnome-maps
-Version: 43.3
+Version: 43.4
Release: 0
Summary: Maps Application for GNOME
License: GPL-2.0-or-later
diff --git a/packages/g/gstreamer-plugins-bad/.files b/packages/g/gstreamer-plugins-bad/.files
index 75a2bee..fd58180 100644
Binary files a/packages/g/gstreamer-plugins-bad/.files and b/packages/g/gstreamer-plugins-bad/.files differ
diff --git a/packages/g/gstreamer-plugins-bad/.rev b/packages/g/gstreamer-plugins-bad/.rev
index 87f5569..4e6284e 100644
--- a/packages/g/gstreamer-plugins-bad/.rev
+++ b/packages/g/gstreamer-plugins-bad/.rev
@@ -1177,4 +1177,40 @@
1045100
+
+ 812196eb8ff3b4b12cc3187b460c3410
+ 1.22.0
+
+ dimstar_suse
+ - Temporarily disable zxing, waiting for updated version to land
+ in Factory.
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+- Probably because of a problem in SLE's meson, the generated
+ pkgconfig files are missing some variables that are needed by
+ rpm to generate the pkgconfig(...) provides correctly. In order
+ to fix this, we now check for those variables and insert them
+ in the pc files before installation if they're missing.
+- Only build the microdns plugin in TW since SLE is missing the
+ required dependencies.
+- Add new shared libs libgstcuda-1_0-0 and libgstwebrtcnice-1_0-0
+ to baselibs.conf.
+- Update to version 1.22.0:
+ + Please see changes in gstreamer main package, major version
+ bump.
+- Pass amfcodec=disabled and directshow=disabled to meson, not
+ supported on linux (yet?).
+- Build qsv plugin only for supported targets via passing
+ conditional qsv=disabled/enabled to meson.
+- Add pkgconfig(gtk+-3.0) BuildRequires: New dependency.
+- Package new sub-packages
+ + libgstcuda-1_0-0
+ + libgstwebrtcnice-1_0-0
+ + typelib-1_0-CudaGst-1_0
+ + typelib-1_0-GstCuda-1_0
+ + typelib-1_0-GstVa-1_0
+
+ 1062597
+
diff --git a/packages/g/gstreamer-plugins-bad/baselibs.conf b/packages/g/gstreamer-plugins-bad/baselibs.conf
index 5baa945..b12bd9b 100644
--- a/packages/g/gstreamer-plugins-bad/baselibs.conf
+++ b/packages/g/gstreamer-plugins-bad/baselibs.conf
@@ -7,15 +7,17 @@ libgstbadaudio-1_0-0
libgstbasecamerabinsrc-1_0-0
libgstcodecparsers-1_0-0
libgstcodecs-1_0-0
+libgstcuda-1_0-0
libgstinsertbin-1_0-0
libgstisoff-1_0-0
libgstmpegts-1_0-0
libgstphotography-1_0-0
+libgstplay-1_0-0
libgstplayer-1_0-0
libgstsctp-1_0-0
libgsturidownloader-1_0-0
+libgstva-1_0-0
libgstvulkan-1_0-0
libgstwayland-1_0-0
libgstwebrtc-1_0-0
-libgstplay-1_0-0
-libgstva-1_0-0
+libgstwebrtcnice-1_0-0
diff --git a/packages/g/gstreamer-plugins-bad/gst-plugins-bad-1.20.5.tar.xz b/packages/g/gstreamer-plugins-bad/gst-plugins-bad-1.20.5.tar.xz
deleted file mode 120000
index 2dccb58..0000000
--- a/packages/g/gstreamer-plugins-bad/gst-plugins-bad-1.20.5.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiagaqrojnbomjsdgrsqlq5bdezfotocu3f4qfyf7djrl62uccleeq
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-bad/gst-plugins-bad-1.22.0.tar.xz b/packages/g/gstreamer-plugins-bad/gst-plugins-bad-1.22.0.tar.xz
new file mode 120000
index 0000000..1b43298
--- /dev/null
+++ b/packages/g/gstreamer-plugins-bad/gst-plugins-bad-1.22.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeifesoc4r6wlkzihq37uyofpxcwmo24ngsvqf5vd52z6hxtdkaidvi
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes
index 28ebd90..5f916cb 100644
--- a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes
+++ b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes
@@ -1,4 +1,48 @@
-------------------------------------------------------------------
+Thu Feb 2 07:51:37 UTC 2023 - Bjørn Lie
+
+- Temporarily disable zxing, waiting for updated version to land
+ in Factory.
+
+-------------------------------------------------------------------
+Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa
+
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+- Probably because of a problem in SLE's meson, the generated
+ pkgconfig files are missing some variables that are needed by
+ rpm to generate the pkgconfig(...) provides correctly. In order
+ to fix this, we now check for those variables and insert them
+ in the pc files before installation if they're missing.
+- Only build the microdns plugin in TW since SLE is missing the
+ required dependencies.
+
+-------------------------------------------------------------------
+Fri Jan 27 09:19:19 UTC 2023 - Bjørn Lie
+
+- Add new shared libs libgstcuda-1_0-0 and libgstwebrtcnice-1_0-0
+ to baselibs.conf.
+
+-------------------------------------------------------------------
+Wed Jan 25 10:32:17 UTC 2023 - Bjørn Lie
+
+- Update to version 1.22.0:
+ + Please see changes in gstreamer main package, major version
+ bump.
+- Pass amfcodec=disabled and directshow=disabled to meson, not
+ supported on linux (yet?).
+- Build qsv plugin only for supported targets via passing
+ conditional qsv=disabled/enabled to meson.
+- Add pkgconfig(gtk+-3.0) BuildRequires: New dependency.
+- Package new sub-packages
+ + libgstcuda-1_0-0
+ + libgstwebrtcnice-1_0-0
+ + typelib-1_0-CudaGst-1_0
+ + typelib-1_0-GstCuda-1_0
+ + typelib-1_0-GstVa-1_0
+
+-------------------------------------------------------------------
Fri Dec 23 19:21:55 UTC 2022 - Bjørn Lie
- Update to version 1.20.5:
diff --git a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
index 711a64a..7d0de87 100644
--- a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
+++ b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-plugins-bad
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -49,7 +49,8 @@
%endif
%if 0%{?suse_version} >= 1550 || (0%{?is_opensuse} && 0%{?sle_version} >= 150400)
-%bcond_without zxing
+# Temp disable zxing - waiting for updated version to land in Factory
+#%%bcond_without zxing
%else
%bcond_with zxing
%endif
@@ -60,8 +61,14 @@
%bcond_without ldacBT
%endif
+%if 0%{?suse_version} >= 1550
+%bcond_without microdns
+%else
+%bcond_with microdns
+%endif
+
Name: gstreamer-plugins-bad
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: LGPL-2.1-or-later
@@ -74,6 +81,8 @@ Source99: baselibs.conf
Patch0: fix-build-with-srt-1.3.4.patch
# PATCH-FIX-OPENSUSE spandsp3.patch jengelh@inai.de -- Fix build against spandsp 3.x. Patch is not upstreamable in this form
Patch2: spandsp3.patch
+# PATCH-FIX-SLE reduce-required-meson.patch alarrosa@suse.com -- Reduce the required meson version to build in SLE
+Patch3: reduce-required-meson.patch
%if %{with fdk_aac}
BuildRequires: pkgconfig(fdk-aac) >= 0.1.4
@@ -84,7 +93,7 @@ BuildRequires: gobject-introspection-devel
BuildRequires: ladspa-devel
BuildRequires: libgme-devel
BuildRequires: libgsm-devel
-BuildRequires: meson >= 0.47.0
+BuildRequires: meson >= 0.61.0
BuildRequires: musepack-devel
BuildRequires: orc >= 0.4.11
BuildRequires: pkgconfig
@@ -117,6 +126,7 @@ BuildRequires: pkgconfig(gstreamer-audio-1.0) >= %{gstreamer_req_version}
BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= %{gstreamer_req_version}
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= %{gstreamer_req_version}
BuildRequires: pkgconfig(gstreamer-video-1.0) >= %{gstreamer_req_version}
+BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(lcms2)
@@ -144,10 +154,12 @@ BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(lilv-0) >= 0.16
BuildRequires: pkgconfig(lrdf)
+%if %{with microdns}
BuildRequires: pkgconfig(microdns)
+%endif
BuildRequires: pkgconfig(mjpegtools)
BuildRequires: pkgconfig(neon)
-BuildRequires: pkgconfig(nice) >= 0.1.14
+BuildRequires: pkgconfig(nice) >= 0.1.20
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(openssl) >= 0.9.5
BuildRequires: pkgconfig(opus) >= 0.9.4
@@ -175,7 +187,7 @@ BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xkbcommon-x11)
BuildRequires: pkgconfig(zvbi-0.2)
%if %{with zxing}
-BuildRequires: pkgconfig(zxing)
+BuildRequires: pkgconfig(zxing) >= 1.4.0
%endif
Requires(post): glib2-tools
Requires(postun):glib2-tools
@@ -441,6 +453,28 @@ anything media-related,from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
+%package -n libgstcuda-1_0-0
+Summary: GStreamer Streaming-Media Framework Plug-Ins
+Group: System/Libraries
+
+%description -n libgstcuda-1_0-0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related,from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
+%package -n libgstwebrtcnice-1_0-0
+Summary: GStreamer Streaming-Media Framework Plug-Ins
+Group: System/Libraries
+
+%description -n libgstwebrtcnice-1_0-0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related,from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
%package devel
Summary: GStreamer Streaming-Media Framework Plug-Ins
Group: Development/Libraries/C and C++
@@ -451,6 +485,7 @@ Requires: libgstbadaudio-1_0-0 = %{version}
Requires: libgstbasecamerabinsrc-1_0-0 = %{version}
Requires: libgstcodecparsers-1_0-0 = %{version}
Requires: libgstcodecs-1_0-0 = %{version}
+Requires: libgstcuda-1_0-0 = %{version}
Requires: libgstinsertbin-1_0-0 = %{version}
Requires: libgstisoff-1_0-0 = %{version}
Requires: libgstmpegts-1_0-0 = %{version}
@@ -458,17 +493,22 @@ Requires: libgstphotography-1_0-0 = %{version}
Requires: libgstplay-1_0-0 = %{version}
Requires: libgstplayer-1_0-0 = %{version}
Requires: libgstsctp-1_0-0 = %{version}
+Requires: libgsttranscoder-1_0-0 = %{version}
Requires: libgsturidownloader-1_0-0 = %{version}
Requires: libgstva-1_0-0 = %{version}
Requires: libgstvulkan-1_0-0 = %{version}
Requires: libgstwayland-1_0-0 = %{version}
Requires: libgstwebrtc-1_0-0 = %{version}
+Requires: libgstwebrtcnice-1_0-0 = %{version}
+Requires: typelib-1_0-CudaGst-1_0 = %{version}
Requires: typelib-1_0-GstBadAudio-1_0 = %{version}
Requires: typelib-1_0-GstCodecs-1_0 = %{version}
+Requires: typelib-1_0-GstCuda-1_0 = %{version}
Requires: typelib-1_0-GstInsertBin-1_0 = %{version}
Requires: typelib-1_0-GstMpegts-1_0 = %{version}
Requires: typelib-1_0-GstPlay-1_0 = %{version}
Requires: typelib-1_0-GstPlayer-1_0 = %{version}
+Requires: typelib-1_0-GstVa-1_0 = %{version}
Requires: typelib-1_0-GstWebRTC-1_0 = %{version}
%if %{with fluidsynth}
Requires: gstreamer-plugins-bad-fluidsynth
@@ -604,6 +644,39 @@ anything media-related, from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
+%package -n typelib-1_0-GstCuda-1_0
+Summary: GStreamer Streaming-Media Framework Plug-Ins -- Introspection bindings
+Group: System/Libraries
+
+%description -n typelib-1_0-GstCuda-1_0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related, from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
+%package -n typelib-1_0-CudaGst-1_0
+Summary: GStreamer Streaming-Media Framework Plug-Ins -- Introspection bindings
+Group: System/Libraries
+
+%description -n typelib-1_0-CudaGst-1_0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related, from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
+%package -n typelib-1_0-GstVa-1_0
+Summary: GStreamer Streaming-Media Framework Plug-Ins -- Introspection bindings
+Group: System/Libraries
+
+%description -n typelib-1_0-GstVa-1_0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related, from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
%package -n gstreamer-transcoder
Summary: GStreamer Transcoding API
Group: Productivity/Multimedia/Other
@@ -650,6 +723,7 @@ making use of the GStreamer Transcoding API.
%if %{pkg_vcmp spandsp-devel >= 3}
%patch2 -p1
%endif
+%patch3 -p1
%build
%global optflags %{optflags} -fcommon
@@ -710,7 +784,11 @@ export PYTHON=%{_bindir}/python3
-Diqa=disabled \
-Dkate=disabled \
-Dmagicleap=disabled \
+%if %{without microdns}
+ -Dmicrodns=disabled \
+%else
-Dmicrodns=enabled \
+%endif
-Dopencv=disabled \
-Dopenni2=disabled \
-Dopensles=disabled \
@@ -727,12 +805,25 @@ export PYTHON=%{_bindir}/python3
-Donnx=disabled \
%ifarch x86_64
-Dmsdk=enabled \
+ -Dqsv=enabled \
%else
-Dmsdk=disabled \
+ -Dqsv=disabled \
%endif
+ -Damfcodec=disabled \
+ -Ddirectshow=disabled \
%{nil}
%meson_build
+# meson 0.61.4 in SLE 15 SP5 doesn't generate all variables needed in the pc files
+# As a result the pkgconfig(...) provides are not generated in the rpm file so
+# we have to add the variables to the pc files if they're missing
+for pc in *-suse-linux/meson-private/*.pc ; do
+ grep -q ^datarootdir= $pc || sed -ie "/^pluginsdir=.*/a datarootdir=\${prefix}\/share" $pc ;
+ grep -q ^datadir= $pc || sed -ie "/^datarootdir=.*/a datadir=\${datarootdir}" $pc ;
+ grep -q ^libexecdir= $pc || sed -ie "/^datadir=.*/a libexecdir=\${prefix}\/libexec" $pc ;
+done
+
%install
%meson_install
@@ -754,6 +845,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%ldconfig_scriptlets -n libgstbasecamerabinsrc-1_0-0
%ldconfig_scriptlets -n libgstcodecs-1_0-0
%ldconfig_scriptlets -n libgstcodecparsers-1_0-0
+%ldconfig_scriptlets -n libgstcuda-1_0-0
%ldconfig_scriptlets -n libgstinsertbin-1_0-0
%ldconfig_scriptlets -n libgstisoff-1_0-0
%ldconfig_scriptlets -n libgstmpegts-1_0-0
@@ -766,6 +858,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%ldconfig_scriptlets -n libgstplay-1_0-0
%ldconfig_scriptlets -n libgstva-1_0-0
%ldconfig_scriptlets -n libgstwayland-1_0-0
+%ldconfig_scriptlets -n libgstwebrtcnice-1_0-0
%ldconfig_scriptlets -n libgsttranscoder-1_0-0
%files
@@ -835,7 +928,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/gstreamer-%{gst_branch}/libgstjpegformat.so
%{_libdir}/gstreamer-%{gst_branch}/libgstkms.so
%{_libdir}/gstreamer-%{gst_branch}/libgstladspa.so
+%if %{with microdns}
%{_libdir}/gstreamer-%{gst_branch}/libgstmicrodns.so
+%endif
%{_libdir}/gstreamer-%{gst_branch}/libgstmidi.so
%{_libdir}/gstreamer-%{gst_branch}/libgstmpeg2enc.so
%{_libdir}/gstreamer-%{gst_branch}/libgstmpegpsdemux.so
@@ -901,6 +996,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/gstreamer-%{gst_branch}/libgsty4mdec.so
%{_libdir}/gstreamer-%{gst_branch}/libgstuvch264.so
%{_libdir}/gstreamer-%{gst_branch}/libgstwebp.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstcodectimestamper.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstgtkwayland.so
+%ifarch x86_64
+%{_libdir}/gstreamer-%{gst_branch}/libgstqsv.so
+%endif
# Explicitly list openSUSE only plugins
%if %{with bs2b}
@@ -972,7 +1072,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/libgstwebrtc-%{gst_branch}.so.0*
%files -n libgstwayland-1_0-0
-%{_libdir}/libgstwayland-1.0.so.*
+%{_libdir}/libgstwayland-%{gst_branch}.so.*
+
+%files -n libgstcuda-1_0-0
+%{_libdir}/libgstcuda-%{gst_branch}.so.0*
+
+%files -n libgstwebrtcnice-1_0-0
+%{_libdir}/libgstwebrtcnice-%{gst_branch}.so.0*
%files -n typelib-1_0-GstBadAudio-1_0
%{_libdir}/girepository-1.0/GstBadAudio-1.0.typelib
@@ -1004,6 +1110,15 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n typelib-1_0-GstWebRTC-1_0
%{_libdir}/girepository-1.0/GstWebRTC-1.0.typelib
+%files -n typelib-1_0-CudaGst-1_0
+%{_libdir}/girepository-1.0/CudaGst-1.0.typelib
+
+%files -n typelib-1_0-GstCuda-1_0
+%{_libdir}/girepository-1.0/GstCuda-1.0.typelib
+
+%files -n typelib-1_0-GstVa-1_0
+%{_libdir}/girepository-1.0/GstVa-1.0.typelib
+
%files devel
%doc AUTHORS NEWS README.md RELEASE REQUIREMENTS
%{_includedir}/gstreamer-%{gst_branch}
@@ -1022,6 +1137,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/pkgconfig/gstreamer-webrtc-%{gst_branch}.pc
%{_libdir}/pkgconfig/gstreamer-play-%{gst_branch}.pc
%{_libdir}/pkgconfig/gstreamer-wayland-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-cuda-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-va-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-webrtc-nice-%{gst_branch}.pc
%{_datadir}/gir-1.0/*.gir
%files -n gstreamer-transcoder
diff --git a/packages/g/gstreamer-plugins-bad/reduce-required-meson.patch b/packages/g/gstreamer-plugins-bad/reduce-required-meson.patch
new file mode 100644
index 0000000..56d71dc
--- /dev/null
+++ b/packages/g/gstreamer-plugins-bad/reduce-required-meson.patch
@@ -0,0 +1,12 @@
+Index: gst-plugins-bad-1.22.0/meson.build
+===================================================================
+--- gst-plugins-bad-1.22.0.orig/meson.build
++++ gst-plugins-bad-1.22.0/meson.build
+@@ -1,6 +1,6 @@
+ project('gst-plugins-bad', 'c', 'cpp',
+ version : '1.22.0',
+- meson_version : '>= 0.62',
++ meson_version : '>= 0.61',
+ default_options : [ 'warning_level=1',
+ 'buildtype=debugoptimized' ])
+
diff --git a/packages/g/gstreamer-plugins-base/.files b/packages/g/gstreamer-plugins-base/.files
index 6565384..95f3b51 100644
Binary files a/packages/g/gstreamer-plugins-base/.files and b/packages/g/gstreamer-plugins-base/.files differ
diff --git a/packages/g/gstreamer-plugins-base/.rev b/packages/g/gstreamer-plugins-base/.rev
index 76d279f..3742a56 100644
--- a/packages/g/gstreamer-plugins-base/.rev
+++ b/packages/g/gstreamer-plugins-base/.rev
@@ -735,4 +735,12 @@
1045096
+
+ 76637e28864382173db08a3fa6884b07
+ 1.22.0
+
+ dimstar_suse
+
+ 1061545
+
diff --git a/packages/g/gstreamer-plugins-base/MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch b/packages/g/gstreamer-plugins-base/MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
index 7e48277..c3af694 100644
--- a/packages/g/gstreamer-plugins-base/MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
+++ b/packages/g/gstreamer-plugins-base/MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
@@ -1,10 +1,10 @@
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/221
-diff --git a/gst-libs/gst/video/video-anc.c b/gst-libs/gst/video/video-anc.c
-index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de200c71b6d 100644
---- a/gst-libs/gst/video/video-anc.c
-+++ b/gst-libs/gst/video/video-anc.c
-@@ -1028,6 +1028,8 @@ gst_buffer_add_video_caption_meta (GstBuffer * buffer,
+Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
+===================================================================
+--- gst-plugins-base-1.22.0.orig/gst-libs/gst/video/video-anc.c
++++ gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
+@@ -1017,6 +1017,8 @@ gst_buffer_add_video_caption_meta (GstBu
switch (caption_type) {
case GST_VIDEO_CAPTION_TYPE_CEA608_RAW:
case GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A:
@@ -13,7 +13,7 @@ index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de2
case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
case GST_VIDEO_CAPTION_TYPE_CEA708_CDP:
break;
-@@ -1077,6 +1079,10 @@ gst_video_caption_type_from_caps (const GstCaps * caps)
+@@ -1066,6 +1068,10 @@ gst_video_caption_type_from_caps (const
return GST_VIDEO_CAPTION_TYPE_CEA608_RAW;
} else if (g_strcmp0 (format, "s334-1a") == 0) {
return GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A;
@@ -24,7 +24,7 @@ index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de2
}
} else if (gst_structure_has_name (s, "closedcaption/x-cea-708")) {
if (g_strcmp0 (format, "cc_data") == 0) {
-@@ -1114,6 +1120,14 @@ gst_video_caption_type_to_caps (GstVideoCaptionType type)
+@@ -1103,6 +1109,14 @@ gst_video_caption_type_to_caps (GstVideo
caption_caps = gst_caps_new_simple ("closedcaption/x-cea-608",
"format", G_TYPE_STRING, "s334-1a", NULL);
break;
@@ -39,11 +39,11 @@ index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de2
case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
caption_caps = gst_caps_new_simple ("closedcaption/x-cea-708",
"format", G_TYPE_STRING, "cc_data", NULL);
-diff --git a/gst-libs/gst/video/video-anc.h b/gst-libs/gst/video/video-anc.h
-index bb5883c5207e88314467ead1209f76f64c8c4dc0..f3a1d69b9a6300acda45fa2c30371043e7f1d0cd 100644
---- a/gst-libs/gst/video/video-anc.h
-+++ b/gst-libs/gst/video/video-anc.h
-@@ -357,7 +357,53 @@ GstVideoBarMeta *gst_buffer_add_video_bar_meta (GstBuffer * buffer, guint8 field
+Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
+===================================================================
+--- gst-plugins-base-1.22.0.orig/gst-libs/gst/video/video-anc.h
++++ gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
+@@ -345,7 +345,53 @@ GstVideoBarMeta *gst_buffer_add_video_ba
* offset relative to the base-line of the original image format (line 9
* for 525-line field 1, line 272 for 525-line field 2, line 5 for
* 625-line field 1 and line 318 for 625-line field 2).
@@ -98,7 +98,7 @@ index bb5883c5207e88314467ead1209f76f64c8c4dc0..f3a1d69b9a6300acda45fa2c30371043
* can also contain 608-in-708 and the first byte of each triplet has to
* be inspected for detecting the type.
* @GST_VIDEO_CAPTION_TYPE_CEA708_CDP: CEA-708 (and optionally CEA-608) in
-@@ -373,7 +419,9 @@ typedef enum {
+@@ -361,7 +407,9 @@ typedef enum {
GST_VIDEO_CAPTION_TYPE_CEA608_RAW = 1,
GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A = 2,
GST_VIDEO_CAPTION_TYPE_CEA708_RAW = 3,
diff --git a/packages/g/gstreamer-plugins-base/add_wayland_dep_to_tests.patch b/packages/g/gstreamer-plugins-base/add_wayland_dep_to_tests.patch
index 0176387..0725f4c 100644
--- a/packages/g/gstreamer-plugins-base/add_wayland_dep_to_tests.patch
+++ b/packages/g/gstreamer-plugins-base/add_wayland_dep_to_tests.patch
@@ -1,11 +1,13 @@
---- orig-gst-plugins-base-1.19.90/tests/check/meson.build 2022-01-28 15:28:42.000000000 +0100
-+++ gst-plugins-base-1.19.90/tests/check/meson.build 2022-01-29 22:32:03.705900464 +0100
-@@ -134,7 +134,7 @@
+Index: gst-plugins-base-1.22.0/tests/check/meson.build
+===================================================================
+--- gst-plugins-base-1.22.0.orig/tests/check/meson.build
++++ gst-plugins-base-1.22.0/tests/check/meson.build
+@@ -135,7 +135,7 @@ if build_gstgl
test_defines += ['-DTEST_GST_GL_ABI_CHECK']
endif
-test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, audio_dep,
+test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, wayland_client_dep, audio_dep,
video_dep, pbutils_dep, rtp_dep, rtsp_dep, tag_dep, allocators_dep, app_dep,
- fft_dep, riff_dep, sdp_dep, gio_dep, valgrind_dep] + glib_deps
+ fft_dep, riff_dep, sdp_dep, gio_dep, valgrind_dep]
diff --git a/packages/g/gstreamer-plugins-base/gst-plugins-base-1.20.5.tar.xz b/packages/g/gstreamer-plugins-base/gst-plugins-base-1.20.5.tar.xz
deleted file mode 120000
index 4d9fdfb..0000000
--- a/packages/g/gstreamer-plugins-base/gst-plugins-base-1.20.5.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeia3ssep6dbhe4h3t3ap6qznnutklg374u7vokoqq2qpssmmdwcwtm
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-base/gst-plugins-base-1.22.0.tar.xz b/packages/g/gstreamer-plugins-base/gst-plugins-base-1.22.0.tar.xz
new file mode 120000
index 0000000..bcac40e
--- /dev/null
+++ b/packages/g/gstreamer-plugins-base/gst-plugins-base-1.22.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeieyud7arm7b2dd2qtq7vlfxzl22cgoczpkfuh6uokkgb3xu3vkvki
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.changes b/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.changes
index 526269c..35b493b 100644
--- a/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.changes
+++ b/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.changes
@@ -1,4 +1,25 @@
-------------------------------------------------------------------
+Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa
+
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+- Probably because of a problem in SLE's meson, the generated
+ pkgconfig files are missing some variables that are needed by
+ rpm to generate the pkgconfig(...) provides correctly. In order
+ to fix this, we now check for those variables and insert them
+ in the pc files before installation if they're missing.
+
+-------------------------------------------------------------------
+Tue Jan 24 16:57:20 UTC 2023 - Bjørn Lie
+
+- Update to version 1.22.0:
+ + Please see changes in gstreamer main package, major version
+ bump.
+- Rebase patches with quilt.
+- Add pkgconfig(xi) BuildRequires: New dependency.
+
+-------------------------------------------------------------------
Fri Dec 23 18:59:40 UTC 2022 - Bjørn Lie
- Update to version 1.20.5:
diff --git a/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.spec b/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.spec
index 46be629..bde9050 100644
--- a/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.spec
+++ b/packages/g/gstreamer-plugins-base/gstreamer-plugins-base.spec
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-plugins-base
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define gst_branch 1.0
%define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
Name: gstreamer-plugins-base
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -32,11 +32,12 @@ Source2: baselibs.conf
Patch4: add_wayland_dep_to_tests.patch
Patch5: MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
+Patch6: reduce-required-meson.patch
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: cdparanoia-devel
BuildRequires: gcc-c++
-BuildRequires: glib2-devel >= 2.40.0
+BuildRequires: glib2-devel >= 2.62.0
BuildRequires: gobject-introspection-devel >= 1.31.1
BuildRequires: libICE-devel
BuildRequires: libSM-devel
@@ -44,7 +45,7 @@ BuildRequires: libXext-devel
BuildRequires: libXv-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: meson >= 0.59
+BuildRequires: meson >= 0.61
BuildRequires: orc >= 0.4.24
BuildRequires: pkgconfig
BuildRequires: python3-base
@@ -81,6 +82,7 @@ BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zlib)
Requires: gstreamer >= %{gstreamer_req_version}
@@ -492,6 +494,7 @@ to compile and link applications that use gstreamer-plugins-base.
%autosetup -n %{_name}-%{version} -N
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
export PYTHON=%{_bindir}/python3
@@ -507,6 +510,15 @@ export PYTHON=%{_bindir}/python3
%{nil}
%meson_build
+# meson 0.61.4 in SLE 15 SP5 doesn't generate all variables needed in the pc files
+# As a result the pkgconfig(...) provides are not generated in the rpm file so
+# we have to add the variables to the pc files if they're missing
+for pc in *-suse-linux/meson-private/*.pc ; do
+ grep -q ^datarootdir= $pc || sed -ie "/^pluginsdir=.*/a datarootdir=\${prefix}\/share" $pc ;
+ grep -q ^datadir= $pc || sed -ie "/^datarootdir=.*/a datadir=\${datarootdir}" $pc ;
+ grep -q ^libexecdir= $pc || sed -ie "/^datadir=.*/a libexecdir=\${prefix}\/libexec" $pc ;
+done
+
%install
%meson_install
if [ -f %{buildroot}%{_datadir}/appdata/gstreamer-plugins-base.appdata.xml ]; then
@@ -567,9 +579,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/gstreamer-%{gst_branch}/libgsttcp.so
%{_libdir}/gstreamer-%{gst_branch}/libgsttheora.so
%{_libdir}/gstreamer-%{gst_branch}/libgsttypefindfunctions.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstvideoconvert.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstvideoconvertscale.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideorate.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstvideoscale.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideotestsrc.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvolume.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvorbis.so
diff --git a/packages/g/gstreamer-plugins-base/reduce-required-meson.patch b/packages/g/gstreamer-plugins-base/reduce-required-meson.patch
new file mode 100644
index 0000000..b573734
--- /dev/null
+++ b/packages/g/gstreamer-plugins-base/reduce-required-meson.patch
@@ -0,0 +1,12 @@
+Index: gst-plugins-base-1.22.0/meson.build
+===================================================================
+--- gst-plugins-base-1.22.0.orig/meson.build
++++ gst-plugins-base-1.22.0/meson.build
+@@ -1,6 +1,6 @@
+ project('gst-plugins-base', 'c',
+ version : '1.22.0',
+- meson_version : '>= 0.62',
++ meson_version : '>= 0.61',
+ default_options : [ 'warning_level=1',
+ 'buildtype=debugoptimized' ])
+
diff --git a/packages/g/gstreamer-plugins-good/.files b/packages/g/gstreamer-plugins-good/.files
index ef745c7..aecef03 100644
Binary files a/packages/g/gstreamer-plugins-good/.files and b/packages/g/gstreamer-plugins-good/.files differ
diff --git a/packages/g/gstreamer-plugins-good/.rev b/packages/g/gstreamer-plugins-good/.rev
index 1021c37..ef72f0a 100644
--- a/packages/g/gstreamer-plugins-good/.rev
+++ b/packages/g/gstreamer-plugins-good/.rev
@@ -734,4 +734,12 @@ From the patch header
1045097
+
+ 5ac1efe0a5874548301b7cba51980954
+ 1.22.0
+
+ dimstar_suse
+
+ 1061546
+
diff --git a/packages/g/gstreamer-plugins-good/gst-plugins-good-1.20.5.tar.xz b/packages/g/gstreamer-plugins-good/gst-plugins-good-1.20.5.tar.xz
deleted file mode 120000
index 5d93120..0000000
--- a/packages/g/gstreamer-plugins-good/gst-plugins-good-1.20.5.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiennlzpv573o6kylot5abpfhhwptzsnsvbqml5kqavwuotq7mhkru
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-good/gst-plugins-good-1.22.0.tar.xz b/packages/g/gstreamer-plugins-good/gst-plugins-good-1.22.0.tar.xz
new file mode 120000
index 0000000..ad92774
--- /dev/null
+++ b/packages/g/gstreamer-plugins-good/gst-plugins-good-1.22.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeid4tkozdydemofol3ab3qswzjkcylpxoqciij7xha4eg7qmynpbva
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.changes b/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.changes
index 203e530..92c4130 100644
--- a/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.changes
+++ b/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.changes
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa
+
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+
+-------------------------------------------------------------------
+Tue Jan 24 17:56:55 UTC 2023 - Bjørn Lie
+
+- Update to version 1.22.0:
+ + Please see changes in gstreamer main package, major version
+ bump.
+- Add disabled pkgconfig(Qt6Core), pkgconfig(Qt6Gui),
+ pkgconfig(Qt6Qml), pkgconfig(Qt6Quick) and
+ pkgconfig(Qt6WaylandClient) BuildRequires and pass Dqt6=disabled
+ to meson, do not build qt6 support yet.
+
+-------------------------------------------------------------------
Fri Dec 23 19:09:27 UTC 2022 - Bjørn Lie
- Update to version 1.20.5:
diff --git a/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.spec b/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.spec
index aee2e21..7c2a8e5 100644
--- a/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.spec
+++ b/packages/g/gstreamer-plugins-good/gstreamer-plugins-good.spec
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-plugins-good
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
%define gst_branch 1.0
Name: gstreamer-plugins-good
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: LGPL-2.1-or-later
@@ -35,6 +35,7 @@ URL: https://gstreamer.freedesktop.org
Source0: %{url}/src/%{_name}/%{_name}-%{version}.tar.xz
Source1: gstreamer-plugins-good.appdata.xml
Source99: baselibs.conf
+Patch0: reduce-required-meson.patch
BuildRequires: Mesa-libGLESv2-devel
BuildRequires: Mesa-libGLESv3-devel
@@ -48,19 +49,28 @@ BuildRequires: libavc1394-devel
BuildRequires: libbz2-devel
BuildRequires: libjpeg-devel
BuildRequires: libmp3lame-devel
-BuildRequires: meson >= 0.47.0
+BuildRequires: meson >= 0.61.0
BuildRequires: nasm
BuildRequires: orc >= 0.4.16
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: python3-xml
BuildRequires: zlib-devel
+
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5WaylandClient)
BuildRequires: pkgconfig(Qt5X11Extras)
+
+# Disable qt6 for now (see -Dqt6=disabled passed to meson)
+#BuildRequires: pkgconfig(Qt6Core)
+#BuildRequires: pkgconfig(Qt6Gui)
+#BuildRequires: pkgconfig(Qt6Qml)
+#BuildRequires: pkgconfig(Qt6Quick)
+#BuildRequires: pkgconfig(Qt6WaylandClient)
+
BuildRequires: pkgconfig(caca)
BuildRequires: pkgconfig(cairo) >= 1.10.0
BuildRequires: pkgconfig(cairo-gobject) >= 1.10.0
@@ -90,7 +100,7 @@ BuildRequires: pkgconfig(libsoup-3.0)
BuildRequires: pkgconfig(libsoup-gnome-2.4) >= 2.40.0
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.9
-BuildRequires: pkgconfig(shout) >= 2.0
+BuildRequires: pkgconfig(shout) >= 2.4.3
BuildRequires: pkgconfig(speex) >= 1.1.6
BuildRequires: pkgconfig(taglib) >= 1.5
BuildRequires: pkgconfig(twolame) >= 0.3.10
@@ -168,8 +178,9 @@ export PYTHON=%{_bindir}/python3
-Daalib=disabled \
%endif
-Ddoc=disabled \
- -Drpicamsrc=disabled \
+ -Drpicamsrc=disabled \
-Dv4l2-probe=true \
+ -Dqt6=disabled \
%{nil}
%meson_build
@@ -193,9 +204,10 @@ fi
%{_datadir}/gstreamer-%{gst_branch}/presets/GstIirEqualizer3Bands.prs
%{_datadir}/gstreamer-%{gst_branch}/presets/GstQTMux.prs
%{_datadir}/gstreamer-%{gst_branch}/presets/GstVP8Enc.prs
+%{_libdir}/gstreamer-%{gst_branch}/libgstadaptivedemux2.so
%{_libdir}/gstreamer-%{gst_branch}/libgstalaw.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstalpha.so
%{_libdir}/gstreamer-%{gst_branch}/libgstalphacolor.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstalpha.so
%{_libdir}/gstreamer-%{gst_branch}/libgstapetag.so
%{_libdir}/gstreamer-%{gst_branch}/libgstaudiofx.so
%{_libdir}/gstreamer-%{gst_branch}/libgstaudioparsers.so
@@ -212,8 +224,8 @@ fi
%{_libdir}/gstreamer-%{gst_branch}/libgstflv.so
%{_libdir}/gstreamer-%{gst_branch}/libgstflxdec.so
%{_libdir}/gstreamer-%{gst_branch}/libgstgdkpixbuf.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstgoom.so
%{_libdir}/gstreamer-%{gst_branch}/libgstgoom2k1.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstgoom.so
%{_libdir}/gstreamer-%{gst_branch}/libgsticydemux.so
%{_libdir}/gstreamer-%{gst_branch}/libgstid3demux.so
%{_libdir}/gstreamer-%{gst_branch}/libgstimagefreeze.so
@@ -233,8 +245,8 @@ fi
%{_libdir}/gstreamer-%{gst_branch}/libgstpng.so
%{_libdir}/gstreamer-%{gst_branch}/libgstpulseaudio.so
%{_libdir}/gstreamer-%{gst_branch}/libgstreplaygain.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstrtp.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrtpmanager.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstrtp.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrtsp.so
%{_libdir}/gstreamer-%{gst_branch}/libgstshapewipe.so
%{_libdir}/gstreamer-%{gst_branch}/libgstsmpte.so
@@ -254,6 +266,7 @@ fi
%{_libdir}/gstreamer-%{gst_branch}/libgstwavpack.so
%{_libdir}/gstreamer-%{gst_branch}/libgstwavparse.so
%{_libdir}/gstreamer-%{gst_branch}/libgstximagesrc.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstxingmux.so
%{_libdir}/gstreamer-%{gst_branch}/libgsty4menc.so
%files extra
diff --git a/packages/g/gstreamer-plugins-good/reduce-required-meson.patch b/packages/g/gstreamer-plugins-good/reduce-required-meson.patch
new file mode 100644
index 0000000..56a871c
--- /dev/null
+++ b/packages/g/gstreamer-plugins-good/reduce-required-meson.patch
@@ -0,0 +1,12 @@
+Index: gst-plugins-good-1.22.0/meson.build
+===================================================================
+--- gst-plugins-good-1.22.0.orig/meson.build
++++ gst-plugins-good-1.22.0/meson.build
+@@ -1,6 +1,6 @@
+ project('gst-plugins-good', 'c',
+ version : '1.22.0',
+- meson_version : '>= 0.62',
++ meson_version : '>= 0.61',
+ default_options : [ 'warning_level=1',
+ 'buildtype=debugoptimized' ])
+
diff --git a/packages/g/gstreamer-plugins-libav/.files b/packages/g/gstreamer-plugins-libav/.files
index 8dc6c99..50e6a22 100644
Binary files a/packages/g/gstreamer-plugins-libav/.files and b/packages/g/gstreamer-plugins-libav/.files differ
diff --git a/packages/g/gstreamer-plugins-libav/.rev b/packages/g/gstreamer-plugins-libav/.rev
index 0bde52c..5226cff 100644
--- a/packages/g/gstreamer-plugins-libav/.rev
+++ b/packages/g/gstreamer-plugins-libav/.rev
@@ -287,4 +287,12 @@
1045099
+
+ 0373ac3d5ca98ebc80ba3a40fa871b0d
+ 1.22.0
+
+ dimstar_suse
+
+ 1061333
+
diff --git a/packages/g/gstreamer-plugins-libav/gst-libav-1.20.5.tar.xz b/packages/g/gstreamer-plugins-libav/gst-libav-1.20.5.tar.xz
deleted file mode 120000
index 0c6be5c..0000000
--- a/packages/g/gstreamer-plugins-libav/gst-libav-1.20.5.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeich4rvccxvgdsu4eli25tmjll2ycwgtid2tqtb7qkkfbpkg2ptbde
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-libav/gst-libav-1.22.0.tar.xz b/packages/g/gstreamer-plugins-libav/gst-libav-1.22.0.tar.xz
new file mode 120000
index 0000000..21acd0e
--- /dev/null
+++ b/packages/g/gstreamer-plugins-libav/gst-libav-1.22.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreiaojbahwsifej5cmaqt3pnijs5dqexqkmh4pj23iobjcaxpqkaq6e
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.changes b/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.changes
index 6324e38..44d5cc6 100644
--- a/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.changes
+++ b/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Jan 25 16:28:35 UTC 2023 - Bjørn Lie
+
+- Update to version 1.22.0:
+ + Please see changes in gstreamer main package, major version
+ bump.
+
+-------------------------------------------------------------------
Fri Dec 23 19:26:35 UTC 2022 - Bjørn Lie
- Update to version 1.20.5:
diff --git a/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.spec b/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.spec
index 7e12166..53daf86 100644
--- a/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.spec
+++ b/packages/g/gstreamer-plugins-libav/gstreamer-plugins-libav.spec
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-plugins-libav
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define gst_branch 1.0
Name: gstreamer-plugins-libav
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: A ffmpeg/libav plugin for GStreamer
License: LGPL-2.1-or-later
diff --git a/packages/g/gstreamer-plugins-ugly/.files b/packages/g/gstreamer-plugins-ugly/.files
index 5687e65..d461b2a 100644
Binary files a/packages/g/gstreamer-plugins-ugly/.files and b/packages/g/gstreamer-plugins-ugly/.files differ
diff --git a/packages/g/gstreamer-plugins-ugly/.rev b/packages/g/gstreamer-plugins-ugly/.rev
index 349a4c3..931cbf8 100644
--- a/packages/g/gstreamer-plugins-ugly/.rev
+++ b/packages/g/gstreamer-plugins-ugly/.rev
@@ -615,4 +615,12 @@
1045098
+
+ bd50e1d2e7a345718bbe3f1634e8e25a
+ 1.22.0
+
+ dimstar_suse
+
+ 1061543
+
diff --git a/packages/g/gstreamer-plugins-ugly/gst-plugins-ugly-1.20.5.tar.xz b/packages/g/gstreamer-plugins-ugly/gst-plugins-ugly-1.20.5.tar.xz
deleted file mode 120000
index 14299dc..0000000
--- a/packages/g/gstreamer-plugins-ugly/gst-plugins-ugly-1.20.5.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeigz7iwxgd4vovdzje6hs64iebhu6g4szgxvl6jgnnpugyff6t63eu
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz b/packages/g/gstreamer-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz
new file mode 120000
index 0000000..0b41ec1
--- /dev/null
+++ b/packages/g/gstreamer-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreifgitojqgx2fwgtvej7oy5lsur4ayqo4ttfu7whhr3sdqu5upc2bq
\ No newline at end of file
diff --git a/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.changes b/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.changes
index d154157..5782c86 100644
--- a/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.changes
+++ b/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.changes
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa
+
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+
+-------------------------------------------------------------------
+Wed Jan 25 10:17:44 UTC 2023 - Bjørn Lie
+
+- Update to version 1.22.0:
+ + Please see changes in gstreamer main package, major version
+ bump.
+
+-------------------------------------------------------------------
Fri Dec 23 19:19:47 UTC 2022 - Bjørn Lie
- Update to version 1.20.5:
diff --git a/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec b/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec
index 9217d47..b144b1a 100644
--- a/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec
+++ b/packages/g/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-plugins-ugly
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
%define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
Name: gstreamer-plugins-ugly
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: LGPL-2.1-or-later
@@ -33,12 +33,13 @@ Group: Productivity/Multimedia/Other
URL: https://gstreamer.freedesktop.org
Source0: %{url}/src/%{_name}/%{_name}-%{version}.tar.xz
Source99: baselibs.conf
+Patch0: reduce-required-meson.patch
BuildRequires: gcc-c++
BuildRequires: liba52-devel
BuildRequires: libcdio-devel >= 0.76
BuildRequires: libdvdread-devel
-BuildRequires: meson >= 0.47.0
+BuildRequires: meson >= 0.61.0
BuildRequires: orc >= 0.4.16
BuildRequires: pkgconfig
BuildRequires: python3-base
@@ -132,7 +133,6 @@ export PYTHON=%{_bindir}/python3
%{_libdir}/gstreamer-%{gst_branch}/libgstdvdsub.so
%{_libdir}/gstreamer-%{gst_branch}/libgstmpeg2dec.so
%{_libdir}/gstreamer-%{gst_branch}/libgstrealmedia.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstxingmux.so
%if 0%{?BUILD_ORIG}
%if 0%{?BUILD_ORIG_ADDON}
diff --git a/packages/g/gstreamer-plugins-ugly/reduce-required-meson.patch b/packages/g/gstreamer-plugins-ugly/reduce-required-meson.patch
new file mode 100644
index 0000000..4bf457c
--- /dev/null
+++ b/packages/g/gstreamer-plugins-ugly/reduce-required-meson.patch
@@ -0,0 +1,12 @@
+Index: gst-plugins-ugly-1.22.0/meson.build
+===================================================================
+--- gst-plugins-ugly-1.22.0.orig/meson.build
++++ gst-plugins-ugly-1.22.0/meson.build
+@@ -1,6 +1,6 @@
+ project('gst-plugins-ugly', 'c',
+ version : '1.22.0',
+- meson_version : '>= 0.62',
++ meson_version : '>= 0.61',
+ default_options : [ 'warning_level=1',
+ 'buildtype=debugoptimized' ])
+
diff --git a/packages/g/gstreamer/.files b/packages/g/gstreamer/.files
index f2fa840..161147d 100644
Binary files a/packages/g/gstreamer/.files and b/packages/g/gstreamer/.files differ
diff --git a/packages/g/gstreamer/.rev b/packages/g/gstreamer/.rev
index 8ef3666..5602715 100644
--- a/packages/g/gstreamer/.rev
+++ b/packages/g/gstreamer/.rev
@@ -728,4 +728,12 @@
1045094
+
+ fdcb616d33b3dd67c609ea9c61021764
+ 1.22.0
+
+ dimstar_suse
+
+ 1061544
+
diff --git a/packages/g/gstreamer/gstreamer-1.20.5.tar.xz b/packages/g/gstreamer/gstreamer-1.20.5.tar.xz
deleted file mode 120000
index 77f48dd..0000000
--- a/packages/g/gstreamer/gstreamer-1.20.5.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidbb7lksktavj6r3ssoxn7jmquhexmr2bwzus6ct3hjikkrofjqh4
\ No newline at end of file
diff --git a/packages/g/gstreamer/gstreamer-1.22.0.tar.xz b/packages/g/gstreamer/gstreamer-1.22.0.tar.xz
new file mode 120000
index 0000000..bc01673
--- /dev/null
+++ b/packages/g/gstreamer/gstreamer-1.22.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeicqfb7guqywbpctaaqgsjwjhhryykj3dzyvkxsuqrlxggiisfepoy
\ No newline at end of file
diff --git a/packages/g/gstreamer/gstreamer-pie.patch b/packages/g/gstreamer/gstreamer-pie.patch
index ea4a65a..0f3c542 100644
--- a/packages/g/gstreamer/gstreamer-pie.patch
+++ b/packages/g/gstreamer/gstreamer-pie.patch
@@ -1,26 +1,26 @@
-Index: gstreamer-1.18.5/libs/gst/helpers/meson.build
+Index: gstreamer-1.22.0/libs/gst/helpers/meson.build
===================================================================
---- gstreamer-1.18.5.orig/libs/gst/helpers/meson.build
-+++ gstreamer-1.18.5/libs/gst/helpers/meson.build
-@@ -5,6 +5,7 @@ executable('gst-plugin-scanner',
- dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, gst_dep],
+--- gstreamer-1.22.0.orig/libs/gst/helpers/meson.build
++++ gstreamer-1.22.0/libs/gst/helpers/meson.build
+@@ -5,6 +5,7 @@ exe = executable('gst-plugin-scanner',
+ dependencies : [gst_dep, mathlib, gmodule_dep,],
install_dir : helpers_install_dir,
install: true,
+ pie: true,
)
- # Used in test env setup to make tests find plugin scanner in build tree
-@@ -18,6 +19,7 @@ if bashcomp_found
- dependencies : [gobject_dep, glib_dep, gst_dep],
+ meson.add_devenv({'GST_PLUGIN_SCANNER': exe.full_path()})
+@@ -21,6 +22,7 @@ if bashcomp_found
install_dir : helpers_install_dir,
+ install_tag : 'bin',
install: true,
+ pie: true,
)
endif
-@@ -114,7 +116,8 @@ if have_ptp
+@@ -117,7 +119,8 @@ if have_ptp
include_directories : [configinc, libsinc],
- dependencies : [gio_dep, gobject_dep, glib_dep, mathlib, gst_dep, cap_dep],
+ dependencies : [gst_dep, gio_dep, mathlib, cap_dep],
install_dir : helpers_install_dir,
- install : true)
+ install : true,
diff --git a/packages/g/gstreamer/gstreamer-rpm-prov.patch b/packages/g/gstreamer/gstreamer-rpm-prov.patch
index 6a219c9..0b24153 100644
--- a/packages/g/gstreamer/gstreamer-rpm-prov.patch
+++ b/packages/g/gstreamer/gstreamer-rpm-prov.patch
@@ -1,8 +1,8 @@
-Index: gstreamer-1.18.5/tools/gst-inspect.c
+Index: gstreamer-1.22.0/tools/gst-inspect.c
===================================================================
---- gstreamer-1.18.5.orig/tools/gst-inspect.c
-+++ gstreamer-1.18.5/tools/gst-inspect.c
-@@ -1750,7 +1750,224 @@ print_tracer_info (GstPluginFeature * fe
+--- gstreamer-1.22.0.orig/tools/gst-inspect.c
++++ gstreamer-1.22.0/tools/gst-inspect.c
+@@ -1869,7 +1869,224 @@ print_tracer_info (GstPluginFeature * fe
* is meant for machines, not humans.
*/
static void
@@ -228,7 +228,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
{
GstPadDirection direction;
const gchar *type_name;
-@@ -1776,6 +1993,13 @@ print_plugin_automatic_install_info_code
+@@ -1895,6 +2112,13 @@ print_plugin_automatic_install_info_code
return;
}
@@ -242,7 +242,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
/* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory);
-@@ -1812,15 +2036,20 @@ print_plugin_automatic_install_info_code
+@@ -1931,15 +2155,20 @@ print_plugin_automatic_install_info_code
gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate");
@@ -267,7 +267,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
{
const gchar *const *protocols;
-@@ -1829,13 +2058,19 @@ print_plugin_automatic_install_info_prot
+@@ -1948,13 +2177,19 @@ print_plugin_automatic_install_info_prot
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
while (*protocols != NULL) {
@@ -289,7 +289,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
++protocols;
}
break;
-@@ -1846,7 +2081,7 @@ print_plugin_automatic_install_info_prot
+@@ -1965,7 +2200,7 @@ print_plugin_automatic_install_info_prot
}
static void
@@ -298,7 +298,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
{
GList *features, *l;
-@@ -1865,11 +2100,15 @@ print_plugin_automatic_install_info (Gst
+@@ -1984,11 +2219,15 @@ print_plugin_automatic_install_info (Gst
if (feature_plugin == plugin) {
GstElementFactory *factory;
@@ -317,7 +317,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
}
if (feature_plugin)
gst_object_unref (feature_plugin);
-@@ -1891,7 +2130,7 @@ print_all_plugin_automatic_install_info
+@@ -2012,7 +2251,7 @@ print_all_plugin_automatic_install_info
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
@@ -326,7 +326,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
}
gst_plugin_list_free (orig_plugins);
}
-@@ -1958,6 +2197,7 @@ main (int argc, char *argv[])
+@@ -2098,6 +2337,7 @@ real_main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
@@ -334,7 +334,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE;
gboolean color_always = FALSE;
-@@ -1979,6 +2219,9 @@ main (int argc, char *argv[])
+@@ -2119,6 +2359,9 @@ real_main (int argc, char *argv[])
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
@@ -344,7 +344,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"types", 't', 0, G_OPTION_ARG_STRING, &types,
-@@ -2144,7 +2387,7 @@ main (int argc, char *argv[])
+@@ -2284,7 +2527,7 @@ real_main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
@@ -353,7 +353,7 @@ Index: gstreamer-1.18.5/tools/gst-inspect.c
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
-@@ -2157,13 +2400,17 @@ main (int argc, char *argv[])
+@@ -2297,13 +2540,17 @@ real_main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
diff --git a/packages/g/gstreamer/gstreamer.changes b/packages/g/gstreamer/gstreamer.changes
index 11367e2..f34c864 100644
--- a/packages/g/gstreamer/gstreamer.changes
+++ b/packages/g/gstreamer/gstreamer.changes
@@ -1,4 +1,63 @@
-------------------------------------------------------------------
+Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa
+
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+- Probably because of a problem in SLE's meson, the generated
+ pkgconfig files are missing some variables that are needed by
+ rpm to generate the pkgconfig(...) provides correctly. In order
+ to fix this, we now check for those variables and insert them
+ in the pc files before installation if they're missing.
+
+-------------------------------------------------------------------
+Tue Jan 24 16:46:29 UTC 2023 - Bjørn Lie
+
+- Update to version 1.22.0:
+ + AV1 video codec support improvements
+ + New HLS, DASH and Microsoft Smooth Streaming adaptive streaming
+ clients
+ + Qt6 support for rendering video inside a QML scene
+ + Minimal builds optimised for binary size, including only the
+ individual elements needed
+ + Playbin3, Decodebin3, UriDecodebin3, Parsebin enhancements and
+ stabilisation
+ + WebRTC simulcast support and support for Google Congestion
+ Control
+ + WebRTC-based media server ingestion/egress (WHIP/WHEP) support
+ + New easy to use batteries-included WebRTC sender plugin
+ + Easy RTP sender timestamp reconstruction for RTP and RTSP
+ + ONVIF timed metadata support
+ + New fragmented MP4 muxer and non-fragmented MP4 muxer
+ + New plugins for Amazon AWS storage and audio transcription
+ services
+ + New gtk4paintablesink and gtkwaylandsink renderers
+ + New videocolorscale element that can convert and scale in one
+ go for better performance
+ + High bit-depth video improvements
+ + Touchscreen event support in navigation API
+ + Rust plugins now shipped in macOS and Windows/MSVC binary
+ packages
+ + H.264/H.265 timestamp correction elements for PTS/DTS
+ reconstruction before muxers
+ + Improved design for DMA buffer sharing and modifier handling
+ for hardware-accelerated video decoders/encoders/filters and
+ capturing/rendering on Linux
+ + Video4Linux2 hardware accelerated decoder improvements
+ + CUDA integration and Direct3D11 integration and plugin
+ improvements
+ + New H.264 / AVC, H.265 / HEVC and AV1 hardware-accelerated
+ video encoders for AMD GPUs using the Advanced Media Framework
+ (AMF) SDK
+ + applemedia: H.265 / HEVC video encoding + decoding support
+ + androidmedia: H.265 / HEVC video encoding support
+ + New "force-live" property for audiomixer, compositor,
+ glvideomixer, d3d11compositor etc.
+ + Lots of new plugins, features, performance improvements and bug
+ fixes
+- Rebase patches with quilt.
+
+-------------------------------------------------------------------
Thu Dec 22 12:43:08 UTC 2022 - Dirk Müller
- update to 1.20.5:
diff --git a/packages/g/gstreamer/gstreamer.spec b/packages/g/gstreamer/gstreamer.spec
index 0d51e03..ddaee63 100644
--- a/packages/g/gstreamer/gstreamer.spec
+++ b/packages/g/gstreamer/gstreamer.spec
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define gst_branch 1.0
Name: gstreamer
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: Streaming-Media Framework Runtime
License: LGPL-2.1-or-later
@@ -34,6 +34,8 @@ Source99: baselibs.conf
Patch1: gstreamer-rpm-prov.patch
# PATCH-FIX-OPENSUSE gstreamer-pie.patch mgorse@suse.com -- create position-independent executables.
Patch2: gstreamer-pie.patch
+# PATCH-FIX-OPENSUSE reduce-required-meson.patch alarrosa@suse.com -- build with meson 0.61
+Patch3: reduce-required-meson.patch
BuildRequires: bison >= 2.4
BuildRequires: check-devel
@@ -41,14 +43,14 @@ BuildRequires: flex >= 2.5.31
BuildRequires: gobject-introspection-devel >= 1.31.1
BuildRequires: libcap-devel
BuildRequires: libcap-progs
-BuildRequires: meson >= 0.59
+BuildRequires: meson >= 0.61
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: python3-xml
BuildRequires: pkgconfig(bash-completion) >= 2.0
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
-BuildRequires: pkgconfig(glib-2.0) >= 2.40.0
+BuildRequires: pkgconfig(glib-2.0) >= 2.62.0
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(libdw)
@@ -137,7 +139,7 @@ sed -i -e '1{s,^#!/usr/bin/env python3,#!%{_bindir}/python3,}' docs/gst-plugins-
%build
export PYTHON=%{_bindir}/python3
-sed -i "s/^executable('gst-plugin-scanner',/executable('gst-plugin-scanner-%{_target_cpu}',/" libs/gst/helpers/meson.build
+sed -i "s/executable('gst-plugin-scanner',/executable('gst-plugin-scanner-%{_target_cpu}',/" libs/gst/helpers/meson.build
sed -i "s/gst-plugin-scanner/gst-plugin-scanner-%{_target_cpu}/" meson.build
# TODO: enable dbghelp
%meson \
@@ -155,6 +157,15 @@ sed -i "s/gst-plugin-scanner/gst-plugin-scanner-%{_target_cpu}/" meson.build
%{nil}
%meson_build
+# meson 0.61.4 in SLE 15 SP5 doesn't generate all variables needed in the pc files
+# As a result the pkgconfig(...) provides are not generated in the rpm file so
+# we have to add the variables to the pc files if they're missing
+for pc in *-suse-linux/meson-private/*.pc ; do
+ grep -q ^datarootdir= $pc || sed -ie "/^pluginsdir=.*/a datarootdir=\${prefix}\/share" $pc ;
+ grep -q ^datadir= $pc || sed -ie "/^datarootdir=.*/a datadir=\${datarootdir}" $pc ;
+ grep -q ^libexecdir= $pc || sed -ie "/^datadir=.*/a libexecdir=\${prefix}\/libexec" $pc ;
+done
+
%install
%meson_install
%find_lang %{name}-%{gst_branch}
diff --git a/packages/g/gstreamer/reduce-required-meson.patch b/packages/g/gstreamer/reduce-required-meson.patch
new file mode 100644
index 0000000..86ce35b
--- /dev/null
+++ b/packages/g/gstreamer/reduce-required-meson.patch
@@ -0,0 +1,12 @@
+Index: gstreamer-1.22.0/meson.build
+===================================================================
+--- gstreamer-1.22.0.orig/meson.build
++++ gstreamer-1.22.0/meson.build
+@@ -1,6 +1,6 @@
+ project('gstreamer', 'c',
+ version : '1.22.0',
+- meson_version : '>= 0.62',
++ meson_version : '>= 0.61',
+ default_options : [ 'warning_level=1',
+ 'buildtype=debugoptimized' ])
+
diff --git a/packages/k/k9s/.files b/packages/k/k9s/.files
index 4ccbbb1..adfb459 100644
Binary files a/packages/k/k9s/.files and b/packages/k/k9s/.files differ
diff --git a/packages/k/k9s/.rev b/packages/k/k9s/.rev
index 7427e2b..c254f85 100644
--- a/packages/k/k9s/.rev
+++ b/packages/k/k9s/.rev
@@ -218,4 +218,12 @@
1061475
+
+ 4fb92bf1b25b627546be7897c23e3fea
+ 0.27.2
+
+ dimstar_suse
+
+ 1062576
+
diff --git a/packages/k/k9s/.servicemark b/packages/k/k9s/.servicemark
index 8f78b47..7441ca9 100644
--- a/packages/k/k9s/.servicemark
+++ b/packages/k/k9s/.servicemark
@@ -1 +1 @@
-132f89064fe8fbe57e29273cfb587a06
+3e11579f76dd221b632bf4236c0b5913
diff --git a/packages/k/k9s/_service b/packages/k/k9s/_service
index b50357f..474cf6e 100644
--- a/packages/k/k9s/_service
+++ b/packages/k/k9s/_service
@@ -3,7 +3,7 @@
https://github.com/derailed/k9s.git
git
.git
- v0.27.0
+ v0.27.2
@PARENT_TAG@
enable
v(.*)
diff --git a/packages/k/k9s/_servicedata b/packages/k/k9s/_servicedata
index caa8e48..a5a1da6 100644
--- a/packages/k/k9s/_servicedata
+++ b/packages/k/k9s/_servicedata
@@ -1,4 +1,4 @@
https://github.com/derailed/k9s.git
- b5a7cfb3af43a0a79423683094bd33b1b9605faf
\ No newline at end of file
+ 3794a61eaffb5ccbd68fe128f7216db005d70f6f
\ No newline at end of file
diff --git a/packages/k/k9s/k9s-0.27.0.tar.gz b/packages/k/k9s/k9s-0.27.0.tar.gz
deleted file mode 120000
index 5570bec..0000000
--- a/packages/k/k9s/k9s-0.27.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidzids3tlzjsr2enpjqkw3dqyv6m4pbgxa5cwrl5tmyaacoftj53i
\ No newline at end of file
diff --git a/packages/k/k9s/k9s-0.27.2.tar.gz b/packages/k/k9s/k9s-0.27.2.tar.gz
new file mode 120000
index 0000000..8284e28
--- /dev/null
+++ b/packages/k/k9s/k9s-0.27.2.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeih7yy4qoyrbltjfosta7ghhmyobp4t6erlwxb22kecjyqnemfo4bu
\ No newline at end of file
diff --git a/packages/k/k9s/k9s.changes b/packages/k/k9s/k9s.changes
index 569b948..10a32ee 100644
--- a/packages/k/k9s/k9s.changes
+++ b/packages/k/k9s/k9s.changes
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Wed Feb 01 14:33:22 UTC 2023 - kastl@b1-systems.de
+
+- Update to version 0.27.2:
+ * fix brew installer
+ * bring out the duds
+
+-------------------------------------------------------------------
+Tue Jan 31 15:33:48 UTC 2023 - kastl@b1-systems.de
+
+- Update to version 0.27.1:
+ * release v0.27.1 (#1945)
+ Resolved Issues
+ * [Issue #1943](https://github.com/derailed/k9s/issues/1943) k9s display is broken after switching to v0.27.0
+ * [Issue #1935](https://github.com/derailed/k9s/issues/1935) Active namespace is dropped after accessing forbidden resources
+ * [Issue #1913](https://github.com/derailed/k9s/issues/1913) Exit edit mode deadlock
+ * [Issue #1895](https://github.com/derailed/k9s/issues/1895) AWS workspace. K9s fails on startup with unknown userid error
+ * [Issue #1842](https://github.com/derailed/k9s/issues/1842) Strange one - brew installed k9s
+
+-------------------------------------------------------------------
Fri Jan 27 06:07:42 UTC 2023 - kastl@b1-systems.de
- Update to version 0.27.0:
diff --git a/packages/k/k9s/k9s.spec b/packages/k/k9s/k9s.spec
index cb80d3b..4a68d68 100644
--- a/packages/k/k9s/k9s.spec
+++ b/packages/k/k9s/k9s.spec
@@ -17,7 +17,7 @@
Name: k9s
-Version: 0.27.0
+Version: 0.27.2
Release: 0
Summary: Curses based terminal UI for Kubernetes clusters
License: Apache-2.0
diff --git a/packages/k/k9s/vendor.tar.gz b/packages/k/k9s/vendor.tar.gz
index 94020b3..119e6d2 120000
--- a/packages/k/k9s/vendor.tar.gz
+++ b/packages/k/k9s/vendor.tar.gz
@@ -1 +1 @@
-/ipfs/bafybeidwpffye6ksrlqe4a5riya2b5jlyxcojur34grrfeq4bpncs623ui
\ No newline at end of file
+/ipfs/bafybeig3oqnxbhpgu4dwj7lcjfwsd4tt7j2sxyzx4llx5yo2uu6qmuc4tu
\ No newline at end of file
diff --git a/packages/k/knot/.files b/packages/k/knot/.files
index b049c1e..b842256 100644
Binary files a/packages/k/knot/.files and b/packages/k/knot/.files differ
diff --git a/packages/k/knot/.rev b/packages/k/knot/.rev
index bc63f69..2098f5a 100644
--- a/packages/k/knot/.rev
+++ b/packages/k/knot/.rev
@@ -129,4 +129,15 @@ https://www.knot-dns.cz/
Automatic submission by obs-autosubmit
1038425
+
+ 9712a46701ac6d5ac5c4cbabd1bc2820
+ 3.2.5
+
+ dimstar_suse
+ - update to version 3.2.5, see:
+ https://www.knot-dns.cz/2023-02-02-version-325.html
+- update to version 3.2.4, see:
+ https://www.knot-dns.cz/2022-12-12-version-324.html
+ 1062643
+
diff --git a/packages/k/knot/knot-3.2.3.tar.xz b/packages/k/knot/knot-3.2.3.tar.xz
deleted file mode 120000
index c9f57f9..0000000
--- a/packages/k/knot/knot-3.2.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeie5ei4nww5embjqkgzl3ay7lanfatvdg7i7povj4qhcnztgoqz36i
\ No newline at end of file
diff --git a/packages/k/knot/knot-3.2.3.tar.xz.asc b/packages/k/knot/knot-3.2.3.tar.xz.asc
deleted file mode 100644
index 1fa3bfb..0000000
--- a/packages/k/knot/knot-3.2.3.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEdC+k6VgptsXqxrhXELt69v671qsFAmN51sQACgkQELt69v67
-1qvvFBAAi2m8/TdGFXr3MR+cuVEcuvYVF4Rir9aaJR8JBcLsWp2Yujx9XMqE11Uy
-IEfDOGSaQ5gd44YspHqavx6ilcwqVBETx8dsMPGOVOsHC/PJghiYQnihUMcZtl3Z
-9JPxovJh83T01LQiQvsT/5+lfyH1/5NIhXfWxh4X7irY4AgZSnqda+04gED5RMOa
-HwbW/zKn236XqBEZAuxulxFY5YNPac3XaHJcut/mjq3zjJt9V+/JqGC7x9yodrh+
-RcTCBohJznXOZB0MAi71emtv/Hc+buDYM/Bf986jPmaPN0YKtKYWnUq+r8T0j/na
-00HX7sR312MVTC/lx5DmoKDf4sSO4CIyv0SODCpbmxlmT06PzyX7G9HWJ2HGX4Ee
-tSF9uMMFxiHkJvy0z59bzIfwDnpZlIGMl2o4cBiVvk+PcdWgOIkjUPw98XsFLosx
-DVO6P3vg3+C8wGTTznd7vB3bZ/wqoIlpphc5PAJpuYzv3WakCF+BqmlCfj/L0rmv
-AxZoVzZNR0ZtETWi9d5XSrSTV5lMdv6vJ4EJaPDloI4b3wGZBuBZY9nDTR2SIocH
-7DJMx8WHMkVYti+sT8qEfT/F2c6xudQEjGSB7N86tYDyuW3+H+6e3+G6jZ0mpxgc
-6WXR2cih6JkUF+LtuirlFdMRMkTv26sOgRutE6eEk96uzxTccos=
-=lylz
------END PGP SIGNATURE-----
diff --git a/packages/k/knot/knot-3.2.5.tar.xz b/packages/k/knot/knot-3.2.5.tar.xz
new file mode 120000
index 0000000..ef5193f
--- /dev/null
+++ b/packages/k/knot/knot-3.2.5.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeidsjnam72rkkykbmz44v6mgcjrmjpodertmb2q65tjtjxhe4qz6zi
\ No newline at end of file
diff --git a/packages/k/knot/knot-3.2.5.tar.xz.asc b/packages/k/knot/knot-3.2.5.tar.xz.asc
new file mode 100644
index 0000000..d2120b9
--- /dev/null
+++ b/packages/k/knot/knot-3.2.5.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEdC+k6VgptsXqxrhXELt69v671qsFAmPbjHAACgkQELt69v67
+1qsr2g//QVYS4YYnIV4FC1EgXDTeLoMlGhlZt69iAh66S4Bn1IRhKJP+XXssp2nz
+kDFDqo1rUvsrJvJrwGzQ1kHrxDzZ0okNwb5F1QVFttj2ocZ65TuQt7uuesEQgxYu
+YciPsUN+vM8u9Elo+eXO1rCZIF8L4d2MCjGmxCfMAimhtZq6PrOlcrl5tXzQnugN
+YNf9VThacT8vnZ426F/88WMsHJbsGfRvDGPCBBd4rykhKfULFFfcT+Vug97wTTbn
+EEsoyLAdXvJTptfHDXK/rtJ0paYo2+LoGMtTbJv3NQVNcE01rT5Wh61/LV9RgfzN
+wdIHvlnx4WYxUeODlGXNEga1b0mdSB1yrDvFml+SBpzhMd3z4mOWsPnL0QA5CS4l
+BfCJez3LqFt29X6Kc0MWHQRfb//EQjacn2Raf94As+NT0aRoFG8D1F2NQ6KIqSBm
+E/JXrjN6fyjHibrVun/eSPHXNTVViXiwpBwCURXLpyGnUTZmWI14lF+6z9Z0P2QX
+2zz/ZaTU87gvgd9j10I2lrEUUsPYgbNB6DPJlIlyNR/FeBeXsNVROyz43WfH3sdK
+P5BrLHhme7bzjHaZxjFcA5cT9T9sfJMW8thjKf8kL06IsBW0i701sDASuheDFmPA
+htzPkqhpXxo8Sd25eDPFta9LkvxDRPqf7c2qhMkvCNSFw195i9M=
+=vkRJ
+-----END PGP SIGNATURE-----
diff --git a/packages/k/knot/knot.changes b/packages/k/knot/knot.changes
index f4ffbe0..ebe2296 100644
--- a/packages/k/knot/knot.changes
+++ b/packages/k/knot/knot.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Thu Feb 2 12:46:53 UTC 2023 - Michal Hrusecky
+
+- update to version 3.2.5, see:
+ https://www.knot-dns.cz/2023-02-02-version-325.html
+
+-------------------------------------------------------------------
+Mon Dec 12 08:05:34 UTC 2022 - Michal Hrusecky
+
+- update to version 3.2.4, see:
+ https://www.knot-dns.cz/2022-12-12-version-324.html
+
+-------------------------------------------------------------------
Sun Nov 20 10:46:52 UTC 2022 - Michal Hrusecky
- update to version 3.2.3, see:
diff --git a/packages/k/knot/knot.spec b/packages/k/knot/knot.spec
index c637405..8498c26 100644
--- a/packages/k/knot/knot.spec
+++ b/packages/k/knot/knot.spec
@@ -1,7 +1,7 @@
#
# spec file for package knot
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,7 @@ BuildRequires: systemd-devel
%{?systemd_requires}
%endif
Name: knot
-Version: 3.2.3
+Version: 3.2.5
Release: 0
Summary: An authoritative DNS daemon
License: GPL-3.0-or-later
diff --git a/packages/k/kubie/.files b/packages/k/kubie/.files
index 8441fda..9b1b7cd 100644
Binary files a/packages/k/kubie/.files and b/packages/k/kubie/.files differ
diff --git a/packages/k/kubie/.rev b/packages/k/kubie/.rev
index 690c264..69ff0f6 100644
--- a/packages/k/kubie/.rev
+++ b/packages/k/kubie/.rev
@@ -87,4 +87,12 @@
1062059
+
+ 485cec431616c5999eeab9a88d3e41bb
+ 0.19.3
+
+ dimstar_suse
+
+ 1062608
+
diff --git a/packages/k/kubie/.servicemark b/packages/k/kubie/.servicemark
index aba7261..41f1191 100644
--- a/packages/k/kubie/.servicemark
+++ b/packages/k/kubie/.servicemark
@@ -1 +1 @@
-f71efc325bc133672f5419f0517d576c
+9f3967704d1b69aa3d1d1e3786214cab
diff --git a/packages/k/kubie/_service b/packages/k/kubie/_service
index 1f2a4b8..dd8942d 100644
--- a/packages/k/kubie/_service
+++ b/packages/k/kubie/_service
@@ -5,7 +5,7 @@
.git
@PARENT_TAG@
v(.*)
- v0.19.2
+ v0.19.3
enable
diff --git a/packages/k/kubie/_servicedata b/packages/k/kubie/_servicedata
index 81dc43f..0c2ce45 100644
--- a/packages/k/kubie/_servicedata
+++ b/packages/k/kubie/_servicedata
@@ -1,4 +1,4 @@
https://github.com/sbstp/kubie
- 74831cf26fe9389b2643b87180d99b89b54d4832
\ No newline at end of file
+ 9a479232b1f604c28deb3db5aa61ec28e46c197b
\ No newline at end of file
diff --git a/packages/k/kubie/kubie-0.19.2.tar.gz b/packages/k/kubie/kubie-0.19.2.tar.gz
deleted file mode 120000
index 9a061fa..0000000
--- a/packages/k/kubie/kubie-0.19.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreig3bbb6ilo55tonhlndooehywya3tlmysdv4z7pybzez5jrvsfcg4
\ No newline at end of file
diff --git a/packages/k/kubie/kubie-0.19.3.tar.gz b/packages/k/kubie/kubie-0.19.3.tar.gz
new file mode 120000
index 0000000..fa66079
--- /dev/null
+++ b/packages/k/kubie/kubie-0.19.3.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafkreigurqasu2qhfsemlxz7lefzsi7zp25j6wysh4slu2aqv5pmw2bz74
\ No newline at end of file
diff --git a/packages/k/kubie/kubie.changes b/packages/k/kubie/kubie.changes
index 49d1db3..4444e95 100644
--- a/packages/k/kubie/kubie.changes
+++ b/packages/k/kubie/kubie.changes
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Thu Feb 02 06:48:01 UTC 2023 - kastl@b1-systems.de
+
+- Update to version 0.19.3:
+ * Version 0.19.3
+ * Delete old release script
+ * Github actions handle publish now
+ * Apply clippy lints
+ * Add job to publish to crates.io when tag is created
+
+-------------------------------------------------------------------
Mon Jan 30 12:07:13 UTC 2023 - kastl@b1-systems.de
- Update to version 0.19.2:
diff --git a/packages/k/kubie/kubie.spec b/packages/k/kubie/kubie.spec
index f343835..c40da77 100644
--- a/packages/k/kubie/kubie.spec
+++ b/packages/k/kubie/kubie.spec
@@ -19,7 +19,7 @@
%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
Name: kubie
-Version: 0.19.2
+Version: 0.19.3
Release: 0
Summary: A Kubernetes context switcher
License: Zlib
diff --git a/packages/k/kubie/vendor.tar.xz b/packages/k/kubie/vendor.tar.xz
index a3dbad9..93317ae 120000
--- a/packages/k/kubie/vendor.tar.xz
+++ b/packages/k/kubie/vendor.tar.xz
@@ -1 +1 @@
-/ipfs/bafybeiacx6frwtmknz223fzf7s4ehvn4rdrd6diav2ooc23g6d7cniza4a
\ No newline at end of file
+/ipfs/bafybeicwlsbezenvb26bckro3edcmyginkutotttsay2wufukafo33gmfu
\ No newline at end of file
diff --git a/packages/k/kyverno/.files b/packages/k/kyverno/.files
index 99b0548..5fa7636 100644
Binary files a/packages/k/kyverno/.files and b/packages/k/kyverno/.files differ
diff --git a/packages/k/kyverno/.rev b/packages/k/kyverno/.rev
index 3be1694..71428a8 100644
--- a/packages/k/kyverno/.rev
+++ b/packages/k/kyverno/.rev
@@ -111,4 +111,12 @@
1043927
+
+ a6d89f14d273fc2c0ec238457472e91d
+ 1.9.0
+
+ dimstar_suse
+
+ 1062587
+
diff --git a/packages/k/kyverno/.servicemark b/packages/k/kyverno/.servicemark
index 9891ca5..64b115b 100644
--- a/packages/k/kyverno/.servicemark
+++ b/packages/k/kyverno/.servicemark
@@ -1 +1 @@
-d3c2cba852d1b70d9d47354c20615eab
+7d9d119b5d54ea9b70b4fa1a144f57bd
diff --git a/packages/k/kyverno/_service b/packages/k/kyverno/_service
index 81c5ef7..a27a0db 100644
--- a/packages/k/kyverno/_service
+++ b/packages/k/kyverno/_service
@@ -3,7 +3,7 @@
https://github.com/kyverno/kyverno
git
.git
- v1.8.5
+ v1.9.0
@PARENT_TAG@
enable
v(.*)
@@ -17,6 +17,6 @@
gz
- kyverno-1.8.5.tar.gz
+ kyverno-1.9.0.tar.gz
diff --git a/packages/k/kyverno/_servicedata b/packages/k/kyverno/_servicedata
index 6d26028..fd14e6e 100644
--- a/packages/k/kyverno/_servicedata
+++ b/packages/k/kyverno/_servicedata
@@ -1,4 +1,4 @@
https://github.com/kyverno/kyverno
- c19061758dc4203106ab6d87a245045c20192721
\ No newline at end of file
+ a1534cc2f581bbc93c15fa5ac42fe5c59f03d66a
\ No newline at end of file
diff --git a/packages/k/kyverno/kyverno-1.8.5.tar.gz b/packages/k/kyverno/kyverno-1.8.5.tar.gz
deleted file mode 120000
index 2ccce85..0000000
--- a/packages/k/kyverno/kyverno-1.8.5.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeib5ekdxbzlunsss5wmcgmdsifzmmrcrlra3hth7qbgpi43vw6lbhm
\ No newline at end of file
diff --git a/packages/k/kyverno/kyverno-1.9.0.tar.gz b/packages/k/kyverno/kyverno-1.9.0.tar.gz
new file mode 120000
index 0000000..7b2b5c8
--- /dev/null
+++ b/packages/k/kyverno/kyverno-1.9.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeihrqagl32pqxzbuhhlajpz276gl7zjr3xspxagbjrg3btu2kxwygm
\ No newline at end of file
diff --git a/packages/k/kyverno/kyverno.changes b/packages/k/kyverno/kyverno.changes
index 8b7655b..9b60ada 100644
--- a/packages/k/kyverno/kyverno.changes
+++ b/packages/k/kyverno/kyverno.changes
@@ -1,4 +1,679 @@
-------------------------------------------------------------------
+Thu Feb 02 06:49:27 UTC 2023 - kastl@b1-systems.de
+
+- Update to version 1.9.0:
+ * tag v1.9.0 (#6186)
+ * fix: policy exception event source (#6122)
+ * Release v1.9.0-rc.4 (#6108)
+ * fix: tracing attributes length and tracer name (#6112)
+ * fix: cleanup-controller version (#6100) (#6105)
+ * fix: flag added to init container mistake (#6103)
+ * fix: allow deletion of namespace containing managed resources (#6098) (#6102)
+ * fix: flag added to init container mistake (#6103)
+ * Release v1.9.0-rc.3 (#6095)
+ * validate polex activation and namespace (#6046) (#6080)
+ * fix: pin busybox image tag in helm tests (#6051) (#6063)
+ * fix: replace + with _ in Chart.Version label field (#6047) (#6056)
+ * cherry-pick #6030 (#6034)
+ * tag v1.9.0-rc.2 (#6023)
+ * fix ns labels matching (#6022)
+ * tag v1.9.0-rc.1 (#6012)
+ * fix: policy match Kind case-senstive (#6010)
+ * fix: policy exceptions not working in background mode (#5980) (#6003)
+ * chore: log out cleanup policy events (#5998) (#6000)
+ * create failure events on errors (#5988) (#5997)
+ * fix: generate policy exception events (#5987) (#5996)
+ * cherry-pick #5920 (#5990)
+ * Fixes time_now failing (cherry-pick 5928) (#5991)
+ * create events for cleanup policies (#5982) (#5983)
+ * fix: invoke cleanup process during shutdown (#5974) (#5981)
+ * cherry-pick #5967 (#5970)
+ * log out deleted resources at default level (#5977) (#5978)
+ * fix: helm selector (#5965) (#5969)
+ * feat: add cluster role aggregation to cleanup controller (#5966) (#5968)
+ * fix chart invalid annotations (#5960) (#5963)
+ * tag v1.9.0-beta.2 (#5959)
+ * fix imageRef matching (#5956) (#5957)
+ * cherry-pick #5950 (#5955)
+ * Cherry-pick #5941 (#5952)
+ * fix: update policy exception CRD description (#5948) (#5951)
+ * chore: fix releaser badge (#5910) (#5947)
+ * Added a time_add() filter to add duration and absolute time (#5817) (#5946)
+ * fix: cleanup policies with user infos in match/exclude should be rejected (#5943) (#5944)
+ * test: add kuttl test for policy exception (#5935) (#5936)
+ * fix: missing user info matching (#5931) (#5934)
+ * chore: add missing gh workflow concurrency statements (#5914) (#5924)
+ * restrict cjs by PSS restricted checks (#5904) (#5922)
+ * fix: Configure webhook to add ephemeralcontainers for policies matching on Pod (#5886) (#5919)
+ * fix: golangci-lint workflow (#5913) (#5917)
+ * set resourceVersion before update (#5906) (#5916)
+ * fix: configure gh workflow permission (#5909) (#5915)
+ * chore: make check actions pinned by hash a standalone ci job (#5907) (#5911)
+ * feat: add violation details to report.results.properties for PSa policies (#5908) (#5912)
+ * Adds JMESPath filter for returning cron expression for absolute time (#5814) (#5905)
+ * chore: add setup test env gh action (#5897) (#5899)
+ * chore: add setup-build-env gh action (#5892) (#5896)
+ * fix cleanup var 'target.*' (#5888) (#5895)
+ * add kuttl assert file (#5870) (#5894)
+ * chore: small gh workflows improvements (#5883) (#5887)
+ * chore: use gh composite actions (#5885) (#5893)
+ * fix: Add group to subresources declaration in value.yaml file for CLI (#5881) (#5884)
+ * refactor: improve background scan reconciliation (#5871) (#5882)
+ * fix: Add subresources support to policy exceptions (#5839) (#5880)
+ * fix validation checks for foreach and nested foreach (#5875) (#5877)
+ * fix: force background scan recomputation (#5865) (#5868)
+ * fix: background scan events (#5807) (#5874)
+ * feat: cleanup enhancements-1 (cherry-pick #5796) (#5867)
+ * fix mutate targets variable (#5862) (#5866)
+ * chore: move ConvertToUnstructured from engine utils to kube utils (#5847) (#5863)
+ * cleanup new validate webhooks (#5851) (#5857)
+ * Walk back change in PSS policy to send to to_upper (#5823) (#5856)
+ * cherry-pick #5846 (#5855)
+ * feat: improve background scan reports enqueue logic (#5810) (#5853)
+ * chore: cleanup a couple workflows (#5844) (#5854)
+ * fix: improve cli help message (#5843) (#5849)
+ * chore: bump a couple of deps (#5840) (#5850)
+ * refactor: move utils into sub packages (#5828) (#5845)
+ * chore: add a couple unit tests (#5834) (#5842)
+ * chore: cleanup codecov workflow (#5829) (#5838)
+ * fix: enum values for ValidationFailureActionOverride (#5835) (#5836)
+ * fix: default value for validationFailureAction (#5832) (#5833)
+ * Adds JMESPath filter for returning current time (#5813) (#5831)
+ * add source archive checksum into the checksums.txt (#5819) (#5827)
+ * Adds notes to functions (#5824) (#5826)
+ * fix: error handling in last scan time parsing (#5808) (#5809)
+ * fix arguments passed to DeepEqual (#5801) (#5806)
+ * refactor: policy controller package (#5747) (#5803)
+ * enhance logging, fix pull flag description (#5797) (#5798)
+ * chore: switch to kyverno/kuttl (#5504) (#5794)
+ * fix cli output adjustments (#5787) (#5793)
+ * redirect stderr to get digest successfully (#5782) (#5791)
+ * chore: update publicKey description (#5789) (#5792)
+ * fix delete policy (#5776) (#5790)
+ * fix helm chart version (#5775)
+ * bump dep (#5765)
+ * fix image digest (#5762)
+ * tag v1.9.0-beta.1 (#5761)
+ * chore(deps): bump JasonEtco/create-an-issue from 2.8.2 to 2.9.0 (#5760)
+ * chore(deps): bump fluxcd/flux2 from 0.37.0 to 0.38.1 (#5759)
+ * chore(deps): bump actions/cache from 3.0.11 to 3.2.0 (#5758)
+ * refactor: move util funcs in sub packages (#5754)
+ * refactor: cleanup controller validating webhook (#5756)
+ * test: add unit test for GetResourceName util (#5752)
+ * refactor: auth package and add full unit test coverage (#5749)
+ * chore: bump deps including k8s ones (#5751)
+ * refactor: remove common package (#5750)
+ * refactor: use typed client in auth (#5743)
+ * refactor: remove a couple of old util funcs (#5746)
+ * chore: remove e2e tests (#5742)
+ * Issue_templates (#5741)
+ * chore: remove autogen internals tests (#5740)
+ * fix: cleanup controller image build (#5739)
+ * chore: build cleanup controller image (#5737)
+ * generate SLSA provenance on releases (#5735)
+ * run conformance tests on different k8s versions (#5733)
+ * Allows {{image}} var to be used in policies (#5122)
+ * refactor: split CLI jp command (#5566)
+ * chore: update k8s versions test grid (#5732)
+ * feat: add exception logic (#5712)
+ * fix: remove all category from all our CRDs (#5731)
+ * feat: force background scan regularly (#5727)
+ * add rule type pkg/metrics/parsers.go (#5729)
+ * bump Go 1.19.4 (#5728)
+ * Revert "chore(deps): bump ossf/scorecard-action from 2.1.0 to 2.1.1 (#5724)" (#5725)
+ * chore(deps): bump ossf/scorecard-action from 2.1.0 to 2.1.1 (#5724)
+ * feat: propagate psa checks results (#5719)
+ * fix: add back install.yaml manifest (#5721)
+ * refactor: supress usage of kustomize in build (#5691)
+ * Require predicate type (#5713)
+ * fix logger panic (#5715)
+ * fix: interface conversion panic (#5708)
+ * fix missing assignment (#5710)
+ * feat: add kuttl tests for #5704 (#5707)
+ * fix: allow policies from stdin in apply again (#5668)
+ * initialize configmap resolver in background components (#5705)
+ * feat: Implement PolicyException (#5680)
+ * fix digest and verify logic (#5703)
+ * fix: block policy admission if kyverno is down (#5677)
+ * fix info kind error (#5701)
+ * fix: exception validation follow up (#5697)
+ * chore(deps): bump github/codeql-action from 2.1.36 to 2.1.37 (#5696)
+ * feat: add policy exception validation webhook (#5679)
+ * chore(deps): bump ossf/scorecard-action from 2.0.6 to 2.1.0 (#5695)
+ * chore: bump a couple of deps (#5688)
+ * chore(deps): bump github.com/onsi/gomega from 1.24.1 to 1.24.2 (#5694)
+ * chore(deps): bump goreleaser/goreleaser-action from 3.2.0 to 4.1.0 (#5683)
+ * fix: bump log level for autogen debug logs (#5687)
+ * chore: remove deprecated flag splitPolicyReport (#5686)
+ * chore(deps): bump actions/setup-go from 3.4.0 to 3.5.0 (#5684)
+ * chore(deps): bump JasonEtco/create-an-issue from 2.8.1 to 2.8.2 (#5685)
+ * chore: remove secrets client from webhook controller (#5682)
+ * chore: rename exclude into match in policy exception (#5681)
+ * fix: case where deny message is not a string (#5678)
+ * feat: Introduce PolicyException CRD (#5662)
+ * feat: add certs controller to cleanup policies (#5671)
+ * chore(deps): bump actions/checkout from 3.1.0 to 3.2.0 (#5666)
+ * Update version drop-downs in issue templates (#5674)
+ * fix AllNotIn operator (#5636)
+ * chore(deps): bump go.uber.org/multierr from 1.8.0 to 1.9.0 (#5663)
+ * chore(deps): bump azure/setup-helm from 3.4 to 3.5 (#5667)
+ * feat: add engine traces (#5463)
+ * use camel case for ForEach naming (#5660)
+ * feat: add metrics service and service monitor to cleanup controller (#5653)
+ * Support existing imagePullSecrets for image verify functionality (#5627)
+ * Nested foreach (#5589)
+ * chore(deps): bump github.com/sigstore/sigstore from 1.4.6 to 1.5.0 (#5652)
+ * chore(deps): bump github.com/go-git/go-git/v5 from 5.4.2 to 5.5.1 (#5650)
+ * feat: add dev config with support for prom loki and tempo (#5647)
+ * fix: grafana dashboard (#5645)
+ * fix: missing permission in cleanup controller role (#5646)
+ * refactor: tracing package (#5643)
+ * added Arrikto and Trendyol as adopters (via Google Form) (#5644)
+ * feat: improve cleanup policies controller and chart (#5628)
+ * feat: add support for subresources to validating and mutating policies (#4916)
+ * fix: Improve helm-test workflow (#5640)
+ * feat: propagate context through engine (#5639)
+ * chore(deps): bump github/codeql-action from 2.1.35 to 2.1.36 (#5631)
+ * feat: add conditions matching to cleanup controller (#5626)
+ * fix: setup tracing and minor cleanup in tracing and metrics code (#5629)
+ * feat: add http clients tracing (#5630)
+ * chore(deps): bump actions/setup-python from 4.3.0 to 4.3.1 (#5632)
+ * chore(deps): bump k8s.io/cli-runtime from 0.25.4 to 0.25.5 (#5635)
+ * Add api docs (#5605)
+ * feat: use lister in registry client (#5620)
+ * fix: registry client not propagated correctly (#5622)
+ * fix: don't create orphan spans in instrumented clients (#5624)
+ * feat: introduce v2alpha1 (#5625)
+ * feat: implement cleanup policy matching (#5614)
+ * fix nil error panic (#5619)
+ * chore(deps): bump golang.org/x/crypto from 0.3.0 to 0.4.0 (#5618)
+ * add 1.8.3 to version drop-downs (#5616)
+ * fix: mutation of cached object in bg scan controller (#5608)
+ * refactor: registry client (#5596)
+ * use helm values for crd labels (#5594)
+ * chore: bump a couple of deps (#5611)
+ * chore(deps): bump reviewdog/action-golangci-lint from 1.25.0 to 2.2.2 (#5603)
+ * chore(deps): bump azure/setup-helm from 1.1 to 3.4 (#5604)
+ * refactor: improve color management in cli test (#5609)
+ * chore: bump a couple of deps (#5610)
+ * chore(deps): bump CycloneDX/gh-gomod-generate-sbom from 1.0.0 to 1.1.0 (#5601)
+ * feat: add cleanup handler (#5576)
+ * chore(deps): bump actions/download-artifact from 3.0.0 to 3.0.1 (#5602)
+ * Fix: handling unexpected global-anchor-variable for the apply command (#5590)
+ * chore: bump a couple of deps (#5593)
+ * fix: use lister for CA secret (#5598)
+ * add logging guideline (#5406)
+ * Delete category all from CRDs (#5557)
+ * refactor: update otlp packages (#5367)
+ * chore: bump flux action (#5578)
+ * chore(deps): bump aquasecurity/trivy-action from 0.2.3 to 0.8.0 (#5584)
+ * fix: replace + symbol with _ symbol on the Chart.Version field (#5591)
+ * chore(deps): bump helm/chart-testing-action from 2.0.1 to 2.3.1 (#5586)
+ * chore(deps): bump rajatjindal/krew-release-bot from 0.0.38 to 0.0.43 (#5588)
+ * chore(deps): bump ossf/scorecard-action from 2.0.4 to 2.0.6 (#5587)
+ * chore(deps): bump actions/setup-go from 2.1.5 to 3.4.0 (#5585)
+ * chore(deps): bump actions/setup-python from 2.3.1 to 4.3.0 (#5562)
+ * chore(deps): bump sonarsource/sonarcloud-github-action from 1.7 to 1.8 (#5563)
+ * chore(deps): bump codecov/codecov-action from 2.1.0 to 3.1.1 (#5573)
+ * chore(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc (#5559)
+ * adding --warn-exit-code flag (#5577)
+ * feat: add cleanup controller BYOSA and RBAC extensions (#5580)
+ * chore(deps): bump goreleaser/goreleaser-action from 2.8.0 to 3.2.0 (#5572)
+ * chore(deps): bump golang.org/x/text from 0.4.0 to 0.5.0 (#5574)
+ * chore(deps): bump JasonEtco/create-an-issue from 2.8.0 to 2.8.1 (#5571)
+ * chore: disable dependabot auto rebase (#5567)
+ * chore(deps): bump go.uber.org/zap from 1.23.0 to 1.24.0 (#5560)
+ * refactor: jmespath arithmetic operations (#5544)
+ * chore(deps): bump golangci/golangci-lint-action from 3.2.0 to 3.3.1 (#5561)
+ * chore(deps): bump actions/checkout from 2.4.0 to 3.1.0 (#5564)
+ * chore(deps): bump actions/cache from 3.0.8 to 3.0.11 (#5565)
+ * refactor: cli test command (#5550)
+ * refactor: cli jp command (#5552)
+ * add Wayfair to adopters (#5547)
+ * Kyverno CLI: added method to detect duplicate resource in kyverno test (#3612)
+ * To support gitURLs for "apply" command (#4502)
+ * issue-4613: Add support for cache enhancements with informers (#5484)
+ * chore(deps): bump stefanprodan/helm-gh-pages from 1.5.0 to 1.7.0 (#5534)
+ * chore(deps): bump zgosalvez/github-actions-ensure-sha-pinned-actions (#5532)
+ * chore(deps): bump github/codeql-action from 1.0.26 to 2.1.35 (#5536)
+ * bump slsa GH generator to 1.4.0 (#5530)
+ * chore(deps): bump actions/upload-artifact from 3.1.0 to 3.1.1 (#5535)
+ * chore(deps): bump sigstore/cosign-installer from 2.8.0 to 2.8.1 (#5533)
+ * chore: enable dependabot (#5531)
+ * refactor: make policy context immutable and fields private (#5523)
+ * configure opentelemetry logger (#5513)
+ * feat: support attestations with multiple signatures (#5409)
+ * fix: bug in report resource watcher (#5525)
+ * Adding Rafay Systems to Kyverno Adopters list. (#5524)
+ * feat: Add default CI test values for helm charts (#5518)
+ * feat(policies chart): Add ability to set autogen behavior (#5517)
+ * fix: cleanup policy validation (#5514)
+ * fix: pod anti affinity (#5516)
+ * chore: improve cleanup controller (#5509)
+ * feat: use admission review v1 (#5464)
+ * refactor: use internal cmd package in kyverno (#5507)
+ * chore: bump a few deps (#5512)
+ * chore: stop using set-output in gh actions (#5500)
+ * refactor: add controller helper to internal package (#5506)
+ * chore: use builtin slices.Clone (#5510)
+ * feat: add webhook type to admission metrics (#5493)
+ * feat: propagate context to dynamic client (#5495)
+ * chore: bump a couple of deps (#5503)
+ * feat: add controller metrics (#5494)
+ * fix: panic when response is nil (#5502)
+ * fix: report deletion fighting with garbage collection (#5486)
+ * feat: add dynamic client support to internal cmd package (#5477)
+ * Migrate all mutate e2e tests to kuttl and expand (#5491)
+ * chore: replace utils.ContainsString with builtin slices.Contains (#5496)
+ * fix: add image extractor for ReplicationController (#5497)
+ * refactor: move metrics closer to the code that use them (#5492)
+ * chore: refactor metrics namespace check (#5489)
+ * Migrate validate e2e tests to kuttl tests (#5483)
+ * Fix: handled skip rule processing in anyPattern field (#5191)
+ * feat: propagate context to the metrics package (#5479)
+ * fix: fix mutating the "/metadata/serverAddress" section of a keda.s/v1alpha1/ScaledObject object (#5374)
+ * feat: add allowed label to admission metrics (#5478)
+ * chore: bump kyverno version in argo lab (#5482)
+ * fix: typo in autogen package (#5480)
+ * chore: improve tracing instrumented clients (#5474)
+ * refactor: metrics configuration code (#5475)
+ * feat: create a policy utils package (#5473)
+ * Add reconciling logic for creating cronjobs whenever a new cleanup policy is created (#5385)
+ * feat: add new filtering handlers (#5472)
+ * fix: remove filtering for policy admission handlers (#5462)
+ * fix: add clone check before validating namespace policy (#5459)
+ * fix: issue when calling kustomize concurrently (#5465)
+ * feat: support flagsets in internal cmd package (#5461)
+ * chore: add instrumented clients codegen verification (#5460)
+ * fix: reading policies for oci command and pushing image (#5435)
+ * fix: admission reports stacking up (#5457)
+ * docs: add controllers README (#5434)
+ * fix: log watcher error in reports controller (#5449)
+ * ci: cancel redundant builds of workflow on push (#5427)
+ * feat: use client funcs from internal cmd package (#5443)
+ * docs: add reports troubleshooting tips (#5448)
+ * fix: argocd lab monitoring namespace (#5446)
+ * fix: mutate existing policy does not get applied when background=false (#5439)
+ * feat: add signal in internal cmd package (#5444)
+ * feat: improve handlers tracing code (#5442)
+ * chore: bump a bunch of deps (#5440)
+ * feat: add logging support to instrumented clients (#5438)
+ * feat: add discovery support in instrumented clients (#5437)
+ * refactor: dynamic client use instrumented clients (#5436)
+ * fix request.operation in globalValues is always set to CREATE (#5423)
+ * chore: remove obsolete metrics client code (#5401)
+ * refactor: improve instrumented clients code and support dynamic/metadata client (#5428)
+ * refactor: split argocd lab into multiple steps (#5410)
+ * Fix multi attestor keyless (#5432)
+ * Handle Match resources kind (#5421)
+ * udpate slsa to v1.3.0 (#5419)
+ * chore: bump sigstore deps (#5376)
+ * fix blank lines in crds (#5422)
+ * refactor: improve instrumented clients creation (#5417)
+ * logging action (#5416)
+ * adding --audit-warn flag (#5321)
+ * Update version drop-downs; bump Trivy (#5425)
+ * Add most basic kuttl tests for generate rules, clone and sync (#5413)
+ * fix: typo (#5415)
+ * feat: make traces better (#5412)
+ * refactor: introduce cmd internal package (#5404)
+ * refactor: generated instrumented client code part 2 (#5398)
+ * feat: add tracing middleware (#5397)
+ * Fixed issue-3709: Image verify rule gives error for non-existing configmap (#5272)
+ * add os.Exit (#5402)
+ * Complete all basic kuttl tests for generate rules, clone and no-sync (#5400)
+ * refactor: generate instrumented client code (#5362)
+ * refactor: propagate context through admission handlers (#5392)
+ * refactor: improve tracing package (#5391)
+ * [Bug]: Fix wildcard any/all issue (#5387)
+ * Fix incorrect step ID reference (#5388)
+ * fix the entry length validation for the verify image rule (#5384)
+ * Add more kuttl generate test cases (#5364)
+ * fix: set correct logger in profiling server (#5358)
+ * fix closed watchers in the resource-report-controller (#5350)
+ * fix: set logger in metrics server (#5319)
+ * fixed dryrun option to handle changes caused by mutating policy (#4899)
+ * fix: add validation for generate namespace policy (#5346)
+ * chore: add tempo to argocd lab (#5365)
+ * chore: add performance tests tool (#5241)
+ * fix: panic when disable metrics is true (#5366)
+ * feat: add CleanupPolicy validation code to CleanupPolicyHandler (#5338)
+ * test: simplify autogen kuttl tests (#5343)
+ * chore: enable json logs in argocd lab (#5349)
+ * fix digest variable (#5356)
+ * chore: add helm ci values with cleanup controller (#5357)
+ * fix: add some missing options in cleanup helm chart (#5351)
+ * add test cases for yaml verification feature (#5326)
+ * refactor: optimise and use kuttl TestStep with tests (#5328)
+ * test: add rbac kuttl test (#5337)
+ * Update SLSA generator workflow to v1.2.2 (#5323)
+ * test: add kuttl debug failure (#5339)
+ * fix: add replicaset and replicationController kinds in podsecurity validation (#5336)
+ * feat: add cleanup controller to helm chart (#5329)
+ * chore: remove docker support (#5324)
+ * chore: add cli binary to gitignore (#5331)
+ * test: add test to check expected webhooks are created (#5330)
+ * feat: add cleanup controller makefile targets (#5327)
+ * feat: add replicaset and replicationcontroller to autogen (#4975)
+ * feat: add cleanupPolicy validation code (#5279)
+ * fix: synchronize source resource update to clone list resource (#5317)
+ * allow list with policies in test (#5227)
+ * test: add kuttl tests for jmespath special chars (#5310)
+ * Fix issue where CLI test command ignores failures (#5189)
+ * fix: wrong logger used (#5311)
+ * fix: send notification when stoping watching resource in reports system (#5298)
+ * fix: add parsing of json pointers to support special chars (#3578 #3616) (#4767)
+ * fix: set rule response status as skip if precondition failed (#5162)
+ * Update kuttl test scaffolding (#5303)
+ * fix: reduce startup probe delay (#5296)
+ * tests: add kuttl tests for multiple clone generate (#5280)
+ * fix: allow delete of clone target resource with synchronize false (#5161)
+ * fix: image extractor kuttl tests (#5293)
+ * fix: check policy is ready in kuttl tests (#5286)
+ * fix: kuttl test external-service (#5287)
+ * chore: update kuttl (#5285)
+ * fix: make zapr compatible with klog's -v argument (#5166)
+ * feat: add flag to control leader election frequency (#5172)
+ * refactor: admission metrics (counter and latency) (#5245)
+ * fix: resource schema validation in policies under any/all match (#5246)
+ * fix: keep admission warnings (#5269)
+ * add test instructions (#5271)
+ * chore: add kuttl autogen tests (#5253)
+ * fix: add missing test suite to kuttl (#5268)
+ * fix: account for error rules in mutation webhook (#5264)
+ * refactor: admission response utils (#5234)
+ * feat: create cleanup new CRDs (#5233)
+ * chore: remove old conformance tests files (#5260)
+ * fix: add warning when using deprecated validation failure action (#5219)
+ * Kuttl updates (#5257)
+ * chore: use conditions in kuttl tests to check ready policies (#5252)
+ * chore: add kuttl in makefile (#5254)
+ * More kuttl tests (#5238)
+ * fix: remove unused code in config (#5242)
+ * feat: separate webhook rules per GVK/rule (#4986)
+ * fix: kyverno Dockerfile base image tag and sha256 hash (#5248)
+ * refactor: move all middlewares in handlers sub package (#5244)
+ * fix generateName mutation (#5146)
+ * Fix Keda policy installation issue (#5239)
+ * fix: remove /approve from prow actions (#5243)
+ * [Feature] Pin Dependencies by Hash (#5168)
+ * chore: add loki to argocd lab (#5231)
+ * Fixed description for secret name (#5228)
+ * feat: add grafana dashboard to helm chart (#5230)
+ * add remainder of e2e verifyImages tests (#5229)
+ * add kuttl tests (#5204)
+ * [BUG] Fix foreach deletion issue (#5224)
+ * feat: add policy label to policy reports (#5198)
+ * fix: too much information for the Policy Rule Execution Latency metric (#5208)
+ * chore: server side apply in argo lab (#5209)
+ * refactor: health check system (#5176)
+ * fix: early return in policy validation (#5200)
+ * feat: support disabling schema validation on the patched resource (#5197)
+ * fix: deletion of reports not belonging to kyverno (#5194)
+ * Helm chart: add extraCRDAnnotations value and set ArgoCD sync option by default (#4964)
+ * refactor: remove policyreport package (#5174)
+ * fix: use pagination to aggregate reports (#5190)
+ * fix: check resource version on update notification (#5179)
+ * fix: do not cancel context when loosing the lead (#5180)
+ * chore: add kind config file (#5178)
+ * fix: content type in log (#5177)
+ * feat: run leader election in loop (#5173)
+ * refactor: support Audit and Enforce validation failure actions (#5152)
+ * Corrected Kubernetes spelling (#5134)
+ * fix 5151 issue (#5170)
+ * Add ability to use commands in comments (#5154)
+ * fix: configure klog and global logger to use zapr in json mode (#5144)
+ * feature: SLSA Level 3 provenance generation for Kyverno images: kyverno init, kyverno and kyvernopre (#4268)
+ * Fixed issue-5102: Show rule count and type in output (#5106)
+ * skip generating events on empty rule response (#5158)
+ * reset resource version on update (#5157)
+ * fix: mutation policy inconsistent patching for ephemeralContainers (#5121)
+ * feat: remove policy mutation for auto-gen rules (#5123)
+ * chore: remove old docs (#5130)
+ * fix finalizers mutation with patchesJson6902 (#5132)
+ * Add AGE in printer columns of CRDs (#5119)
+ * feat: oci pull/push support for policie(s) (#5026)
+ * feat: add categories support to our CRDs (#5112)
+ * Remove old version of golang.org/x/sys (#5125)
+ * fix: conformance tests (#5118)
+ * [Feature] create command line option to set failurePolicy globally (#4991)
+ * clean conformance (#5089)
+ * feat: enable/disable Debug mode which shows entire AdmissionReview payload (#5024)
+ * docs: separate dev and user docs (#5114)
+ * ci: Fix install manifests publishing with Flux (#5110)
+ * fix: use correct side effects in validating webhooks (#5080)
+ * refactor: simplify variables regex (#5075)
+ * feat: add flag to configure the number of background scan workers (#5088)
+ * fix: allow delete of target resource with synchronize false (#5081)
+ * ci: Use the Docker login action for GHCR auth (#5091)
+ * fix: handle resource cleanup when policy is deleted (#5021)
+ * test: add best practices policies in conformance tests (#5082)
+ * fix: use correct logger in webhook controller (#5083)
+ * feat: add simple conformance tests (#5073)
+ * fix: make reponse order predictable (#5079)
+ * added apiCalls support in kyverno-apply command (#4938)
+ * feat: add webhook server logger (#5063)
+ * fix: configure idle timeout in server (#5062)
+ * fix: image verification reports missing in admission mode (#5037)
+ * fix: setup max procs with correct logger (#5059)
+ * fix: detection of kyverno going down (#5055)
+ * fix: do not update reports when they are identical (#5056)
+ * fix: go routines not gracefully shut down in controllers (#5022)
+ * fix: account for policy/rule deletion in aggregated reports (#5048)
+ * Created configuration file for Openssf scorecard (#4778)
+ * feat: add image verification support to background scan (#5047)
+ * feat: add controller logger helper (#5029)
+ * fix env (#5046)
+ * fix: lease log message (#5030)
+ * feat: make shutdown more graceful (#5031)
+ * fix: lower default qps/burst (#5034)
+ * fix: Attempt to fix the CI failure, extract CI job push-sign-install-manifest (#5035)
+ * Fixed issue-4655: verifyImages is executed before mutate (#4996)
+ * fix: add more infos in reports printers (#5027)
+ * Enable adding annotations to configmaps in the helm chart (#4984)
+ * validate patchJSON6902 (#4469)
+ * remove RBACInfo check (#5015)
+ * fix: policy not denied when kinds set is empty (#5016)
+ * fix: global anchor warning (#4962)
+ * fix: don't process non background policies in background scan (#5008)
+ * fix: update policy status (#5006)
+ * fix: use default retry with retryfunc for a conflict (#4973)
+ * updates with case insensitivity guarantee (#4954)
+ * refactor: add update status helper (#4985)
+ * fix principal and role variables are not substituted (#5000)
+ * fix: skip admission in dry run requests (#4994)
+ * fix: webhooks not registering when using name override (#4992)
+ * feat: add metrics server and kube-prometheus-stack to argocd lab (#4995)
+ * feat: add startup probes support (#4896)
+ * feat: add policy-reporter to argocd lab (#4988)
+ * docs: add resource exclusions note in helm docs (#4989)
+ * chore: add myself in approvers (#4990)
+ * feat: Add container registry setting on Helm Chart (#4281)
+ * fix: config reloading not working correctly (#4951)
+ * fix: missing autogen rules in status (#4971)
+ * fix: add user info in admission request logs (#4969)
+ * fix: don't produce empty admission reports (#4966)
+ * fix: improve banned types management in reports (#4953)
+ * fix: missing watchers in resource report controller (#4967)
+ * chore: Push and sign install manifests to GHCR (#4895)
+ * Fixed issue-4530: Added separate attestor type for secrets and KMS (#4733)
+ * fix: admission reports printer (#4950)
+ * chore: bump a few deps (#4943)
+ * Added support to specify key signature algorithm in verifyImages (#4855)
+ * fix: don't report ready until certs are valid (#4934)
+ * Update issue templates and scan for vulns action (#4952)
+ * Fix background scan with request.operation (#4947)
+ * fix: consider generateName when matching resources (#4945)
+ * fix: probes should work in debug mode (#4926)
+ * fix: set operation in context when necessary (#4940)
+ * chore: add COSIGN_REPOSITORY env to ko-publish-dev step (#4922)
+ * fix: panic when bad variable substitution (#4928)
+ * feat: make cert renewer private and add server name support (#4904)
+ * chore: bump a couple of deps (#4925)
+ * [Cleanup] Disable PolicySkipped events (#4913)
+ * add filter for validation policies when ValidationFailureActionOverrides is used (#4809)
+ * chore: update controller-tools to v0.10.0 (#4918)
+ * fix: use constants defined in openapi controller (#4919)
+ * chore: signing helm releases (#4801)
+ * fix: openapi controller discovery (#4912)
+ * refactor: openapi controller part 2 (#4910)
+ * fix: clean background scan reports (#4908)
+ * fix: don't specify rules when aggregationRule is set (#4867)
+ * refactor: openapi controller part 1 (#4901)
+ * fix: remove unnecessary dependencies from tls package (#4903)
+ * fix: reduce webhook controller logs (#4897)
+ * chore: add argocd lab (#4884)
+ * refactor: manage webhooks with webhook controller (#4846)
+ * fix: auto gen enabled when using names (#4863)
+ * fix: non watchable resources in report controller (#4888)
+ * Fix result colour (#4885)
+ * fix: background scan labels (#4865)
+ * fix: hardening policy validation for generate cloneList (#4881)
+ * docs: add section in helm docs to install with argocd (#4878)
+ * fix test output numbering (#4853)
+ * feature: use cert extension oid as key (#4854)
+ * chore: add launch.json for vscode debugging (#4856)
+ * Add workflow to detect and report on image vulns (#4850)
+ * docs: add debug instructions (#4843)
+ * e2e test for mutate policy (#3383)
+ * fix: replace AbsPath with RequestURI to support query params (#4849)
+ * refactor: make cert manager a real controller (#4792)
+ * refactor: add config support to webhook controller (#4838)
+ * feat: use a dedicated policy metrics controller (#4818)
+ * chore: bump a couple of deps (#4842)
+ * Update PSa images dsecription (#4840)
+ * refactor: leader controllers management (#4832)
+ * fix extension checks (#4836)
+ * fix: call depth in logging package and global logger support for call depth (#4834)
+ * upgrade controller-runtime dependency (#4829)
+ * refactor: non leader controllers management (#4831)
+ * refactor: make tls cert func not depending on cert controller (#4820)
+ * fix: use new client in tls package (#4746)
+ * fix: debug mode (#4785)
+ * fix: add policy validation for ValidationFailureActionOverride field (#4784)
+ * update helm doc
+ * Fix CRD format issue
+ * Bump k8s libraries to v0.25.2
+ * Fix PSa the control name validation
+ * fix: validationFailureAction default value (#4822)
+ * refactor: split main into sub funcs (#4821)
+ * chore: use concurrent map v2 (generics) (#4803)
+ * fix: controllers start in loop (#4815)
+ * refactor: split main into sub func (#4810)
+ * feat: add context support to leader election (#4811)
+ * feat: add context funcs to logging package (#4812)
+ * skip succeed rules when building the blocked return message (#4804)
+ * fix: subject and issuer validation when attestations are present (#4786)
+ * refactor: split main func for metrics (#4796)
+ * fix: remove error prone debug field (#4794)
+ * chore: bump a couple of deps (#4802)
+ * refactor: split main into funcs (#4795)
+ * fix: logger panic (#4793)
+ * fix: publish yaml manifests in release instead of repo (#4738)
+ * fix: remove explicit wait for cache sync (#4791)
+ * Add security context and resource block to test (#4712)
+ * fix: new cert manager controller never returns error (#4789)
+ * chore: bump a few deps (#4790)
+ * refact:update script of generate-self-signed-cert-and-k8secrets.sh to supports custom namespace (#4758)
+ * refactor: introduce webhook controller (#4749)
+ * fix: remove reference to controller runtime log (#4779)
+ * refactor: more context less chans (#4764)
+ * Fix: Typo in x509_decode JMESPath function's note (#4773)
+ * fix: add workers to the controller interface (#4776)
+ * update cosign and k8s-manifest-sigstore (#4781)
+ * chore: change charts registry url (#4768)
+ * add package logger in files (#4766)
+ * fix: parse flags error handling (#4775)
+ * refactor: make server owner of the cleanup chan (#4765)
+ * refactor: use context in openapi controller (#4760)
+ * refactor: use context in controllers instead of chan (#4761)
+ * refactor: use context in dynamic client instead of chan (#4756)
+ * refactor: move from io/ioutil to io and os packages (#4752)
+ * refactor: split main in a couple of funcs and use local loggers (#4754)
+ * fix: helm self signed cert (#4745)
+ * add and use package level logger (#4750)
+ * fix: watch error in resource controller (#4751)
+ * chore: use constant in cert manager controller (#4747)
+ * feat: add typed client support and metrics wrapper (#4724)
+ * chore: speed up helm docs gen on mac (#4742)
+ * fix: reports not generated (#4743)
+ * feat: allow users enable JSON logging with a --loggingFormat=json flag (#4661)
+ * fix: use a single leader election (#4722)
+ * fix: containerd dependency vulnerability (#4629)
+ * Add PSa policy validations (#4735)
+ * Added `x509_decode` JMESPath function (#4664)
+ * feat: add matchlabel selector support with multiple clone (#4713)
+ * docs: add policy cache controller docs (#4714)
+ * fix: output make messages to stderr (#4727)
+ * feat: reports v2 implementation (#4608)
+ * Support PSa integration by `controlName` only (#4710)
+ * chore: update client code generator (#4711)
+ * chore: group unit and cli tests targets and separate sections (#4693)
+ * fix: remove deprecation notice (#4635)
+ * chore: enable overriding images repo (#4694)
+ * fix: change key used in test (#4718)
+ * chore: refactor manifests related makefile targets (#4706)
+ * fix: missing client wrapper (#4703)
+ * refactor: use pod name as leader id (#4680)
+ * fix: split webhook handlers per failure policy (#4650)
+ * fix: shutdown controllers workers gracefully (#4681)
+ * fix: namespaced policy targets namespace validation and scoping them to the policy's namespace (#4671)
+ * refactor: replace signal package by signal.NotifyContext (#4691)
+ * fix: jmespath random error handling (#4697)
+ * chore: simplify go mod (#4692)
+ * fix: bump net standard lib (#4685)
+ * fix: handle auth permission for cloneList validation (#4684)
+ * fix: namespaced policy not validated in engine (#4653)
+ * chore: bump minimum go version (#4677)
+ * Fix issue for wildcard versions (#4670)
+ * chore: publish sbom result to a different repositry from an image (#4665)
+ * added kubeconfig and context flag to kyverno apply (#4524)
+ * feat: add feature flag to disable background scan (#4638)
+ * feat: add explicit key support to controller utils (#4628)
+ * refactor: update log based on the policy types (#4646)
+ * refactor: split policyreport api files (#4641)
+ * fix: missing elements in v2beta1 api (#4654)
+ * refactor: add a couple of constants in api (#4640)
+ * feat: introduce RCR interface (#4642)
+ * fix: incorrect namespace in report controller (#4637)
+ * fix: remove RCR from mutation webhook (#4636)
+ * feat: add controller utils tools (#4639)
+ * chore: bump cosign 1.12.0 to fix vulnerabilities (#4631)
+ * chore: add makefile target to deploy metrics server (#4627)
+ * chore: add target to deploy policy reporter (#4621)
+ * Integrate Sonarcloud and Nancy github action (#3491)
+ * fix: background printer column (#4617)
+ * enhance jmespath random-filter (#4591)
+ * fix: lock in policy report mapper (#4601)
+ * refactor: simplify RCR creator queue (#4578)
+ * chore: add messages in makefile kind targets (#4588)
+ * refactor: info in policyreport package (#4598)
+ * Fix multiple crd slowness issue (#4275)
+ * update helm releases path (#4596)
+ * enable autogen for validate.podsecurity with no exclude (#4594)
+ * chore: add a codegen-quick makefile target (#4583)
+ * chore: switch to github.com/IGLOU-EU/go-wildcard (#4563)
+ * allow PSa validation with no exceptions (#4558)
+ * fix: typo (#4582)
+ * fix: split policy report flag (#4576)
+ * update version drop-down (#4579)
+ * chore: add toggle package unit tests (#4577)
+ * chore: preserve pr title in cherry picks (#4573)
+ * refactor: move generation handler out of webhooks package (#4570)
+ * refactor: move image verification handler out of webhooks package (#4569)
+ * refactor: move mutation handler out of webhooks package (#4567)
+ * refactor: move validation audit out of webhooks package (#4562)
+ * chore: add kocache (#4482)
+ * docs: add help on fetching tags (#4560)
+ * refactor: move validation handler out of webhooks package (#4556)
+ * refactor: make webhook metrics helpers static (#4554)
+ * add new patterns for releases (#4552)
+ * refactor: move webhook events utils in utils package (#4545)
+ * chore: add unit test for updating ur status (#4541)
+ * fix: defer ur update until validation passes (#4540)
+ * refactor: introduce ur updater (#4535)
+
+-------------------------------------------------------------------
Tue Dec 20 12:22:22 UTC 2022 - kastl@b1-systems.de
- Update to version 1.8.5:
diff --git a/packages/k/kyverno/kyverno.spec b/packages/k/kyverno/kyverno.spec
index 2d6084f..2330f67 100644
--- a/packages/k/kyverno/kyverno.spec
+++ b/packages/k/kyverno/kyverno.spec
@@ -1,7 +1,7 @@
#
# spec file for package kyverno
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: kyverno
-Version: 1.8.5
+Version: 1.9.0
Release: 0
Summary: CLI and kubectl plugin for Kyverno
License: Apache-2.0
diff --git a/packages/k/kyverno/vendor.tar.gz b/packages/k/kyverno/vendor.tar.gz
index 60c52bc..e8a19ec 120000
--- a/packages/k/kyverno/vendor.tar.gz
+++ b/packages/k/kyverno/vendor.tar.gz
@@ -1 +1 @@
-/ipfs/bafybeiarj5h5imfhlg6dmyuwnpgg5sqzhfbbyo2oaewctahaownktrygke
\ No newline at end of file
+/ipfs/bafybeidsxrzwyrg3vfierp2m7y7bris3djcgg2tfnqwyzm3x3i7dufgocq
\ No newline at end of file
diff --git a/packages/libb/libbobcat/.files b/packages/libb/libbobcat/.files
index 14796a2..5edd620 100644
Binary files a/packages/libb/libbobcat/.files and b/packages/libb/libbobcat/.files differ
diff --git a/packages/libb/libbobcat/.rev b/packages/libb/libbobcat/.rev
index 9d87d1b..440a298 100644
--- a/packages/libb/libbobcat/.rev
+++ b/packages/libb/libbobcat/.rev
@@ -8,4 +8,19 @@
* Add conflicts between libbobcat-devel and libbobcat-light-devel
1033082
+
+ af010ca539d63659263be2c09dcaa5d0
+ 6.02.02
+
+ dimstar_suse
+ - update to 6.02.02:
+ * Accidentally the ArgConfig header file included ../arg/arg instead of
+ <bobcat/arg> causing compilation failures of files including
+ <bobcat/argconfig>. Fixed in this release.
+ * The singleton classes Arg, ArgConfig, ReadLineHistory, and Signal now
+ return their allocated memory when programs using them end.
+ * Rewrote ReadLineHistory.
+ * Repaired the linking option specifications in the ReadLine* man-pages.
+ 1062357
+
diff --git a/packages/libb/libbobcat/bobcat-6.02.00.tar.bz2 b/packages/libb/libbobcat/bobcat-6.02.00.tar.bz2
deleted file mode 120000
index 02ff922..0000000
--- a/packages/libb/libbobcat/bobcat-6.02.00.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiazodvjzmlxsi2useml6tj57mkfrmhb7ld3wqcf5wxfcpfy7jxgue
\ No newline at end of file
diff --git a/packages/libb/libbobcat/bobcat-6.02.02.tar.gz b/packages/libb/libbobcat/bobcat-6.02.02.tar.gz
new file mode 120000
index 0000000..cc0f11e
--- /dev/null
+++ b/packages/libb/libbobcat/bobcat-6.02.02.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeihlgb2t3uwzhsvfvfqce7g7q3osgxssyj44bjiaws54a3olfty3si
\ No newline at end of file
diff --git a/packages/libb/libbobcat/libbobcat.changes b/packages/libb/libbobcat/libbobcat.changes
index 97397af..f193b62 100644
--- a/packages/libb/libbobcat/libbobcat.changes
+++ b/packages/libb/libbobcat/libbobcat.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Feb 1 00:11:54 UTC 2023 - Dirk Müller
+
+- update to 6.02.02:
+ * Accidentally the ArgConfig header file included ../arg/arg instead of
+ causing compilation failures of files including
+ . Fixed in this release.
+ * The singleton classes Arg, ArgConfig, ReadLineHistory, and Signal now
+ return their allocated memory when programs using them end.
+ * Rewrote ReadLineHistory.
+ * Repaired the linking option specifications in the ReadLine* man-pages.
+
+-------------------------------------------------------------------
Thu Nov 3 13:11:56 UTC 2022 - Valentin Lefebvre
- Remove unecessary Provides
diff --git a/packages/libb/libbobcat/libbobcat.spec b/packages/libb/libbobcat/libbobcat.spec
index 7946902..ca22818 100644
--- a/packages/libb/libbobcat/libbobcat.spec
+++ b/packages/libb/libbobcat/libbobcat.spec
@@ -1,7 +1,7 @@
#
-# spec file for package libbobcat
+# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%global _name bobcat
%global _lib_name lib%{_name}
%global _lib_version 6
@@ -27,13 +28,13 @@
%endif
Name: %{_lib_name}%{?psuffix}
-Version: 6.02.00
+Version: 6.02.02
Release: 0
Summary: Shared library implementing C++ classes that are frequently used
License: GPL-3.0-only
Group: Development/Tools/Building
URL: https://gitlab.com/fbb-git/bobcat
-Source0: %{_name}-%{version}.tar.bz2
+Source0: https://gitlab.com/fbb-git/bobcat/-/archive/%{version}/bobcat-%{version}.tar.gz
Source1: initialbobcatlib
%if "%{name}" == "%{_lib_name}-light"
BuildRequires: the_silver_searcher
@@ -50,15 +51,15 @@ BuildRequires: yodl
BuildRequires: gcc-c++
%package devel-static
+Summary: Bobcat static library
+Group: Development/Libraries/C and C++
%if "%{name}" == "%{_lib_name}-light"
Conflicts: %{_lib_name}-devel
Conflicts: %{_lib_name}-devel-static
%endif
-Summary: Bobcat static library
-Group: Development/Libraries/C and C++
%if "%{name}" == "%{_lib_name}"
-Requires: %{_lib_name}-devel = %{version}
+Requires: %{_lib_name}-devel = %{version}
%description
Bobcat is an acronym of `Brokken's Own Base Classes And Templates'. It is a
@@ -79,9 +80,9 @@ developed by Frank Brokken. All of Frank's C++ programs hosted at GitLab
depend on `bobcat'.
%package devel
-Summary: Headers and documentation for the Bobcat library
-Group: Development/Libraries/C and C++
-Requires: %{_lib_name}%{_lib_version} = %{version}
+Summary: Headers and documentation for the Bobcat library
+Group: Development/Libraries/C and C++
+Requires: %{_lib_name}%{_lib_version} = %{version}
%description devel
Headers and documentation of classes defined in the Bobcat library.
@@ -129,13 +130,11 @@ popd
%postun -n%{_lib_name}%{_lib_version} -p /sbin/ldconfig
%files -n %{_lib_name}%{_lib_version}
-%defattr(-,root,root)
%doc README
%{_libdir}/%{_lib_name}.so.%{_lib_version}
%attr(755, -, -) %{_libdir}/%{_lib_name}.so.%{version}
%files devel
-%defattr(-,root,root)
%{_libdir}/%{_lib_name}.so
%doc %{_docdir}/%{_lib_name}%{_lib_version}-devel/
%{_includedir}/%{_name}/
diff --git a/packages/libh/libhandy/.files b/packages/libh/libhandy/.files
index 568f4a7..b1a0180 100644
Binary files a/packages/libh/libhandy/.files and b/packages/libh/libhandy/.files differ
diff --git a/packages/libh/libhandy/.rev b/packages/libh/libhandy/.rev
index e74ecbc..9b5bb63 100644
--- a/packages/libh/libhandy/.rev
+++ b/packages/libh/libhandy/.rev
@@ -232,4 +232,12 @@
1004820
+
+ 03f671e9481b664c7f26c823ae40e441
+ 1.8.1
+
+ dimstar_suse
+
+ 1062484
+
diff --git a/packages/libh/libhandy/libhandy-1.8.0.tar.xz b/packages/libh/libhandy/libhandy-1.8.0.tar.xz
deleted file mode 120000
index 05bb16a..0000000
--- a/packages/libh/libhandy/libhandy-1.8.0.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicwy3n2rupxzh6sj4xmscnrhrhdpzq2cjb5ey5gtw5fzopk5n7vim
\ No newline at end of file
diff --git a/packages/libh/libhandy/libhandy-1.8.1.tar.xz b/packages/libh/libhandy/libhandy-1.8.1.tar.xz
new file mode 120000
index 0000000..00a4ea0
--- /dev/null
+++ b/packages/libh/libhandy/libhandy-1.8.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiaqdkegnkr5xj6i4dzxraylw3avjhzuf6hm2gwvxmyoggixu25haq
\ No newline at end of file
diff --git a/packages/libh/libhandy/libhandy.changes b/packages/libh/libhandy/libhandy.changes
index dedca2c..e86b1eb 100644
--- a/packages/libh/libhandy/libhandy.changes
+++ b/packages/libh/libhandy/libhandy.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Feb 1 13:27:38 UTC 2023 - Bjørn Lie
+
+- Update to version 1.8.1:
+ + Fix double click handling for HdyWindowHandle and HdyHeaderBar.
+ + Updated translations.
+
+-------------------------------------------------------------------
Thu Sep 15 14:31:13 UTC 2022 - Bjørn Lie
- Update to version 1.8.0:
diff --git a/packages/libh/libhandy/libhandy.spec b/packages/libh/libhandy/libhandy.spec
index 7fdb5eb..7e53b14 100644
--- a/packages/libh/libhandy/libhandy.spec
+++ b/packages/libh/libhandy/libhandy.spec
@@ -1,7 +1,7 @@
#
# spec file for package libhandy
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
%define with_glade 1
Name: libhandy
-Version: 1.8.0
+Version: 1.8.1
Release: 0
Summary: A GTK+ library to develop UI for mobile devices
License: LGPL-2.1-or-later
diff --git a/packages/libh/libheif/.files b/packages/libh/libheif/.files
index d178399..63ff9c0 100644
Binary files a/packages/libh/libheif/.files and b/packages/libh/libheif/.files differ
diff --git a/packages/libh/libheif/.rev b/packages/libh/libheif/.rev
index f0f82dd..810c1a4 100644
--- a/packages/libh/libheif/.rev
+++ b/packages/libh/libheif/.rev
@@ -113,4 +113,12 @@
1060990
+
+ 2ed8529f90672540a231e590b642364e
+ 1.14.2
+
+ dimstar_suse
+
+ 1062466
+
diff --git a/packages/libh/libheif/2ca02a128b2f76f7f293aa86a2ce1e04a8306c65.patch b/packages/libh/libheif/2ca02a128b2f76f7f293aa86a2ce1e04a8306c65.patch
new file mode 100644
index 0000000..57ae801
--- /dev/null
+++ b/packages/libh/libheif/2ca02a128b2f76f7f293aa86a2ce1e04a8306c65.patch
@@ -0,0 +1,22 @@
+From 2ca02a128b2f76f7f293aa86a2ce1e04a8306c65 Mon Sep 17 00:00:00 2001
+From: Dirk Farin
+Date: Sat, 21 Jan 2023 13:29:27 +0100
+Subject: [PATCH] fixed typo (#745)
+
+---
+ libheif/plugins/heif_encoder_svt.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libheif-1.14.2/libheif/plugins/heif_encoder_svt.cc
+===================================================================
+--- libheif-1.14.2.orig/libheif/plugins/heif_encoder_svt.cc
++++ libheif-1.14.2/libheif/plugins/heif_encoder_svt.cc
+@@ -639,7 +639,7 @@ struct heif_error svt_encode_image(void*
+ svt_config.matrix_coefficients = static_cast(nclx->get_matrix_coefficients());
+ svt_config.color_range = nclx->get_full_range_flag() ? EB_CR_FULL_RANGE : EB_CR_STUDIO_RANGE;
+ #else
+- svt_config.color_primaries = static_cast(nclx->colour_primaries);
++ svt_config.color_primaries = static_cast(nclx->color_primaries);
+ svt_config.transfer_characteristics = static_cast(nclx->transfer_characteristics);
+ svt_config.matrix_coefficients = static_cast(nclx->matrix_coefficients);
+ svt_config.color_range = nclx->full_range_flag ? 1 : 0;
diff --git a/packages/libh/libheif/b6812284a2d70f29a5121ec3dbe652da07fdbbb7.patch b/packages/libh/libheif/b6812284a2d70f29a5121ec3dbe652da07fdbbb7.patch
new file mode 100644
index 0000000..a070c47
--- /dev/null
+++ b/packages/libh/libheif/b6812284a2d70f29a5121ec3dbe652da07fdbbb7.patch
@@ -0,0 +1,28 @@
+From b6812284a2d70f29a5121ec3dbe652da07fdbbb7 Mon Sep 17 00:00:00 2001
+From: Dirk Farin
+Date: Fri, 20 Jan 2023 16:21:45 +0100
+Subject: [PATCH] replace internal API with public API (#745)
+
+---
+ libheif/plugins/heif_encoder_svt.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: libheif-1.14.2/libheif/plugins/heif_encoder_svt.cc
+===================================================================
+--- libheif-1.14.2.orig/libheif/plugins/heif_encoder_svt.cc
++++ libheif-1.14.2/libheif/plugins/heif_encoder_svt.cc
+@@ -639,10 +639,10 @@ struct heif_error svt_encode_image(void*
+ svt_config.matrix_coefficients = static_cast(nclx->get_matrix_coefficients());
+ svt_config.color_range = nclx->get_full_range_flag() ? EB_CR_FULL_RANGE : EB_CR_STUDIO_RANGE;
+ #else
+- svt_config.color_primaries = static_cast(nclx->get_colour_primaries());
+- svt_config.transfer_characteristics = static_cast(nclx->get_transfer_characteristics());
+- svt_config.matrix_coefficients = static_cast(nclx->get_matrix_coefficients());
+- svt_config.color_range = nclx->get_full_range_flag() ? 1 : 0;
++ svt_config.color_primaries = static_cast(nclx->colour_primaries);
++ svt_config.transfer_characteristics = static_cast(nclx->transfer_characteristics);
++ svt_config.matrix_coefficients = static_cast(nclx->matrix_coefficients);
++ svt_config.color_range = nclx->full_range_flag ? 1 : 0;
+ #endif
+
+
diff --git a/packages/libh/libheif/libheif.changes b/packages/libh/libheif/libheif.changes
index 5b65cfe..45a9265 100644
--- a/packages/libh/libheif/libheif.changes
+++ b/packages/libh/libheif/libheif.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jan 27 14:32:03 UTC 2023 - Dirk Müller
+
+- add 2ca02a128b2f76f7f293aa86a2ce1e04a8306c65.patch
+ b6812284a2d70f29a5121ec3dbe652da07fdbbb7.patch: (bsc#1206945)
+ * replace internal API with public API and fix typo (Fixes #745)
+
+-------------------------------------------------------------------
Fri Jan 20 14:37:00 UTC 2023 - Arjen de Korte
- Add missing BuildRequires for SVT-AV1 support for Tumbleweed (only
diff --git a/packages/libh/libheif/libheif.spec b/packages/libh/libheif/libheif.spec
index e1d0924..c939004 100644
--- a/packages/libh/libheif/libheif.spec
+++ b/packages/libh/libheif/libheif.spec
@@ -37,6 +37,10 @@ Group: Productivity/Graphics/Other
URL: https://github.com/strukturag/libheif
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source99: baselibs.conf
+# from https://github.com/strukturag/libheif/commit/b6812284a2d70f29a5121ec3dbe652da07fdbbb7.patch
+Patch0: b6812284a2d70f29a5121ec3dbe652da07fdbbb7.patch
+# rebased from https://github.com/strukturag/libheif/commit/2ca02a128b2f76f7f293aa86a2ce1e04a8306c65.patch
+Patch1: 2ca02a128b2f76f7f293aa86a2ce1e04a8306c65.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
diff --git a/packages/libk/libkeccak/.files b/packages/libk/libkeccak/.files
index 1ed4fcd..c37a777 100644
Binary files a/packages/libk/libkeccak/.files and b/packages/libk/libkeccak/.files differ
diff --git a/packages/libk/libkeccak/.rev b/packages/libk/libkeccak/.rev
index 5d94e42..6d34817 100644
--- a/packages/libk/libkeccak/.rev
+++ b/packages/libk/libkeccak/.rev
@@ -48,4 +48,12 @@
956101
+
+ 66574b9a2c017952d598bc0e501f94db
+ 1.3.1.2
+
+ dimstar_suse
+ Automatic submission by obs-autosubmit
+ 1062330
+
diff --git a/packages/libk/libkeccak/libkeccak.changes b/packages/libk/libkeccak/libkeccak.changes
index ffa1bb9..25f564d 100644
--- a/packages/libk/libkeccak/libkeccak.changes
+++ b/packages/libk/libkeccak/libkeccak.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Jan 24 18:11:57 UTC 2023 - Jan Engelhardt
+
+- Override LDFLAGS,LDOPTIMISE to keep debug info.
+
+-------------------------------------------------------------------
Sun Feb 20 08:41:52 UTC 2022 - Andreas Stieger
- update to 1.3.1.2:
diff --git a/packages/libk/libkeccak/libkeccak.spec b/packages/libk/libkeccak/libkeccak.spec
index b308607..aa3bb25 100644
--- a/packages/libk/libkeccak/libkeccak.spec
+++ b/packages/libk/libkeccak/libkeccak.spec
@@ -1,7 +1,7 @@
#
# spec file for package libkeccak
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -64,7 +64,7 @@ A subset of Keccak was specified by NIST as SHA-3 (Secure Hash Algorithm 3).
%autosetup -p1
%build
-%make_build CFLAGS="%optflags"
+%make_build CFLAGS="%optflags" LDFLAGS="" LDOPTIMISE=""
%install
mkdir -p %buildroot%_libdir
diff --git a/packages/libl/liblouis/.files b/packages/libl/liblouis/.files
index 57343de..60df285 100644
Binary files a/packages/libl/liblouis/.files and b/packages/libl/liblouis/.files differ
diff --git a/packages/libl/liblouis/.rev b/packages/libl/liblouis/.rev
index dac588d..fb3502a 100644
--- a/packages/libl/liblouis/.rev
+++ b/packages/libl/liblouis/.rev
@@ -480,4 +480,19 @@ not all subpackages need the full blurb. (forwarded request 530874 from jengelh)
1009286
+
+ b018c0e0763d99c80feb777a9cb4855d
+ 3.24.0
+
+ dimstar_suse
+ - Update to version 3.24.0:
+ + This release contains major updates to Hungarian, UEB, and
+ Chinese bopomofo braille. Danish has been completely reworked
+ and there is now support for the Danish braille standard 2022.
+ There are also some new tables so that liblouis can now
+ generate Georgian computer braille, Swahili (Kenya) and
+ Chichewa (Malawi). Aside from that there is the usual
+ assortment of code cleanups and bug fixes.
+ 1062486
+
diff --git a/packages/libl/liblouis/liblouis-3.23.0.tar.gz b/packages/libl/liblouis/liblouis-3.23.0.tar.gz
deleted file mode 120000
index 8d4989b..0000000
--- a/packages/libl/liblouis/liblouis-3.23.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicpjgbcb3wlvekfigy5sa634fnpedgucvwd7kxtrxyd4x3lv3r7qq
\ No newline at end of file
diff --git a/packages/libl/liblouis/liblouis-3.24.0.tar.gz b/packages/libl/liblouis/liblouis-3.24.0.tar.gz
new file mode 120000
index 0000000..faaa5c9
--- /dev/null
+++ b/packages/libl/liblouis/liblouis-3.24.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeif7jpm47ilztlbl6u33d5e5jdtdlpx5ru6qkoodyv4tfqu2ko4gxy
\ No newline at end of file
diff --git a/packages/libl/liblouis/liblouis.changes b/packages/libl/liblouis/liblouis.changes
index a7a3c34..bf3d94b 100644
--- a/packages/libl/liblouis/liblouis.changes
+++ b/packages/libl/liblouis/liblouis.changes
@@ -1,52 +1,89 @@
-------------------------------------------------------------------
+Mon Jan 16 07:59:16 UTC 2023 - Dirk Müller
+
+- Update to version 3.24.0:
+ + This release contains major updates to Hungarian, UEB, and
+ Chinese bopomofo braille. Danish has been completely reworked
+ and there is now support for the Danish braille standard 2022.
+ There are also some new tables so that liblouis can now
+ generate Georgian computer braille, Swahili (Kenya) and
+ Chichewa (Malawi). Aside from that there is the usual
+ assortment of code cleanups and bug fixes.
+ + For a detailed list of all the changes refer to
+ https://github.com/liblouis/liblouis/milestone/34?closed=1
+ + Braille table improvements:
+ - New grade 1, 1.2, 1.3, 1.4, 1.5 and 2 tables for Swahili
+ (Kenya) and grade 1 table for Chichewa (Malawi).
+ - Improvements to Hungarian.
+ - Update braille patterns of some Chinese characters and
+ phrases in the Chinese bopomofo braille table
+ - Add experimental Georgian computer braille table
+ - Updated the Danish tables to the new 2022 Danish braille
+ standard
+ - Limited contraction level (grade 2l or 1.5) is no longer part
+ of the Danish braille standard 2022.
+ - There is no longer any need for "literary" tables. In Danish
+ braille, capital letters are now always indicated, and steps
+ have been taken in the standard to ensure better
+ back-translation.
+ - As requested by The Danish Braille Committee, the tables for
+ the 1993 standard will be kept as an option for at least a
+ year. All the 1993 tables have been renamed to include
+ "_1993" in the filename, so the new tables will be used as
+ default.
+ - Improvements to UEB.
+ - Add new sign for German sharp S (ICEB July 2022)
+ - Fix a couple of acronyms which require grade 1 indicator
+ (LLB, LLP)
+ - Fix placement of numeral sign in letters comma digits
+ - Review rules for "under" and "there" contractions
+
+-------------------------------------------------------------------
Sat Oct 1 11:06:59 UTC 2022 - Dirk Müller
-- update to 3.23.0:
- - Fix a problem in the parsing of faulty unbalanced context
- expressions. Thanks to Samuel Thibault.
- - Fix a buffer overflow problem when ~output.length~ is larger than
- ~input.length~. Thanks to Samuel Thibault.
- - Fix an endless loop in the handling of computer braille. Thanks to
- Bert Frees.
- ** Braille table improvements
- - Remove computer braille from Japanese Kantenji as it is not part of
- the standard. Thanks to Kensaku Yoza.
- - Bring Swedish tables up to date with the latest standard published
- by Punktskriftsnämnden (the Swedish Braille Authority) in 2009. The
- table for uncontracted braille was replaced and new tables for
- (partially and fully) contracted braille have been added. Thanks to
- David Renström from Insyn Scandinavia AB.
- - Improvements to Hungarian (added more exceptions) and migration to
- the ~nonumsign~ opcode thanks to Attila Hammer.
- - Fixed a bug in the Ukrainian table that led to wrong translation of
- some uppercase letters. Thanks to Andrey Yakuboy and Bert Frees.
- - Augment the UEB grade 2 tables to resolve an ambiguity between lower
- groupsigns and punctuation at the beginning of words by placing a letter
- sign at the front of punctuation. This resolves an ambiguity between, for
- example, "discount" and ".count". Thanks to Krzysztof Drewniak.
- - Add a new table for /Chinese Common Braille Scheme/ which is a type
- of braille used for spelling Mandarin Chinese. It is a variant of
- the /Chinese Current Braille System/ but has more perfect marking
- rules and produces less ambiguity than the latter. For more
- information see the comments in ~zhcn-cbs.ctb~. Thanks to Cary-Rowen
- and Frank.
- - Updates to the Chinese bopomofo braille table thanks to Bo-Cheng
- Jhan:
- - Update braille patterns of some Chinese characters and phrases
- - Add braille patterns for various Greek symbols
- - Add "Math rules" section and the mixed number rule
- - Add braille patterns for ☐ (⣏⣀⣹), ☑ (⣏⣿⣹), and ☒ (⣏⣭⣹)
- - New table for Kinyarwanda braille thanks to Jake Kyle from Compass
- Braille.
- - New table for Luganda braille thanks to Jake Kyle from Compass
- Braille.
- - Improvements to the Russian contracted braille table
- thanks to Andrey Yakuboy:
- - Now prefixes "из" and "без" are correctly contracted
- before hard sign (ъ).
- - Fixed a contraction for word "кое-где", now it is contracted
- according to rules.
- - Other minor fixes and improvements.
+- Update to version 3.23.0:
+ + Fix a problem in the parsing of faulty unbalanced context
+ expressions.
+ + Fix a buffer overflow problem when ~output.length~ is larger
+ than ~input.length~.
+ + Fix an endless loop in the handling of computer braille.
+ + Braille table improvements:
+ - Remove computer braille from Japanese Kantenji as it is not
+ part of the standard.
+ - Bring Swedish tables up to date with the latest standard
+ published by Punktskriftsnämnden (the Swedish Braille
+ Authority) in 2009. The table for uncontracted braille was
+ replaced and new tables for (partially and fully) contracted
+ braille have been added.
+ - Improvements to Hungarian (added more exceptions) and
+ migration to the ~nonumsign~ opcode.
+ - Fixed a bug in the Ukrainian table that led to wrong
+ translation of some uppercase letters.
+ - Augment the UEB grade 2 tables to resolve an ambiguity
+ between lower groupsigns and punctuation at the beginning of
+ words by placing a letter sign at the front of punctuation.
+ This resolves an ambiguity between, for example, "discount"
+ and ".count".
+ - Add a new table for /Chinese Common Braille Scheme/ which is
+ a type of braille used for spelling Mandarin Chinese. It is a
+ variant of the /Chinese Current Braille System/ but has more
+ perfect marking rules and produces less ambiguity than the
+ latter. For more information see the comments in
+ ~zhcn-cbs.ctb~.
+ - Updates to the Chinese bopomofo braille table:
+ . Update braille patterns of some Chinese characters and
+ phrases
+ . Add braille patterns for various Greek symbols
+ . Add "Math rules" section and the mixed number rule
+ . Add braille patterns for ☐ (⣏⣀⣹), ☑ (⣏⣿⣹), and ☒ (⣏⣭⣹)
+ - New table for Kinyarwanda braille
+ - New table for Luganda braille
+ - Improvements to the Russian contracted braille table:
+ . Now prefixes "из" and "без" are correctly contracted
+ before hard sign (ъ).
+ . Fixed a contraction for word "кое-где", now it is
+ contracted according to rules.
+ . Other minor fixes and improvements.
-------------------------------------------------------------------
Fri Jun 24 12:05:17 UTC 2022 - Dominique Leuenberger
diff --git a/packages/libl/liblouis/liblouis.spec b/packages/libl/liblouis/liblouis.spec
index 289a1d8..23124aa 100644
--- a/packages/libl/liblouis/liblouis.spec
+++ b/packages/libl/liblouis/liblouis.spec
@@ -1,7 +1,7 @@
#
# spec file for package liblouis
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define sover 20
Name: liblouis
-Version: 3.23.0
+Version: 3.24.0
Release: 0
Summary: Two-way braille translator
License: LGPL-3.0-or-later
diff --git a/packages/libn/libnice/.files b/packages/libn/libnice/.files
index bc5adc0..c6e2ec1 100644
Binary files a/packages/libn/libnice/.files and b/packages/libn/libnice/.files differ
diff --git a/packages/libn/libnice/.rev b/packages/libn/libnice/.rev
index 9cfd2bd..3c55451 100644
--- a/packages/libn/libnice/.rev
+++ b/packages/libn/libnice/.rev
@@ -347,4 +347,12 @@
* A number of bug fixes (forwarded request 975128 from cgiboudeaux)
975332
+
+ e147e744b99d635fa4bd36431db72929
+ 0.1.21
+
+ dimstar_suse
+
+ 1061299
+
diff --git a/packages/libn/libnice/libnice-0.1.19.tar.gz b/packages/libn/libnice/libnice-0.1.19.tar.gz
deleted file mode 120000
index 3bb3271..0000000
--- a/packages/libn/libnice/libnice-0.1.19.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiacuwoady6aae7apwenrajs6kvdl3yg4ib5x3sa2hturcjgeqpkj4
\ No newline at end of file
diff --git a/packages/libn/libnice/libnice-0.1.21.tar.gz b/packages/libn/libnice/libnice-0.1.21.tar.gz
new file mode 120000
index 0000000..1aa0f0a
--- /dev/null
+++ b/packages/libn/libnice/libnice-0.1.21.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeihooe7qk6knl75hy3ds65vfpjjk6bgiqi43hwy5hfex7qs6apejoy
\ No newline at end of file
diff --git a/packages/libn/libnice/libnice.changes b/packages/libn/libnice/libnice.changes
index 52c7102..411cbe0 100644
--- a/packages/libn/libnice/libnice.changes
+++ b/packages/libn/libnice/libnice.changes
@@ -1,4 +1,25 @@
-------------------------------------------------------------------
+Wed Jan 25 10:37:47 UTC 2023 - Bjørn Lie
+
+- Update to version 0.1.21:
+ * Only use `ifr_ifindex` if OS supports it, fixes build on iOS
+ and FreeBSD.
+- Changes from version 0.1.20:
+ * Remove support for GStreamer 0.10 builds.
+ * Add macro to check LIBNICE version.
+ * Added utility function to get the STUN server from a candidate.
+ * Support additional header in built-in HTTP proxy client.
+ * Add boxed type for NiceAddress for bindings.
+ * Add API to get the interface index for a local address.
+ * Explicitly bind to a specific interface when creating UDP
+ sockets.
+ * Limit the number of stored incoming checks based on a property.
+ * Do asynchronous DNS resolution for STUN and TURN servers.
+ * Add introspection friendly API to get an allocated string from
+ a NiceCandidate.
+ * Enable gst-full to link in a single element.
+
+-------------------------------------------------------------------
Thu May 5 09:13:35 UTC 2022 - Christophe Giboudeaux
- Update to 0.1.19:
diff --git a/packages/libn/libnice/libnice.spec b/packages/libn/libnice/libnice.spec
index 623e83f..199ecee 100644
--- a/packages/libn/libnice/libnice.spec
+++ b/packages/libn/libnice/libnice.spec
@@ -1,7 +1,7 @@
#
# spec file for package libnice
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libnice
-Version: 0.1.19
+Version: 0.1.21
Release: 0
Summary: Interactive Connectivity Establishment implementation
License: LGPL-2.1-only OR MPL-1.1
diff --git a/packages/libp/libpng16/.files b/packages/libp/libpng16/.files
index 6277bf8..44f0d3f 100644
Binary files a/packages/libp/libpng16/.files and b/packages/libp/libpng16/.files differ
diff --git a/packages/libp/libpng16/.rev b/packages/libp/libpng16/.rev
index d130548..b12ec20 100644
--- a/packages/libp/libpng16/.rev
+++ b/packages/libp/libpng16/.rev
@@ -709,4 +709,13 @@
+ tools: Fix a memory leak in pngcp. (forwarded request 1038184 from dimstar)
1038197
+
+ a298ada5d7057d9da1964c09a1eb0512
+ 1.6.39
+
+ dimstar_suse
+ - Fix build: some*.la files are symlinks. Adjust spec to use
+ find -type f,l (forwarded request 1062444 from dimstar)
+ 1062455
+
diff --git a/packages/libp/libpng16/libpng16.changes b/packages/libp/libpng16/libpng16.changes
index 895ec8c..6283d24 100644
--- a/packages/libp/libpng16/libpng16.changes
+++ b/packages/libp/libpng16/libpng16.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Feb 1 12:18:06 UTC 2023 - Dominique Leuenberger
+
+- Fix build: some*.la files are symlinks. Adjust spec to use
+ find -type f,l
+
+-------------------------------------------------------------------
+Wed Feb 1 09:24:14 UTC 2023 - Dirk Müller
+
+- switch to pkgconfig(zlib) to allow alternative providers as well
+- build with glibc hwcaps optimized libs
+
+-------------------------------------------------------------------
Fri Nov 25 11:49:52 UTC 2022 - Dominique Leuenberger
- Update to version 1.6.39:
diff --git a/packages/libp/libpng16/libpng16.spec b/packages/libp/libpng16/libpng16.spec
index fd95157..abe2a1a 100644
--- a/packages/libp/libpng16/libpng16.spec
+++ b/packages/libp/libpng16/libpng16.spec
@@ -1,7 +1,7 @@
#
# spec file for package libpng16
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,8 @@ Source3: rpm-macros.libpng-tools
Source4: baselibs.conf
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
+%{?suse_build_hwcaps_libs}
%package -n %{libname}
Summary: Library for the Portable Network Graphics Format (PNG)
@@ -50,7 +51,7 @@ Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: glibc-devel
Requires: pkgconfig
-Requires: zlib-devel
+Requires: pkgconfig(zlib)
Recommends: libpng%{branch}-compat-devel
#
@@ -117,7 +118,7 @@ sed -i -e 's/^\(CFLAGS.*\)$/\1 -fsanitize=address/' \
%install
%make_install
-rm %{buildroot}/%{_libdir}/libpng*.la
+find %{buildroot} -type f,l -name "*.la" -delete -print
mkdir -p %{buildroot}%{_sysconfdir}/rpm
install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.libpng-tools
%if %{debug_build} ||%{asan_build}
diff --git a/packages/libs/libsrtp2/.files b/packages/libs/libsrtp2/.files
index 62cfdb0..cded499 100644
Binary files a/packages/libs/libsrtp2/.files and b/packages/libs/libsrtp2/.files differ
diff --git a/packages/libs/libsrtp2/.rev b/packages/libs/libsrtp2/.rev
index 66cb582..da4bd86 100644
--- a/packages/libs/libsrtp2/.rev
+++ b/packages/libs/libsrtp2/.rev
@@ -74,4 +74,12 @@
[boo#1198887]
974925
+
+ da13326d1d1b0880c3a508f586d1a15f
+ 2.5.0
+
+ dimstar_suse
+ - Update to release 2.5.0
+ 1062446
+
diff --git a/packages/libs/libsrtp2/libsrtp2.changes b/packages/libs/libsrtp2/libsrtp2.changes
index 2a16cce..177ea60 100644
--- a/packages/libs/libsrtp2/libsrtp2.changes
+++ b/packages/libs/libsrtp2/libsrtp2.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Feb 1 11:25:03 UTC 2023 - Jan Engelhardt
+
+- Update to release 2.5.0
+ * No changelog provided; some unspecified crypto updates occurred.
+
+-------------------------------------------------------------------
Wed May 4 12:39:03 UTC 2022 - Jan Engelhardt
- Remove include header editing; the issue once present in
diff --git a/packages/libs/libsrtp2/libsrtp2.spec b/packages/libs/libsrtp2/libsrtp2.spec
index 022ad6e..3265718 100644
--- a/packages/libs/libsrtp2/libsrtp2.spec
+++ b/packages/libs/libsrtp2/libsrtp2.spec
@@ -1,7 +1,7 @@
#
# spec file for package libsrtp2
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: libsrtp2
%define lname libsrtp2-1
-Version: 2.4.2
+Version: 2.5.0
Release: 0
Summary: Secure Real-Time Transport Protocol (SRTP) library v2
License: BSD-3-Clause
diff --git a/packages/libs/libsrtp2/v2.4.2.tar.gz b/packages/libs/libsrtp2/v2.4.2.tar.gz
deleted file mode 120000
index 48cb685..0000000
--- a/packages/libs/libsrtp2/v2.4.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeihhcyl3hrwhtwfkewvnmr6cnazlyfqxhshdn57vy4wnn7tub4teyu
\ No newline at end of file
diff --git a/packages/libs/libsrtp2/v2.5.0.tar.gz b/packages/libs/libsrtp2/v2.5.0.tar.gz
new file mode 120000
index 0000000..7a35ccf
--- /dev/null
+++ b/packages/libs/libsrtp2/v2.5.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeih3eozb7aw3xg4gstihuqc2z3qseztb4hshw3xdoiotm7ajvj7f5i
\ No newline at end of file
diff --git a/packages/m/MozillaFirefox/.files b/packages/m/MozillaFirefox/.files
index 6efb25e..c0128f7 100644
Binary files a/packages/m/MozillaFirefox/.files and b/packages/m/MozillaFirefox/.files differ
diff --git a/packages/m/MozillaFirefox/.rev b/packages/m/MozillaFirefox/.rev
index e9d5589..eda9c6a 100644
--- a/packages/m/MozillaFirefox/.rev
+++ b/packages/m/MozillaFirefox/.rev
@@ -6068,4 +6068,12 @@
bmo#1804626, bmo#1804971, bmo#1807004)
1059273
+
+ 3dfa6216e2142e9309e65c7facc40ed7
+ 109.0.1
+
+ dimstar_suse
+
+ 1062544
+
diff --git a/packages/m/MozillaFirefox/MozillaFirefox.changes b/packages/m/MozillaFirefox/MozillaFirefox.changes
index 75899c1..c3784db 100644
--- a/packages/m/MozillaFirefox/MozillaFirefox.changes
+++ b/packages/m/MozillaFirefox/MozillaFirefox.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Feb 1 19:48:47 UTC 2023 - Andreas Stieger
+
+- Mozilla Firefox 109.0.1
+ * Fixed jank when loading pages containing a large number of
+ emoji characters (bmo#1809081)
+ * Fixed an issue causing authentication prompts to not appear
+ when loading pages in some enterprise environments
+ (bmo#1809151)
+ * ixed inconsistent sizing of event listener checkboxes inside
+ the Inspector developer tool (bmo#1811760)
+
+-------------------------------------------------------------------
Mon Jan 16 06:54:09 UTC 2023 - Wolfgang Rosenauer
- Mozilla Firefox 109.0
diff --git a/packages/m/MozillaFirefox/MozillaFirefox.spec b/packages/m/MozillaFirefox/MozillaFirefox.spec
index 4883210..cf6ffac 100644
--- a/packages/m/MozillaFirefox/MozillaFirefox.spec
+++ b/packages/m/MozillaFirefox/MozillaFirefox.spec
@@ -29,8 +29,8 @@
# major 69
# mainver %major.99
%define major 109
-%define mainver %major.0
-%define orig_version 109.0
+%define mainver %major.0.1
+%define orig_version 109.0.1
%define orig_suffix %{nil}
%define update_channel release
%define branding 1
diff --git a/packages/m/MozillaFirefox/firefox-109.0.1.source.tar.xz b/packages/m/MozillaFirefox/firefox-109.0.1.source.tar.xz
new file mode 120000
index 0000000..42c18e9
--- /dev/null
+++ b/packages/m/MozillaFirefox/firefox-109.0.1.source.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeihpgrt2qfhejr52v7leuzesi35mhbp5m3irvumihdplqhqqfy2vdu
\ No newline at end of file
diff --git a/packages/m/MozillaFirefox/firefox-109.0.1.source.tar.xz.asc b/packages/m/MozillaFirefox/firefox-109.0.1.source.tar.xz.asc
new file mode 100644
index 0000000..fba9ffb
--- /dev/null
+++ b/packages/m/MozillaFirefox/firefox-109.0.1.source.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmPURkcACgkQ6+QekPbx
+L22P8g/7BGTSLgSFXUUIkKIMwWqSkMG7u5N7KETgeTxlxzW+kWGalZV5VuFNU0FU
+KDGtzar7DAu3fiQz62DhzX9FbA3Rjng7Py2EdrYoBni77awVwEczKS32nT1FyUhJ
+LSCO7z+e8aGsxhUHmCn3/9OvGSmG1dM4SiR7em2pIK3OyI6nHIRjLB25vHJWCqyJ
+6gV0z+Ez1oea6KeS69Nd+45tONuttgwEN5/n7oXD4lTITuQVL5XG2rYLnea5Fw9U
+LzbgbLVeaRUkY0HQBqy6yLsX5L7seiNNi5seOLh/RdSpCQdt/3h6jzphBNQkFIpy
+LaSyqdVTTppJjudwY/30L8BKwQdBdQul3uxSPzJWi/fvm4xhYHa2iDO7i1/6o9+d
+3C2Jrkx9GlOsrIOtGzUHf9Y2EEMjSNnufM2m6UaSvHPEG3MypsJ7RrPIcvISl60M
+pwVWebWYIBAj9MekbM2xstb/pHPmZXLUsZo/Khiq/dAoz2KsACffSiob7p/AbvhX
+iz5BA8hQupOoF3U/e6jjmNiJ6AvQ/4qqRA5XXg+DiXlK5SSo0f7vv6ArIQaPEL62
+7j9wXnSgCN5TFEwHzUR+xEXq0O7J5kJdj77re8cUDCfq8Woo16MJl1p1L6gDWU4t
+s7n9eWCmzhJlo/5q1SGRwNtPiUPKl8iQ/b5tLHy/0yXhZnDIQy0=
+=7v/O
+-----END PGP SIGNATURE-----
diff --git a/packages/m/MozillaFirefox/firefox-109.0.source.tar.xz b/packages/m/MozillaFirefox/firefox-109.0.source.tar.xz
deleted file mode 120000
index d8e2a86..0000000
--- a/packages/m/MozillaFirefox/firefox-109.0.source.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeib3n2b7cntjfnic6r67uevvz7omf2h3ef5u2xnk2gg4c5dotslrl4
\ No newline at end of file
diff --git a/packages/m/MozillaFirefox/firefox-109.0.source.tar.xz.asc b/packages/m/MozillaFirefox/firefox-109.0.source.tar.xz.asc
deleted file mode 100644
index 7c12a3f..0000000
--- a/packages/m/MozillaFirefox/firefox-109.0.source.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmPAaNoACgkQ6+QekPbx
-L21jjA//S/Z+kRySaiGwWBsiUojpu2QUR5VUQQffuweLZpvhG6fjjBQ4/wdnQmvb
-kyLsg3EDAw0eERxlykqUcB4Gcx/mSdn3OI8wXmk6LR729tLVWJZolRtz6xqtD43q
-iJewxLSEuVN/RTkrL/6UihfMeQhHyAwbk8Cw/S3InNtCZXaw3ETwK4VBJDmKB8+L
-f2pHW9XDquMJmSEhCnjHkK525HRa8SM0ahUOKdTyShZoW1iKdVxeyEi8d/UCCgta
-Ted6JaQzsyQ7EJzrLZ3axAV373d5+nllY6b9tX2kL2X+04TsrfMD4vhzt6bBSdQG
-iQTLrLgbbF086MqADaDYgd4IoVzfI2k5Q/ujeaq7do4Jf3fdhJuwFCKE0Zrbt2Rb
-cz1csiA4zCk3mtcz/WNlHEsYDyFNg3FND6tLDm/NBw71pNxWXekbsR9qKWtMFSCz
-XhU91lu5x+u5ct3YnZyS8lz0GkC8//UFwNyldDEhSmq9uqKGTIX6bHtfKfo9YE8A
-848ua6IU5sf4C0hD6/BobFfFeiYwKJ9AUwOT6juO4+csI63dEy2wTfzvKWi/Du4L
-ilUzim7I0ModTAROJoiPNkQQ88aADLGhYlT5r2G0E3GrvvP/hqqRWuFymtfSRLZ3
-jOTAl7vZL/7hsndG1qlLLVDoagTL8JBAk8EnOCTUCmltjUDSZV0=
-=mgCv
------END PGP SIGNATURE-----
diff --git a/packages/m/MozillaFirefox/l10n-109.0.1.tar.xz b/packages/m/MozillaFirefox/l10n-109.0.1.tar.xz
new file mode 120000
index 0000000..79f9b12
--- /dev/null
+++ b/packages/m/MozillaFirefox/l10n-109.0.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiehoqgovkekwa6d6ce4txycqvuh6kjnchispbl27jpw3iv3mzrx2y
\ No newline at end of file
diff --git a/packages/m/MozillaFirefox/l10n-109.0.tar.xz b/packages/m/MozillaFirefox/l10n-109.0.tar.xz
deleted file mode 120000
index 79f9b12..0000000
--- a/packages/m/MozillaFirefox/l10n-109.0.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiehoqgovkekwa6d6ce4txycqvuh6kjnchispbl27jpw3iv3mzrx2y
\ No newline at end of file
diff --git a/packages/m/MozillaFirefox/tar_stamps b/packages/m/MozillaFirefox/tar_stamps
index 09033ec..b99d0eb 100644
--- a/packages/m/MozillaFirefox/tar_stamps
+++ b/packages/m/MozillaFirefox/tar_stamps
@@ -1,10 +1,10 @@
PRODUCT="firefox"
CHANNEL="release"
-VERSION="109.0"
+VERSION="109.0.1"
VERSION_SUFFIX=""
-PREV_VERSION="108.0.2"
+PREV_VERSION="109.0"
PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
-RELEASE_TAG="4de36fef43a27c91f7b8408a117f43d55df3abaf"
-RELEASE_TIMESTAMP="20230112150232"
+RELEASE_TAG="30244986d6ff55bc3396db436fe1dba555828106"
+RELEASE_TIMESTAMP="20230127170202"
diff --git a/packages/m/MozillaThunderbird/.files b/packages/m/MozillaThunderbird/.files
index 784baaf..fff9a25 100644
Binary files a/packages/m/MozillaThunderbird/.files and b/packages/m/MozillaThunderbird/.files differ
diff --git a/packages/m/MozillaThunderbird/.rev b/packages/m/MozillaThunderbird/.rev
index c333156..63dbd37 100644
--- a/packages/m/MozillaThunderbird/.rev
+++ b/packages/m/MozillaThunderbird/.rev
@@ -4667,4 +4667,41 @@ I cannot test locally unfortunately.
malicious extensions
1044166
+
+ d84f60856d3a0939066a6300550ebbf3
+ 102.7.1
+
+ dimstar_suse
+ - Mozilla Thunderbird 102.7.1
+ * Microsoft Office 365 accounts were unable to authenticate
+ * https://www.thunderbird.net/en-US/thunderbird/102.7.1/releasenotes/
+ MFSA 2023-04
+ * CVE-2023-0430 (bmo#1769000)
+ Revocation status of S/Mime signature certificates was not checked
+- update create-tar.sh
+
+- Mozilla Thunderbird 102.7.0
+ https://www.thunderbird.net/en-US/thunderbird/102.7.0/releasenotes/
+ MFSA 2023-03 (bsc#1207119)
+ * CVE-2022-46871 (bmo#1795697)
+ libusrsctp library out of date
+ * CVE-2023-23598 (bmo#1800425)
+ Arbitrary file read from GTK drag and drop on Linux
+ * CVE-2023-23599 (bmo#1777800)
+ Malicious command could be hidden in devtools output on
+ Windows
+ * CVE-2023-23601 (bmo#1794268)
+ URL being dragged from cross-origin iframe into same tab
+ triggers navigation
+ * CVE-2023-23602 (bmo#1800890)
+ Content Security Policy wasn't being correctly applied to
+ WebSockets in WebWorkers
+ * CVE-2022-46877 (bmo#1795139)
+ Fullscreen notification bypass
+ * CVE-2023-23603 (bmo#1800832)
+ Calls to <code>console.log</code> allowed bypasing Content
+ Security Policy via format directive
+ * CVE-2023-23605 (bmo#1764921, bmo#1802690, bmo#1806974)
+ 1062396
+
diff --git a/packages/m/MozillaThunderbird/MozillaThunderbird.changes b/packages/m/MozillaThunderbird/MozillaThunderbird.changes
index c3ee052..14b5c9c 100644
--- a/packages/m/MozillaThunderbird/MozillaThunderbird.changes
+++ b/packages/m/MozillaThunderbird/MozillaThunderbird.changes
@@ -1,4 +1,42 @@
-------------------------------------------------------------------
+Tue Jan 31 21:48:13 UTC 2023 - Wolfgang Rosenauer
+
+- Mozilla Thunderbird 102.7.1
+ * Microsoft Office 365 accounts were unable to authenticate
+ * https://www.thunderbird.net/en-US/thunderbird/102.7.1/releasenotes/
+ MFSA 2023-04
+ * CVE-2023-0430 (bmo#1769000)
+ Revocation status of S/Mime signature certificates was not checked
+- update create-tar.sh
+
+-------------------------------------------------------------------
+Tue Jan 17 13:27:01 UTC 2023 - Wolfgang Rosenauer
+
+- Mozilla Thunderbird 102.7.0
+ https://www.thunderbird.net/en-US/thunderbird/102.7.0/releasenotes/
+ MFSA 2023-03 (bsc#1207119)
+ * CVE-2022-46871 (bmo#1795697)
+ libusrsctp library out of date
+ * CVE-2023-23598 (bmo#1800425)
+ Arbitrary file read from GTK drag and drop on Linux
+ * CVE-2023-23599 (bmo#1777800)
+ Malicious command could be hidden in devtools output on
+ Windows
+ * CVE-2023-23601 (bmo#1794268)
+ URL being dragged from cross-origin iframe into same tab
+ triggers navigation
+ * CVE-2023-23602 (bmo#1800890)
+ Content Security Policy wasn't being correctly applied to
+ WebSockets in WebWorkers
+ * CVE-2022-46877 (bmo#1795139)
+ Fullscreen notification bypass
+ * CVE-2023-23603 (bmo#1800832)
+ Calls to console.log
allowed bypasing Content
+ Security Policy via format directive
+ * CVE-2023-23605 (bmo#1764921, bmo#1802690, bmo#1806974)
+ Memory safety bugs fixed in Thunderbird 102.7
+
+-------------------------------------------------------------------
Tue Dec 20 08:06:29 UTC 2022 - Wolfgang Rosenauer
- Mozilla Thunderbird 102.6.1
diff --git a/packages/m/MozillaThunderbird/MozillaThunderbird.spec b/packages/m/MozillaThunderbird/MozillaThunderbird.spec
index fa192d2..5823687 100644
--- a/packages/m/MozillaThunderbird/MozillaThunderbird.spec
+++ b/packages/m/MozillaThunderbird/MozillaThunderbird.spec
@@ -1,8 +1,8 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
-# 2006-2022 Wolfgang Rosenauer
+# Copyright (c) 2023 SUSE LLC
+# 2006-2023 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,8 +29,8 @@
# major 69
# mainver %major.99
%define major 102
-%define mainver %major.6.1
-%define orig_version 102.6.1
+%define mainver %major.7.1
+%define orig_version 102.7.1
%define orig_suffix %{nil}
%define update_channel release
%define source_prefix thunderbird-%{orig_version}
@@ -180,7 +180,7 @@ Source6: suse-default-prefs.js
Source7: l10n-%{orig_version}%{orig_suffix}.tar.xz
Source9: thunderbird.appdata.xml
Source13: spellcheck.js
-Source14: https://github.com/openSUSE/firefox-scripts/raw/4503820/create-tar.sh
+Source14: https://github.com/openSUSE/firefox-scripts/raw/f4363ab1d76e173666e56408d44fe00af16ddbd8/create-tar.sh
Source20: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc
Source21: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring
# Gecko/Toolkit
diff --git a/packages/m/MozillaThunderbird/create-tar.sh b/packages/m/MozillaThunderbird/create-tar.sh
index b48b556..b10ab5b 100644
--- a/packages/m/MozillaThunderbird/create-tar.sh
+++ b/packages/m/MozillaThunderbird/create-tar.sh
@@ -1,5 +1,27 @@
#!/bin/bash
+function main() {
+ # Exit script on CTRL+C
+ trap "exit" INT
+
+ if [ $# -ne 1 ]; then
+ print_usage_and_exit
+ fi
+
+ check_required_tools
+
+ # Sourcing the given tar_stamps-file to have the variables available
+ TAR_STAMP="$1"
+ source "$TAR_STAMP" || print_usage_and_exit
+
+ set_internal_variables
+
+ check_what_changed
+ download_upstream_source_tarballs
+
+ create_locales_tarballs
+}
+
function print_usage_and_exit() {
echo "Usage: create-tar.sh tar_stamps"
echo ""
@@ -17,56 +39,70 @@ PREV_VERSION_SUFFIX="esr"
#SKIP_LOCALES="" # Uncomment to skip l10n-generation
EOF
-exit 1
+ exit 1
}
-if [ $# -ne 1 ]; then
- print_usage_and_exit
-fi
-
-# Sourcing the given tar_stamps-file to have the variables available
-TAR_STAMP="$1"
-source "$TAR_STAMP" || print_usage_and_exit
-
-# Internal variables
-BRANCH="releases/mozilla-$CHANNEL"
-if [ "$PRODUCT" = "firefox" ]; then
- LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
-else
- LOCALE_FILE="thunderbird-$VERSION/comm/mail/locales/l10n-changesets.json"
-fi
-
-SOURCE_TARBALL="$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz"
-PREV_SOURCE_TARBALL="$PRODUCT-$PREV_VERSION$PREV_VERSION_SUFFIX.source.tar.xz"
-FTP_URL="https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source"
-FTP_CANDIDATES_BASE_URL="https://ftp.mozilla.org/pub/$PRODUCT/candidates"
-# Make first letter of PRODCUT upper case
-PRODUCT_CAP="${PRODUCT^}"
-LOCALES_URL="https://product-details.mozilla.org/1.0/l10n/$PRODUCT_CAP"
-PRODUCT_URL="https://product-details.mozilla.org/1.0/$PRODUCT.json"
-# Exit script on CTRL+C
-trap "exit" INT
+function check_required_tools() {
+ # check required tools
+ check_for_binary /usr/bin/hg "mercurial"
+ check_for_binary /usr/bin/jq "jq"
+ which python3 > /dev/null || exit 1
+
+ # use parallel compression, if available
+ compression='-J'
+ pixz -h > /dev/null 2>&1
+ if (($? != 127)); then
+ compression='-Ipixz'
+ fi
+}
+
+function set_internal_variables() {
+ # Internal variables
+ BRANCH="releases/mozilla-$CHANNEL"
+ if [ "$PRODUCT" = "firefox" ]; then
+ FF_LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
+ else
+ FF_LOCALE_FILE="thunderbird-$VERSION/browser/locales/l10n-changesets.json"
+ TB_LOCALE_FILE="thunderbird-$VERSION/comm/mail/locales/l10n-changesets.json"
+ L10N_STRING_PATTERNS="thunderbird-$VERSION/python/l10n/tbxchannel/l10n_merge.py"
+ fi
+
+ SOURCE_TARBALL="$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz"
+ PREV_SOURCE_TARBALL="$PRODUCT-$PREV_VERSION$PREV_VERSION_SUFFIX.source.tar.xz"
+ FTP_URL="https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source"
+ FTP_CANDIDATES_BASE_URL="https://ftp.mozilla.org/pub/%s/candidates"
+ LOCALES_URL="https://product-details.mozilla.org/1.0/l10n"
+ PRODUCT_URL="https://product-details.mozilla.org/1.0"
+ ALREADY_EXTRACTED_LOCALES_FILE=0
+}
function get_ftp_candidates_url() {
- VERSION_WITH_SUFFIX="$1"
- echo "$FTP_CANDIDATES_BASE_URL/$VERSION_WITH_SUFFIX-candidates"
+ local CURR_PRODUCT="$1"
+ local VERSION_WITH_SUFFIX="$2"
+ printf "$FTP_CANDIDATES_BASE_URL/$VERSION_WITH_SUFFIX-candidates" "$CURR_PRODUCT"
}
function check_tarball_source () {
TARBALL=$1
# Print out what is going to be done:
- if [ -e $TARBALL ]; then
+ if [ -e "$TARBALL" ]; then
echo "Reuse existing file"
- elif wget --spider $FTP_URL/$TARBALL 2> /dev/null; then
+ elif wget --spider "$FTP_URL/$TARBALL" 2> /dev/null; then
echo "Download file"
- else
- echo "Mercurial checkout"
+ else
+ local CANDIDATE_TARBALL_LOCATION=""
+ CANDIDATE_TARBALL_LOCATION="$(printf "%s/%s/source/%s" "$(get_ftp_candidates_url "$PRODUCT" "$VERSION$VERSION_SUFFIX")" "$BUILD_ID" "$TARBALL" )"
+ if wget --spider "$CANDIDATE_TARBALL_LOCATION" 2> /dev/null; then
+ echo "Download UNRELEASED candidate"
+ else
+ echo "Mercurial checkout"
+ fi
fi
}
function ask_cont_abort_question() {
while true; do
- read -p "$1 [(c)ontinue/(a)bort] " ca
+ read -r -p "$1 [(c)ontinue/(a)bort] " ca
case $ca in
[Cc]* ) return 0 ;;
[Aa]* ) return 1 ;;
@@ -76,16 +112,16 @@ function ask_cont_abort_question() {
}
function check_for_binary() {
- if ! test -x $1; then
+ if ! test -x "$1"; then
echo "$1 is missing: execute zypper in $2"
exit 5
fi
}
function get_source_stamp() {
- BUILD_ID="$1"
- FTP_CANDIDATES_BASE_URL=$(get_ftp_candidates_url $VERSION$VERSION_SUFFIX)
- FTP_CANDIDATES_JSON_SUFFIX="${BUILD_ID}/linux-x86_64/en-US/$PRODUCT-$VERSION$VERSION_SUFFIX.json"
+ CURR_BUILD_ID="$1"
+ FTP_CANDIDATES_BASE_URL=$(get_ftp_candidates_url "$PRODUCT" "$VERSION$VERSION_SUFFIX")
+ FTP_CANDIDATES_JSON_SUFFIX="${CURR_BUILD_ID}/linux-x86_64/en-US/$PRODUCT-$VERSION$VERSION_SUFFIX.json"
BUILD_JSON=$(curl --silent --fail "$FTP_CANDIDATES_BASE_URL/$FTP_CANDIDATES_JSON_SUFFIX") || return 1;
REV=$(echo "$BUILD_JSON" | jq .moz_source_stamp)
SOURCE_REPO=$(echo "$BUILD_JSON" | jq .moz_source_repo)
@@ -104,39 +140,43 @@ function get_source_stamp() {
}
function get_build_number() {
- LAST_FOUND=""
- VERSION_WITH_SUFFIX="$1"
-
- BUILD_ID=$(curl --silent "$PRODUCT_URL" | jq -e '.["releases"] | .["'$PRODUCT-$VERSION_WITH_SUFFIX'"] | .["build_number"]')
+ local LAST_FOUND=""
+ local CURR_PRODUCT="$1"
+ local VERSION_WITH_SUFFIX="$2"
+ local CURR_BUILD_ID=""
+ local CURR_FTP_BASE_URL=""
+ CURR_BUILD_ID=$(curl --silent "$PRODUCT_URL/$CURR_PRODUCT.json" | jq -e '.["releases"] | .["'$CURR_PRODUCT-$VERSION_WITH_SUFFIX'"] | .["build_number"]')
# Slow fall-back
if [ $? -ne 0 ]; then
echo "Build number not found in product URL, falling back to slow FTP-parsing." 1>&2
- FTP_CANDIDATES_BASE_URL=$(get_ftp_candidates_url $VERSION_WITH_SUFFIX)
+ CURR_FTP_BASE_URL=$(get_ftp_candidates_url "$CURR_PRODUCT" "$VERSION_WITH_SUFFIX")
# Unfortunately, locales-files are not associated to releases, but to builds.
# And since we don't know which build was the final build, we grep them all from
# the candidates-page, sort them and take the last one which should be the oldest
# Error only if not even the first one exists
- LAST_FOUND=$(curl --silent --fail "$FTP_CANDIDATES_BASE_URL/" | grep -o "build[0-9]*/" | sort | uniq | tail -n 1 | cut -d "/" -f 1)
+ LAST_FOUND=$(curl --silent --fail "$CURR_FTP_BASE_URL/" | grep -o "build[0-9]*/" | sort | uniq | tail -n 1 | cut -d "/" -f 1)
else
- LAST_FOUND="build$BUILD_ID"
+ LAST_FOUND="build$CURR_BUILD_ID"
fi
if [ "$LAST_FOUND" != "" ]; then
echo "$LAST_FOUND"
return 0
else
- echo "Error: Could not find build-number for Firefox $VERSION_WITH_SUFFIX !" 1>&2
+ echo "Error: Could not find build-number for $CURR_PRODUCT $VERSION_WITH_SUFFIX !" 1>&2
return 1
fi
}
-
function locales_get() {
- TMP_VERSION="$1"
- BUILD_ID="$2"
- URL_TO_CHECK="${LOCALES_URL}-${TMP_VERSION}"
- FINAL_URL="${URL_TO_CHECK}-${BUILD_ID}.json"
+ CURR_PRODUCT="$1"
+ TMP_VERSION="$2"
+ CURR_BUILD_ID="$3"
+ # Make first letter of CURR_PRODUCT upper case
+ CURR_PRODUCT_CAP="${CURR_PRODUCT^}"
+ URL_TO_CHECK="${LOCALES_URL}/${CURR_PRODUCT_CAP}-${TMP_VERSION}"
+ FINAL_URL="${URL_TO_CHECK}-${CURR_BUILD_ID}.json"
if wget --quiet --spider "$FINAL_URL"; then
echo "$FINAL_URL"
return 0
@@ -148,39 +188,49 @@ function locales_get() {
function locales_parse_file() {
FILE="$1"
- cat "$FILE" | python -c "import json; import sys; \
+ python3 -c "import json; import sys; \
print('\n'.join(['{} {}'.format(key, value['revision']) \
- for key, value in sorted(json.load(sys.stdin).items())]));"
+ for key, value in sorted(json.load(sys.stdin).items())]));" < "$FILE"
}
function locales_parse_url() {
URL="$1"
- curl -s "$URL" | python -c "import json; import sys; \
+ curl -s "$URL" | python3 -c "import json; import sys; \
print('\n'.join(['{} {}'.format(key, value['changeset']) \
for key, value in sorted(json.load(sys.stdin)['locales'].items())]));"
}
function extract_locales_file() {
- # still need to extract the locale information from the archive
- echo "extract locale changesets"
- tar -xf $SOURCE_TARBALL $LOCALE_FILE
+ if [ $ALREADY_EXTRACTED_LOCALES_FILE -ne 1 ]; then
+ # still need to extract the locale information from the archive
+ echo "extract locale changesets"
+ if [ "$PRODUCT" = "thunderbird" ]; then
+ tar -xf "$SOURCE_TARBALL" "$FF_LOCALE_FILE" "$TB_LOCALE_FILE" "$L10N_STRING_PATTERNS"
+ else
+ tar -xf "$SOURCE_TARBALL" "$FF_LOCALE_FILE"
+ fi
+ ALREADY_EXTRACTED_LOCALES_FILE=1
+ else
+ echo "Skipping locale changeset extraction, as it was already done."
+ fi
}
function locales_unchanged() {
- BUILD_ID="$1"
- PREV_BUILD_ID=$(get_build_number "$PREV_VERSION$PREV_VERSION_SUFFIX")
+ CURR_PRODUCT="$1"
+ CURR_BUILD_ID="$2"
+ PREV_BUILD_ID=$(get_build_number "$CURR_PRODUCT" "$PREV_VERSION$PREV_VERSION_SUFFIX")
# If no json-file for one of the versions can be found, we say "they changed"
- prev_url=$(locales_get "$PREV_VERSION$PREV_VERSION_SUFFIX" "$PREV_BUILD_ID") || return 1
+ prev_url=$(locales_get "$CURR_PRODUCT" "$PREV_VERSION$PREV_VERSION_SUFFIX" "$PREV_BUILD_ID") || return 1
prev_content=$(locales_parse_url "$prev_url") || exit 1
- curr_url=$(locales_get "$VERSION$VERSION_SUFFIX" "$BUILD_ID")
+ curr_url=$(locales_get "$CURR_PRODUCT" "$VERSION$VERSION_SUFFIX" "$CURR_BUILD_ID")
if [ $? -ne 0 ]; then
# We did not find a locales file upstream on the servers
- if [ -e $SOURCE_TARBALL ]; then
+ if [ -e "$SOURCE_TARBALL" ]; then
# We can find out what the locales are, by extracting the json-file from the tar-ball
# instead of getting it from the server
extract_locales_file || return 1
- curr_content=$(locales_parse_file "$LOCALE_FILE") || exit 1
+ curr_content=$(locales_parse_file "$FF_LOCALE_FILE") || exit 1
else
# We can't know what the locales are in the current version
return 1
@@ -192,62 +242,116 @@ function locales_unchanged() {
diff -y --suppress-common-lines -d <(echo "$prev_content") <(echo "$curr_content")
}
-# check required tools
-check_for_binary /usr/bin/hg "mercurial"
-check_for_binary /usr/bin/jq "jq"
-which python > /dev/null || exit 1
-
-# use parallel compression, if available
-compression='-J'
-pixz -h > /dev/null 2>&1
-if (($? != 127)); then
- compression='-Ipixz'
-fi
-
-# Get ID
-BUILD_ID=$(get_build_number "$VERSION$VERSION_SUFFIX")
-
-if [ -z ${SKIP_LOCALES+x} ]; then
- if [ "$PREV_VERSION" != "" ] && locales_unchanged "$BUILD_ID"; then
- printf "%-40s: Did not change. Skipping.\n" "locales"
- LOCALES_CHANGED=0
+function get_locales_directories() {
+ pattern="$1"
+
+ # This file contains a list of directories, upstream uses to build locales
+ # If it is there, use it. If not, default to all FF + 3 TB-dirs.
+ if [ -e "$L10N_STRING_PATTERNS" ]; then
+ python3 -c "import os; import sys; \
+ sys.path.append(os.path.dirname(\"$L10N_STRING_PATTERNS\")); \
+ from l10n_merge import $pattern; \
+ print(\" \".join([p.strip('*') for p in $pattern]));"
else
- printf "%-40s: Need to download.\n" "locales"
+ if [ "$pattern" = "GECKO_STRINGS_PATTERNS" ]; then
+ # Default of Firefox: Take all
+ echo "{lang}/"
+ else
+ # Default of Thunderbird: Take those 3 dirs
+ echo "{lang}/calendar/" "{lang}/chat/" "{lang}/mail/"
+ fi
+ fi
+}
+
+function create_and_copy_locales() {
+ locale="$1"
+ source_base="$2"
+ source_template="$3"
+ final_dest="$4"
+
+ # Replace {lang} with the actual language-basedir
+ for template in $source_template; do
+ locale_source=$(echo "$template" | sed "s|{lang}|./$source_base/$locale|g")
+ locale_dest=$(echo "$template" | sed "s|{lang}|./$final_dest/$locale|g")
+
+ # Create intermediary folders
+ for destdir in $locale_dest; do
+ mkdir -p "$destdir"
+ done
+
+ # Copy over FF-files
+ cp -r "$locale_source"/* "$locale_dest"
+ done
+}
+
+function check_what_changed() {
+ # Get ID
+ BUILD_ID=$(get_build_number "$PRODUCT" "$VERSION$VERSION_SUFFIX")
+
+ if [ -z ${SKIP_LOCALES+x} ]; then
LOCALES_CHANGED=1
+ if [ "$PREV_VERSION" != "" ]; then
+ # If we have a previous version, check either FF or (TB and FF)
+ if [ "$PRODUCT" = "firefox" ]; then
+ locales_unchanged "$PRODUCT" "$BUILD_ID"
+ else
+ FF_BUILD_ID=$(get_build_number "firefox" "$VERSION$VERSION_SUFFIX")
+ locales_unchanged "$PRODUCT" "$BUILD_ID" && locales_unchanged "firefox" "$FF_BUILD_ID"
+ fi
+ LOCALES_CHANGED=$?
+ fi
+
+ if [ $LOCALES_CHANGED -eq 1 ]; then
+ printf "%-40s: Need to download.\n" "locales"
+ else
+ printf "%-40s: Did not change. Skipping.\n" "locales"
+ fi
+ else
+ printf "%-40s: User forced skip (SKIP_LOCALES set)\n" "locales"
fi
-else
- printf "%-40s: User forced skip (SKIP_LOCALES set)\n" "locales"
-fi
-
-# Check what is going to be done and ask for consent
-for ff in $SOURCE_TARBALL $SOURCE_TARBALL.asc; do
- printf "%-40s: %s\n" $ff "$(check_tarball_source $ff)"
-done
-
-$(ask_cont_abort_question "Is this ok?") || exit 0
-
-# Try to download tar-ball from officiall mozilla-mirror
-if [ ! -e $SOURCE_TARBALL ]; then
- wget https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source/$SOURCE_TARBALL
-fi
-# including signature
-if [ ! -e $SOURCE_TARBALL.asc ]; then
- wget https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source/$SOURCE_TARBALL.asc
-fi
-
-# we might have an upstream archive already and can skip the checkout
-if [ -e $SOURCE_TARBALL ]; then
- if [ -z ${SKIP_LOCALES+x} ] && [ $LOCALES_CHANGED -ne 0 ]; then
- extract_locales_file
+
+ # Check what is going to be done and ask for consent
+ for ff in $SOURCE_TARBALL $SOURCE_TARBALL.asc; do
+ printf "%-40s: %s\n" "$ff" "$(check_tarball_source $ff)"
+ done
+
+ ask_cont_abort_question "Is this ok?" || exit 0
+}
+
+function download_release_or_candidate_file() {
+ local upstream_file="$1"
+ if [ -e "$upstream_file" ]; then
+ return;
fi
- get_source_stamp "$BUILD_ID"
-else
- # We are working on a version that is not yet published on the mozilla mirror
- # so we have to actually check out the repo
-
- # mozilla
- if [ -d $PRODUCT-$VERSION ]; then
- pushd $PRODUCT-$VERSION || exit 1
+
+ if ! wget --quiet --show-progress --progress=bar "$FTP_URL/$upstream_file"; then
+ local CANDIDATE_TARBALL_LOCATION=""
+ CANDIDATE_TARBALL_LOCATION="$(printf "%s/%s/source/%s" "$(get_ftp_candidates_url "$PRODUCT" "$VERSION$VERSION_SUFFIX")" "$BUILD_ID" "$upstream_file" )"
+ wget --quiet --show-progress --progress=bar "$CANDIDATE_TARBALL_LOCATION"
+ fi
+}
+
+function download_upstream_source_tarballs() {
+ # Try to download tar-ball from officiall mozilla-mirror
+ download_release_or_candidate_file "$SOURCE_TARBALL"
+ download_release_or_candidate_file "$SOURCE_TARBALL.asc"
+
+ # we might have an upstream archive already and can skip the checkout
+ if [ -e "$SOURCE_TARBALL" ]; then
+ if [ -z ${SKIP_LOCALES+x} ] && [ $LOCALES_CHANGED -ne 0 ]; then
+ extract_locales_file
+ fi
+ get_source_stamp "$BUILD_ID"
+ else
+ # We are working on a version that is not yet published on the mozilla mirror
+ # so we have to actually check out the repo
+ clone_and_repackage_sources
+ fi
+}
+
+function clone_and_repackage_sources() {
+ if [ -d "$PRODUCT-$VERSION" ]; then
+ pushd "$PRODUCT-$VERSION" || exit 1
_repourl=$(hg paths)
case "$_repourl" in
*$BRANCH*)
@@ -258,18 +362,18 @@ else
* )
echo "removing obsolete tree"
popd || exit 1
- rm -rf $PRODUCT-$VERSION
+ rm -rf "$PRODUCT-$VERSION"
;;
esac
fi
- if [ ! -d $PRODUCT-$VERSION ]; then
+ if [ ! -d "$PRODUCT-$VERSION" ]; then
echo "cloning new $BRANCH..."
- hg clone https://hg.mozilla.org/$BRANCH $PRODUCT-$VERSION
+ hg clone "https://hg.mozilla.org/$BRANCH $PRODUCT-$VERSION"
if [ "$PRODUCT" = "thunderbird" ]; then
- hg clone https://hg.mozilla.org/releases/comm-$CHANNEL $PRODUCT-$VERSION/comm
+ hg clone "https://hg.mozilla.org/releases/comm-$CHANNEL" "$PRODUCT-$VERSION/comm"
fi
fi
- pushd $PRODUCT-$VERSION || exit 1
+ pushd "$PRODUCT-$VERSION" || exit 1
# parse out the Firefox-release tag for this Thunderbird-checkout
if [ "$PRODUCT" = "thunderbird" ]; then
@@ -279,8 +383,8 @@ else
FF_RELEASE_TAG="$RELEASE_TAG"
fi
- hg update --check $FF_RELEASE_TAG
- [ "$FF_RELEASE_TAG" == "default" ] || hg update -r $FF_RELEASE_TAG
+ hg update --check "$FF_RELEASE_TAG"
+ [ "$FF_RELEASE_TAG" == "default" ] || hg update -r "$FF_RELEASE_TAG"
# get repo and source stamp
REV=$(hg -R . parent --template="{node|short}\n")
SOURCE_REPO=$(hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/https:/")
@@ -288,9 +392,9 @@ else
if [ "$PRODUCT" = "thunderbird" ]; then
pushd comm || exit 1
- hg update --check $RELEASE_TAG
+ hg update --check "$RELEASE_TAG"
popd || exit 1
- rm -rf thunderbird-${VERSION}/{,comm/}other-licenses/7zstub
+ rm -rf thunderbird-"${VERSION}"/{,comm/}other-licenses/7zstub
fi
popd || exit 1
@@ -308,56 +412,107 @@ else
echo "RELEASE_TIMESTAMP=$TIMESTAMP" >> "$TAR_STAMP"
echo "creating archive..."
- tar $compression -cf $PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS $PRODUCT-$VERSION
-fi
+ tar "$compression" -cf "$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz" --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS "$PRODUCT-$VERSION"
+}
-if [ ! -z ${SKIP_LOCALES+x} ]; then
- echo "Skipping locales-creation."
- exit 0
-fi
+function create_locales_tarballs() {
+ if [ ! -z ${SKIP_LOCALES+x} ]; then
+ echo "Skipping locales-creation."
+ exit 0
+ fi
+
+ if [ "$LOCALES_CHANGED" -ne 0 ]; then
+ clone_and_repackage_locales
+ elif [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ]; then
+ # Locales did not change, but the old tar-ball is in this directory
+ # Simply rename it:
+ echo "Moving l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz to l10n-$VERSION$VERSION_SUFFIX.tar.xz"
+ mv "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" "l10n-$VERSION$VERSION_SUFFIX.tar.xz"
+ fi
+}
-if [ $LOCALES_CHANGED -ne 0 ]; then
+function clone_and_repackage_locales() {
# l10n
- echo "fetching locales..."
- test ! -d l10n && mkdir l10n
- jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' $LOCALE_FILE | \
- while read locale changeset ; do
+ FINAL_L10N_BASE="l10n"
+ FF_L10N_BASE="l10n" # Only change this in TB-builds to a separate dir
+ TB_L10N_BASE="l10n_tb"
+
+ # If we are doing Thunderbird, we'll have to checkout both TB and FF l10n-repos
+ # Thunderbird has one single mono-repo, FF has one for each language
+ if [ "$PRODUCT" = "thunderbird" ]; then
+ echo "Fetching Thunderbird locales..."
+ if [ -d "$TB_L10N_BASE/.hg" ]; then
+ pushd "$TB_L10N_BASE/" || exit 1
+ hg pull || exit 1
+ popd || exit 1
+ else
+ hg clone "https://hg.mozilla.org/projects/comm-l10n/" "$TB_L10N_BASE/" || exit 1
+ fi
+ # Just using the first entry here, as all languages have the same changeset
+ tb_changeset=$(jq -r 'to_entries[0]| "\(.key) \(.value|.revision)"' "$TB_LOCALE_FILE" | cut -d " " -f 2)
+ [ "$RELEASE_TAG" == "default" ] || hg -R "$TB_L10N_BASE/" up -C -r "$tb_changeset" || exit 1
+ FF_L10N_BASE="l10n_ff"
+ fi
+
+ test ! -d $FF_L10N_BASE && mkdir $FF_L10N_BASE
+ # No-op, if we are building FF:
+ test ! -d $FINAL_L10N_BASE && mkdir $FINAL_L10N_BASE
+
+ # This is only relevant for Thunderbird-builds
+ # Here, the relevant directories we need to copy from FF and from TB
+ # are specified in a python-file in the tarball
+ # Is of form '{lang}/Foo/bar/ {lang}/Baz/bar/ ..'
+ ff_locale_template=$(get_locales_directories "GECKO_STRINGS_PATTERNS")
+ tb_locale_template=$(get_locales_directories "COMM_STRINGS_PATTERNS")
+
+ echo "Fetching Browser locales..."
+ jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' "$FF_LOCALE_FILE" | \
+ while read -r locale changeset ; do
case $locale in
ja-JP-mac|en-US)
;;
*)
echo "reading changeset information for $locale"
echo "fetching $locale changeset $changeset ..."
- if [ -d "l10n/$locale/.hg" ]; then
- pushd "l10n/$locale" || exit 1
- hg pull
+ if [ -d "$FF_L10N_BASE/$locale/.hg" ]; then
+ pushd "$FF_L10N_BASE/$locale" || exit 1
+ hg pull || exit 1
popd || exit 1
else
- hg clone "https://hg.mozilla.org/l10n-central/$locale" "l10n/$locale"
+ hg clone "https://hg.mozilla.org/l10n-central/$locale" "$FF_L10N_BASE/$locale" || exit 1
+ fi
+ [ "$RELEASE_TAG" == "default" ] || hg -R "$FF_L10N_BASE/$locale" up -C -r "$changeset" || exit 1
+
+ # If we are doing TB, we have to merge both l10n-repos
+ if [ "$PRODUCT" = "thunderbird" ] && test -d "$TB_L10N_BASE/$locale/" ; then
+ create_and_copy_locales "$locale" "$FF_L10N_BASE" "$ff_locale_template" "$FINAL_L10N_BASE"
+ create_and_copy_locales "$locale" "$TB_L10N_BASE" "$tb_locale_template" "$FINAL_L10N_BASE"
fi
- [ "$RELEASE_TAG" == "default" ] || hg -R "l10n/$locale" up -C -r "$changeset"
;;
esac
done
echo "creating l10n archive..."
if [ "$PRODUCT" = "thunderbird" ]; then
- TB_TAR_FLAGS="--exclude=browser --exclude=suite"
+ TB_TAR_FLAGS="--exclude=suite"
fi
- tar $compression -cf l10n-$VERSION$VERSION_SUFFIX.tar.xz \
+ tar "$compression" -cf "l10n-$VERSION$VERSION_SUFFIX.tar.xz" \
--exclude=.hgtags --exclude=.hgignore --exclude=.hg \
- $TB_TAR_FLAGS \
- l10n
-elif [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ]; then
- # Locales did not change, but the old tar-ball is in this directory
- # Simply rename it:
- echo "Moving l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz to l10n-$VERSION$VERSION_SUFFIX.tar.xz"
- mv "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" "l10n-$VERSION$VERSION_SUFFIX.tar.xz"
-fi
-
-if [ -e $PREV_SOURCE_TARBALL ]; then
- echo ""
- echo "Deleting old sources tarball $PREV_SOURCE_TARBALL"
- $(ask_cont_abort_question "Is this ok?") || exit 0
- rm "$PREV_SOURCE_TARBALL"
- rm "$PREV_SOURCE_TARBALL.asc"
-fi
+ "$TB_TAR_FLAGS" \
+ "$FINAL_L10N_BASE"
+}
+
+function clean_up_old_tarballs() {
+ if [ -e "$PREV_SOURCE_TARBALL" ]; then
+ echo ""
+ echo "Deleting old sources tarball $PREV_SOURCE_TARBALL"
+ ask_cont_abort_question "Is this ok?" || exit 0
+ rm "$PREV_SOURCE_TARBALL"
+ rm "$PREV_SOURCE_TARBALL.asc"
+ # if old and new lang-tarball are there, delete the old one
+ if [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ] && [ -f "l10n-$VERSION$VERSION_SUFFIX.tar.xz" ]; then
+ rm "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz"
+ fi
+ fi
+}
+
+main "$@"
diff --git a/packages/m/MozillaThunderbird/l10n-102.6.1.tar.xz b/packages/m/MozillaThunderbird/l10n-102.6.1.tar.xz
deleted file mode 120000
index e2e0f83..0000000
--- a/packages/m/MozillaThunderbird/l10n-102.6.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeifjyetiyw3lec66urfh2zq3bk2at6ibyavbbur7t3xkosogvjc63i
\ No newline at end of file
diff --git a/packages/m/MozillaThunderbird/l10n-102.7.1.tar.xz b/packages/m/MozillaThunderbird/l10n-102.7.1.tar.xz
new file mode 120000
index 0000000..06d58c4
--- /dev/null
+++ b/packages/m/MozillaThunderbird/l10n-102.7.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeibkiycrweizlc3h6dnm7qxwc5kjpdr6xiiez5xakq4nz76zyjuhwm
\ No newline at end of file
diff --git a/packages/m/MozillaThunderbird/tar_stamps b/packages/m/MozillaThunderbird/tar_stamps
index 5e576f1..089699d 100644
--- a/packages/m/MozillaThunderbird/tar_stamps
+++ b/packages/m/MozillaThunderbird/tar_stamps
@@ -1,10 +1,10 @@
PRODUCT="thunderbird"
CHANNEL="esr102"
-VERSION="102.6.1"
+VERSION="102.7.1"
VERSION_SUFFIX=""
-PREV_VERSION="102.6.0"
+PREV_VERSION="102.7.0"
PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr102"
-RELEASE_TAG="563cc2baf242975fda41000da903db513713dc65"
-RELEASE_TIMESTAMP="20221208182320"
+RELEASE_TAG="88d80acadbab4acb4d81cb2934caa807cd59e85a"
+RELEASE_TIMESTAMP="20230123204438"
diff --git a/packages/m/MozillaThunderbird/thunderbird-102.6.1.source.tar.xz b/packages/m/MozillaThunderbird/thunderbird-102.6.1.source.tar.xz
deleted file mode 120000
index 9891c96..0000000
--- a/packages/m/MozillaThunderbird/thunderbird-102.6.1.source.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeid46lhnwbzytpyowrvoypm2helg3zyj2mjj7q5s6udalyccilhrvm
\ No newline at end of file
diff --git a/packages/m/MozillaThunderbird/thunderbird-102.6.1.source.tar.xz.asc b/packages/m/MozillaThunderbird/thunderbird-102.6.1.source.tar.xz.asc
deleted file mode 100644
index 4ff2fe8..0000000
--- a/packages/m/MozillaThunderbird/thunderbird-102.6.1.source.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmOhCS4ACgkQ6+QekPbx
-L21ESA//YGzTUENtkULEgoJDS0FZNZ68nAV5PGZxUwQaolEMPFq+uh3IMUo2ml/T
-+j/bTewFiOaeP7NJVuXCCcSjgdGIvv49fqzj3bDLt2CRyaw6O9XtatLSfUbxcBxm
-9vxfkzXh0T2qbkmPJ5NPXtZEAfjhnLK02uvvCxk1xTWFo7OVd15mz4iFbkKhAEn0
-vd4YwAEhEHG7ophcq/oVlbGLKHLape5Zr5VgSo/hTmq7CPaNQQj93uwQr/zuzlc+
-Or9nleu3HKp9FJ/HmK5TCZM4n3sP5diBte+ZglLbqgtpK8eZPEEw6yBy80RLt+Vr
-yjTV4B9M2GiEdwaRxsl/qDHAgte34GLZbG/tnWhvMVmPm4oTRCXZBAZfpvZC0xIC
-pnvW2sWAKRQNXcLw7g9mrUg3kzHiYBVzRXSUsrlJBD0KE4x3H7m62ZY5UhltjA4S
-Lv32cbF9Z0KkUSjLrwNSzsmMXcLJkgTni8Til+ls3gj5bvABQuIyxJX++V2+eVLW
-xJstjcGwI88eIMHVsFIM2fUG8ONyGy+m/5oyf74R5tPXcDgn9+QnB7I08hlWX4aU
-YYEJGyZFRw70C726TlwjXNghPJqa160VEVo3zxmCPLN6CPAt6AxBtUBXR+KKSHyu
-NC8gFKimtUQjdXtf+e1EDApBLLY3nOxaG+v2fLidStc9stGX9Ec=
-=wVx/
------END PGP SIGNATURE-----
diff --git a/packages/m/MozillaThunderbird/thunderbird-102.7.1.source.tar.xz b/packages/m/MozillaThunderbird/thunderbird-102.7.1.source.tar.xz
new file mode 120000
index 0000000..9b22517
--- /dev/null
+++ b/packages/m/MozillaThunderbird/thunderbird-102.7.1.source.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeia5bi3w4sgsxez4s3uru2tqvscbfyqmaedzuqlczpgn6qkdvpzwm4
\ No newline at end of file
diff --git a/packages/m/MozillaThunderbird/thunderbird-102.7.1.source.tar.xz.asc b/packages/m/MozillaThunderbird/thunderbird-102.7.1.source.tar.xz.asc
new file mode 100644
index 0000000..e7e4acc
--- /dev/null
+++ b/packages/m/MozillaThunderbird/thunderbird-102.7.1.source.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmPZN7kACgkQ6+QekPbx
+L23qrA//YXSJYbCI2af6fwmfgMJEUnFNQZYt7yNsT1jxFgZZNho2UrLGQtdyrjkL
+NXZ09aOSnFA4h6CdhlWufiwJE09woRbkY6V4wsbZwTZYXdow4MZQowb+wjMJIvIL
+ccTL1rouNa1bfXK0HTNvI4J7LiodRXMiBnvooa6056yQ5eUuLVOcDI0XjcVwUqD1
+0GY40InZAzx2Epoglp0Dlefg4QlqxGf0olAmpLPZnyLEmh991Boky1wmfsjTIDyV
+cwSXtzW/y9VMDWEgTp1sepGh8N5MT2CdJkMWheuEuiJCb2cAGO6UkSRWSg1Zm2wi
+DeAcjERJymhDRkz5jCGxQq8Oi3Uylu5gA8Ty2mpW38R00eLI1xxb7zYbMygHBzGK
+8cRtiTWa0X43sB/A/mirRQbZ8aeydqVdAcC4Vcp0QtiOd42qyNqLNlxd7qCXXJGW
+JDVA/o+IGGnhkIbRm1qtrXqXQVmSjhsWd/oUgWDdc40whjKo4tWTh2cr4VQUpUxQ
+wdb0eIvLr+tG/Nt77toJIhLkqmnClVAa44poDzZCpW0ar+kvuURoZtkCR2+4iZWw
+JKPAMUpabtnYwJ7dfz6FTjHmWJMGm2PUdwv0nfV4MoFdm1Nbgwi5wG3g40iRGk5h
+0czTxBjYmvwxWaR+DCyBfNXB4Xnju5PPk+/q9SQJ705xWy8Or3Y=
+=gOHu
+-----END PGP SIGNATURE-----
diff --git a/packages/m/maeparser/.files b/packages/m/maeparser/.files
index 9dfffac..46a7e50 100644
Binary files a/packages/m/maeparser/.files and b/packages/m/maeparser/.files differ
diff --git a/packages/m/maeparser/.rev b/packages/m/maeparser/.rev
index a579cb9..7d0c8b5 100644
--- a/packages/m/maeparser/.rev
+++ b/packages/m/maeparser/.rev
@@ -20,4 +20,15 @@
- Remove upstreamed maeparser-1.2.4-cmake-config-installdir.patch.
1001520
+
+ ea950ca301b88cb8fa9f34efd177ae06
+ 1.3.1
+
+ dimstar_suse
+ - Update to version 1.3.1:
+ * Allow property names to include colons
+ (gh#schrodinger/maeparser#77).
+
+ 1062538
+
diff --git a/packages/m/maeparser/maeparser-1.3.0.tar.gz b/packages/m/maeparser/maeparser-1.3.0.tar.gz
deleted file mode 120000
index 73c610d..0000000
--- a/packages/m/maeparser/maeparser-1.3.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreih2r6jtnxq6luokx3bju3naivd3d6yebozsxjir74yljikas7dvdq
\ No newline at end of file
diff --git a/packages/m/maeparser/maeparser-1.3.1.tar.gz b/packages/m/maeparser/maeparser-1.3.1.tar.gz
new file mode 120000
index 0000000..66e4428
--- /dev/null
+++ b/packages/m/maeparser/maeparser-1.3.1.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafkreifi3ahwpunzxzxcholfds3up5fdeaatfz6ypcrikem4q27uivuogy
\ No newline at end of file
diff --git a/packages/m/maeparser/maeparser.changes b/packages/m/maeparser/maeparser.changes
index cec5b57..eb00c87 100644
--- a/packages/m/maeparser/maeparser.changes
+++ b/packages/m/maeparser/maeparser.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Feb 1 19:51:01 UTC 2023 - Antoine Belvire
+
+- Update to version 1.3.1:
+ * Allow property names to include colons
+ (gh#schrodinger/maeparser#77).
+
+-------------------------------------------------------------------
Tue Sep 6 19:51:16 UTC 2022 - Antoine Belvire
- Update to version 1.3.0:
diff --git a/packages/m/maeparser/maeparser.spec b/packages/m/maeparser/maeparser.spec
index 244aec7..4cb0f13 100644
--- a/packages/m/maeparser/maeparser.spec
+++ b/packages/m/maeparser/maeparser.spec
@@ -1,7 +1,7 @@
#
# spec file for package maeparser
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define abiver 1
Name: maeparser
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Summary: Maestro file parser
License: MIT
diff --git a/packages/m/mercurial-extension-hg-git/.files b/packages/m/mercurial-extension-hg-git/.files
index ea21858..32abb99 100644
Binary files a/packages/m/mercurial-extension-hg-git/.files and b/packages/m/mercurial-extension-hg-git/.files differ
diff --git a/packages/m/mercurial-extension-hg-git/.rev b/packages/m/mercurial-extension-hg-git/.rev
index 48886ce..c15be10 100644
--- a/packages/m/mercurial-extension-hg-git/.rev
+++ b/packages/m/mercurial-extension-hg-git/.rev
@@ -49,4 +49,12 @@
Update to version 1.0.1 (forwarded request 1042423 from develop7)
1042424
+
+ cee2d0b53ab6f55c3ab3b8eed162b4b6
+ 1.0.1
+
+ dimstar_suse
+
+ 1062540
+
diff --git a/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.changes b/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.changes
index da7165f..42b1905 100644
--- a/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.changes
+++ b/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Feb 1 19:56:50 UTC 2023 - Lukas Müller
+
+- Use pyproject.toml instead of setup.py for build and install.
+- Add python3-setuptools_scm to determine the correct version of the package.
+
+-------------------------------------------------------------------
Mon Dec 12 15:53:46 UTC 2022 - Andrei Dziahel
- Update to version 1.0.1
diff --git a/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.spec b/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.spec
index a41540c..343491c 100644
--- a/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.spec
+++ b/packages/m/mercurial-extension-hg-git/mercurial-extension-hg-git.spec
@@ -1,7 +1,7 @@
#
# spec file for package mercurial-extension-hg-git
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,6 +22,7 @@
%bcond_with test
%endif
+%define pythons python3
Name: mercurial-extension-hg-git
Version: 1.0.1
Release: 0
@@ -37,7 +38,10 @@ BuildRequires: mercurial
BuildRequires: python-rpm-macros
BuildRequires: python3
BuildRequires: python3-gpg
+BuildRequires: python3-pip
BuildRequires: python3-setuptools
+BuildRequires: python3-setuptools_scm
+BuildRequires: python3-wheel
BuildRequires: unzip
Requires: mercurial
Requires: python3-dulwich >= 0.19.0
@@ -54,10 +58,10 @@ The Hg-Git plugin can convert commits/changesets losslessly from one system to a
%setup -q -n hg-git-%{version}
%build
-%python3_build
+%pyproject_wheel
%install
-%python3_install
+%pyproject_install
%fdupes %{buildroot}%{python3_sitelib}
%check
diff --git a/packages/m/minio-client/.files b/packages/m/minio-client/.files
index 60eb1b7..6146edf 100644
Binary files a/packages/m/minio-client/.files and b/packages/m/minio-client/.files differ
diff --git a/packages/m/minio-client/.rev b/packages/m/minio-client/.rev
index 46367d8..4b0931c 100644
--- a/packages/m/minio-client/.rev
+++ b/packages/m/minio-client/.rev
@@ -199,4 +199,12 @@
1058119
+
+ 1bfeade3bf3814ba4b48b65cf9f38604
+ 20230128T202938Z
+
+ dimstar_suse
+
+ 1062590
+
diff --git a/packages/m/minio-client/.servicemark b/packages/m/minio-client/.servicemark
index 4c69ceb..1441434 100644
--- a/packages/m/minio-client/.servicemark
+++ b/packages/m/minio-client/.servicemark
@@ -1 +1 @@
-004ce94a7ba877b9c6fc80d4eeb521ed
+baed88d8106a073c3781e91dd324f85a
diff --git a/packages/m/minio-client/_service b/packages/m/minio-client/_service
index d84935d..f790e7f 100644
--- a/packages/m/minio-client/_service
+++ b/packages/m/minio-client/_service
@@ -5,7 +5,7 @@
.git
enable
@PARENT_TAG@
- RELEASE.2023-01-11T03-14-16Z
+ RELEASE.2023-01-28T20-29-38Z
RELEASE.*
RELEASE\.(.*)-(.*)-(.*)-(.*)-(.*)
\1\2\3\4\5
@@ -21,6 +21,6 @@
gz
- mc-20230111T031416Z.tar.gz
+ mc-20230128T202938Z.tar.gz
diff --git a/packages/m/minio-client/_servicedata b/packages/m/minio-client/_servicedata
index 716f345..c59f23c 100644
--- a/packages/m/minio-client/_servicedata
+++ b/packages/m/minio-client/_servicedata
@@ -1,4 +1,4 @@
https://github.com/minio/mc
- 14c2e506fa78b53fb6db88bcf87d8f6d3fb6989e
\ No newline at end of file
+ 2e95a70c98fb9c2629cd89817b8759bfa109a4d0
\ No newline at end of file
diff --git a/packages/m/minio-client/mc-20230111T031416Z.tar.gz b/packages/m/minio-client/mc-20230111T031416Z.tar.gz
deleted file mode 120000
index c383671..0000000
--- a/packages/m/minio-client/mc-20230111T031416Z.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeickqnvpdqf7cxbfj4byqp3e6eiwe47vbb3ioayvmzdlyuxdtbimhy
\ No newline at end of file
diff --git a/packages/m/minio-client/mc-20230128T202938Z.tar.gz b/packages/m/minio-client/mc-20230128T202938Z.tar.gz
new file mode 120000
index 0000000..a7d9443
--- /dev/null
+++ b/packages/m/minio-client/mc-20230128T202938Z.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeidamiwoh7j6yk5yjgq2pn7ky57rxvjzrb23dvre2shqubv4hjrudq
\ No newline at end of file
diff --git a/packages/m/minio-client/minio-client.changes b/packages/m/minio-client/minio-client.changes
index 0ae4f96..2f4c5fd 100644
--- a/packages/m/minio-client/minio-client.changes
+++ b/packages/m/minio-client/minio-client.changes
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Thu Feb 02 07:22:08 UTC 2023 - kastl@b1-systems.de
+
+- Update to version 20230128T202938Z:
+ * Use --api-key flag on register when provided (#4458)
+ * fix: hide duration flag its not useful for users (#4457)
+ * Add support for restoring SSE-C encrypted objects (#4456)
+ * use humanize.IBytes instead of humanize.Bytes (#4455)
+ * cleanup mc to use 'go' errs to be 'e' (#4450)
+ * Corrected the logic for calculating the expiration no of days (#4451)
+ * Corrected output for command `mc admin info` (#4448)
+ * Support --airgap in unregister command (#4441)
+ * Add support of giving a comment to service accounts (#4438)
+ * Improve message when profile upload fails (#4443)
+ * Simplify/speedup container image publishing script (#4442)
+
+-------------------------------------------------------------------
Fri Jan 13 06:10:14 UTC 2023 - kastl@b1-systems.de
- Update to version 20230111T031416Z:
diff --git a/packages/m/minio-client/minio-client.spec b/packages/m/minio-client/minio-client.spec
index 51cc166..1eda014 100644
--- a/packages/m/minio-client/minio-client.spec
+++ b/packages/m/minio-client/minio-client.spec
@@ -22,7 +22,7 @@
%define binary_name minio-client
Name: minio-client
-Version: 20230111T031416Z
+Version: 20230128T202938Z
Release: 0
Summary: Client for MinIO
License: AGPL-3.0-only
diff --git a/packages/m/minio-client/vendor.tar.gz b/packages/m/minio-client/vendor.tar.gz
index ecc20d8..17f1fb2 120000
--- a/packages/m/minio-client/vendor.tar.gz
+++ b/packages/m/minio-client/vendor.tar.gz
@@ -1 +1 @@
-/ipfs/bafybeibxk2yaw5zw67l67oup5iyleh7evgbmzjuby7fslofhkvd7pynowa
\ No newline at end of file
+/ipfs/bafybeibbm4ixa42bp7bax7dyjbb4mgpqxtremalluep3wypkpvsmt6xrvq
\ No newline at end of file
diff --git a/packages/m/mpfr/.files b/packages/m/mpfr/.files
index 59f0965..aa97343 100644
Binary files a/packages/m/mpfr/.files and b/packages/m/mpfr/.files differ
diff --git a/packages/m/mpfr/.rev b/packages/m/mpfr/.rev
index ff8f367..78bde65 100644
--- a/packages/m/mpfr/.rev
+++ b/packages/m/mpfr/.rev
@@ -530,4 +530,31 @@
the mpfr_custom_get_kind macro.
1037844
+
+ 85148bd036ce9c674689034193b340d7
+ 4.2.0
+
+ dimstar_suse
+ - tests-tsprintf.patch: Avoid testsuite failure with glibc >= 2.37
+
+- Update to mpfr 4.2.0
+ * New functions mpfr_cosu, mpfr_sinu, mpfr_tanu, mpfr_acosu, mpfr_asinu,
+ mpfr_atanu and mpfr_atan2u.
+ * New functions mpfr_cospi, mpfr_sinpi, mpfr_tanpi, mpfr_acospi, mpfr_asinpi,
+ mpfr_atanpi and mpfr_atan2pi.
+ * New functions mpfr_log2p1, mpfr_log10p1, mpfr_exp2m1, mpfr_exp10m1 and
+ mpfr_compound_si.
+ * New functions mpfr_fmod_ui, mpfr_powr, mpfr_pown, mpfr_pow_uj, mpfr_pow_sj
+ and mpfr_rootn_si (mpfr_pown is actually a macro defined as an alias for
+ mpfr_pow_sj).
+ * Bug fixes.
+ In particular, for the formatted output functions (mpfr_printf, etc.),
+ the case where the precision consists only of a period has been fixed
+ to be like ".0" as specified in the ISO C standard, and the manual has
+ been corrected and clarified.
+ The macros of the custom interface have also been fixed: they now behave
+ like functions (except a minor limitation for mpfr_custom_init_set).
+- Remove mpfr-4.1.1-patch01.patch which is included in the new release.
+ 1062392
+
diff --git a/packages/m/mpfr/mpfr-4.1.1-patch01.patch b/packages/m/mpfr/mpfr-4.1.1-patch01.patch
deleted file mode 100644
index 0566c80..0000000
--- a/packages/m/mpfr/mpfr-4.1.1-patch01.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naurd mpfr-4.1.1-a/PATCHES mpfr-4.1.1-b/PATCHES
---- mpfr-4.1.1-a/PATCHES 2022-11-23 11:45:26.800476079 +0000
-+++ mpfr-4.1.1-b/PATCHES 2022-11-23 11:45:26.844475966 +0000
-@@ -0,0 +1 @@
-+mpfr_custom_get_kind
-diff -Naurd mpfr-4.1.1-a/VERSION mpfr-4.1.1-b/VERSION
---- mpfr-4.1.1-a/VERSION 2022-11-17 13:28:44.000000000 +0000
-+++ mpfr-4.1.1-b/VERSION 2022-11-23 11:45:26.844475966 +0000
-@@ -1 +1 @@
--4.1.1
-+4.1.1-p1
-diff -Naurd mpfr-4.1.1-a/src/mpfr.h mpfr-4.1.1-b/src/mpfr.h
---- mpfr-4.1.1-a/src/mpfr.h 2022-11-17 13:28:44.000000000 +0000
-+++ mpfr-4.1.1-b/src/mpfr.h 2022-11-23 11:45:26.840475978 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 4
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "4.1.1"
-+#define MPFR_VERSION_STRING "4.1.1-p1"
-
- /* User macros:
- MPFR_USE_FILE: Define it to make MPFR define functions dealing
-@@ -1027,7 +1027,7 @@
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #define mpfr_custom_get_kind(x) \
- __extension__ ({ \
-- mpfr_ptr _x = (x); \
-+ mpfr_srcptr _x = (x); \
- _x->_mpfr_exp > __MPFR_EXP_INF ? \
- (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \
- : _x->_mpfr_exp == __MPFR_EXP_INF ? \
-diff -Naurd mpfr-4.1.1-a/src/version.c mpfr-4.1.1-b/src/version.c
---- mpfr-4.1.1-a/src/version.c 2022-11-17 13:28:44.000000000 +0000
-+++ mpfr-4.1.1-b/src/version.c 2022-11-23 11:45:26.844475966 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "4.1.1";
-+ return "4.1.1-p1";
- }
-diff -Naurd mpfr-4.1.1-a/tests/tstckintc.c mpfr-4.1.1-b/tests/tstckintc.c
---- mpfr-4.1.1-a/tests/tstckintc.c 2022-05-06 13:47:17.000000000 +0000
-+++ mpfr-4.1.1-b/tests/tstckintc.c 2022-11-23 11:45:26.836475987 +0000
-@@ -295,14 +295,16 @@
- test_nan_inf_zero (void)
- {
- mpfr_ptr val;
-+ mpfr_srcptr sval; /* for compilation error checking */
- int sign;
- int kind;
-
- reset_stack ();
-
- val = new_mpfr (MPFR_PREC_MIN);
-+ sval = val;
- mpfr_set_nan (val);
-- kind = (mpfr_custom_get_kind) (val);
-+ kind = (mpfr_custom_get_kind) (sval);
- if (kind != MPFR_NAN_KIND)
- {
- printf ("mpfr_custom_get_kind error: ");
-@@ -380,7 +382,8 @@
- dummy_set_si (long si)
- {
- mpfr_t x;
-- long * r = dummy_new ();
-+ mpfr_srcptr px; /* for compilation error checking */
-+ long *r = dummy_new ();
- int i1, i2, i3, i4, i5;
-
- /* Check that the type "void *" can be used, like with the function.
-@@ -405,7 +408,8 @@
- MPFR_ASSERTN (i5 == 1);
-
- mpfr_set_si (x, si, MPFR_RNDN);
-- r[0] = mpfr_custom_get_kind (x);
-+ px = x;
-+ r[0] = mpfr_custom_get_kind (px);
-
- /* Check that the type "void *" can be used in C, like with the function
- (forbidden in C++). Also check side effects. */
diff --git a/packages/m/mpfr/mpfr-4.1.1.tar.xz b/packages/m/mpfr/mpfr-4.1.1.tar.xz
deleted file mode 120000
index 19f97d8..0000000
--- a/packages/m/mpfr/mpfr-4.1.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeihe7ize6kvzc2uyitmocclk26p4u7kvy2t2sbipyf2r5s42qttpom
\ No newline at end of file
diff --git a/packages/m/mpfr/mpfr-4.1.1.tar.xz.asc b/packages/m/mpfr/mpfr-4.1.1.tar.xz.asc
deleted file mode 100644
index 8cde65d..0000000
--- a/packages/m/mpfr/mpfr-4.1.1.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQSlNL4/g+JB2RgoCutYMdEaDU2wKgUCY3Y8nQAKCRBYMdEaDU2w
-Kl5VAP0RgeqbW7slZlfkxAtJ5FF4pM/cXzkc9BlLSqazc0vD2AEAuYw6eA5QmjjH
-5Un62IrZMVzSmp98XqG18IF9k/J7RAM=
-=pqz1
------END PGP SIGNATURE-----
diff --git a/packages/m/mpfr/mpfr-4.2.0.tar.xz b/packages/m/mpfr/mpfr-4.2.0.tar.xz
new file mode 120000
index 0000000..234ca62
--- /dev/null
+++ b/packages/m/mpfr/mpfr-4.2.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeibc5dcgcobpow4avyu5kdyyykdcbweftb4ix27r5tzqh6zdzyj3tu
\ No newline at end of file
diff --git a/packages/m/mpfr/mpfr-4.2.0.tar.xz.asc b/packages/m/mpfr/mpfr-4.2.0.tar.xz.asc
new file mode 100644
index 0000000..5ff5a7c
--- /dev/null
+++ b/packages/m/mpfr/mpfr-4.2.0.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYIAB0WIQSlNL4/g+JB2RgoCutYMdEaDU2wKgUCY7gEFgAKCRBYMdEaDU2w
+KvJAAP9ittAduZGXgjgIYT7detiVCnDpcyFUTIzkFh5NM3KmagEA5bEcwHjUQT8H
++KGcR9nBRBxqcvjHUX6qOHqNdHZTfwM=
+=QJu5
+-----END PGP SIGNATURE-----
diff --git a/packages/m/mpfr/mpfr.changes b/packages/m/mpfr/mpfr.changes
index 8c197b6..46251f4 100644
--- a/packages/m/mpfr/mpfr.changes
+++ b/packages/m/mpfr/mpfr.changes
@@ -1,4 +1,31 @@
-------------------------------------------------------------------
+Tue Jan 31 15:58:22 UTC 2023 - Andreas Schwab
+
+- tests-tsprintf.patch: Avoid testsuite failure with glibc >= 2.37
+
+-------------------------------------------------------------------
+Mon Jan 9 08:22:17 UTC 2023 - Richard Biener
+
+- Update to mpfr 4.2.0
+ * New functions mpfr_cosu, mpfr_sinu, mpfr_tanu, mpfr_acosu, mpfr_asinu,
+ mpfr_atanu and mpfr_atan2u.
+ * New functions mpfr_cospi, mpfr_sinpi, mpfr_tanpi, mpfr_acospi, mpfr_asinpi,
+ mpfr_atanpi and mpfr_atan2pi.
+ * New functions mpfr_log2p1, mpfr_log10p1, mpfr_exp2m1, mpfr_exp10m1 and
+ mpfr_compound_si.
+ * New functions mpfr_fmod_ui, mpfr_powr, mpfr_pown, mpfr_pow_uj, mpfr_pow_sj
+ and mpfr_rootn_si (mpfr_pown is actually a macro defined as an alias for
+ mpfr_pow_sj).
+ * Bug fixes.
+ In particular, for the formatted output functions (mpfr_printf, etc.),
+ the case where the precision consists only of a period has been fixed
+ to be like ".0" as specified in the ISO C standard, and the manual has
+ been corrected and clarified.
+ The macros of the custom interface have also been fixed: they now behave
+ like functions (except a minor limitation for mpfr_custom_init_set).
+- Remove mpfr-4.1.1-patch01.patch which is included in the new release.
+
+-------------------------------------------------------------------
Thu Nov 24 09:08:38 UTC 2022 - Richard Biener
- Add mpfr-4.1.1-patch01.patch to fix bug with code using
diff --git a/packages/m/mpfr/mpfr.spec b/packages/m/mpfr/mpfr.spec
index 4364423..21658e4 100644
--- a/packages/m/mpfr/mpfr.spec
+++ b/packages/m/mpfr/mpfr.spec
@@ -1,7 +1,7 @@
#
# spec file for package mpfr
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: mpfr
-Version: 4.1.1
+Version: 4.2.0
Release: 0
Summary: The GNU multiple-precision floating-point library
License: LGPL-3.0-or-later
@@ -27,7 +27,7 @@ Source0: https://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.xz
Source1: https://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.xz.asc
Source2: %{name}.keyring
Source3: baselibs.conf
-Patch0: mpfr-4.1.1-patch01.patch
+Patch0: tests-tsprintf.patch
BuildRequires: gmp-devel
BuildRequires: pkgconfig
diff --git a/packages/m/mpfr/tests-tsprintf.patch b/packages/m/mpfr/tests-tsprintf.patch
new file mode 100644
index 0000000..ba6f41b
--- /dev/null
+++ b/packages/m/mpfr/tests-tsprintf.patch
@@ -0,0 +1,56 @@
+From 5172494c09718ffcb7ef1f19b3b211e3bce8781a Mon Sep 17 00:00:00 2001
+From: Vincent Lefevre
+Date: Tue, 10 Jan 2023 17:05:17 +0100
+Subject: [PATCH] [tests/tsprintf.c] Modified a buggy test of the thousands
+ separator.
+
+The test
+
+ check_vsprintf ("+01,234,567 :", "%0+ -'13.10Pd:", (mpfr_prec_t) 1234567);
+
+is based on the output from glibc up to 2.36, which is incorrect:
+
+ https://sourceware.org/bugzilla/show_bug.cgi?id=23432
+
+The GNU C Library has apparently been partially fixed in its Git
+repository for the future 2.37, since a tsprintf failure has been
+reported (this is a bug in this test, not in the MPFR library):
+
+ https://sympa.inria.fr/sympa/arc/mpfr/2023-01/msg00001.html
+
+So, modified the test to avoid the particular case of leading zeros
+due to the precision field larger than the number of digits. This
+case has already been tested without the thousands separator (where
+there are no issues with the C libraries), so that we do not miss
+much testing. Added a comment explaining the issue and a possible
+solution for future testing of this particular case (if need be).
+---
+ tests/tsprintf.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/tests/tsprintf.c b/tests/tsprintf.c
+index c68b2ba71..c0182503b 100644
+--- a/tests/tsprintf.c
++++ b/tests/tsprintf.c
+@@ -1719,7 +1719,17 @@ test_locale (void)
+ check_sprintf ("000000001,000", "%'013.4Rg", x);
+
+ #ifdef PRINTF_GROUPFLAG
+- check_vsprintf ("+01,234,567 :", "%0+ -'13.10Pd:", (mpfr_prec_t) 1234567);
++ /* Do not test the thousands separator with a precision field larger
++ than the number of digits (thus needing leading zeros), such as
++ "%0+ -'13.10Pd:" (used up to MPFR 4.2.0), since the GNU libc is
++ buggy: https://sourceware.org/bugzilla/show_bug.cgi?id=23432
++ We don't know about the other implementations.
++ If we wanted to check that and avoid a failure of the test because of
++ a buggy C library (while MPFR would be consistent with the C library),
++ we could compare the MPFR output with both the correct output and the
++ output from the C library (possibly buggy). But to do that in a clean
++ way, this would require a change in the check_vsprintf() call. */
++ check_vsprintf ("+1,234,567 :", "%0+ -'13Pd:", (mpfr_prec_t) 1234567);
+ #endif
+
+ mpfr_clear (x);
+--
+2.39.1
+
diff --git a/packages/n/NetworkManager/.files b/packages/n/NetworkManager/.files
index 36bf8f9..bf6c63d 100644
Binary files a/packages/n/NetworkManager/.files and b/packages/n/NetworkManager/.files differ
diff --git a/packages/n/NetworkManager/.rev b/packages/n/NetworkManager/.rev
index 63d6d27..eb028a8 100644
--- a/packages/n/NetworkManager/.rev
+++ b/packages/n/NetworkManager/.rev
@@ -2111,4 +2111,12 @@ WANTED for 13.1 - BLUEZ5 FIX (forwarded request 203010 from Zaitor)
New stable release (forwarded request 1057758 from iznogood)
1058171
+
+ bd6085d424e620d359b29a1a892eae6d
+ 1.40.12
+
+ dimstar_suse
+
+ 1062415
+
diff --git a/packages/n/NetworkManager/NetworkManager-1.40.10.tar.xz b/packages/n/NetworkManager/NetworkManager-1.40.10.tar.xz
deleted file mode 120000
index 657a319..0000000
--- a/packages/n/NetworkManager/NetworkManager-1.40.10.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeickti2eoqh3wcmbkg3tgf3jcswzrc62vvqowmj2oebrza5izav7ei
\ No newline at end of file
diff --git a/packages/n/NetworkManager/NetworkManager-1.40.12.tar.xz b/packages/n/NetworkManager/NetworkManager-1.40.12.tar.xz
new file mode 120000
index 0000000..e2dc3f0
--- /dev/null
+++ b/packages/n/NetworkManager/NetworkManager-1.40.12.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeicfyomtynm5neqb2j6nef5epphxh3eqibwko5x4m7727kg7kp5w7i
\ No newline at end of file
diff --git a/packages/n/NetworkManager/NetworkManager.changes b/packages/n/NetworkManager/NetworkManager.changes
index 03f84f7..e643122 100644
--- a/packages/n/NetworkManager/NetworkManager.changes
+++ b/packages/n/NetworkManager/NetworkManager.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri Jan 27 18:39:15 UTC 2023 - Bjørn Lie
+
+- Update to version 1.40.12:
+ + Make sure "external-ids" stays up to date in Open vSwitch
+ database on a connection reapply.
+ + Retry if a netlink sockets runs out of buffer space before
+ we're able to read results of a link change.
+ + Fix a possible race involving concurrent invocation of iptables
+ in IPv4 shared mode.
+ + Other various fixes.
+
+-------------------------------------------------------------------
Wed Jan 11 11:17:01 UTC 2023 - Bjørn Lie
- Update to version 1.40.10:
diff --git a/packages/n/NetworkManager/NetworkManager.spec b/packages/n/NetworkManager/NetworkManager.spec
index ce42225..d0a5360 100644
--- a/packages/n/NetworkManager/NetworkManager.spec
+++ b/packages/n/NetworkManager/NetworkManager.spec
@@ -64,7 +64,7 @@
%endif
Name: NetworkManager
-Version: 1.40.10
+Version: 1.40.12
Release: 0
Summary: Network Link Manager and user applications for it
License: GPL-2.0-or-later AND LGPL-2.1-or-later
diff --git a/packages/n/ncurses/.files b/packages/n/ncurses/.files
index dabcd58..81a359e 100644
Binary files a/packages/n/ncurses/.files and b/packages/n/ncurses/.files differ
diff --git a/packages/n/ncurses/.rev b/packages/n/ncurses/.rev
index eb738a3..4614e96 100644
--- a/packages/n/ncurses/.rev
+++ b/packages/n/ncurses/.rev
@@ -3949,4 +3949,12 @@
* ncurses-6.4.dif
1058637
+
+ 517e5b14c4e50ae54740265e81ffd16d
+ 6.4.MACRO
+
+ dimstar_suse
+ Automatic submission by obs-autosubmit
+ 1062058
+
diff --git a/packages/n/ncurses/ncurses-6.4-patches.tar.bz2 b/packages/n/ncurses/ncurses-6.4-patches.tar.bz2
index 314d37f..61c76ae 120000
--- a/packages/n/ncurses/ncurses-6.4-patches.tar.bz2
+++ b/packages/n/ncurses/ncurses-6.4-patches.tar.bz2
@@ -1 +1 @@
-/ipfs/bafkreiegz24vislxpe67rzu2cgjrvdogbamk2htssptxjzgizqw33bd5ei
\ No newline at end of file
+/ipfs/bafybeigzeg6r2evhereauq26hapesfbammltaqa3giasry3dbfa3bbctfa
\ No newline at end of file
diff --git a/packages/n/ncurses/ncurses-6.4.dif b/packages/n/ncurses/ncurses-6.4.dif
index c174988..5fc78ae 100644
--- a/packages/n/ncurses/ncurses-6.4.dif
+++ b/packages/n/ncurses/ncurses-6.4.dif
@@ -18,8 +18,8 @@
16 files changed, 207 insertions(+), 70 deletions(-)
--- aclocal.m4
-+++ aclocal.m4 2023-01-16 08:31:57.044889237 +0000
-@@ -5988,12 +5988,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP
CF_EOF
- if test -n "$cf_compress" ; then
-@@ -6118,9 +6121,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP
CF_EOF
- if test -n "$cf_compress" ; then
-@@ -15385,9 +15388,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@
--- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh 2023-01-09 11:47:28.920395274 +0000
++++ ncurses/run_cmd.sh 2023-01-23 13:00:47.043268809 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@@ -729,7 +729,7 @@
+
+exec /bin/sh -e ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh 2023-01-09 11:47:28.920395274 +0000
++++ ncurses/tinfo/MKfallback.sh 2023-01-23 13:00:47.043268809 +0000
@@ -66,14 +66,22 @@ if test $# != 0 ; then
TERMINFO=`pwd`/$tmp_info
export TERMINFO
@@ -773,7 +773,7 @@
done
--- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c 2023-01-09 11:47:28.920395274 +0000
++++ ncurses/tinfo/lib_setup.c 2023-01-23 13:00:47.043268809 +0000
@@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@@ -785,7 +785,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- progs/Makefile.in
-+++ progs/Makefile.in 2023-01-09 11:47:28.920395274 +0000
++++ progs/Makefile.in 2023-01-23 13:00:47.043268809 +0000
@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC
CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
@@ -805,7 +805,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h
-+++ test/test.priv.h 2023-01-09 11:47:28.920395274 +0000
++++ test/test.priv.h 2023-01-23 13:00:47.043268809 +0000
@@ -1108,12 +1108,12 @@ extern char *_nc_strstr(const char *, co
#endif
@@ -822,7 +822,7 @@
#define CANCELLED_STRING (char *)(-1)
--- test/tracemunch
-+++ test/tracemunch 2023-01-09 11:47:28.920395274 +0000
++++ test/tracemunch 2023-01-23 13:00:47.043268809 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
diff --git a/packages/n/ncurses/ncurses.changes b/packages/n/ncurses/ncurses.changes
index 8d81909..fdf12c4 100644
--- a/packages/n/ncurses/ncurses.changes
+++ b/packages/n/ncurses/ncurses.changes
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Mon Jan 23 13:00:25 UTC 2023 - Dr. Werner Fink
+
+- Add ncurses patch 20230121
+ + correct limit-check when dumping tc/use clause via tic -I (report by
+ Gabriel Ravier).
+ + correct a check for manpage-alias in edit_man.sh, to work with out of
+ tree builds (report by Sven Joachim).
+- Port ncurses-6.4.dif to patch 20230121
+
+-------------------------------------------------------------------
Mon Jan 16 08:30:13 UTC 2023 - Dr. Werner Fink
- Add ncurses patch 20230114
diff --git a/packages/n/nodejs18/.files b/packages/n/nodejs18/.files
index 721f0c8..bba43df 100644
Binary files a/packages/n/nodejs18/.files and b/packages/n/nodejs18/.files differ
diff --git a/packages/n/nodejs18/.rev b/packages/n/nodejs18/.rev
index 7cd0d9c..d16b426 100644
--- a/packages/n/nodejs18/.rev
+++ b/packages/n/nodejs18/.rev
@@ -153,4 +153,15 @@ manual_configure.patch npm_search_paths.patch skip_no_console.patch
flaky_test_rerun.patch nodejs-libpath.patch sle12_python3_compat.patch
1062242
+
+ c9de65d0e6a1e4dc74f9ec72db957758
+ 18.13.0
+
+ dimstar_suse
+ - Do not use pkg_vcmp to decide BuildDependencies: this works based
+ on 'installed packages' which is not interpreted correctly by the
+ scheduler. Rather switch to boolean dependencies.
+------------------------------------------------------------------
+ 1062438
+
diff --git a/packages/n/nodejs18/nodejs18.changes b/packages/n/nodejs18/nodejs18.changes
index 16b94ca..e52e972 100644
--- a/packages/n/nodejs18/nodejs18.changes
+++ b/packages/n/nodejs18/nodejs18.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Feb 1 07:58:26 UTC 2023 - Dominique Leuenberger
+
+- Do not use pkg_vcmp to decide BuildDependencies: this works based
+ on 'installed packages' which is not interpreted correctly by the
+ scheduler. Rather switch to boolean dependencies.
+
+------------------------------------------------------------------
Wed Jan 25 12:01:18 UTC 2023 - Adam Majer
- Again use openssl-3, if available.
diff --git a/packages/n/nodejs18/nodejs18.spec b/packages/n/nodejs18/nodejs18.spec
index 489fa34..f9c4cc1 100644
--- a/packages/n/nodejs18/nodejs18.spec
+++ b/packages/n/nodejs18/nodejs18.spec
@@ -282,16 +282,14 @@ Requires: openssl-has-RSA_get0_pss_params
%if 0%{?suse_version} >= 1500
BuildRequires: openssl >= %{openssl_req_ver}
+BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel)
+BuildRequires: (libopenssl3-hmac if libopenssl-3-devel)
%else
BuildRequires: openssl-1_1 >= %{openssl_req_ver}
-%endif
-
-%if %{pkg_vcmp pkgconfig(openssl) > '3.0' }
-BuildRequires: libopenssl3-hmac
-%else
BuildRequires: libopenssl1_1-hmac
%endif
+
# /suse_version
%endif
diff --git a/packages/n/nodejs19/.files b/packages/n/nodejs19/.files
index a26aaed..cad8be7 100644
Binary files a/packages/n/nodejs19/.files and b/packages/n/nodejs19/.files differ
diff --git a/packages/n/nodejs19/.rev b/packages/n/nodejs19/.rev
index 55271ea..d26549f 100644
--- a/packages/n/nodejs19/.rev
+++ b/packages/n/nodejs19/.rev
@@ -95,4 +95,14 @@ For details, see CHANGELOG_V19.md
otherwise some unit tests can fail
1061207
+
+ 1238cc011a4ff48e121f0c826d791ce8
+ 19.5.0
+
+ dimstar_suse
+ - Do not use pkg_vcmp to decide BuildDependencies: this works based
+ on 'installed packages' which is not interpreted correctly by the
+ scheduler. Rather switch to boolean dependencies.
+ 1062437
+
diff --git a/packages/n/nodejs19/nodejs19.changes b/packages/n/nodejs19/nodejs19.changes
index 4d7ea9e..9649f65 100644
--- a/packages/n/nodejs19/nodejs19.changes
+++ b/packages/n/nodejs19/nodejs19.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Feb 1 07:58:26 UTC 2023 - Dominique Leuenberger
+
+- Do not use pkg_vcmp to decide BuildDependencies: this works based
+ on 'installed packages' which is not interpreted correctly by the
+ scheduler. Rather switch to boolean dependencies.
+
+-------------------------------------------------------------------
Wed Jan 25 15:13:49 UTC 2023 - Adam Majer
- Update to version 19.5.0:
diff --git a/packages/n/nodejs19/nodejs19.spec b/packages/n/nodejs19/nodejs19.spec
index 0e9e805..3817235 100644
--- a/packages/n/nodejs19/nodejs19.spec
+++ b/packages/n/nodejs19/nodejs19.spec
@@ -282,16 +282,14 @@ Requires: openssl-has-RSA_get0_pss_params
%if 0%{?suse_version} >= 1500
BuildRequires: openssl >= %{openssl_req_ver}
+BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel)
+BuildRequires: (libopenssl3-hmac if libopenssl-3-devel)
%else
BuildRequires: openssl-1_1 >= %{openssl_req_ver}
-%endif
-
-%if %{pkg_vcmp pkgconfig(openssl) > '3.0' }
-BuildRequires: libopenssl3-hmac
-%else
BuildRequires: libopenssl1_1-hmac
%endif
+
# /suse_version
%endif
diff --git a/packages/n/ntp/.files b/packages/n/ntp/.files
index 72fe881..4f148c7 100644
Binary files a/packages/n/ntp/.files and b/packages/n/ntp/.files differ
diff --git a/packages/n/ntp/.rev b/packages/n/ntp/.rev
index 4398b9c..a999f09 100644
--- a/packages/n/ntp/.rev
+++ b/packages/n/ntp/.rev
@@ -1274,4 +1274,12 @@ Properly categorise licenses and sync with Fedora declaration (forwarded request
- boo#1207577: set /var/lib/ntp/var/run/ntp to 775
1061308
+
+ 3c970bbb86c394a07988c96d760cd1a0
+ 4.2.8p15
+
+ dimstar_suse
+
+ 1062463
+
diff --git a/packages/n/ntp/ntp.changes b/packages/n/ntp/ntp.changes
index 5037bae..0df7275 100644
--- a/packages/n/ntp/ntp.changes
+++ b/packages/n/ntp/ntp.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sat Jan 28 22:38:45 UTC 2023 - Dirk Müller
+
+- run bash specific post with bash
+
+-------------------------------------------------------------------
Thu Jan 26 16:43:42 UTC 2023 - Reinhard Max
- boo#1207577: set /var/lib/ntp/var/run/ntp to 775
diff --git a/packages/n/ntp/ntp.spec b/packages/n/ntp/ntp.spec
index ca9f59c..459f20c 100644
--- a/packages/n/ntp/ntp.spec
+++ b/packages/n/ntp/ntp.spec
@@ -275,7 +275,7 @@ if [ $1 -eq 0 ]; then
test -e %{_localstatedir}/log/ntp && rm -f %{_localstatedir}/log/ntp
fi
-%post
+%post -p /bin/bash
getntpconf() {
# Get the value of a single-value ntp.conf directive, first match wins.
diff --git a/packages/o/ocaml-rpm-macros/.files b/packages/o/ocaml-rpm-macros/.files
index 4edf7fd..e1c788a 100644
Binary files a/packages/o/ocaml-rpm-macros/.files and b/packages/o/ocaml-rpm-macros/.files differ
diff --git a/packages/o/ocaml-rpm-macros/.rev b/packages/o/ocaml-rpm-macros/.rev
index 8c85798..4313351 100644
--- a/packages/o/ocaml-rpm-macros/.rev
+++ b/packages/o/ocaml-rpm-macros/.rev
@@ -205,4 +205,13 @@ trim changes file
- Remove stale references to ocaml_make_testsuite
1046306
+
+ 6bdbbe6ee9c7236f642fae6029624016
+ 20230101
+
+ dimstar_suse
+ Allow variables in smp_mflags to be interpolated
+ for https://github.com/rpm-software-management/rpm/issues/2343 (forwarded request 1061850 from bmwiedemann)
+ 1062399
+
diff --git a/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.changes b/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.changes
index 750a1c0..26848d4 100644
--- a/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.changes
+++ b/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sun Jan 29 08:34:55 UTC 2023 - Bernhard Wiedemann
+
+- Allow variables in smp_mflags to be interpolated
+ for https://github.com/rpm-software-management/rpm/issues/2343
+
+-------------------------------------------------------------------
Sun Jan 1 01:01:01 UTC 2023 - ohering@suse.de
- Remove stale references to ocaml_make_testsuite
diff --git a/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.spec b/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.spec
index f4c8d28..a037a47 100644
--- a/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.spec
+++ b/packages/o/ocaml-rpm-macros/ocaml-rpm-macros.spec
@@ -461,7 +461,7 @@ ocaml setup.ml -configure \\\
dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \
if test -z "${_smp_mflags}" ;\
then \
- _smp_mflags='%%{?_smp_mflags}' ;\
+ _smp_mflags="%%{?_smp_mflags}" ;\
case "$(ocamlc --version)" in \\\
4.08*) _smp_mflags='-j1' ;;\\\
4.09*) _smp_mflags='-j1' ;;\\\
@@ -480,7 +480,7 @@ ocaml setup.ml -configure \\\
%endif
if test -z "${_smp_mflags}" ;\
then \
- _smp_mflags='%%{?_smp_mflags}' ;\
+ _smp_mflags="%%{?_smp_mflags}" ;\
case "$(ocamlc --version)" in \\\
4.08*) _smp_mflags='-j1' ;;\\\
4.09*) _smp_mflags='-j1' ;;\\\
diff --git a/packages/o/openssl-1_1/.files b/packages/o/openssl-1_1/.files
index 1d2179b..dfbb575 100644
Binary files a/packages/o/openssl-1_1/.files and b/packages/o/openssl-1_1/.files differ
diff --git a/packages/o/openssl-1_1/.rev b/packages/o/openssl-1_1/.rev
index 1700daa..a6cc276 100644
--- a/packages/o/openssl-1_1/.rev
+++ b/packages/o/openssl-1_1/.rev
@@ -330,4 +330,12 @@
1042988
+
+ 9bbc419bb0160ea0dab59d34479cd0af
+ 1.1.1s
+
+ dimstar_suse
+
+ 1062225
+
diff --git a/packages/o/openssl-1_1/baselibs.conf b/packages/o/openssl-1_1/baselibs.conf
index 40f7752..75eb2fe 100644
--- a/packages/o/openssl-1_1/baselibs.conf
+++ b/packages/o/openssl-1_1/baselibs.conf
@@ -5,5 +5,6 @@ libopenssl1_1-hmac
libopenssl-1_1-devel
provides "libopenssl-devel- = "
conflicts "otherproviders(libopenssl-devel-)"
+ conflicts "libopenssl-3-devel-"
requires -"openssl-1_1-"
requires "libopenssl1_1- = "
diff --git a/packages/o/openssl-1_1/openssl-1_1-openssl-config.patch b/packages/o/openssl-1_1/openssl-1_1-openssl-config.patch
new file mode 100644
index 0000000..702a865
--- /dev/null
+++ b/packages/o/openssl-1_1/openssl-1_1-openssl-config.patch
@@ -0,0 +1,530 @@
+Index: openssl-1.1.1s/Configurations/unix-Makefile.tmpl
+===================================================================
+--- openssl-1.1.1s.orig/Configurations/unix-Makefile.tmpl
++++ openssl-1.1.1s/Configurations/unix-Makefile.tmpl
+@@ -140,8 +140,8 @@ INSTALL_SHLIB_INFO={- join(" ", map { "\
+ INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -}
+ INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } @{$unified_info{install}->{programs}}) -}
+ {- output_off() if $disabled{apps}; "" -}
+-BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash
+-MISC_SCRIPTS=$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget.pl:tsget
++BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash-1_1
++MISC_SCRIPTS=$(BLDDIR)/apps/CA-1_1.pl $(BLDDIR)/apps/tsget-1_1.pl:tsget-1_1
+ {- output_on() if $disabled{apps}; "" -}
+
+ APPS_OPENSSL={- use File::Spec::Functions;
+@@ -579,14 +579,14 @@ install_ssldirs:
+ : {- output_on() if windowsdll(); "" -}; \
+ fi; \
+ done
+- @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
+- @cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new"
+- @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new"
+- @mv -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
+- @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
+- $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
+- cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
+- chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
++ @$(ECHO) "install $(SRCDIR)/apps/openssl-1_1.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf.dist"
++ @cp $(SRCDIR)/apps/openssl-1_1.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf.new"
++ @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf.new"
++ @mv -f "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf.dist"
++ @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf" ]; then \
++ $(ECHO) "install $(SRCDIR)/apps/openssl-1_1.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf"; \
++ cp $(SRCDIR)/apps/openssl-1_1.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf"; \
++ chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl-1_1.cnf"; \
+ fi
+ @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
+ @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new"
+@@ -870,7 +870,7 @@ lint:
+
+ generate_apps:
+ ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \
+- < apps/openssl.cnf > apps/openssl-vms.cnf )
++ < apps/openssl-1_1.cnf > apps/openssl-vms.cnf )
+
+ generate_crypto_bn:
+ ( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h )
+Index: openssl-1.1.1s/Configure
+===================================================================
+--- openssl-1.1.1s.orig/Configure
++++ openssl-1.1.1s/Configure
+@@ -35,7 +35,7 @@ my $usage="Usage: Configure [no-
+ # directories bin, lib, include, share/man, share/doc/openssl
+ # This becomes the value of INSTALLTOP in Makefile
+ # (Default: /usr/local)
+-# --openssldir OpenSSL data area, such as openssl.cnf, certificates and keys.
++# --openssldir OpenSSL data area, such as openssl-1_1.cnf, certificates and keys.
+ # If it's a relative directory, it will be added on the directory
+ # given with --prefix.
+ # This becomes the value of OPENSSLDIR in Makefile and in C.
+Index: openssl-1.1.1s/INSTALL
+===================================================================
+--- openssl-1.1.1s.orig/INSTALL
++++ openssl-1.1.1s/INSTALL
+@@ -296,7 +296,7 @@
+ be undesirable if small executable size is an objective.
+
+ no-autoload-config
+- Don't automatically load the default openssl.cnf file.
++ Don't automatically load the default openssl-1_1.cnf file.
+ Typically OpenSSL will automatically load a system config
+ file which configures default ssl options.
+
+Index: openssl-1.1.1s/NEWS
+===================================================================
+--- openssl-1.1.1s.orig/NEWS
++++ openssl-1.1.1s/NEWS
+@@ -5,6 +5,9 @@
+ This file gives a brief overview of the major changes between each OpenSSL
+ release. For more details please read the CHANGES file.
+
++ IMPORTANT: For compatibility with OpenSSL 3.0, the OpenSSL master
++ configuration file openssl.cnf has been renamed to openssl-1_1.cnf.
++
+ Major changes between OpenSSL 1.1.1r and OpenSSL 1.1.1s [1 Nov 2022]
+
+ o Fixed a regression introduced in OpenSSL 1.1.1r not refreshing the
+Index: openssl-1.1.1s/doc/HOWTO/certificates.txt
+===================================================================
+--- openssl-1.1.1s.orig/doc/HOWTO/certificates.txt
++++ openssl-1.1.1s/doc/HOWTO/certificates.txt
+@@ -16,7 +16,7 @@ Certificate authorities should read http
+ In all the cases shown below, the standard configuration file, as
+ compiled into openssl, will be used. You may find it in /etc/,
+ /usr/local/ssl/ or somewhere else. By default the file is named
+-openssl.cnf and is described at https://www.openssl.org/docs/apps/config.html.
++openssl-1_1.cnf and is described at https://www.openssl.org/docs/apps/config.html.
+ You can specify a different configuration file using the
+ '-config {file}' argument with the commands shown below.
+
+Index: openssl-1.1.1s/doc/man3/OPENSSL_config.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man3/OPENSSL_config.pod
++++ openssl-1.1.1s/doc/man3/OPENSSL_config.pod
+@@ -15,7 +15,7 @@ OPENSSL_config, OPENSSL_no_config - simp
+
+ =head1 DESCRIPTION
+
+-OPENSSL_config() configures OpenSSL using the standard B and
++OPENSSL_config() configures OpenSSL using the standard B and
+ reads from the application section B. If B is NULL then
+ the default section, B, will be used.
+ Errors are silently ignored.
+Index: openssl-1.1.1s/doc/man5/config.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man5/config.pod
++++ openssl-1.1.1s/doc/man5/config.pod
+@@ -7,7 +7,7 @@ config - OpenSSL CONF library configurat
+ =head1 DESCRIPTION
+
+ The OpenSSL CONF library can be used to read configuration files.
+-It is used for the OpenSSL master configuration file B
++It is used for the OpenSSL master configuration file B
+ and in a few other places like B files and certificate extension
+ files for the B utility. OpenSSL applications can also use the
+ CONF library for their own purposes.
+Index: openssl-1.1.1s/include/internal/cryptlib.h
+===================================================================
+--- openssl-1.1.1s.orig/include/internal/cryptlib.h
++++ openssl-1.1.1s/include/internal/cryptlib.h
+@@ -51,7 +51,7 @@ typedef struct app_mem_info_st APP_INFO;
+ typedef struct mem_st MEM;
+ DEFINE_LHASH_OF(MEM);
+
+-# define OPENSSL_CONF "openssl.cnf"
++# define OPENSSL_CONF "openssl-1_1.cnf"
+
+ # ifndef OPENSSL_SYS_VMS
+ # define X509_CERT_AREA OPENSSLDIR
+Index: openssl-1.1.1s/Configurations/descrip.mms.tmpl
+===================================================================
+--- openssl-1.1.1s.orig/Configurations/descrip.mms.tmpl
++++ openssl-1.1.1s/Configurations/descrip.mms.tmpl
+@@ -140,8 +140,8 @@ INSTALL_SHLIBS={- join(", ", map { "-\n\
+ INSTALL_ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{engines}}) -}
+ INSTALL_PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{programs}}) -}
+ {- output_off() if $disabled{apps}; "" -}
+-BIN_SCRIPTS=[.tools]c_rehash.pl
+-MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl
++BIN_SCRIPTS=[.tools]c_rehash-1_1.pl
++MISC_SCRIPTS=[.apps]CA-1_1.pl, [.apps]tsget-1_1.pl
+ {- output_on() if $disabled{apps}; "" -}
+
+ APPS_OPENSSL={- use File::Spec::Functions;
+Index: openssl-1.1.1s/VMS/openssl_utils.com.in
+===================================================================
+--- openssl-1.1.1s.orig/VMS/openssl_utils.com.in
++++ openssl-1.1.1s/VMS/openssl_utils.com.in
+@@ -8,7 +8,7 @@ $ OPENSSL :== $OSSL$EXE:OPENSSL'v'
+ $
+ $ IF F$TYPE(PERL) .EQS. "STRING"
+ $ THEN
+-$ C_REHASH :== 'PERL' OSSL$EXE:c_rehash.pl
++$ C_REHASH :== 'PERL' OSSL$EXE:c_rehash-1_1.pl
+ $ ELSE
+ $ WRITE SYS$ERROR "NOTE: no perl => no C_REHASH"
+ $ ENDIF
+Index: openssl-1.1.1s/apps/CA.pl.in
+===================================================================
+--- openssl-1.1.1s.orig/apps/CA.pl.in
++++ openssl-1.1.1s/apps/CA.pl.in
+@@ -113,10 +113,10 @@ sub run
+
+
+ if ( $WHAT =~ /^(-\?|-h|-help)$/ ) {
+- print STDERR "usage: CA.pl -newcert | -newreq | -newreq-nodes | -xsign | -sign | -signCA | -signcert | -crl | -newca [-extra-cmd extra-params]\n";
+- print STDERR " CA.pl -pkcs12 [-extra-pkcs12 extra-params] [certname]\n";
+- print STDERR " CA.pl -verify [-extra-verify extra-params] certfile ...\n";
+- print STDERR " CA.pl -revoke [-extra-ca extra-params] certfile [reason]\n";
++ print STDERR "usage: CA-1_1.pl -newcert | -newreq | -newreq-nodes | -xsign | -sign | -signCA | -signcert | -crl | -newca [-extra-cmd extra-params]\n";
++ print STDERR " CA-1_1.pl -pkcs12 [-extra-pkcs12 extra-params] [certname]\n";
++ print STDERR " CA-1_1.pl -verify [-extra-verify extra-params] certfile ...\n";
++ print STDERR " CA-1_1.pl -revoke [-extra-ca extra-params] certfile [reason]\n";
+ exit 0;
+ }
+ if ($WHAT eq '-newcert' ) {
+Index: openssl-1.1.1s/apps/build.info
+===================================================================
+--- openssl-1.1.1s.orig/apps/build.info
++++ openssl-1.1.1s/apps/build.info
+@@ -73,7 +73,7 @@ IF[{- !$disabled{apps} -}]
+ GENERATE[progs.h]=progs.pl $(APPS_OPENSSL)
+ DEPEND[progs.h]=../configdata.pm
+
+- SCRIPTS=CA.pl tsget.pl
+- SOURCE[CA.pl]=CA.pl.in
+- SOURCE[tsget.pl]=tsget.in
++ SCRIPTS=CA-1_1.pl tsget-1_1.pl
++ SOURCE[CA-1_1.pl]=CA.pl.in
++ SOURCE[tsget-1_1.pl]=tsget.in
+ ENDIF
+Index: openssl-1.1.1s/apps/tsget.in
+===================================================================
+--- openssl-1.1.1s.orig/apps/tsget.in
++++ openssl-1.1.1s/apps/tsget.in
+@@ -47,7 +47,7 @@ sub create_curl {
+ $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d};
+ $curl->setopt(CURLOPT_FAILONERROR, 1);
+ $curl->setopt(CURLOPT_USERAGENT,
+- "OpenTSA tsget.pl/openssl-{- $config{version} -}");
++ "OpenTSA tsget-1_1.pl/openssl-{- $config{version} -}");
+
+ # Options for POST method.
+ $curl->setopt(CURLOPT_UPLOAD, 1);
+Index: openssl-1.1.1s/doc/man1/CA.pl.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man1/CA.pl.pod
++++ openssl-1.1.1s/doc/man1/CA.pl.pod
+@@ -2,16 +2,16 @@
+
+ =head1 NAME
+
+-CA.pl - friendlier interface for OpenSSL certificate programs
++CA-1_1.pl - friendlier interface for OpenSSL certificate programs
+
+ =head1 SYNOPSIS
+
+-B
++B
+ B<-?> |
+ B<-h> |
+ B<-help>
+
+-B
++B
+ B<-newcert> |
+ B<-newreq> |
+ B<-newreq-nodes> |
+@@ -23,15 +23,15 @@ B<-crl> |
+ B<-newca>
+ [B<-extra-cmd> extra-params]
+
+-B B<-pkcs12> [B<-extra-pkcs12> extra-params] [B]
++B B<-pkcs12> [B<-extra-pkcs12> extra-params] [B]
+
+-B B<-verify> [B<-extra-verify> extra-params] B...
++B B<-verify> [B<-extra-verify> extra-params] B...
+
+-B B<-revoke> [B<-extra-ca> extra-params] B [B]
++B B<-revoke> [B<-extra-ca> extra-params] B [B]
+
+ =head1 DESCRIPTION
+
+-The B script is a perl script that supplies the relevant command line
++The B script is a perl script that supplies the relevant command line
+ arguments to the B command for some common certificate operations.
+ It is intended to simplify the process of certificate creation and management
+ by the use of some simple options.
+@@ -136,19 +136,19 @@ Users should consult B command
+
+ Create a CA hierarchy:
+
+- CA.pl -newca
++ CA-1_1.pl -newca
+
+ Complete certificate creation example: create a CA, create a request, sign
+ the request and finally create a PKCS#12 file containing it.
+
+- CA.pl -newca
+- CA.pl -newreq
+- CA.pl -sign
+- CA.pl -pkcs12 "My Test Certificate"
++ CA-1_1.pl -newca
++ CA-1_1.pl -newreq
++ CA-1_1.pl -sign
++ CA-1_1.pl -pkcs12 "My Test Certificate"
+
+ =head1 DSA CERTIFICATES
+
+-Although the B creates RSA CAs and requests it is still possible to
++Although the B creates RSA CAs and requests it is still possible to
+ use it with DSA certificates and requests using the L command
+ directly. The following example shows the steps that would typically be taken.
+
+@@ -162,7 +162,7 @@ Create a DSA CA certificate and private
+
+ Create the CA directories and files:
+
+- CA.pl -newca
++ CA-1_1.pl -newca
+
+ enter cacert.pem when prompted for the CA filename.
+
+@@ -173,22 +173,22 @@ can optionally be created first):
+
+ Sign the request:
+
+- CA.pl -sign
++ CA-1_1.pl -sign
+
+ =head1 NOTES
+
+-Most of the filenames mentioned can be modified by editing the B script.
++Most of the filenames mentioned can be modified by editing the B script.
+
+ If the demoCA directory already exists then the B<-newca> command will not
+ overwrite it and will do nothing. This can happen if a previous call using
+ the B<-newca> option terminated abnormally. To get the correct behaviour
+ delete the demoCA directory if it already exists.
+
+-Under some environments it may not be possible to run the B script
++Under some environments it may not be possible to run the B script
+ directly (for example Win32) and the default configuration file location may
+ be wrong. In this case the command:
+
+- perl -S CA.pl
++ perl -S CA-1_1.pl
+
+ can be used and the B environment variable changed to point to
+ the correct path of the configuration file.
+Index: openssl-1.1.1s/doc/man1/ca.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man1/ca.pod
++++ openssl-1.1.1s/doc/man1/ca.pod
+@@ -698,7 +698,7 @@ the database has to be kept in memory.
+ The B command really needs rewriting or the required functionality
+ exposed at either a command or interface level so a more friendly utility
+ (perl script or GUI) can handle things properly. The script
+-B helps a little but not very much.
++B helps a little but not very much.
+
+ Any fields in a request that are not present in a policy are silently
+ deleted. This does not happen if the B<-preserveDN> option is used. To
+@@ -754,7 +754,7 @@ are in year 2050 or later.
+
+ =head1 SEE ALSO
+
+-L, L, L, L,
++L, L, L, L,
+ L, L
+
+ =head1 COPYRIGHT
+Index: openssl-1.1.1s/doc/man1/rehash.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man1/rehash.pod
++++ openssl-1.1.1s/doc/man1/rehash.pod
+@@ -6,7 +6,7 @@ Original text by James Westby, contribut
+ =head1 NAME
+
+ openssl-c_rehash, openssl-rehash,
+-c_rehash, rehash - Create symbolic links to files named by the hash values
++c_rehash-1_1, rehash - Create symbolic links to files named by the hash values
+
+ =head1 SYNOPSIS
+
+@@ -19,13 +19,13 @@ B<[-n]>
+ B<[-v]>
+ [ I...]
+
+-B
++B
+ I
+
+ =head1 DESCRIPTION
+
+-On some platforms, the OpenSSL B command is available as
+-an external script called B. They are functionally equivalent,
++On some platforms, the OpenSSL B command is available as
++an external script called B. They are functionally equivalent,
+ except for minor differences noted below.
+
+ B scans directories and calculates a hash value of each
+@@ -66,7 +66,7 @@ more than one such object appears in the
+
+ =head2 Script Configuration
+
+-The B script
++The B script
+ uses the B program to compute the hashes and
+ fingerprints. If not found in the user's B, then set the
+ B environment variable to the full pathname.
+Index: openssl-1.1.1s/doc/man1/tsget.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man1/tsget.pod
++++ openssl-1.1.1s/doc/man1/tsget.pod
+@@ -35,7 +35,7 @@ line.
+ The tool sends the following HTTP request for each timestamp request:
+
+ POST url HTTP/1.1
+- User-Agent: OpenTSA tsget.pl/
++ User-Agent: OpenTSA tsget-1_1.pl/
+ Host: :
+ Pragma: no-cache
+ Content-Type: application/timestamp-query
+@@ -108,7 +108,7 @@ Either option B<-C> or option B<-P> must
+ =item B<-P> CA_path
+
+ (HTTPS) The path containing the trusted CA certificates to verify the peer's
+-certificate. The directory must be prepared with the B
++certificate. The directory must be prepared with the B
+ OpenSSL utility. Either option B<-C> or option B<-P> must be given in case of
+ HTTPS. (Optional)
+
+Index: openssl-1.1.1s/doc/man1/verify.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man1/verify.pod
++++ openssl-1.1.1s/doc/man1/verify.pod
+@@ -75,7 +75,7 @@ The file should contain one or more cert
+ A directory of trusted certificates. The certificates should have names
+ of the form: hash.0 or have symbolic links to them of this
+ form ("hash" is the hashed certificate subject name: see the B<-hash> option
+-of the B utility). Under Unix the B script will automatically
++of the B utility). Under Unix the B script will automatically
+ create symbolic links to a directory of certificates.
+
+ =item B<-no-CAfile>
+Index: openssl-1.1.1s/doc/man1/x509.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man1/x509.pod
++++ openssl-1.1.1s/doc/man1/x509.pod
+@@ -932,7 +932,7 @@ The hash algorithm used in the B<-subjec
+ before OpenSSL 1.0.0 was based on the deprecated MD5 algorithm and the encoding
+ of the distinguished name. In OpenSSL 1.0.0 and later it is based on a
+ canonical version of the DN using SHA1. This means that any directories using
+-the old form must have their links rebuilt using B or similar.
++the old form must have their links rebuilt using B or similar.
+
+ =head1 COPYRIGHT
+
+Index: openssl-1.1.1s/doc/man3/SSL_CTX_load_verify_locations.pod
+===================================================================
+--- openssl-1.1.1s.orig/doc/man3/SSL_CTX_load_verify_locations.pod
++++ openssl-1.1.1s/doc/man3/SSL_CTX_load_verify_locations.pod
+@@ -63,7 +63,7 @@ If more than one CA certificate with the
+ extension must be different (e.g. 9d66eef0.0, 9d66eef0.1 etc). The search
+ is performed in the ordering of the extension number, regardless of other
+ properties of the certificates.
+-Use the B utility to create the necessary links.
++Use the B utility to create the necessary links.
+
+ The certificates in B are only looked up when required, e.g. when
+ building the certificate chain or when actually performing the verification
+@@ -137,7 +137,7 @@ Prepare the directory /some/where/certs
+ for use as B:
+
+ cd /some/where/certs
+- c_rehash .
++ c_rehash-1_1 .
+
+ =head1 SEE ALSO
+
+Index: openssl-1.1.1s/test/recipes/80-test_ca.t
+===================================================================
+--- openssl-1.1.1s.orig/test/recipes/80-test_ca.t
++++ openssl-1.1.1s/test/recipes/80-test_ca.t
+@@ -27,27 +27,27 @@ plan tests => 5;
+ SKIP: {
+ $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "CAss.cnf").'"';
+ skip "failed creating CA structure", 4
+- if !ok(run(perlapp(["CA.pl","-newca"], stdin => undef)),
++ if !ok(run(perlapp(["CA-1_1.pl","-newca"], stdin => undef)),
+ 'creating CA structure');
+
+ $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "Uss.cnf").'"';
+ skip "failed creating new certificate request", 3
+- if !ok(run(perlapp(["CA.pl","-newreq"])),
++ if !ok(run(perlapp(["CA-1_1.pl","-newreq"])),
+ 'creating certificate request');
+
+ $ENV{OPENSSL_CONFIG} = '-rand_serial -config "'.$std_openssl_cnf.'"';
+ skip "failed to sign certificate request", 2
+- if !is(yes(cmdstr(perlapp(["CA.pl", "-sign"]))), 0,
++ if !is(yes(cmdstr(perlapp(["CA-1_1.pl", "-sign"]))), 0,
+ 'signing certificate request');
+
+- ok(run(perlapp(["CA.pl", "-verify", "newcert.pem"])),
++ ok(run(perlapp(["CA-1_1.pl", "-verify", "newcert.pem"])),
+ 'verifying new certificate');
+
+ skip "CT not configured, can't use -precert", 1
+ if disabled("ct");
+
+ $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "Uss.cnf").'"';
+- ok(run(perlapp(["CA.pl", "-precert"], stderr => undef)),
++ ok(run(perlapp(["CA-1_1.pl", "-precert"], stderr => undef)),
+ 'creating new pre-certificate');
+ }
+
+Index: openssl-1.1.1s/tools/build.info
+===================================================================
+--- openssl-1.1.1s.orig/tools/build.info
++++ openssl-1.1.1s/tools/build.info
+@@ -1,5 +1,5 @@
+ {- our $c_rehash_name =
+- $config{target} =~ /^(VC|vms)-/ ? "c_rehash.pl" : "c_rehash";
++ $config{target} =~ /^(VC|vms)-/ ? "c_rehash-1_1.pl" : "c_rehash-1_1";
+ "" -}
+ IF[{- !$disabled{apps} -}]
+ SCRIPTS={- $c_rehash_name -}
+Index: openssl-1.1.1s/tools/c_rehash.in
+===================================================================
+--- openssl-1.1.1s.orig/tools/c_rehash.in
++++ openssl-1.1.1s/tools/c_rehash.in
+@@ -8,7 +8,7 @@
+ # in the file LICENSE in the source distribution or at
+ # https://www.openssl.org/source/license.html
+
+-# Perl c_rehash script, scan all files in a directory
++# Perl c_rehash-1_1 script, scan all files in a directory
+ # and add symbolic links to their hash values.
+
+ my $dir = {- quotify1($config{openssldir}) -};
+@@ -44,7 +44,7 @@ while ( $ARGV[0] =~ /^-/ ) {
+ }
+
+ sub help {
+- print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
++ print "Usage: c_rehash-1_1 [-old] [-h] [-help] [-v] [dirs...]\n";
+ print " -old use old-style digest\n";
+ print " -h or -help print this help text\n";
+ print " -v print files removed and linked\n";
+@@ -73,7 +73,7 @@ if (! -x $openssl) {
+ }
+ }
+ if ($found == 0) {
+- print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
++ print STDERR "c_rehash-1_1: rehashing skipped ('openssl-1_1' program not available)\n";
+ exit 0;
+ }
+ }
diff --git a/packages/o/openssl-1_1/openssl-1_1.changes b/packages/o/openssl-1_1/openssl-1_1.changes
index 7c9f73e..280e82c 100644
--- a/packages/o/openssl-1_1/openssl-1_1.changes
+++ b/packages/o/openssl-1_1/openssl-1_1.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Dec 14 12:56:06 UTC 2022 - Pedro Monreal
+
+- Set OpenSSL 3.0 as the default openssl [bsc#1205042]
+ * For compatibility with OpenSSL 3.0, the OpenSSL master
+ configuration file openssl.cnf has been renamed to
+ openssl-1_1.cnf. The executables openssl, c_rehash, CA.pl and
+ tsget.pl have been also renamed to openssl-1_1, c_rehash-1_1,
+ CA-1_1.pl and tsget-1_1.pl, respectively.
+ * Add openssl-1_1-devel as conflicting with libopenssl-3-devel
+ * Add openssl-1_1-openssl-config.patch
+
+-------------------------------------------------------------------
Wed Dec 14 09:04:40 UTC 2022 - Otto Hollmann
- POWER10 performance enhancements for cryptography [jsc#PED-512]
diff --git a/packages/o/openssl-1_1/openssl-1_1.spec b/packages/o/openssl-1_1/openssl-1_1.spec
index d167144..1cbfbfd 100644
--- a/packages/o/openssl-1_1/openssl-1_1.spec
+++ b/packages/o/openssl-1_1/openssl-1_1.spec
@@ -1,7 +1,7 @@
#
# spec file for package openssl-1_1
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -40,7 +40,7 @@
%define maj_min 1.1
%define _rname openssl
Name: openssl-1_1
-# Don't forget to update the version in the "openssl" package!
+# Don't forget to update the version in the "openssl" meta-package!
Version: 1.1.1s
Release: 0
Summary: Secure Sockets and Transport Layer Security
@@ -130,16 +130,14 @@ Patch76: openssl-1_1-Fixed-counter-overflow.patch
Patch77: openssl-1_1-chacha20-performance-optimizations-for-ppc64le-with-.patch
Patch78: openssl-1_1-Fixed-conditional-statement-testing-64-and-256-bytes.patch
Patch79: openssl-1_1-Fix-AES-GCM-on-Power-8-CPUs.patch
-
-Requires: libopenssl1_1 = %{version}-%{release}
+#PATCH-FIX-OPENSUSE bsc#1205042 Set OpenSSL 3.0 as the default openssl
+Patch80: openssl-1_1-openssl-config.patch
BuildRequires: pkgconfig
BuildRequires: pkgconfig(zlib)
+Requires: libopenssl1_1 = %{version}-%{release}
%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550
Requires: crypto-policies
%endif
-Conflicts: ssl
-Provides: ssl
-Provides: openssl(cli)
# Needed for clean upgrade path, boo#1070003
Obsoletes: openssl-1_0_0
# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
@@ -178,11 +176,9 @@ Group: Development/Libraries/C and C++
Requires: libopenssl1_1 = %{version}
Requires: pkgconfig(zlib)
Recommends: %{name} = %{version}
-# we need to have around only the exact version we are able to operate with
-Conflicts: libopenssl-devel < %{version}
-Conflicts: libopenssl-devel > %{version}
Conflicts: ssl-devel
-Provides: ssl-devel
+# Conflicting names with libopenssl-3-devel
+Conflicts: libopenssl-3-devel
# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
Obsoletes: libopenssl-1_1_0-devel
# Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499
@@ -222,6 +218,8 @@ this package's base documentation.
%prep
%autosetup -p1 -n %{_rname}-%{version}
+cp apps/openssl.cnf apps/openssl-1_1.cnf
+
%build
%ifarch armv5el armv5tel
export MACHINE=armv5el
@@ -306,9 +304,19 @@ cp %{tar_package_name} %{_other}
%make_install %{?_smp_mflags}
# kill static libs
rm -f %{buildroot}%{_libdir}/lib*.a
+
+# Rename the openssl CLI to openssl-1_1
+mv %{buildroot}%{_bindir}/openssl %{buildroot}%{_bindir}/openssl-1_1
+
+# Install the openssl-1_1.cnf config file
+install -m 644 apps/openssl-1_1.cnf %{buildroot}%{_sysconfdir}/ssl/openssl-1_1.cnf
+
# remove the cnf.dist
-rm -f %{buildroot}%{_sysconfdir}/ssl/openssl.cnf.dist
+rm -f %{buildroot}%{_sysconfdir}/ssl/openssl-1_1.cnf.dist
+rm -f %{buildroot}%{_sysconfdir}/ssl/ct_log_list.cnf
+rm -f %{buildroot}%{_sysconfdir}/ssl/ct_log_list.cnf.dist
ln -sf ./%{_rname} %{buildroot}/%{_includedir}/ssl
+
mkdir %{buildroot}/%{_datadir}/ssl
mv %{buildroot}/%{ssletcdir}/misc %{buildroot}/%{_datadir}/ssl/
# Create the two directories into which packages will drop their configuration
@@ -410,17 +418,14 @@ unset LD_LIBRARY_PATH
%files -f filelist
%doc CHANGE* NEWS README
%dir %{ssletcdir}
-%config (noreplace) %{ssletcdir}/openssl.cnf
+%config (noreplace) %{ssletcdir}/openssl-1_1.cnf
%attr(700,root,root) %{ssletcdir}/private
%dir %{ssletcdir}/engines.d
%dir %{ssletcdir}/engdef.d
-%{ssletcdir}/ct_log_list.cnf
-%{ssletcdir}/ct_log_list.cnf.dist
-
%dir %{_datadir}/ssl
%{_datadir}/ssl/misc
-%{_bindir}/c_rehash
+%{_bindir}/c_rehash-1_1
%{_bindir}/fips_standalone_hmac
-%{_bindir}/%{_rname}
+%{_bindir}/openssl-1_1
%changelog
diff --git a/packages/o/openssl-3/.files b/packages/o/openssl-3/.files
index 7137c39..613ea02 100644
Binary files a/packages/o/openssl-3/.files and b/packages/o/openssl-3/.files differ
diff --git a/packages/o/openssl-3/.rev b/packages/o/openssl-3/.rev
index 1849b38..3432040 100644
--- a/packages/o/openssl-3/.rev
+++ b/packages/o/openssl-3/.rev
@@ -55,4 +55,12 @@
1042989
+
+ 331bcc4cb73a586cb9485cdebcbcf687
+ 3.0.7
+
+ dimstar_suse
+
+ 1062224
+
diff --git a/packages/o/openssl-3/baselibs.conf b/packages/o/openssl-3/baselibs.conf
index d3d8759..119c73a 100644
--- a/packages/o/openssl-3/baselibs.conf
+++ b/packages/o/openssl-3/baselibs.conf
@@ -1,6 +1,10 @@
libopenssl3
+ obsoletes "libopenssl1_1_0-"
+libopenssl3-hmac
+ requires "libopenssl3- = -%release"
libopenssl-3-devel
provides "libopenssl-devel- = "
conflicts "otherproviders(libopenssl-devel-)"
+ conflicts "libopenssl-1_1-devel-"
requires -"openssl-3-"
requires "libopenssl3- = "
diff --git a/packages/o/openssl-3/fix-config-in-tests.patch b/packages/o/openssl-3/fix-config-in-tests.patch
deleted file mode 100644
index 2f83aa7..0000000
--- a/packages/o/openssl-3/fix-config-in-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openssl-3.0.1/test/run_tests.pl
-===================================================================
---- openssl-3.0.1.orig/test/run_tests.pl
-+++ openssl-3.0.1/test/run_tests.pl
-@@ -33,7 +33,7 @@ my $recipesdir = catdir($srctop, "test",
- my $libdir = rel2abs(catdir($srctop, "util", "perl"));
- my $jobs = $ENV{HARNESS_JOBS} // 1;
-
--$ENV{OPENSSL_CONF} = rel2abs(catfile($srctop, "apps", "openssl.cnf"));
-+$ENV{OPENSSL_CONF} = rel2abs(catfile($srctop, "apps", "openssl3.cnf"));
- $ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "test"));
- $ENV{OPENSSL_MODULES} = rel2abs(catdir($bldtop, "providers"));
- $ENV{OPENSSL_ENGINES} = rel2abs(catdir($bldtop, "engines"));
diff --git a/packages/o/openssl-3/openssl-1.1.0-no-html.patch b/packages/o/openssl-3/openssl-1.1.0-no-html.patch
deleted file mode 100644
index 30a7db1..0000000
--- a/packages/o/openssl-3/openssl-1.1.0-no-html.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openssl-3.0.0-alpha1/Configurations/unix-Makefile.tmpl
-===================================================================
---- openssl-3.0.0-alpha1.orig/Configurations/unix-Makefile.tmpl 2020-04-23 22:56:27.365853133 +0200
-+++ openssl-3.0.0-alpha1/Configurations/unix-Makefile.tmpl 2020-04-23 22:56:52.474004636 +0200
-@@ -544,7 +544,7 @@ install_sw: install_dev install_engines
-
- uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
-
--install_docs: install_man_docs install_html_docs
-+install_docs: install_man_docs
-
- uninstall_docs: uninstall_man_docs uninstall_html_docs
- $(RM) -r $(DESTDIR)$(DOCDIR)
diff --git a/packages/o/openssl-3/openssl-3.changes b/packages/o/openssl-3/openssl-3.changes
index c3fbad9..f73a773 100644
--- a/packages/o/openssl-3/openssl-3.changes
+++ b/packages/o/openssl-3/openssl-3.changes
@@ -1,10 +1,43 @@
-------------------------------------------------------------------
+Thu Jan 26 08:17:50 UTC 2023 - Pedro Monreal
+
+- Relax the crypto-policies requirements for the regression tests
+
+-------------------------------------------------------------------
+Wed Jan 25 11:09:52 UTC 2023 - Pedro Monreal
+
+- Set OpenSSL 3.0.7 as the default openssl [bsc#1205042]
+ * Rename openssl-1.1.0-no-html.patch to openssl-no-html-docs.patch
+ * Rebase openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
+ * Package a copy of the original default config file called
+ openssl.cnf and name it as openssl-orig.cnf and warn the user
+ if the files differ.
+ * Add openssl-3-devel as conflicting with libopenssl-1_1-devel
+ * Remove patches:
+ - fix-config-in-tests.patch
+ - openssl-use-versioned-config.patch
+
+-------------------------------------------------------------------
+Wed Jan 25 09:10:06 UTC 2023 - Pedro Monreal
+
+- Create the openssl ca-certificates directory in case the
+ ca-certificates package is not installed. This directory is
+ required by the nodejs regression tests. [bsc#1207484]
+
+-------------------------------------------------------------------
Wed Dec 14 16:38:05 UTC 2022 - Otto Hollmann
- Fix X.509 Policy Constraints Double Locking [bsc#1206374, CVE-2022-3996]
* Add patch: openssl-3-Fix-double-locking-problem.patch
-------------------------------------------------------------------
+Wed Dec 14 12:40:04 UTC 2022 - Pedro Monreal
+
+- Compute the hmac files for FIPS 140-3 integrity checking of the
+ openssl shared libraries using the brp-50-generate-fips-hmac
+ script. Also computed for the 32bit package.
+
+-------------------------------------------------------------------
Tue Nov 1 18:29:41 UTC 2022 - Otto Hollmann
- Temporary disable tests test_ssl_new and test_sslapi because they are
diff --git a/packages/o/openssl-3/openssl-3.spec b/packages/o/openssl-3/openssl-3.spec
index c876cac..c00942a 100644
--- a/packages/o/openssl-3/openssl-3.spec
+++ b/packages/o/openssl-3/openssl-3.spec
@@ -1,7 +1,7 @@
#
# spec file for package openssl-3
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,10 @@
%define ssletcdir %{_sysconfdir}/ssl
%define sover 3
-%define _rname openssl
+%define _rname openssl
+%define man_suffix 3ssl
Name: openssl-3
-# Don't forget to update the version in the "openssl" package!
+# Don't forget to update the version in the "openssl" meta-package!
Version: 3.0.7
Release: 0
Summary: Secure Sockets and Transport Layer Security
@@ -35,28 +36,32 @@ Source3: https://www.%{_rname}.org/source/%{_rname}-%{version}.tar.gz.asc
# http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xA2D29B7BF295C759#/openssl.keyring
Source4: %{_rname}.keyring
Source5: showciphers.c
-# PATCH-FIX-OPENSUSE: do not install html mans as it takes ages
-Patch1: openssl-1.1.0-no-html.patch
+# PATCH-FIX-OPENSUSE: Do not install html docs as it takes ages
+Patch1: openssl-no-html-docs.patch
Patch2: openssl-truststore.patch
Patch3: openssl-pkgconfig.patch
Patch4: openssl-DEFAULT_SUSE_cipher.patch
Patch5: openssl-ppc64-config.patch
Patch6: openssl-no-date.patch
-# Patches for crypto-policies
+# Add crypto-policies support
Patch7: openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
Patch8: openssl-Override-default-paths-for-the-CA-directory-tree.patch
-# use openssl3.cnf
-Patch9: openssl-use-versioned-config.patch
-Patch10: fix-config-in-tests.patch
# PATCH-FIX-UPSTREAM bsc#1206374 CVE-2022-3996 X.509 Policy Constraints Double Locking
-Patch11: openssl-3-Fix-double-locking-problem.patch
+Patch9: openssl-3-Fix-double-locking-problem.patch
BuildRequires: pkgconfig
BuildRequires: pkgconfig(zlib)
-# Add requires for ct_log_list.cnf{,.dist}
+Requires: libopenssl3 = %{version}-%{release}
Requires: openssl
+Conflicts: ssl
+Provides: ssl
+Provides: openssl(cli)
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
Requires: crypto-policies
%endif
+# Needed for clean upgrade path, boo#1070003
+Obsoletes: openssl-1_0_0
+# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
+Obsoletes: openssl-1_1_0
%description
OpenSSL is a software library to be used in applications that need to
@@ -70,6 +75,11 @@ Summary: Secure Sockets and Transport Layer Security
Requires: crypto-policies
%endif
Recommends: ca-certificates-mozilla
+# install libopenssl and libopenssl-hmac close together (bsc#1090765)
+Suggests: libopenssl3-hmac = %{version}-%{release}
+# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
+Obsoletes: libopenssl1_1_0
+Conflicts: %{name} < %{version}-%{release}
%description -n libopenssl3
OpenSSL is a software library to be used in applications that need to
@@ -82,11 +92,13 @@ Summary: Development files for OpenSSL
Requires: libopenssl3 = %{version}
Requires: pkgconfig(zlib)
Recommends: %{name} = %{version}
-# We need to have around only the exact version we are able to operate with
-Conflicts: libopenssl-devel < %{version}
-Conflicts: libopenssl-devel > %{version}
Conflicts: libressl-devel
-Conflicts: ssl-devel
+# Conflicting names with libopenssl-1_1-devel
+Conflicts: libopenssl-1_1-devel
+# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
+Obsoletes: libopenssl-1_1_0-devel
+# Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499
+Obsoletes: libopenssl-1_0_0-devel
%description -n libopenssl-3-devel
This subpackage contains header files for developing applications
@@ -103,6 +115,20 @@ BuildArch: noarch
This package contains optional documentation provided in addition to
this package's base documentation.
+%package -n libopenssl3-hmac
+Summary: HMAC files for FIPS 140-3 integrity checking of the openssl shared libraries
+License: BSD-3-Clause
+Requires: libopenssl3 = %{version}-%{release}
+BuildRequires: fipscheck
+# Needed for clean upgrade from former openssl-1_1_0, boo#1081335
+Obsoletes: libopenssl1_1_0-hmac
+# Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499
+Obsoletes: libopenssl-1_0_0-hmac
+
+%description -n libopenssl3-hmac
+The FIPS compliant operation of the openssl shared libraries is NOT
+possible without the HMAC hashes contained in this package!
+
%prep
%autosetup -p1 -n %{_rname}-%{version}
@@ -115,13 +141,12 @@ export MACHINE=armv6l
%endif
./config \
- no-idea \
- no-ec2m \
- enable-rfc3779 \
+ no-mdc2 no-ec2m no-sm2 no-sm4 \
+ enable-rfc3779 enable-camellia enable-seed \
%ifarch x86_64 aarch64 ppc64le
enable-ec_nistp_64_gcc_128 \
%endif
- enable-camellia \
+ enable-fips \
zlib \
--prefix=%{_prefix} \
--libdir=%{_lib} \
@@ -142,110 +167,133 @@ export MACHINE=armv6l
# Show build configuration
perl configdata.pm --dump
+# Do not run this in a production package the FIPS symbols must be patched-in
# util/mkdef.pl crypto update
+
%make_build depend
%make_build all
%check
-
-# We must revert patch8 before running tests, otherwise they will fail.
+# Relax the crypto-policies requirements for the regression tests
+# Revert patch8 before running tests
patch -p1 -R < %{P:8}
+export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file
export MALLOC_CHECK_=3
export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
# export HARNESS_VERBOSE=yes
-LD_LIBRARY_PATH="$PWD" make TESTS='-test_evp_fetch_prov -test_tsa -test_ssl_new -test_sslapi' test -j1
+LD_LIBRARY_PATH="$PWD" make test -j16
+
# show ciphers
gcc -o showciphers %{optflags} -I%{buildroot}%{_includedir} %{SOURCE5} -L%{buildroot}%{_libdir} -lssl -lcrypto
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./showciphers
%install
-%make_install %{?_smp_mflags}
+%make_install %{?_smp_mflags} MANSUFFIX=%{man_suffix}
-# Kill static libs
+rename so.%{sover} so.%{version} %{buildroot}%{_libdir}/*.so.%{sover}
+for lib in %{buildroot}%{_libdir}/*.so.%{version} ; do
+ chmod 755 ${lib}
+ ln -sf $(basename ${lib}) %{buildroot}%{_libdir}/$(basename ${lib} .%{version})
+ ln -sf $(basename ${lib}) %{buildroot}%{_libdir}/$(basename ${lib} .%{version}).%{sover}
+done
+
+# Remove static libraries
rm -f %{buildroot}%{_libdir}/lib*.a
+
# Remove the cnf.dist
-rm -f %{buildroot}%{_sysconfdir}/ssl/openssl3.cnf.dist
-mkdir %{buildroot}/%{_datadir}/ssl-3
-mv %{buildroot}/%{ssletcdir}/misc %{buildroot}/%{_datadir}/ssl-3/
+rm -f %{buildroot}%{ssletcdir}/openssl.cnf.dist
+rm -f %{buildroot}%{ssletcdir}/ct_log_list.cnf.dist
+
+# Make a copy of the default openssl.cnf file
+cp %{buildroot}%{ssletcdir}/openssl.cnf %{buildroot}%{ssletcdir}/openssl-orig.cnf
+
+# Create openssl ca-certificates dir required by nodejs regression tests [bsc#1207484]
+mkdir -p %{buildroot}/var/lib/ca-certificates/openssl
+install -d -m 555 %{buildroot}/var/lib/ca-certificates/openssl
+
+# Remove the fipsmodule.cnf because FIPS module is loaded automatically
+rm -f %{buildroot}%{ssletcdir}/fipsmodule.cnf
+
ln -sf ./%{_rname} %{buildroot}/%{_includedir}/ssl
mkdir %{buildroot}/%{_datadir}/ssl
-# Rename binary
-mv %{buildroot}%{_bindir}/%{_rname} %{buildroot}%{_bindir}/%{name}
+mv %{buildroot}/%{ssletcdir}/misc %{buildroot}/%{_datadir}/ssl/
+
# Avoid file conflicts with man pages from other packages
pushd %{buildroot}/%{_mandir}
find . -type f -exec chmod 644 {} +
-# Some man pages now contain spaces. This makes several
-# scripts go havoc, among them /usr/sbin/Check.
-# Replace spaces by underscores
-# for i in man?/*\ *; do mv -v "$i" "${i// /_}"; done
-
-touch $OLDPWD/filelist.doc $OLDPWD/filelist
-which readlink &>/dev/null || function readlink { ( set +x; target=$(file $1 2>/dev/null); target=${target//* }; test -f $target && echo $target; ) }
-for i in man?/*; do
- if test -L $i ; then
- LDEST=`readlink $i`
- rm -f $i ${i}ssl
- ln -sf ${LDEST}ssl-3 ${i}ssl-3
- else
- mv $i ${i}ssl-3
- fi
- case "$i" in
- *.1)
- # These are the pages mentioned in openssl(1). They go into the main package.
- echo %doc %{_mandir}/${i}ssl-3%{?ext_man} >> $OLDPWD/filelist;;
- *)
- # The rest goes into the openssl-doc package.
- echo %doc %{_mandir}/${i}ssl-3%{?ext_man} >> $OLDPWD/filelist.doc;;
- esac
-done
+mv man5/config.5%{man_suffix} man5/openssl.cnf.5
popd
-mv %{buildroot}%{_bindir}/c_rehash %{buildroot}%{_bindir}/c_rehash-3
-
-# They are provided by openssl package
-rm %{buildroot}%{ssletcdir}/ct_log_list.cnf*
-
# Do not install demo scripts executable under /usr/share/doc
find demos -type f -perm /111 -exec chmod 644 {} +
# Place showciphers.c for %%doc macro
cp %{SOURCE5} .
+# Compute the FIPS hmac using the brp-50-generate-fips-hmac script
+export BRP_FIPSHMAC_FILES="%{buildroot}%{_libdir}/libssl.so.%{sover} %{buildroot}%{_libdir}/libcrypto.so.%{sover}"
+
+%post -p "/bin/bash"
+if [ "$1" -gt 1 ] ; then
+ # Check if the packaged default config file for openssl-3, called openssl.cnf,
+ # is the original or if it has been modified and alert the user in that case
+ # that a copy of the original file openssl-orig.cnf can be used if needed.
+ cmp --silent %{ssletcdir}/openssl.cnf %{ssletcdir}/openssl-orig.cnf 2>/dev/null
+ if [ "$?" -eq 1 ] ; then
+ echo -e " The openssl-3 default config file openssl.cnf is different from" ;
+ echo -e " the original one shipped by the package. A copy of the original" ;
+ echo -e " file is packaged and named as openssl-orig.cnf if needed."
+ fi
+fi
+
%post -n libopenssl3 -p /sbin/ldconfig
%postun -n libopenssl3 -p /sbin/ldconfig
%files -n libopenssl3
%license LICENSE.txt
+%attr(0755,root,root) %{_libdir}/libssl.so.%{version}
%{_libdir}/libssl.so.%{sover}
+%attr(0755,root,root) %{_libdir}/libcrypto.so.%{version}
%{_libdir}/libcrypto.so.%{sover}
%{_libdir}/engines-%{sover}
%dir %{_libdir}/ossl-modules
-#%%{_libdir}/ossl-modules/fips.so
+%{_libdir}/ossl-modules/fips.so
%{_libdir}/ossl-modules/legacy.so
+%files -n libopenssl3-hmac
+%{_libdir}/.libssl.so.%{sover}.hmac
+%{_libdir}/.libcrypto.so.%{sover}.hmac
+
%files -n libopenssl-3-devel
+%doc NOTES*.md CONTRIBUTING.md HACKING.md AUTHORS.md ACKNOWLEDGEMENTS.md
%{_includedir}/%{_rname}/
%{_includedir}/ssl
-%{_libdir}/libssl.so
-%{_libdir}/libcrypto.so
-%{_libdir}/pkgconfig/libcrypto.pc
-%{_libdir}/pkgconfig/libssl.pc
-%{_libdir}/pkgconfig/openssl.pc
-
-%files doc -f filelist.doc
-%doc doc/* demos
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/*
+
+%files doc
+%doc README.md
+%doc doc/html/* doc/HOWTO/* demos
%doc showciphers.c
-%files -f filelist
-%doc CHANGE*
+%files
+%license LICENSE.txt
+%doc CHANGES.md NEWS.md FAQ.md README.md
%dir %{ssletcdir}
-%config (noreplace) %{ssletcdir}/openssl3.cnf
+%config %{ssletcdir}/openssl-orig.cnf
+%config (noreplace) %{ssletcdir}/openssl.cnf
+%config (noreplace) %{ssletcdir}/ct_log_list.cnf
%attr(700,root,root) %{ssletcdir}/private
-
-%dir %{_datadir}/ssl-3
-%{_datadir}/ssl-3/misc
-%{_bindir}/c_rehash-3
-%{_bindir}/%{name}
+%dir %{_datadir}/ssl
+%{_datadir}/ssl/misc
+%dir /var/lib/ca-certificates/
+%dir /var/lib/ca-certificates/openssl
+%{_bindir}/%{_rname}
+%{_bindir}/c_rehash
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man7/*
%changelog
diff --git a/packages/o/openssl-3/openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch b/packages/o/openssl-3/openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
index b8e2cda..1006ad7 100644
--- a/packages/o/openssl-3/openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
+++ b/packages/o/openssl-3/openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
@@ -15,10 +15,10 @@ Subject: Add support for PROFILE=SYSTEM system default cipherlist
util/libcrypto.num | 1 +
8 files changed, 110 insertions(+), 14 deletions(-)
-Index: openssl-3.0.5/Configurations/unix-Makefile.tmpl
+Index: openssl-3.0.7/Configurations/unix-Makefile.tmpl
===================================================================
---- openssl-3.0.5.orig/Configurations/unix-Makefile.tmpl
-+++ openssl-3.0.5/Configurations/unix-Makefile.tmpl
+--- openssl-3.0.7.orig/Configurations/unix-Makefile.tmpl
++++ openssl-3.0.7/Configurations/unix-Makefile.tmpl
@@ -315,6 +315,10 @@ MANDIR=$(INSTALLTOP)/share/man
DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
HTMLDIR=$(DOCDIR)/html
@@ -38,10 +38,10 @@ Index: openssl-3.0.5/Configurations/unix-Makefile.tmpl
(map { "-I".$_} @{$config{CPPINCLUDES}}),
@{$config{CPPFLAGS}}) -}
CFLAGS={- join(' ', @{$config{CFLAGS}}) -}
-Index: openssl-3.0.5/doc/man1/openssl-ciphers.pod.in
+Index: openssl-3.0.7/doc/man1/openssl-ciphers.pod.in
===================================================================
---- openssl-3.0.5.orig/doc/man1/openssl-ciphers.pod.in
-+++ openssl-3.0.5/doc/man1/openssl-ciphers.pod.in
+--- openssl-3.0.7.orig/doc/man1/openssl-ciphers.pod.in
++++ openssl-3.0.7/doc/man1/openssl-ciphers.pod.in
@@ -186,6 +186,15 @@ As of OpenSSL 1.0.0, the B cipher s
The cipher suites not enabled by B, currently B.
@@ -58,10 +58,10 @@ Index: openssl-3.0.5/doc/man1/openssl-ciphers.pod.in
=item B
"High" encryption cipher suites. This currently means those with key lengths
-Index: openssl-3.0.5/include/openssl/ssl.h.in
+Index: openssl-3.0.7/include/openssl/ssl.h.in
===================================================================
---- openssl-3.0.5.orig/include/openssl/ssl.h.in
-+++ openssl-3.0.5/include/openssl/ssl.h.in
+--- openssl-3.0.7.orig/include/openssl/ssl.h.in
++++ openssl-3.0.7/include/openssl/ssl.h.in
@@ -210,6 +210,11 @@ extern "C" {
* throwing out anonymous and unencrypted ciphersuites! (The latter are not
* actually enabled by ALL, but "ALL:RSA" would enable some of them.)
@@ -74,11 +74,11 @@ Index: openssl-3.0.5/include/openssl/ssl.h.in
/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
# define SSL_SENT_SHUTDOWN 1
-Index: openssl-3.0.5/ssl/ssl_ciph.c
+Index: openssl-3.0.7/ssl/ssl_ciph.c
===================================================================
---- openssl-3.0.5.orig/ssl/ssl_ciph.c
-+++ openssl-3.0.5/ssl/ssl_ciph.c
-@@ -1436,6 +1436,53 @@ int SSL_set_ciphersuites(SSL *s, const c
+--- openssl-3.0.7.orig/ssl/ssl_ciph.c
++++ openssl-3.0.7/ssl/ssl_ciph.c
+@@ -1438,6 +1438,53 @@ int SSL_set_ciphersuites(SSL *s, const c
return ret;
}
@@ -132,7 +132,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
STACK_OF(SSL_CIPHER) **cipher_list,
-@@ -1450,15 +1497,25 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1452,15 +1499,25 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
CIPHER_ORDER *co_list = NULL, *head = NULL, *tail = NULL, *curr;
const SSL_CIPHER **ca_list = NULL;
const SSL_METHOD *ssl_method = ctx->method;
@@ -160,7 +160,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
/*
* To reduce the work to do we only want to process the compiled
-@@ -1480,7 +1537,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1482,7 +1539,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
co_list = OPENSSL_malloc(sizeof(*co_list) * num_of_ciphers);
if (co_list == NULL) {
ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
@@ -169,7 +169,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
}
ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers,
-@@ -1546,8 +1603,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1548,8 +1605,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
* in force within each class
*/
if (!ssl_cipher_strength_sort(&head, &tail)) {
@@ -179,7 +179,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
}
/*
-@@ -1591,9 +1647,8 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1593,9 +1649,8 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1;
ca_list = OPENSSL_malloc(sizeof(*ca_list) * num_of_alias_max);
if (ca_list == NULL) {
@@ -190,7 +190,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
}
ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
disabled_mkey, disabled_auth, disabled_enc,
-@@ -1626,8 +1681,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1628,8 +1683,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
OPENSSL_free(ca_list); /* Not needed anymore */
if (!ok) { /* Rule processing failure */
@@ -200,7 +200,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
}
/*
-@@ -1635,10 +1689,13 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1637,10 +1691,13 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
* if we cannot get one.
*/
if ((cipherstack = sk_SSL_CIPHER_new_null()) == NULL) {
@@ -216,7 +216,7 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
/* Add TLSv1.3 ciphers first - we always prefer those if possible */
for (i = 0; i < sk_SSL_CIPHER_num(tls13_ciphersuites); i++) {
const SSL_CIPHER *sslc = sk_SSL_CIPHER_value(tls13_ciphersuites, i);
-@@ -1690,6 +1747,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+@@ -1692,6 +1749,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
*cipher_list = cipherstack;
return cipherstack;
@@ -231,10 +231,10 @@ Index: openssl-3.0.5/ssl/ssl_ciph.c
}
char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
-Index: openssl-3.0.5/ssl/ssl_lib.c
+Index: openssl-3.0.7/ssl/ssl_lib.c
===================================================================
---- openssl-3.0.5.orig/ssl/ssl_lib.c
-+++ openssl-3.0.5/ssl/ssl_lib.c
+--- openssl-3.0.7.orig/ssl/ssl_lib.c
++++ openssl-3.0.7/ssl/ssl_lib.c
@@ -660,7 +660,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx
ctx->tls13_ciphersuites,
&(ctx->cipher_list),
@@ -244,7 +244,7 @@ Index: openssl-3.0.5/ssl/ssl_lib.c
if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0)) {
ERR_raise(ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
return 0;
-@@ -3271,7 +3271,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *li
+@@ -3285,7 +3285,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *li
if (!ssl_create_cipher_list(ret,
ret->tls13_ciphersuites,
&ret->cipher_list, &ret->cipher_list_by_id,
@@ -253,10 +253,10 @@ Index: openssl-3.0.5/ssl/ssl_lib.c
|| sk_SSL_CIPHER_num(ret->cipher_list) <= 0) {
ERR_raise(ERR_LIB_SSL, SSL_R_LIBRARY_HAS_NO_CIPHERS);
goto err2;
-Index: openssl-3.0.5/test/cipherlist_test.c
+Index: openssl-3.0.7/test/cipherlist_test.c
===================================================================
---- openssl-3.0.5.orig/test/cipherlist_test.c
-+++ openssl-3.0.5/test/cipherlist_test.c
+--- openssl-3.0.7.orig/test/cipherlist_test.c
++++ openssl-3.0.7/test/cipherlist_test.c
@@ -246,7 +246,9 @@ end:
int setup_tests(void)
@@ -267,20 +267,20 @@ Index: openssl-3.0.5/test/cipherlist_test.c
ADD_TEST(test_default_cipherlist_explicit);
ADD_TEST(test_default_cipherlist_clear);
return 1;
-Index: openssl-3.0.5/util/libcrypto.num
+Index: openssl-3.0.7/util/libcrypto.num
===================================================================
---- openssl-3.0.5.orig/util/libcrypto.num
-+++ openssl-3.0.5/util/libcrypto.num
+--- openssl-3.0.7.orig/util/libcrypto.num
++++ openssl-3.0.7/util/libcrypto.num
@@ -5427,3 +5427,4 @@ EVP_PKEY_get0_provider
EVP_PKEY_CTX_get0_provider 5555 3_0_0 EXIST::FUNCTION:
OPENSSL_strcasecmp 5556 3_0_3 EXIST::FUNCTION:
OPENSSL_strncasecmp 5557 3_0_3 EXIST::FUNCTION:
+ossl_safe_getenv ? 3_0_0 EXIST::FUNCTION:
-Index: openssl-3.0.5/Configure
+Index: openssl-3.0.7/Configure
===================================================================
---- openssl-3.0.5.orig/Configure
-+++ openssl-3.0.5/Configure
-@@ -28,7 +28,7 @@ use OpenSSL::config;
+--- openssl-3.0.7.orig/Configure
++++ openssl-3.0.7/Configure
+@@ -27,7 +27,7 @@ use OpenSSL::config;
my $orig_death_handler = $SIG{__DIE__};
$SIG{__DIE__} = \&death_handler;
@@ -289,7 +289,7 @@ Index: openssl-3.0.5/Configure
my $banner = <<"EOF";
-@@ -62,6 +62,10 @@ EOF
+@@ -61,6 +61,10 @@ EOF
# given with --prefix.
# This becomes the value of OPENSSLDIR in Makefile and in C.
# (Default: PREFIX/ssl)
@@ -300,7 +300,7 @@ Index: openssl-3.0.5/Configure
# --banner=".." Output specified text instead of default completion banner
#
# -w Don't wait after showing a Configure warning
-@@ -388,6 +392,7 @@ $config{prefix}="";
+@@ -387,6 +391,7 @@ $config{prefix}="";
$config{openssldir}="";
$config{processor}="";
$config{libdir}="";
@@ -308,14 +308,14 @@ Index: openssl-3.0.5/Configure
my $auto_threads=1; # enable threads automatically? true by default
my $default_ranlib;
-@@ -990,6 +995,10 @@ while (@argvcopy)
+@@ -989,6 +994,10 @@ while (@argvcopy)
die "FIPS key too long (64 bytes max)\n"
if length $1 > 64;
}
-+ elsif (/^--system-ciphers-file=(.*)$/)
-+ {
-+ $config{system_ciphers_file}=$1;
-+ }
++ elsif (/^--system-ciphers-file=(.*)$/)
++ {
++ $config{system_ciphers_file}=$1;
++ }
elsif (/^--banner=(.*)$/)
{
$banner = $1 . "\n";
diff --git a/packages/o/openssl-3/openssl-no-html-docs.patch b/packages/o/openssl-3/openssl-no-html-docs.patch
new file mode 100644
index 0000000..30a7db1
--- /dev/null
+++ b/packages/o/openssl-3/openssl-no-html-docs.patch
@@ -0,0 +1,13 @@
+Index: openssl-3.0.0-alpha1/Configurations/unix-Makefile.tmpl
+===================================================================
+--- openssl-3.0.0-alpha1.orig/Configurations/unix-Makefile.tmpl 2020-04-23 22:56:27.365853133 +0200
++++ openssl-3.0.0-alpha1/Configurations/unix-Makefile.tmpl 2020-04-23 22:56:52.474004636 +0200
+@@ -544,7 +544,7 @@ install_sw: install_dev install_engines
+
+ uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
+
+-install_docs: install_man_docs install_html_docs
++install_docs: install_man_docs
+
+ uninstall_docs: uninstall_man_docs uninstall_html_docs
+ $(RM) -r $(DESTDIR)$(DOCDIR)
diff --git a/packages/o/openssl-3/openssl-use-versioned-config.patch b/packages/o/openssl-3/openssl-use-versioned-config.patch
deleted file mode 100644
index 828526b..0000000
--- a/packages/o/openssl-3/openssl-use-versioned-config.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 300d2b56166aee85d9ce4c1275da1ad79c876e31 Mon Sep 17 00:00:00 2001
-From: Sahana Prasad
-Date: Tue, 5 Oct 2021 12:10:42 +0200
-Subject: [PATCH] Updates the conf file to openssl11.cnf Resolves:
- rhbz#1947584, rhbz#2003123 Signed-off-by: Sahana Prasad
-
-Refactored for SUSE by Simon Lees sflees@suse.de
-
-Index: openssl-3.0.2/include/internal/cryptlib.h
-===================================================================
---- openssl-3.0.2.orig/include/internal/cryptlib.h
-+++ openssl-3.0.2/include/internal/cryptlib.h
-@@ -61,7 +61,7 @@ DEFINE_STACK_OF(EX_CALLBACK)
- typedef struct mem_st MEM;
- DEFINE_LHASH_OF(MEM);
-
--# define OPENSSL_CONF "openssl.cnf"
-+# define OPENSSL_CONF "openssl3.cnf"
-
- # ifndef OPENSSL_SYS_VMS
- # define X509_CERT_AREA OPENSSLDIR
-Index: openssl-3.0.2/Configurations/unix-Makefile.tmpl
-===================================================================
---- openssl-3.0.2.orig/Configurations/unix-Makefile.tmpl
-+++ openssl-3.0.2/Configurations/unix-Makefile.tmpl
-@@ -675,14 +675,14 @@ install_ssldirs:
- : {- output_on() if windowsdll(); "" -}; \
- fi; \
- done
-- @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
-- @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
-- @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
-- @mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist
-- @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
-- $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
-- cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
-- chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
-+ @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf.dist"
-+ @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf.new
-+ @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf.new
-+ @mv -f $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf.dist
-+ @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl3.cnf" ]; then \
-+ $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf"; \
-+ cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf; \
-+ chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl3.cnf; \
- fi
- @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
- @cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
-@@ -1136,7 +1136,7 @@ lint:
-
- generate_apps:
- ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \
-- < apps/openssl.cnf > apps/openssl-vms.cnf )
-+ < apps/openssl3.cnf > apps/openssl-vms.cnf )
-
- generate_crypto_bn:
- ( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h )
-@@ -1374,7 +1374,7 @@ tar:
-
- # Helper targets #####################################################
-
--link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/apps/openssl.cnf
-+link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/apps/openssl3.cnf
-
- $(BLDDIR)/util/opensslwrap.sh: Makefile
- @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
-@@ -1382,7 +1382,7 @@ $(BLDDIR)/util/opensslwrap.sh: Makefile
- ln -sf "../$(SRCDIR)/util/`basename "$@"`" "$(BLDDIR)/util"; \
- fi
-
--$(BLDDIR)/apps/openssl.cnf: Makefile
-+$(BLDDIR)/apps/openssl3.cnf: Makefile
- @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
- mkdir -p "$(BLDDIR)/apps"; \
- ln -sf "../$(SRCDIR)/apps/`basename "$@"`" "$(BLDDIR)/apps"; \
-Index: openssl-3.0.2/Configure
-===================================================================
---- openssl-3.0.2.orig/Configure
-+++ openssl-3.0.2/Configure
-@@ -56,7 +56,7 @@ EOF
- # directories bin, lib, include, share/man, share/doc/openssl
- # This becomes the value of INSTALLTOP in Makefile
- # (Default: /usr/local)
--# --openssldir OpenSSL data area, such as openssl.cnf, certificates and keys.
-+# --openssldir OpenSSL data area, such as openssl3.cnf, certificates and keys.
- # If it's a relative directory, it will be added on the directory
- # given with --prefix.
- # This becomes the value of OPENSSLDIR in Makefile and in C.
-Index: openssl-3.0.2/doc/HOWTO/certificates.txt
-===================================================================
---- openssl-3.0.2.orig/doc/HOWTO/certificates.txt
-+++ openssl-3.0.2/doc/HOWTO/certificates.txt
-@@ -16,7 +16,7 @@ Certificate authorities should read http
- In all the cases shown below, the standard configuration file, as
- compiled into openssl, will be used. You may find it in /etc/,
- /usr/local/ssl/ or somewhere else. By default the file is named
--openssl.cnf and is described at https://www.openssl.org/docs/apps/config.html.
-+openssl3.cnf and is described at https://www.openssl.org/docs/apps/config.html.
- You can specify a different configuration file using the
- '-config {file}' argument with the commands shown below.
-
-Index: openssl-3.0.2/doc/man3/OPENSSL_config.pod
-===================================================================
---- openssl-3.0.2.orig/doc/man3/OPENSSL_config.pod
-+++ openssl-3.0.2/doc/man3/OPENSSL_config.pod
-@@ -17,7 +17,7 @@ see L:
-
- =head1 DESCRIPTION
-
--OPENSSL_config() configures OpenSSL using the standard B and
-+OPENSSL_config() configures OpenSSL using the standard B and
- reads from the application section B. If B is NULL then
- the default section, B, will be used.
- Errors are silently ignored.
-Index: openssl-3.0.2/INSTALL.md
-===================================================================
---- openssl-3.0.2.orig/INSTALL.md
-+++ openssl-3.0.2/INSTALL.md
-@@ -567,7 +567,7 @@ is an objective.
-
- ### no-autoload-config
-
--Don't automatically load the default `openssl.cnf` file.
-+Don't automatically load the default `openssl3.cnf` file.
-
- Typically OpenSSL will automatically load a system config file which configures
- default SSL options.
diff --git a/packages/o/openssl/.files b/packages/o/openssl/.files
index 53050cb..19c8d3e 100644
Binary files a/packages/o/openssl/.files and b/packages/o/openssl/.files differ
diff --git a/packages/o/openssl/.rev b/packages/o/openssl/.rev
index a030c4a..fb8fa07 100644
--- a/packages/o/openssl/.rev
+++ b/packages/o/openssl/.rev
@@ -1681,4 +1681,12 @@ fixes its regression.
1032896
+
+ 63ce3e6f76f4f812e9059188133f1e84
+ 3.0.7
+
+ dimstar_suse
+
+ 1062223
+
diff --git a/packages/o/openssl/baselibs.conf b/packages/o/openssl/baselibs.conf
index 5a6fc5a..60cccb9 100644
--- a/packages/o/openssl/baselibs.conf
+++ b/packages/o/openssl/baselibs.conf
@@ -1,8 +1,8 @@
openssl
- requires "openssl-1_1- = "
+ requires "openssl-3- = "
obsoletes "openssl-1_1_0-"
libopenssl-devel
requires "openssl- = "
- requires "libopenssl1_1- = "
- requires "libopenssl-1_1-devel- = "
+ requires "libopenssl3- = "
+ requires "libopenssl-3-devel- = "
obsoletes "libopenssl-1_1_0-devel-"
diff --git a/packages/o/openssl/openssl.changes b/packages/o/openssl/openssl.changes
index 8e95738..e27420a 100644
--- a/packages/o/openssl/openssl.changes
+++ b/packages/o/openssl/openssl.changes
@@ -1,43 +1,57 @@
-------------------------------------------------------------------
-Wed Nov 2 12:09:53 UTC 2022 - Otto Hollmann
+Tue Nov 1 15:46:44 UTC 2022 - Otto Hollmann
-- updated to 1.1.s release
+- Update to 3.0.7
-------------------------------------------------------------------
-Thu Jul 7 07:13:31 UTC 2022 - Marcus Meissner
+Tue Nov 1 10:42:00 UTC 2022 - Otto Hollmann
-- updated to 1.1.q release
+- Update to 3.0.6
-------------------------------------------------------------------
-Mon Jun 27 07:48:05 UTC 2022 - Marcus Meissner
+Thu Jul 21 09:09:07 UTC 2022 - Pedro Monreal
-- Update to 1.1.1p release
+- Update to 3.0.5
-------------------------------------------------------------------
-Tue Jun 7 10:30:55 UTC 2022 - Marcus Meissner
+Mon Jul 18 12:03:55 UTC 2022 - Pedro Monreal
-- Update to 1.1.1o release
+- Update to 3.0.4
-------------------------------------------------------------------
-Thu May 5 08:41:02 UTC 2022 - Jan Engelhardt
+Mon Jul 18 12:03:21 UTC 2022 - Pedro Monreal
-- Use same %description as openssl-3 (describe the software,
- not the project).
+- Update to 3.0.3
-------------------------------------------------------------------
Tue Mar 15 17:41:47 UTC 2022 - Pedro Monreal
-- Update to 1.1.1n release
+- Update to 3.0.2
-------------------------------------------------------------------
-Tue Dec 28 12:34:04 UTC 2021 - Pedro Monreal
+Thu Jan 13 10:49:26 UTC 2022 - Pedro Monreal
-- Update to 1.1.1m release
+- Update to 3.0.1
-------------------------------------------------------------------
-Tue Aug 24 19:32:25 UTC 2021 - Pedro Monreal
+Tue Sep 7 14:58:35 UTC 2021 - Pedro Monreal
-- Update to 1.1.1l release
+- Update to 3.0.0
+
+-------------------------------------------------------------------
+Thu Jul 29 16:46:14 UTC 2021 - Pedro Monreal