scm-commits November 2018

scm-commits@lists.fedoraproject.org

1 participants
16568 discussions

tdawson pushed to dbus-sharp (epel7). "Rebuild to be on all supported arches (#1655191)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:53:26 UTC From 1e72f97dd665be09cb064f5e8b300a641e3467cf Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Nov 30 2018 22:53:16 +0000 Subject: Rebuild to be on all supported arches (#1655191) --- diff --git a/dbus-sharp.spec b/dbus-sharp.spec index 780442b..d00c913 100644 --- a/dbus-sharp.spec +++ b/dbus-sharp.spec @@ -3,7 +3,7 @@ Summary: C# bindings for D-Bus Name: dbus-sharp Version: 0.7.0 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 URL: http://mono.github.com/dbus-sharp/ Source0: https://github.com/downloads/mono/dbus-sharp/%{name}-%{version}.tar.gz @@ -53,6 +53,9 @@ test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgcon %{_libdir}/pkgconfig/dbus-sharp-1.0.pc %changelog +* Fri Nov 30 2018 Troy Dawson <tdawson(a)redhat.com> - 1:0.7.0-16 +- Rebuild to be on all supported arches (#1655191) + * Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.7.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild https://src.fedoraproject.org/rpms/dbus-sharp/c/1e72f97dd665be09cb064f5e8b3…

1 0

tdawson pushed to dbus-sharp-glib (epel7). "Rebuild to be on all supported arches (#1651399)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:39:04 UTC From ada3c960e5fcffc0a0dd622d6b7d06d638bd1d9e Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Nov 30 2018 22:38:53 +0000 Subject: Rebuild to be on all supported arches (#1651399) --- diff --git a/dbus-sharp-glib.spec b/dbus-sharp-glib.spec index 57ed449..fb02d6b 100644 --- a/dbus-sharp-glib.spec +++ b/dbus-sharp-glib.spec @@ -3,7 +3,7 @@ Summary: C# bindings for D-Bus glib main loop integration Name: dbus-sharp-glib Version: 0.5.0 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://mono.github.com/dbus-sharp/ Source0: https://github.com/downloads/mono/dbus-sharp/%{name}-%{version}.tar.gz License: MIT @@ -50,6 +50,9 @@ test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgcon %{_libdir}/pkgconfig/dbus-sharp-glib-1.0.pc %changelog +* Fri Nov 30 2018 Troy Dawson <tdawson(a)redhat.com> - 0.5.0-14 +- Rebuild to be on all supported arches (#1651399) + * Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild https://src.fedoraproject.org/rpms/dbus-sharp-glib/c/ada3c960e5fcffc0a0dd62…

1 0

tdawson pushed to gnome-sharp (epel7). "Rebuild to be on all supported arches (#1651398)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:38:34 UTC From d3898deec807b432eafb913f520126cec68b0d5d Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Nov 30 2018 22:38:24 +0000 Subject: Rebuild to be on all supported arches (#1651398) --- diff --git a/gnome-sharp.spec b/gnome-sharp.spec index d99a7d9..80db2f9 100644 --- a/gnome-sharp.spec +++ b/gnome-sharp.spec @@ -1,6 +1,6 @@ Name: gnome-sharp Version: 2.24.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -75,6 +75,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.*a %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc %changelog +* Fri Nov 30 2018 Troy Dawson <tdawson(a)redhat.com> - 2.24.2-13 +- Rebuild to be on all supported arches (#1651398) + * Tue Feb 16 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.24.2-12 - Remove libgnomeprint deps (#1307549) https://src.fedoraproject.org/rpms/gnome-sharp/c/d3898deec807b432eafb913f52…

1 0

tdawson pushed to gtk-sharp2 (epel7). "Rebuild to be on all supported arches (#1651401)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:12:19 UTC From c4c74d861ae84d47403ef33f467d4dc7a5d4660a Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Nov 30 2018 22:12:08 +0000 Subject: Rebuild to be on all supported arches (#1651401) --- diff --git a/gtk-sharp2.spec b/gtk-sharp2.spec index e0606b9..de3f09c 100644 --- a/gtk-sharp2.spec +++ b/gtk-sharp2.spec @@ -1,6 +1,6 @@ Name: gtk-sharp2 Version: 2.12.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -108,6 +108,9 @@ find %{buildroot} -type f -name "*.a" -delete %{_prefix}/lib/monodoc/sources/* %changelog +* Fri Nov 30 2018 Troy Dawson <tdawson(a)redhat.com> - 2.12.26-4 +- Rebuild to be on all supported arches (#1651401) + * Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild https://src.fedoraproject.org/rpms/gtk-sharp2/c/c4c74d861ae84d47403ef33f467…

1 0

