Commit Graph

4 Commits

Author SHA1 Message Date
Debarshi Ray
b231e9912a Rebase to 1.12.8
RHEL 8's SELinux stack doesn't have the systemd_userdbd_stream_connect()
interface, and hence it was dropped.  Otherwise, it leads to:
  flatpak.te:36:ERROR 'syntax error' at token
    'systemd_userdbd_stream_connect' on line 4970:
      systemd_userdbd_stream_connect(flatpak_helper_t)

The dependencies specified by the %systemd_requires RPM macro are not
required for the %systemd_post, %systemd_postun_with_restart and
%systemd_preun macros that are used [1].  Hence, %systemd_requires was
dropped.

The workaround to cope better with /var/lib/flatpak existing but being
empty, by using 'flatpak remote-list --system' in %post, was dropped
because the root cause was fixed in 1.12.7 [2].

[1] https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/

[2] https://github.com/flatpak/flatpak/issues/4111
    https://github.com/flatpak/flatpak/releases/tag/1.12.7

Resolves: RHEL-4220
2023-11-06 20:29:25 +01:00
Debarshi Ray
2591b14abf Rebase to 1.10.8 (CVE-2023-28100 and CVE-2023-28101)
The gpgme dependency was simplified to prefer pkg-config on
distributions released after 2016, as opposed to gpgme-config [1].
Unfortunately, on RHEL 8, gpgme-devel doesn't pull in libassuan-devel
even though gpgme.pc refers to it [2]:
  $ pkg-config --cflags --libs gpgme
  -I/usr/include/libassuan2 -lgpgme -lgpg-error -lassuan

... and libassuan-devel itself doesn't provide a libassuan.pc.

Last time when flatpak-1.10.7 was built for RHEL 8.7, something was
pulling python36 into the buildroot.  Now, on RHEL 8.9, something is
pulling python3.11 into the buildroot, and that requires the
python3.11-pyparsing RPM.

[1] Flatpak commit f1dd7d6076645b06
    https://github.com/flatpak/flatpak/commit/f1dd7d6076645b06

[2] https://bugzilla.redhat.com/show_bug.cgi?id=2222124

Resolves: #2180311, #2222103
2023-07-12 00:06:47 +02:00
James Antill
479598361b Import rpm: c8s 2023-02-27 13:00:31 -05:00
James Antill
1555765f22 Auto sync2gitlab import of flatpak-1.10.7-1.el8.src.rpm 2022-05-26 07:06:56 -04:00