From 105fbd9ef717a90e9e4406a879e3b84bbcb4e170446b9900655a4e9b1aa5aada Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 16 Aug 2022 14:26:16 +0000 Subject: [PATCH] Accepting request 997350 from GNOME:Next - Update to version 1.0.1+git.20220816: * Drop call to appstreamcli refresh * Added hardening to systemd service (bsc#1181400) * Typo fix for command help - Drop harden_appstream-sync-cache.service.patch: fixed upstream. - Drop Appstream recommends: no longer needed, as we no longer call appstreamcli. OBS-URL: https://build.opensuse.org/request/show/997350 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libzypp-plugin-appdata?expand=0&rev=56 --- _servicedata | 2 +- harden_appstream-sync-cache.service.patch | 24 -------------------- libzypp-plugin-appdata.changes | 11 +++++++++ libzypp-plugin-appdata.spec | 12 ++++------ openSUSE-appstream-1.0.1+git.20180426.tar.xz | 3 --- openSUSE-appstream-1.0.1+git.20220816.tar.xz | 3 +++ 6 files changed, 19 insertions(+), 36 deletions(-) delete mode 100644 harden_appstream-sync-cache.service.patch delete mode 100644 openSUSE-appstream-1.0.1+git.20180426.tar.xz create mode 100644 openSUSE-appstream-1.0.1+git.20220816.tar.xz diff --git a/_servicedata b/_servicedata index 37da4c4..88eacf9 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/DimStar77/openSUSE-appstream.git - 8708ff5b3330e28eefb228a78d719871ff5bd6da \ No newline at end of file + 39008e0c9df9f404666d7979e4b166840be6c436 \ No newline at end of file diff --git a/harden_appstream-sync-cache.service.patch b/harden_appstream-sync-cache.service.patch deleted file mode 100644 index f6cfdd3..0000000 --- a/harden_appstream-sync-cache.service.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: openSUSE-appstream-1.0.1+git.20180426/appstream-sync-cache.service -=================================================================== ---- openSUSE-appstream-1.0.1+git.20180426.orig/appstream-sync-cache.service -+++ openSUSE-appstream-1.0.1+git.20180426/appstream-sync-cache.service -@@ -4,6 +4,19 @@ After=local-fs.target - ConditionDirectoryNotEmpty=!/var/cache/app-info/xmls - - [Service] -+# added automatically, for details please see -+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort -+ProtectSystem=full -+ProtectHome=true -+PrivateDevices=true -+ProtectHostname=true -+ProtectClock=true -+ProtectKernelTunables=true -+ProtectKernelModules=true -+ProtectKernelLogs=true -+ProtectControlGroups=true -+RestrictRealtime=true -+# end of automatic additions - Type=forking - ExecStart=/usr/bin/zypper appstream-cache - diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes index c3ddc31..6bde76e 100644 --- a/libzypp-plugin-appdata.changes +++ b/libzypp-plugin-appdata.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 16 12:19:30 UTC 2022 - dimstar@opensuse.org + +- Update to version 1.0.1+git.20220816: + * Drop call to appstreamcli refresh + * Added hardening to systemd service (bsc#1181400) + * Typo fix for command help +- Drop harden_appstream-sync-cache.service.patch: fixed upstream. +- Drop Appstream recommends: no longer needed, as we no longer call + appstreamcli. + ------------------------------------------------------------------- Tue Oct 5 09:12:00 UTC 2021 - Johannes Segitz diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec index d3554a5..fdb3f7d 100644 --- a/libzypp-plugin-appdata.spec +++ b/libzypp-plugin-appdata.spec @@ -1,7 +1,7 @@ # # spec file for package libzypp-plugin-appdata # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,14 @@ Name: libzypp-plugin-appdata -Version: 1.0.1+git.20180426 +Version: 1.0.1+git.20220816 Release: 0 Summary: libzypp extension to handle AppStream metadata -License: MIT AND CC0-1.0 +License: CC0-1.0 AND MIT Group: System/Libraries URL: https://wiki.gnome.org/Design/Apps/Software Source0: openSUSE-appstream-%{version}.tar.xz Source99: libzypp-plugin-appdata-rpmlintrc -Patch0: harden_appstream-sync-cache.service.patch -# appstreamcli is provided by the AppStream package. Let's pull it in when available, but ignore its absence -Recommends: AppStream # appstream-glib >= 0.3.6 is the first to correctly to appstream-util uninstall in /var/cache Requires: appstream-glib >= 0.3.6 # appdata hook was introduced in libzypp 14.29.4 @@ -59,8 +56,7 @@ Group: Metapackages This package contains extra appstream metadata to be used by appstream-builder %prep -%setup -q -n openSUSE-appstream-%{version} -%patch0 -p1 +%autosetup -n openSUSE-appstream-%{version} %build diff --git a/openSUSE-appstream-1.0.1+git.20180426.tar.xz b/openSUSE-appstream-1.0.1+git.20180426.tar.xz deleted file mode 100644 index 3992b9b..0000000 --- a/openSUSE-appstream-1.0.1+git.20180426.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bbd929af050d0106d1cb6ba6e26050573d7d198721afdc087a0c47f587352ed -size 91312 diff --git a/openSUSE-appstream-1.0.1+git.20220816.tar.xz b/openSUSE-appstream-1.0.1+git.20220816.tar.xz new file mode 100644 index 0000000..852f102 --- /dev/null +++ b/openSUSE-appstream-1.0.1+git.20220816.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e31e8cea0f3f592bfe150dfa52d80ac2ef4af7d369df4c0416889c08c0bf6b1c +size 91504