tdawson pushed to gtk-sharp3 (epel7). "Rebuild to be on all supported arches (#1651400)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:10:59 UTC From 98db04e0dc2689afec9bd5ace1701fa959b1a293 Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Nov 30 2018 22:10:49 +0000 Subject: Rebuild to be on all supported arches (#1651400) --- diff --git a/gtk-sharp3.spec b/gtk-sharp3.spec index 0b590e2..41e472c 100644 --- a/gtk-sharp3.spec +++ b/gtk-sharp3.spec @@ -10,7 +10,7 @@ Summary: GTK+ 3 and GNOME 3 bindings for Mono Name: gtk-sharp3 Version: 2.99.3 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2 Group: System Environment/Libraries @@ -125,6 +125,9 @@ chmod 0755 %{buildroot}%{_libdir}/*.so* %{_prefix}/lib/monodoc/sources/* %changelog +* Fri Nov 30 2018 Troy Dawson <tdawson(a)redhat.com> 2.99.3-11 +- Rebuild to be on all supported arches (#1651400) + * Fri May 15 2015 Claudio Rodrigo Pereyra Diaz <elsupergomez(a)fedoraproject.org> 2.99.3-10 - Fix url - Use global insted define for rhel and epel7 https://src.fedoraproject.org/rpms/gtk-sharp3/c/98db04e0dc2689afec9bd5ace17…

1 0

dmoluguw pushed to nuxwdog (nuxwdog-1.0.5-2.fc30). "Syncing changes with upstream repo (..more)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:02:46 UTC From 6e0e14e964c05810b001df5eb0c3bb872a0a5af3 Mon Sep 17 00:00:00 2001 From: Dinesh Prasanth M K <dmoluguw(a)redhat.com> Date: Oct 03 2018 21:14:34 +0000 Subject: Syncing changes with upstream repo Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com> --- diff --git a/nuxwdog.spec b/nuxwdog.spec index 08d4175..69f8140 100644 --- a/nuxwdog.spec +++ b/nuxwdog.spec @@ -1,14 +1,21 @@ +################################################################################ Name: nuxwdog -Version: 1.0.5 -Release: 2%{?dist} +################################################################################ Summary: Watchdog server to start and stop processes, and prompt for passwords # The entire source code is LGPLv2 except for the perl module, which is GPL+ or Artistic +URL: http://www.dogtagpki.org/wiki/Nuxwdog License: LGPLv2 and (GPL+ or Artistic) -URL: http://www.redhat.com/certificate_system + +Version: 1.0.5 +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +# global _phase -a1 # For epel5 and fc < 20 compatibility %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +# autosetup +BuildRequires: git + BuildRequires: ant BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils @@ -70,7 +77,7 @@ Requires: %{name} = %{version}-%{release} The nuxwdog-client-perl package contains a perl interface to nuxwdog. %prep -%setup -q -n %{name}-%{version} +%autosetup -n %{name}-%{version}%{?_phase} -p 1 -S git sed -i \ -e 's,^NUXWDOGCLIENT_DOCUMENTATION=${NUXWDOGCLIENT_BUILD_PREFIX}/.*$,NUXWDOGCLIENT_DOCUMENTATION=${NUXWDOGCLIENT_BUILD_PREFIX}%{_pkgdocdir},' setup_package @@ -130,6 +137,7 @@ rm -rf %{buildroot}%{_usr}/jars %changelog * Wed Aug 22 2018 Alexander Bokovoy <abokovoy(a)redhat.com> - 1.0.5-2 - Remove obsolete ExcludeArch statement for RHEL builds +- Syncing with upstream changes * Thu Aug 16 2018 Dogtag PKI Team (pki-devel(a)redhat.com) 1.0.5-1 - Fix memory bug due to insufficient memory allocation https://src.fedoraproject.org/rpms/nuxwdog/c/6e0e14e964c05810b001df5eb0c3bb…

1 0

limb pushed to gftp (epel7). "Re-enable gftp-text."
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 22:02:09 UTC From c21eed1149d5d5c5e12ecb7b6df2c333ecdd3404 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla <limburgher(a)gmail.com> Date: Nov 30 2018 18:02:57 +0000 Subject: Re-enable gftp-text. --- diff --git a/gftp-text-disabled.sh b/gftp-text-disabled.sh deleted file mode 100644 index f2fd338..0000000 --- a/gftp-text-disabled.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "Sorry, gftp-text has been disabled." diff --git a/gftp.spec b/gftp.spec index 15749c1..86ab974 100644 --- a/gftp.spec +++ b/gftp.spec @@ -1,13 +1,12 @@ Summary: A multi-threaded FTP client for the X Window System Name: gftp Version: 2.0.19 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 2 License: GPLv2+ Group: Applications/Internet Url: http://gftp.seul.org/ Source0: http://gftp.seul.org/%{name}-%{version}.tar.bz2 -Source1: gftp-text-disabled.sh Patch0: gftp-stropts.patch Patch1: gftp-2.0.19-fix-broken-bookmarks.patch BuildRequires: gcc @@ -51,10 +50,6 @@ desktop-file-install --vendor net --delete-original \ --remove-category Application \ $RPM_BUILD_ROOT%{_datadir}/applications/gftp.desktop -# Disable to save space -rm -f $RPM_BUILD_ROOT%{_bindir}/gftp-text -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/gftp-text - %find_lang %name %clean @@ -71,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/gftp.1.gz %changelog +* Fri Nov 30 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 2:2.0.19-20 +- Re-enable gftp-text. Disks are larger than 14 years ago. + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.0.19-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild https://src.fedoraproject.org/rpms/gftp/c/c21eed1149d5d5c5e12ecb7b6df2c333e…

