1 Commits

Author SHA256 Message Date
Xiaoguang Wang
10920fb27b Update to version 1.4.8 2025-09-22 14:44:55 +08:00
9 changed files with 58 additions and 93 deletions

Binary file not shown.

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEFj61ARkiXbPfj0nqF6y6jfqXDhcFAmINGfUACgkQF6y6jfqX
Dhf9VQgAtPp8r6gRnkblnfuw1LuChCKo+I8wQfw+PMki+J8ojL8EJ7+4U9aIf97p
ueBhhJse0bySKIgiBBMDcIos821tgdtX+19Nj0jfgIrdRGg+jo2leZA1i9WUUo7D
p4sTxHVnt9jP3vLVZqIrhaVLE8O4x54eBLb/Jc+MVE9pDvuVPP7k1M44rJOKY+mH
MMPcCfYvw1N6PpGasfW9P786iLyNz5VoCiGTAI+SmRl0oaXzAjcR2AZkXCUKFba2
L4EogkM4sO+z9e6vnIk3xPeq6xoIylWXzZnty2EE/3Syp7zL4VmkRYOu0J/g0MWk
sfCrNLVoGcUTjl1hImGiSW+aB/DhdA==
=l7fH
-----END PGP SIGNATURE-----

BIN
colord-1.4.8.tar.xz LFS Normal file

Binary file not shown.

11
colord-1.4.8.tar.xz.asc Normal file
View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEFj61ARkiXbPfj0nqF6y6jfqXDhcFAmhZX6UACgkQF6y6jfqX
DhdmWQgAhmZWG0PR88nKTlMoNPSAcP3yiXz2Zj/IwCUXNnT32M8J2ewOU2tunQqL
LeJYqNOz4diFlJIx/ABNvUMwI6sXFDsIrCu8570RxGnmv3nprLXki3fAX9bMpydM
fXnJO/lrtLmGHuzCnnEaSlHRPqyHbbHbnl7E0CNKPhJvJCH5HYmsc2vmXhhIJVhe
LRp6gIDGysyoGWtTg4S45VZgHOvRwTwH/iJFkpDdoSOszZ3JrnjrphBccu0FDjeK
gzBts4Egw1zTvGCjfSdKR2p/hW3nLgrloeWJgao2XAtR935pgZuTzuy0iNqrS2LB
k34QoR+q/WS6XjV8EDAp4dDu7p9Ilw==
=gWKE
-----END PGP SIGNATURE-----

View File

