From b8cf71d8c946e14e69b09d65019c805f77cce97d Mon Sep 17 00:00:00 2001 From: wangqi Date: Mon, 28 Mar 2022 14:33:32 +0800 Subject: [PATCH] delete empty link --- 9000-delete-empty-link.patch | 43 ++++++++++++++++++++++++++++++++++++ cockpit.spec | 9 +++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 9000-delete-empty-link.patch diff --git a/9000-delete-empty-link.patch b/9000-delete-empty-link.patch new file mode 100644 index 0000000..250e455 --- /dev/null +++ b/9000-delete-empty-link.patch @@ -0,0 +1,43 @@ +diff --git a/Makefile.in b/Makefile.in +index a99132b..604bfca 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -9145,29 +9145,29 @@ dist/base1/test-%.js: dist/base1/test-%.html + # Opportunistically use fedora-logos + install-data-hook:: + $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(centosbrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(centosbrandingdir)/apple-touch-icon.png +- $(LN_S) -f /etc/favicon.png $(DESTDIR)$(centosbrandingdir)/favicon.ico ++# $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(centosbrandingdir)/apple-touch-icon.png ++# $(LN_S) -f /etc/favicon.png $(DESTDIR)$(centosbrandingdir)/favicon.ico + + # Opportunistically use debconf debian logos + install-data-hook:: +- $(LN_S) -f /usr/share/pixmaps/debian-logo.png $(DESTDIR)$(debianbrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/debian-logo.png $(DESTDIR)$(debianbrandingdir)/favicon.ico ++# $(LN_S) -f /usr/share/pixmaps/debian-logo.png $(DESTDIR)$(debianbrandingdir)/logo.png ++# $(LN_S) -f /usr/share/pixmaps/debian-logo.png $(DESTDIR)$(debianbrandingdir)/favicon.ico + + # Opportunistically use fedora-logos + install-data-hook:: + $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(fedorabrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(fedorabrandingdir)/apple-touch-icon.png +- $(LN_S) -f /etc/favicon.png $(DESTDIR)$(fedorabrandingdir)/favicon.ico ++# $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(fedorabrandingdir)/apple-touch-icon.png ++# $(LN_S) -f /etc/favicon.png $(DESTDIR)$(fedorabrandingdir)/favicon.ico + + # Opportunistically use redhat-logos ... yes they're called 'fedora' + install-data-hook:: + $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(rhelbrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(rhelbrandingdir)/apple-touch-icon.png +- $(LN_S) -f /etc/favicon.png $(DESTDIR)$(rhelbrandingdir)/favicon.ico ++# $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(rhelbrandingdir)/apple-touch-icon.png ++# $(LN_S) -f /etc/favicon.png $(DESTDIR)$(rhelbrandingdir)/favicon.ico + + # Opportunistically use plymouth ubuntu logo + install-data-hook:: +- $(LN_S) -f /usr/share/plymouth/ubuntu-logo.png $(DESTDIR)$(ubuntubrandingdir)/logo.png ++# $(LN_S) -f /usr/share/plymouth/ubuntu-logo.png $(DESTDIR)$(ubuntubrandingdir)/logo.png + + # This is non-portable, but I don't feel like dragging in libtool just + # for this. diff --git a/cockpit.spec b/cockpit.spec index 7db3f6e..3c30a04 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,7 +1,7 @@ %bcond_with pcp Name: cockpit Version: 178 -Release: 9 +Release: 10 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ @@ -10,6 +10,7 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v Patch6000: CVE-2019-3804.patch Patch6001: backport-0001-CVE-2021-3660.patch Patch6002: backport-0002-CVE-2021-3660.patch +Patch6003: 9000-delete-empty-link.patch BuildRequires: pkgconfig(gio-unix-2.0) pkgconfig(json-glib-1.0) pkgconfig(polkit-agent-1) >= 0.105 pam-devel BuildRequires: autoconf automake python3 intltool libssh-devel >= 0.7.1 openssl-devel zlib-devel krb5-devel @@ -179,6 +180,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz} %changelog +* Mon Mar 28 2022 wangqia - 178-10 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:delete empty link + * Fri Sep 24 2021 wangkerong - 178-9 - Type:CVE - Id:CVE-2021-3660 -- Gitee