1 0

otaylor pushed to flatpak (master). "Fix OCI system remotes (..more)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 21:49:53 UTC From 46af40e4bceb542e49abe006a71058a6773ca8ae Mon Sep 17 00:00:00 2001 From: Owen W. Taylor <otaylor(a)fishsoup.net> Date: Nov 30 2018 21:49:35 +0000 Subject: Fix OCI system remotes Add patches so that the system-helper downloads and creates the summary data, and so that the icon permissions are correct. --- diff --git a/OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch b/OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch new file mode 100644 index 0000000..27415bd --- /dev/null +++ b/OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch @@ -0,0 +1,272 @@ +From efd698210389f6be52c04117ca8615971ec009fc Mon Sep 17 00:00:00 2001 +From: Alexander Larsson <alexl(a)redhat.com> +Date: Fri, 30 Nov 2018 10:30:20 +0100 +Subject: [PATCH] OCI: Use system helper to generate summary for OCI remotes + +The OCI support relies on downloading a json index and converting it +to a ostree-style summary, which we the use in all sorts of operations +in the client code. Currently this happens in the user code, which means +that it will fail (due to permissions) in the system installation case. + +We could do the conversion as the user, but when eventually installing +something the system-helper will anyway do this download and +conversion, so that would only double the work and risk things going out +of sync. Also, the OCI index is not gpg signed, so we can't realy on +downloads done as the user. + +So, the solution done here is to add a GenerateOciSummary +system-helper call which we use instead of directly generating the +oci summary. + +This fixes https://github.com/flatpak/flatpak/issues/2350 +--- + common/flatpak-dir-private.h | 5 ++ + common/flatpak-dir.c | 94 +++++++++++++++++++-------- + data/org.freedesktop.Flatpak.xml | 5 ++ + system-helper/flatpak-system-helper.c | 54 ++++++++++++++- + 4 files changed, 131 insertions(+), 27 deletions(-) + +diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h +index da7ea8e3..4d47385a 100644 +--- a/common/flatpak-dir-private.h ++++ b/common/flatpak-dir-private.h +@@ -720,6 +720,11 @@ FlatpakRemoteState * flatpak_dir_get_remote_state_for_summary (FlatpakDir *sel + GBytes *opt_summary_sig, + GCancellable *cancellable, + GError **error); ++gboolean flatpak_dir_remote_make_oci_summary (FlatpakDir *self, ++ const char *remote, ++ GBytes **out_summary, ++ GCancellable *cancellable, ++ GError **error); + FlatpakRemoteState * flatpak_dir_get_remote_state_optional (FlatpakDir *self, + const char *remote, + GCancellable *cancellable, +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 0809a42b..4698aa4a 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -1385,6 +1385,22 @@ flatpak_dir_system_helper_call_update_summary (FlatpakDir *self, + return ret != NULL; + } + ++static gboolean ++flatpak_dir_system_helper_call_generate_oci_summary (FlatpakDir *self, ++ const gchar *arg_origin, ++ const gchar *arg_installation, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ g_autoptr(GVariant) ret = ++ flatpak_dir_system_helper_call (self, "GenerateOciSummary", ++ g_variant_new ("(ss)", ++ arg_origin, ++ arg_installation), ++ cancellable, error); ++ return ret != NULL; ++} ++ + static OstreeRepo * + system_ostree_repo_new (GFile *repodir) + { +@@ -9104,7 +9120,7 @@ flatpak_dir_cache_summary (FlatpakDir *self, + G_UNLOCK (cache); + } + +-static gboolean ++gboolean + flatpak_dir_remote_make_oci_summary (FlatpakDir *self, + const char *remote, + GBytes **out_summary, +@@ -9119,42 +9135,68 @@ flatpak_dir_remote_make_oci_summary (FlatpakDir *self, + g_autoptr(GError) local_error = NULL; + g_autoptr(GMappedFile) mfile = NULL; + g_autoptr(GBytes) cache_bytes = NULL; ++ g_autoptr(GBytes) summary_bytes = NULL; + +- self_name = flatpak_dir_get_name (self); +- +- index_cache = flatpak_dir_update_oci_index (self, remote, &index_uri, cancellable, error); +- if (index_cache == NULL) +- return FALSE; ++ if (flatpak_dir_use_system_helper (self, NULL)) ++ { ++ const char *installation = flatpak_dir_get_id (self); + +- summary_cache = flatpak_dir_get_oci_summary_location (self, remote, error); +- if (summary_cache == NULL) +- return FALSE; ++ if (!flatpak_dir_system_helper_call_generate_oci_summary (self, remote, ++ installation ? installation : "", ++ cancellable, error)) ++ return FALSE; + +- if (check_destination_mtime (index_cache, summary_cache, cancellable)) ++ summary_cache = flatpak_dir_get_oci_summary_location (self, remote, error); ++ if (summary_cache == NULL) ++ return FALSE; ++ } ++ else + { +- mfile = g_mapped_file_new (flatpak_file_get_path_cached (summary_cache), FALSE, NULL); +- if (mfile) ++ self_name = flatpak_dir_get_name (self); ++ ++ index_cache = flatpak_dir_update_oci_index (self, remote, &index_uri, cancellable, error); ++ if (index_cache == NULL) ++ return FALSE; ++ ++ summary_cache = flatpak_dir_get_oci_summary_location (self, remote, error); ++ if (summary_cache == NULL) ++ return FALSE; ++ ++ if (!check_destination_mtime (index_cache, summary_cache, cancellable)) + { +- cache_bytes = g_mapped_file_get_bytes (mfile); +- *out_summary = g_steal_pointer (&cache_bytes); ++ summary = flatpak_oci_index_make_summary (index_cache, index_uri, cancellable, &local_error); ++ if (summary == NULL) ++ { ++ g_propagate_error (error, g_steal_pointer (&local_error)); ++ return FALSE; ++ } ++ ++ summary_bytes = g_variant_get_data_as_bytes (summary); ++ ++ if (!g_file_replace_contents (summary_cache, ++ g_bytes_get_data (summary_bytes, NULL), ++ g_bytes_get_size (summary_bytes), ++ NULL, FALSE, 0, NULL, cancellable, error)) ++ { ++ g_prefix_error (error, _("Failed to write summary cache: ")); ++ return FALSE; ++ } ++ ++ if (out_summary) ++ *out_summary = g_steal_pointer (&summary_bytes); + return TRUE; + } + } + +- summary = flatpak_oci_index_make_summary (index_cache, index_uri, cancellable, &local_error); +- if (summary == NULL) ++ if (out_summary) + { +- g_propagate_error (error, g_steal_pointer (&local_error)); +- return FALSE; +- } +- +- *out_summary = g_variant_get_data_as_bytes (summary); ++ mfile = g_mapped_file_new (flatpak_file_get_path_cached (summary_cache), FALSE, error); ++ if (mfile == NULL) ++ return FALSE; + +- if (!g_file_replace_contents (summary_cache, +- g_bytes_get_data (*out_summary, NULL), +- g_bytes_get_size (*out_summary), +- NULL, FALSE, 0, NULL, cancellable, NULL)) +- g_warning ("Failed to write summary cache"); ++ cache_bytes = g_mapped_file_get_bytes (mfile); ++ *out_summary = g_steal_pointer (&cache_bytes); ++ } + + return TRUE; + } +diff --git a/data/org.freedesktop.Flatpak.xml b/data/org.freedesktop.Flatpak.xml +index 25dc8a02..8b1606c6 100644 +--- a/data/org.freedesktop.Flatpak.xml ++++ b/data/org.freedesktop.Flatpak.xml +@@ -144,6 +144,11 @@ + <arg type='s' name='installation' direction='in'/> + </method> + ++ <method name="GenerateOciSummary"> ++ <arg type='s' name='origin' direction='in'/> ++ <arg type='s' name='installation' direction='in'/> ++ </method> ++ + </interface> + + </node> +diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c +index ce647b6e..24b3ddf9 100644 +--- a/system-helper/flatpak-system-helper.c ++++ b/system-helper/flatpak-system-helper.c +@@ -1122,6 +1122,56 @@ handle_update_summary (FlatpakSystemHelper *object, + return TRUE; + } + ++static gboolean ++handle_generate_oci_summary (FlatpakSystemHelper *object, ++ GDBusMethodInvocation *invocation, ++ const gchar *arg_origin, ++ const gchar *arg_installation) ++{ ++ g_autoptr(FlatpakDir) system = NULL; ++ g_autoptr(GError) error = NULL; ++ g_autofree char *new_branch = NULL; ++ g_autofree char *old_branch = NULL; ++ gboolean is_oci; ++ ++ g_debug ("GenerateOciSummary %s %s", arg_origin, arg_installation); ++ ++ system = dir_get_system (arg_installation, &error); ++ if (system == NULL) ++ { ++ g_dbus_method_invocation_return_gerror (invocation, error); ++ return TRUE; ++ } ++ ++ if (!flatpak_dir_ensure_repo (system, NULL, &error)) ++ { ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, ++ "Can't open system repo %s", error->message); ++ return TRUE; ++ } ++ ++ is_oci = flatpak_dir_get_remote_oci (system, arg_origin); ++ if (!is_oci) ++ { ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, ++ "%s is not a OCI remote", arg_origin); ++ return TRUE; ++ } ++ ++ if (!flatpak_dir_remote_make_oci_summary (system, arg_origin, NULL, NULL, &error)) ++ { ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, ++ "Failed to update OCI summary: %s", error->message); ++ return TRUE; ++ } ++ ++ ++ flatpak_system_helper_complete_generate_oci_summary (object, invocation); ++ ++ return TRUE; ++} ++ ++ + static gboolean + flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface, + GDBusMethodInvocation *invocation, +@@ -1250,7 +1300,8 @@ flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface, + g_strcmp0 (method_name, "PruneLocalRepo") == 0 || + g_strcmp0 (method_name, "EnsureRepo") == 0 || + g_strcmp0 (method_name, "RunTriggers") == 0 || +- g_strcmp0 (method_name, "UpdateSummary") == 0) ++ g_strcmp0 (method_name, "UpdateSummary") == 0 || ++ g_strcmp0 (method_name, "GenerateOciSummary") == 0) + { + const char *remote; + +@@ -1321,6 +1372,7 @@ on_bus_acquired (GDBusConnection *connection, + g_signal_connect (helper, "handle-ensure-repo", G_CALLBACK (handle_ensure_repo), NULL); + g_signal_connect (helper, "handle-run-triggers", G_CALLBACK (handle_run_triggers), NULL); + g_signal_connect (helper, "handle-update-summary", G_CALLBACK (handle_update_summary), NULL); ++ g_signal_connect (helper, "handle-generate-oci-summary", G_CALLBACK (handle_generate_oci_summary), NULL); + + g_signal_connect (helper, "g-authorize-method", + G_CALLBACK (flatpak_authorize_method_handler), +-- +2.19.1 + diff --git a/flatpak.spec b/flatpak.spec index 24ac2c7..d209409 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -3,13 +3,18 @@ Name: flatpak Version: 1.0.6 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{v… +# https://github.com/flatpak/flatpak/pull/2357 +Patch0: OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch +# https://github.com/flatpak/flatpak/pull/2362 +Patch1: flatpak_cache_http_uri-save-downloaded-files-with-pe.patch + BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0 @@ -153,6 +158,10 @@ flatpak remote-list --system &> /dev/null || : %changelog +* Fri Nov 30 2018 fedora-toolbox <otaylor(a)redhat.com> - 1.0.6-3 +- Add a patch to fix OCI system remotes +- Add patch fixing permissions on icons downloaded from an OCI registry + * Fri Nov 16 2018 Kalev Lember <klember(a)redhat.com> - 1.0.6-1 - Update to 1.0.6 diff --git a/flatpak_cache_http_uri-save-downloaded-files-with-pe.patch b/flatpak_cache_http_uri-save-downloaded-files-with-pe.patch new file mode 100644 index 0000000..b724c14 --- /dev/null +++ b/flatpak_cache_http_uri-save-downloaded-files-with-pe.patch @@ -0,0 +1,30 @@ +From bb1076ab776886b82efcfee753f201a6ff72dfce Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" <otaylor(a)fishsoup.net> +Date: Fri, 30 Nov 2018 16:11:06 -0500 +Subject: [PATCH] flatpak_cache_http_uri: save downloaded files with permission + 0644 + +Previously, downloaded files were being saved with 0600 permissions, +which prevented OCI icons downloaded by the system helper at appstream +creation time from being read by users. +--- + common/flatpak-utils-http.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/common/flatpak-utils-http.c b/common/flatpak-utils-http.c +index 53074162..997c9db8 100644 +--- a/common/flatpak-utils-http.c ++++ b/common/flatpak-utils-http.c +@@ -645,6 +645,9 @@ sync_and_rename_tmpfile (GLnxTmpfile *tmpfile, + if (fdatasync (tmpfile->fd) != 0) + return glnx_throw_errno_prefix (error, "fdatasync"); + ++ if (fchmod (tmpfile->fd, 0644) != 0) ++ return glnx_throw_errno_prefix (error, "fchmod"); ++ + if (!glnx_link_tmpfile_at (tmpfile, + GLNX_LINK_TMPFILE_REPLACE, + tmpfile->src_dfd, dest_name, error)) +-- +2.19.2 + https://src.fedoraproject.org/rpms/flatpak/c/46af40e4bceb542e49abe006a71058…