@@ -1,47 +0,0 @@
From 1452a975ecae14299fb27d41522dfd32305481ce Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 13 Apr 2022 14:21:32 +0100
Subject: [PATCH] trivial: Fix a small memory leak on db open failure
---
src/cd-mapping-db.c | 3 +--
src/cd-profile-db.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/cd-mapping-db.c b/src/cd-mapping-db.c
index 7a3df35..996f07e 100644
--- a/src/cd-mapping-db.c
+++ b/src/cd-mapping-db.c
@@ -67,7 +67,7 @@ cd_mapping_db_open (CdMappingDb *mdb,
GError **error)
{
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
- gchar *error_msg = NULL;
+ g_autofree gchar *error_msg = NULL;
gint rc;
g_autofree gchar *path = NULL;
@@ -116,7 +116,6 @@ cd_mapping_db_open (CdMappingDb *mdb,
CD_CLIENT_ERROR_INTERNAL,
"Cannot open mapping database: %s",
error_msg);
- sqlite3_free (error_msg);
return FALSE;
}
}
diff --git a/src/cd-profile-db.c b/src/cd-profile-db.c
index 5661d09..57ab864 100644
--- a/src/cd-profile-db.c
+++ b/src/cd-profile-db.c
@@ -48,7 +48,7 @@ cd_profile_db_load (CdProfileDb *pdb,
{
CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
const gchar *statement;
- gchar *error_msg = NULL;
+ g_autofree gchar *error_msg = NULL;
gint rc;
g_autofree gchar *path = NULL;
--
2.37.3

View File

@@ -1,3 +1,40 @@
-------------------------------------------------------------------
Mon Aug 25 14:51:36 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 1.4.8:
+ New Features:
- Add AppStream metainfo XML with hardware provide info.
- Add support for -Dsystemd_root_prefix to make local building
easier.
- Install sysusers.d config file if configured user is not
root.
+ Bugfixes:
- Add the source attribute for each man page.
- Drop component type from AppStream metadata XML to avoid
parsing error.
- Fix a critical warning when running the self tests.
- Fix USB scanners not working with RestrictAddressFamilies.
- Fix writing to the database with ProtectSystem=strict.
- Properly set the status to CD_SESSION_STATUS_RUNNING.
- Use g_ascii_strtod instead of atof().
- Use sqlite3_errmsg() to avoid getting a mutable error
message.
- Changes from version 1.4.7:
+ Bugfixes:
- Add various hardenings to the systemd service.
- Always close the ICC profile when loading fails.
- Avoid destructing LCMS plugin twice with lcms 2.14.
- Do not make state files executable in tmpfiles.d/colord.conf.
- Fix a double free spotted by Coverity.
- Fix an error check when parsing the DTP94 data.
- Fix a -Wincompatible-pointer-types warning.
- Fix potential crash when reading from broken Huey hardware.
- Set FILE_OFFSET_BITS explicitly.
- Use a 64-bit time_t.
- Use thread context for Gamut Alarm codes.
- Drop colord-CVE-2021-42523.patch and
harden_colord.service.patch: fixed upstream.
-------------------------------------------------------------------
Tue Oct 15 11:58:27 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@@ -1,7 +1,7 @@
#
# spec file for package colord
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
Name: colord
Version: 1.4.6
Version: 1.4.8
Release: 0
Summary: System Daemon for Managing Color Devices
License: GPL-2.0-or-later
@@ -28,14 +28,9 @@ URL: https://github.com/hughsie/colord/
Source0: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
Source1: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
# PATCH-FEATURE-OPENSUSE
Patch0: harden_colord.service.patch
# Apparmor profile
Source3: usr.lib.colord
Source4: colord.sysusers
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM colord-CVE-2021-42523.patch boo#1202802 mgorse@suse.com -- fix a small memory leak on db open failure.
Patch1: colord-CVE-2021-42523.patch
BuildRequires: argyllcms
BuildRequires: docbook5-xsl-stylesheets
@@ -149,7 +144,6 @@ there are no users logged in.
%autosetup -p1
%build
%sysusers_generate_pre %{SOURCE4} %{name} %{name}.conf
# Set ~2 GiB limit so that colprof is forced to work in chunks when
# generating the print profile rather than trying to allocate a 3.1 GiB
# chunk of RAM to put the entire B-to-A tables in.
@@ -180,14 +174,15 @@ ulimit -Sv 2000000
%meson_install
find %{buildroot} -type f -name "*.la" -delete -print
%sysusers_generate_pre %{buildroot}%{_sysusersdir}/%{name}-sysusers.conf colord-sysusers colord-sysusers.conf
# Install Apparmor profile
mkdir -p %{buildroot}%{_sysconfdir}/apparmor.d/
install -c -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/
install -Dm0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
%find_lang %{name}
%pre -f %{name}.pre
%pre -f %{name}-sysusers.pre
%service_add_pre %{name}.service
%preun
@@ -209,7 +204,6 @@ install -Dm0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
%license COPYING
%doc AUTHORS NEWS
%{_unitdir}/colord.service
%{_sysusersdir}/%{name}.conf
%{_udevrulesdir}/*.rules
%attr(755,colord,colord) %dir %{_localstatedir}/lib/colord
%ghost %attr(755,colord,colord) %{_localstatedir}/lib/colord/icc
@@ -230,6 +224,7 @@ install -Dm0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
%dir %{_datadir}/dbus-1/system.d
%{_datadir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
%{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
%{_datadir}/metainfo/org.freedesktop.colord.metainfo.xml
%{_datadir}/polkit-1/actions/org.freedesktop.color.policy
%{_mandir}/man1/cd-create-profile.1%{?ext_man}
%{_mandir}/man1/cd-fix-profile.1%{?ext_man}
@@ -241,6 +236,7 @@ install -Dm0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
%{_libdir}/libcolordcompat.so
%{_libdir}/colord-plugins/libcolord_sensor_camera.so
%{_libdir}/colord-plugins/libcolord_sensor_scanner.so
%{_sysusersdir}/colord-sysusers.conf
%{_userunitdir}/colord-session.service
%{_tmpfilesdir}/colord.conf

View File

@@ -1,2 +0,0 @@
#Type Name ID GECOS Home directory Shell
u colord - "user for colord" /var/lib/colord -

View File

@@ -1,19 +0,0 @@
Index: colord-1.4.5/data/colord.service.in
===================================================================
--- colord-1.4.5.orig/data/colord.service.in
+++ colord-1.4.5/data/colord.service.in
@@ -10,3 +10,14 @@ User=@daemon_user@
# network namespacing is on.
# PrivateNetwork=yes
PrivateTmp=yes
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions