.flatpak.metadata

@@ -1 +0,0 @@
-9efde3d86f706e2bed43cb6bcd7177126388e544 SOURCES/flatpak-1.4.3.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/flatpak-1.4.3.tar.xz
+SOURCES/flatpak-1.10.8.tar.xz

SOURCES/0001-ref-Fix-a-memory-leak.patch

@@ -1,26 +0,0 @@
-From 18a16227556ad0aa24f9b8c759d571fcc5cdb728 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Fri, 14 Jun 2019 12:30:57 +0200
-Subject: [PATCH] ref: Fix a memory leak
-
-Closes: #2964
-Approved by: mwleeds
----
- common/flatpak-ref.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/flatpak-ref.c b/common/flatpak-ref.c
-index 38554e97..6dacb19c 100644
---- a/common/flatpak-ref.c
-+++ b/common/flatpak-ref.c
-@@ -82,6 +82,7 @@ flatpak_ref_finalize (GObject *object)
-   g_free (priv->arch);
-   g_free (priv->branch);
-   g_free (priv->commit);
-+  g_free (priv->collection_id);
- 
-   G_OBJECT_CLASS (flatpak_ref_parent_class)->finalize (object);
- }
--- 
-2.21.0
-

SPECS/flatpak.spec

@@ -1,8 +1,8 @@
-%global bubblewrap_version 0.2.1
-%global ostree_version 2018.9
+%global bubblewrap_version 0.4.0
+%global ostree_version 2020.8
 
 Name:           flatpak
-Version:        1.4.3
+Version:        1.10.8
 Release:        2%{?dist}
 Summary:        Application deployment framework for desktop apps
 
@@ -10,21 +10,20 @@ License:        LGPLv2+
 URL:            http://flatpak.org/
 Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
 
-# Backported from upstream
-Patch0:         0001-ref-Fix-a-memory-leak.patch
-
 BuildRequires:  pkgconfig(appstream-glib)
 BuildRequires:  pkgconfig(dconf)
 BuildRequires:  pkgconfig(fuse)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.40.0
+BuildRequires:  pkgconfig(gpgme)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libarchive) >= 2.8.0
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.4
+BuildRequires:  pkgconfig(libzstd) >= 0.8.1
 BuildRequires:  pkgconfig(ostree-1) >= %{ostree_version}
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(xau)
@@ -33,8 +32,10 @@ BuildRequires:  bubblewrap >= %{bubblewrap_version}
 BuildRequires:  docbook-dtds
 BuildRequires:  docbook-style-xsl
 BuildRequires:  gettext
-BuildRequires:  gpgme-devel
+BuildRequires:  libassuan-devel
 BuildRequires:  libcap-devel
+BuildRequires:  python3-devel
+BuildRequires:  python3-pyparsing
 BuildRequires:  systemd
 BuildRequires:  /usr/bin/xmlto
 BuildRequires:  /usr/bin/xsltproc
@@ -108,6 +109,7 @@ Summary:        Tests for %{name}
 License:        LGPLv2+
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-session-helper%{?_isa} = %{version}-%{release}
 Requires:       bubblewrap >= %{bubblewrap_version}
 Requires:       ostree%{?_isa} >= %{ostree_version}
 
@@ -117,13 +119,11 @@ This package contains installed tests for %{name}.
 
 %prep
 %autosetup -p1
+# Make sure to use the RHEL-lifetime supported Python and no other
+%py3_shebang_fix scripts/*  variant-schema-compiler/*
 
 
 %build
-# Fix generic python shebangs.
-find tests -name '*.py' -exec \
-    sed -i -e 's|/usr/bin/python|/usr/bin/python3|' {} +
-
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  # Generate consistent IDs between runs to avoid multilib problems.
  export XMLTO_FLAGS="--stringparam generate.consistent.ids=1"
@@ -146,6 +146,11 @@ install -d %{buildroot}%{_sysconfdir}/flatpak/remotes.d
 rm -f %{buildroot}%{_libdir}/libflatpak.la
 %find_lang %{name}
 
+# Work around selinux denials, see
+# https://github.com/flatpak/flatpak/issues/4128 for details. Note that we are
+# going to need the system env generator if we should enable malcontent support
+# in the future.
+rm %{buildroot}%{_systemd_system_env_generator_dir}/60-flatpak-system-only
 
 %pre
 getent group flatpak >/dev/null || groupadd -r flatpak
@@ -183,15 +188,17 @@ fi
 %{_bindir}/flatpak-coredumpctl
 %{_datadir}/bash-completion
 %{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.Authenticator.xml
+%{_datadir}/dbus-1/services/org.flatpak.Authenticator.Oci.service
 %{_datadir}/dbus-1/services/org.freedesktop.portal.Flatpak.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.Flatpak.SystemHelper.service
-# Co-own directory.
-%{_datadir}/gdm/env.d
+%{_datadir}/fish
 %{_datadir}/%{name}
 %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
 %{_datadir}/polkit-1/rules.d/org.freedesktop.Flatpak.rules
 %{_datadir}/zsh/site-functions
 %{_libexecdir}/flatpak-dbus-proxy
+%{_libexecdir}/flatpak-oci-authenticator
 %{_libexecdir}/flatpak-portal
 %{_libexecdir}/flatpak-system-helper
 %{_libexecdir}/flatpak-validate-icon
@@ -206,7 +213,9 @@ fi
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
 %{_sysconfdir}/flatpak/remotes.d
 %{_sysconfdir}/profile.d/flatpak.sh
+%{_sysusersdir}/flatpak.conf
 %{_unitdir}/flatpak-system-helper.service
+%{_userunitdir}/flatpak-oci-authenticator.service
 %{_userunitdir}/flatpak-portal.service
 %{_systemd_user_env_generator_dir}/60-flatpak
 
@@ -239,6 +248,67 @@ fi
 
 
 %changelog
+* Mon Sep 04 2023 Miro Hrončok <mhroncok@redhat.com> - 1.10.8-2
+- Make sure to use the RHEL-lifetime supported Python and no other (RHEL-2225)
+
+* Tue Jul 11 2023 Debarshi Ray <rishi@fedoraproject.org> - 1.10.8-1
+- Rebase to 1.10.8 (#2222103)
+- Fix CVE-2023-28100 and CVE-2023-28101 (#2180311)
+
+* Wed Mar 09 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.10.7-1
+- Rebase to 1.10.7 (#2062417)
+
+* Thu Feb 03 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.8.7-1
+- Rebase to 1.8.7 (#2041972)
+
+* Tue Jan 25 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.8.6-1
+- Rebase to 1.8.6 (#2010533)
+
+* Tue Oct 26 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.8.5-6
+- Fix CVE-2021-41133 (#2012869)
+
+* Tue Oct 05 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.8.5-5
+- Disable gvfs plugins when listing flatpak installations (#1980438)
+
+* Wed Jul 28 2021 Tomas Popela <tpopela@redhat.com> - 1.8.5-4
+- Ship flatpak-devel in CRB (#1938064)
+
+* Mon Mar 22 2021 David King <dking@redhat.com> - 1.8.5-3
+- Fix CVE-2021-21381 (#1938064)
+
+* Mon Jan 25 2021 David King <dking@redhat.com> - 1.8.5-2
+- Apply post-release CVE fixes (#1918776)
+
+* Thu Jan 14 2021 David King <dking@redhat.com> - 1.8.5-1
+- Rebase to 1.8.5 (#1851958)
+
+* Tue Nov 17 2020 David King <dking@redhat.com> - 1.8.3-1
+- Rebase to 1.8.3 (#1851958)
+
+* Mon Oct 05 2020 David King <dking@redhat.com> - 1.8.2-1
+- Rebase to 1.8.2 (#1851958)
+
+* Mon Sep 14 2020 Kalev Lember <klember@redhat.com> - 1.6.2-4
+- OCI: extract appstream data for runtimes (#1878231)
+
+* Wed Jun 17 2020 David King <dking@redhat.com> - 1.6.2-3
+- Further fixes for OCI authenticator (#1847201)
+
+* Fri Mar 20 2020 David King <dking@redhat.com> - 1.6.2-2
+- Fixes for OCI authenticator (#1814045)
+
+* Thu Feb 13 2020 David King <dking@redhat.com> - 1.6.2-1
+- Rebase to 1.6.2 (#1775339)
+
+* Thu Jan 23 2020 David King <dking@redhat.com> - 1.6.1-1
+- Rebase to 1.6.1 (#1775339)
+
+* Fri Jan 17 2020 David King <dking@redhat.com> - 1.6.0-2
+- Remove broken python3 sed hack (#1775339)
+
+* Sat Dec 21 2019 David King <dking@redhat.com> - 1.6.0-1
+- Rebase to 1.6.0 (#1775339)
+
 * Fri Nov 08 2019 David King <dking@redhat.com> - 1.4.3-2
 - Use %%{?selinux_requires} for proper install ordering