1 0

otaylor pushed to flatpak (f29). "Fix OCI system remotes (..more)"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 21:48:37 UTC From ae2275bc873cdf72d1b377e0ad37f574b3f7020f Mon Sep 17 00:00:00 2001 From: Owen W. Taylor <otaylor(a)fishsoup.net> Date: Nov 30 2018 21:46:41 +0000 Subject: Fix OCI system remotes Add patches so that the system-helper downloads and creates the summary data, and so that the icon permissions are correct. --- diff --git a/OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch b/OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch new file mode 100644 index 0000000..27415bd --- /dev/null +++ b/OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch @@ -0,0 +1,272 @@ +From efd698210389f6be52c04117ca8615971ec009fc Mon Sep 17 00:00:00 2001 +From: Alexander Larsson <alexl(a)redhat.com> +Date: Fri, 30 Nov 2018 10:30:20 +0100 +Subject: [PATCH] OCI: Use system helper to generate summary for OCI remotes + +The OCI support relies on downloading a json index and converting it +to a ostree-style summary, which we the use in all sorts of operations +in the client code. Currently this happens in the user code, which means +that it will fail (due to permissions) in the system installation case. + +We could do the conversion as the user, but when eventually installing +something the system-helper will anyway do this download and +conversion, so that would only double the work and risk things going out +of sync. Also, the OCI index is not gpg signed, so we can't realy on +downloads done as the user. + +So, the solution done here is to add a GenerateOciSummary +system-helper call which we use instead of directly generating the +oci summary. + +This fixes https://github.com/flatpak/flatpak/issues/2350 +--- + common/flatpak-dir-private.h | 5 ++ + common/flatpak-dir.c | 94 +++++++++++++++++++-------- + data/org.freedesktop.Flatpak.xml | 5 ++ + system-helper/flatpak-system-helper.c | 54 ++++++++++++++- + 4 files changed, 131 insertions(+), 27 deletions(-) + +diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h +index da7ea8e3..4d47385a 100644 +--- a/common/flatpak-dir-private.h ++++ b/common/flatpak-dir-private.h +@@ -720,6 +720,11 @@ FlatpakRemoteState * flatpak_dir_get_remote_state_for_summary (FlatpakDir *sel + GBytes *opt_summary_sig, + GCancellable *cancellable, + GError **error); ++gboolean flatpak_dir_remote_make_oci_summary (FlatpakDir *self, ++ const char *remote, ++ GBytes **out_summary, ++ GCancellable *cancellable, ++ GError **error); + FlatpakRemoteState * flatpak_dir_get_remote_state_optional (FlatpakDir *self, + const char *remote, + GCancellable *cancellable, +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 0809a42b..4698aa4a 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -1385,6 +1385,22 @@ flatpak_dir_system_helper_call_update_summary (FlatpakDir *self, + return ret != NULL; + } + ++static gboolean ++flatpak_dir_system_helper_call_generate_oci_summary (FlatpakDir *self, ++ const gchar *arg_origin, ++ const gchar *arg_installation, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ g_autoptr(GVariant) ret = ++ flatpak_dir_system_helper_call (self, "GenerateOciSummary", ++ g_variant_new ("(ss)", ++ arg_origin, ++ arg_installation), ++ cancellable, error); ++ return ret != NULL; ++} ++ + static OstreeRepo * + system_ostree_repo_new (GFile *repodir) + { +@@ -9104,7 +9120,7 @@ flatpak_dir_cache_summary (FlatpakDir *self, + G_UNLOCK (cache); + } + +-static gboolean ++gboolean + flatpak_dir_remote_make_oci_summary (FlatpakDir *self, + const char *remote, + GBytes **out_summary, +@@ -9119,42 +9135,68 @@ flatpak_dir_remote_make_oci_summary (FlatpakDir *self, + g_autoptr(GError) local_error = NULL; + g_autoptr(GMappedFile) mfile = NULL; + g_autoptr(GBytes) cache_bytes = NULL; ++ g_autoptr(GBytes) summary_bytes = NULL; + +- self_name = flatpak_dir_get_name (self); +- +- index_cache = flatpak_dir_update_oci_index (self, remote, &index_uri, cancellable, error); +- if (index_cache == NULL) +- return FALSE; ++ if (flatpak_dir_use_system_helper (self, NULL)) ++ { ++ const char *installation = flatpak_dir_get_id (self); + +- summary_cache = flatpak_dir_get_oci_summary_location (self, remote, error); +- if (summary_cache == NULL) +- return FALSE; ++ if (!flatpak_dir_system_helper_call_generate_oci_summary (self, remote, ++ installation ? installation : "", ++ cancellable, error)) ++ return FALSE; + +- if (check_destination_mtime (index_cache, summary_cache, cancellable)) ++ summary_cache = flatpak_dir_get_oci_summary_location (self, remote, error); ++ if (summary_cache == NULL) ++ return FALSE; ++ } ++ else + { +- mfile = g_mapped_file_new (flatpak_file_get_path_cached (summary_cache), FALSE, NULL); +- if (mfile) ++ self_name = flatpak_dir_get_name (self); ++ ++ index_cache = flatpak_dir_update_oci_index (self, remote, &index_uri, cancellable, error); ++ if (index_cache == NULL) ++ return FALSE; ++ ++ summary_cache = flatpak_dir_get_oci_summary_location (self, remote, error); ++ if (summary_cache == NULL) ++ return FALSE; ++ ++ if (!check_destination_mtime (index_cache, summary_cache, cancellable)) + { +- cache_bytes = g_mapped_file_get_bytes (mfile); +- *out_summary = g_steal_pointer (&cache_bytes); ++ summary = flatpak_oci_index_make_summary (index_cache, index_uri, cancellable, &local_error); ++ if (summary == NULL) ++ { ++ g_propagate_error (error, g_steal_pointer (&local_error)); ++ return FALSE; ++ } ++ ++ summary_bytes = g_variant_get_data_as_bytes (summary); ++ ++ if (!g_file_replace_contents (summary_cache, ++ g_bytes_get_data (summary_bytes, NULL), ++ g_bytes_get_size (summary_bytes), ++ NULL, FALSE, 0, NULL, cancellable, error)) ++ { ++ g_prefix_error (error, _("Failed to write summary cache: ")); ++ return FALSE; ++ } ++ ++ if (out_summary) ++ *out_summary = g_steal_pointer (&summary_bytes); + return TRUE; + } + } + +- summary = flatpak_oci_index_make_summary (index_cache, index_uri, cancellable, &local_error); +- if (summary == NULL) ++ if (out_summary) + { +- g_propagate_error (error, g_steal_pointer (&local_error)); +- return FALSE; +- } +- +- *out_summary = g_variant_get_data_as_bytes (summary); ++ mfile = g_mapped_file_new (flatpak_file_get_path_cached (summary_cache), FALSE, error); ++ if (mfile == NULL) ++ return FALSE; + +- if (!g_file_replace_contents (summary_cache, +- g_bytes_get_data (*out_summary, NULL), +- g_bytes_get_size (*out_summary), +- NULL, FALSE, 0, NULL, cancellable, NULL)) +- g_warning ("Failed to write summary cache"); ++ cache_bytes = g_mapped_file_get_bytes (mfile); ++ *out_summary = g_steal_pointer (&cache_bytes); ++ } + + return TRUE; + } +diff --git a/data/org.freedesktop.Flatpak.xml b/data/org.freedesktop.Flatpak.xml +index 25dc8a02..8b1606c6 100644 +--- a/data/org.freedesktop.Flatpak.xml ++++ b/data/org.freedesktop.Flatpak.xml +@@ -144,6 +144,11 @@ + <arg type='s' name='installation' direction='in'/> + </method> + ++ <method name="GenerateOciSummary"> ++ <arg type='s' name='origin' direction='in'/> ++ <arg type='s' name='installation' direction='in'/> ++ </method> ++ + </interface> + + </node> +diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c +index ce647b6e..24b3ddf9 100644 +--- a/system-helper/flatpak-system-helper.c ++++ b/system-helper/flatpak-system-helper.c +@@ -1122,6 +1122,56 @@ handle_update_summary (FlatpakSystemHelper *object, + return TRUE; + } + ++static gboolean ++handle_generate_oci_summary (FlatpakSystemHelper *object, ++ GDBusMethodInvocation *invocation, ++ const gchar *arg_origin, ++ const gchar *arg_installation) ++{ ++ g_autoptr(FlatpakDir) system = NULL; ++ g_autoptr(GError) error = NULL; ++ g_autofree char *new_branch = NULL; ++ g_autofree char *old_branch = NULL; ++ gboolean is_oci; ++ ++ g_debug ("GenerateOciSummary %s %s", arg_origin, arg_installation); ++ ++ system = dir_get_system (arg_installation, &error); ++ if (system == NULL) ++ { ++ g_dbus_method_invocation_return_gerror (invocation, error); ++ return TRUE; ++ } ++ ++ if (!flatpak_dir_ensure_repo (system, NULL, &error)) ++ { ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, ++ "Can't open system repo %s", error->message); ++ return TRUE; ++ } ++ ++ is_oci = flatpak_dir_get_remote_oci (system, arg_origin); ++ if (!is_oci) ++ { ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, ++ "%s is not a OCI remote", arg_origin); ++ return TRUE; ++ } ++ ++ if (!flatpak_dir_remote_make_oci_summary (system, arg_origin, NULL, NULL, &error)) ++ { ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, ++ "Failed to update OCI summary: %s", error->message); ++ return TRUE; ++ } ++ ++ ++ flatpak_system_helper_complete_generate_oci_summary (object, invocation); ++ ++ return TRUE; ++} ++ ++ + static gboolean + flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface, + GDBusMethodInvocation *invocation, +@@ -1250,7 +1300,8 @@ flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface, + g_strcmp0 (method_name, "PruneLocalRepo") == 0 || + g_strcmp0 (method_name, "EnsureRepo") == 0 || + g_strcmp0 (method_name, "RunTriggers") == 0 || +- g_strcmp0 (method_name, "UpdateSummary") == 0) ++ g_strcmp0 (method_name, "UpdateSummary") == 0 || ++ g_strcmp0 (method_name, "GenerateOciSummary") == 0) + { + const char *remote; + +@@ -1321,6 +1372,7 @@ on_bus_acquired (GDBusConnection *connection, + g_signal_connect (helper, "handle-ensure-repo", G_CALLBACK (handle_ensure_repo), NULL); + g_signal_connect (helper, "handle-run-triggers", G_CALLBACK (handle_run_triggers), NULL); + g_signal_connect (helper, "handle-update-summary", G_CALLBACK (handle_update_summary), NULL); ++ g_signal_connect (helper, "handle-generate-oci-summary", G_CALLBACK (handle_generate_oci_summary), NULL); + + g_signal_connect (helper, "g-authorize-method", + G_CALLBACK (flatpak_authorize_method_handler), +-- +2.19.1 + diff --git a/flatpak.spec b/flatpak.spec index 24ac2c7..d209409 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -3,13 +3,18 @@ Name: flatpak Version: 1.0.6 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{v… +# https://github.com/flatpak/flatpak/pull/2357 +Patch0: OCI-Use-system-helper-to-generate-summary-for-OCI-re.patch +# https://github.com/flatpak/flatpak/pull/2362 +Patch1: flatpak_cache_http_uri-save-downloaded-files-with-pe.patch + BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0 @@ -153,6 +158,10 @@ flatpak remote-list --system &> /dev/null || : %changelog +* Fri Nov 30 2018 fedora-toolbox <otaylor(a)redhat.com> - 1.0.6-3 +- Add a patch to fix OCI system remotes +- Add patch fixing permissions on icons downloaded from an OCI registry + * Fri Nov 16 2018 Kalev Lember <klember(a)redhat.com> - 1.0.6-1 - Update to 1.0.6 diff --git a/flatpak_cache_http_uri-save-downloaded-files-with-pe.patch b/flatpak_cache_http_uri-save-downloaded-files-with-pe.patch new file mode 100644 index 0000000..b724c14 --- /dev/null +++ b/flatpak_cache_http_uri-save-downloaded-files-with-pe.patch @@ -0,0 +1,30 @@ +From bb1076ab776886b82efcfee753f201a6ff72dfce Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" <otaylor(a)fishsoup.net> +Date: Fri, 30 Nov 2018 16:11:06 -0500 +Subject: [PATCH] flatpak_cache_http_uri: save downloaded files with permission + 0644 + +Previously, downloaded files were being saved with 0600 permissions, +which prevented OCI icons downloaded by the system helper at appstream +creation time from being read by users. +--- + common/flatpak-utils-http.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/common/flatpak-utils-http.c b/common/flatpak-utils-http.c +index 53074162..997c9db8 100644 +--- a/common/flatpak-utils-http.c ++++ b/common/flatpak-utils-http.c +@@ -645,6 +645,9 @@ sync_and_rename_tmpfile (GLnxTmpfile *tmpfile, + if (fdatasync (tmpfile->fd) != 0) + return glnx_throw_errno_prefix (error, "fdatasync"); + ++ if (fchmod (tmpfile->fd, 0644) != 0) ++ return glnx_throw_errno_prefix (error, "fchmod"); ++ + if (!glnx_link_tmpfile_at (tmpfile, + GLNX_LINK_TMPFILE_REPLACE, + tmpfile->src_dfd, dest_name, error)) +-- +2.19.2 + https://src.fedoraproject.org/rpms/flatpak/c/ae2275bc873cdf72d1b377e0ad37f5…

1 0

pagure pushed to clang (master). "Updated pull-request 427f437a004c4500932b9c72f7de39b5: Drop python2 dependency from clang-tools-extra"
by notifications＠fedoraproject.org 30 Nov '18

30 Nov '18

Notification time stamped 2018-11-30 21:48:06 UTC pagure pushed to clang (master). "Updated pull-request 427f437a004c4500932b9c72f7de39b5: Drop python2 dependency from clang-tools-extra" https://src.fedoraproject.org/rpms/clang/c/00815193526b66488c1971a3fa530536…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2018