rpms/libxklavier
7
0
Fork 0
Code Issues Pull Requests Releases Activity

libxklavier package is retired on branch c10s for CS-2305

Browse Source
This commit is contained in:
David Fan 2024-06-27 13:12:57 +00:00
parent b777bbf795
commit d93d19e6d4
8 changed files with 1 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +0,0 @@
/libxklavier-5.*.tar.bz2
/libxklavier-5.*.tar.xz

47
0001-props-fix-the-max-lengths-for-set_name-description-s.patch
View File

@ -1,47 +0,0 @@
From 0610dc493702929f8376687249b5ba98180198f3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Jan 2024 10:40:42 +1000
Subject: [PATCH 1/3] props: fix the max lengths for
set_name/description/short_description
All three had the wrong copy/pasta applied to them, so if this function
was ever called, our description was limited to e.g. 32 bytes.
I'm assuming this function has never been used before.
---
libxklavier/xklavier_props.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c
index 95f38e2..73996d6 100644
--- a/libxklavier/xklavier_props.c
+++ b/libxklavier/xklavier_props.c
@@ -65,7 +65,7 @@ xkl_config_item_set_name(XklConfigItem * item,
const gchar * name)
{
if (name != NULL)
- strncpy (item->name, name, XKL_MAX_CI_SHORT_DESC_LENGTH-1);
+ strncpy (item->name, name, XKL_MAX_CI_NAME_LENGTH-1);
else
item->name[0] = '\0';
}
@@ -81,7 +81,7 @@ xkl_config_item_set_short_description(XklConfigItem * item,
const gchar * short_description)
{
if (short_description != NULL)
- strncpy (item->short_description, short_description, XKL_MAX_CI_DESC_LENGTH-1);
+ strncpy (item->short_description, short_description, XKL_MAX_CI_SHORT_DESC_LENGTH-1);
else
item->short_description[0] = '\0';
}
@@ -97,7 +97,7 @@ xkl_config_item_set_description(XklConfigItem * item,
const gchar * description)
{
if (description != NULL)
- strncpy (item->description, description, XKL_MAX_CI_NAME_LENGTH-1);
+ strncpy (item->description, description, XKL_MAX_CI_DESC_LENGTH-1);
else
item->description[0] = '\0';
}
--
2.43.0

50
0002-config-use-our-name-description-setter-functions.patch
View File

@ -1,50 +0,0 @@
From be4a42c9638768777f9db6746676519e06e12425 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Jan 2024 10:53:49 +1000
Subject: [PATCH 2/3] config: use our name/description setter functions
The direct strncat into the struct is probably the reason no-one noticed
the wrong #defines being used in those setters (see previous commit).
We have the setters, let's use them.
---
libxklavier/xklavier_config.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c
index ac34a20..c6c9bc1 100644
--- a/libxklavier/xklavier_config.c
+++ b/libxklavier/xklavier_config.c
@@ -191,16 +191,13 @@ xkl_read_config_item(XklConfigRegistry * config, gint doc_index,
vendor_element = xkl_find_element(ptr, XML_TAG_VENDOR);
if (name_element != NULL && name_element->children != NULL)
- strncat(item->name,
- (char *) name_element->children->content,
- XKL_MAX_CI_NAME_LENGTH - 1);
+ xkl_config_item_set_name(item, (char *) name_element->children->content);
if (short_desc_element != NULL
&& short_desc_element->children != NULL) {
- strncat(item->short_description,
- dgettext(XKB_DOMAIN, (const char *)
- short_desc_element->children->content),
- XKL_MAX_CI_SHORT_DESC_LENGTH - 1);
+ xkl_config_item_set_short_description(item,
+ dgettext(XKB_DOMAIN, (const char *)
+ short_desc_element->children->content));
}
if (desc_element != NULL && desc_element->children != NULL) {
@@ -238,8 +235,7 @@ xkl_read_config_item(XklConfigRegistry * config, gint doc_index,
g_free(translated);
translated = unescaped;
}
- strncat(item->description,
- translated, XKL_MAX_CI_DESC_LENGTH - 1);
+ xkl_config_item_set_description(item, translated);
g_free(translated);
}
--
2.43.0

96
0003-props-validate-name-and-descriptions-for-valid-UTF-8.patch
View File

@ -1,96 +0,0 @@
From c95e5dd9c041bc7e41fb40df96076200458fc19e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 22 Jan 2024 09:39:41 +1000
Subject: [PATCH 3/3] props: validate name and descriptions for valid UTF-8
All three are truncated to a fixed max length, potentially leading to
invalid UTF-8 sequences. Ensure that can't happen by chopping off any
invalid sequences.
See
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/435
---
libxklavier/xklavier_props.c | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c
index 73996d6..8929de7 100644
--- a/libxklavier/xklavier_props.c
+++ b/libxklavier/xklavier_props.c
@@ -21,6 +21,8 @@
#include <locale.h>
#include <string.h>
+#include <glib.h>
+
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -30,6 +32,19 @@
#include "xklavier_private.h"
+/* Truncate the given null-terminated string (within an allocation
+ * of sz bytes) to the longest continuously valid UTF-8 sequence */
+static void
+utf8_truncate(gchar string[], size_t sz)
+{
+ const char *end;
+
+ if (!g_utf8_validate (string, -1, &end)) {
+ ptrdiff_t valid = end - (const gchar *)string;
+ memset (&string[valid], 0, sz - valid);
+ }
+}
+
static GObjectClass *parent_class = NULL;
static void xkl_config_rec_destroy(XklConfigRec * data);
@@ -64,10 +79,12 @@ void
xkl_config_item_set_name(XklConfigItem * item,
const gchar * name)
{
- if (name != NULL)
+ if (name != NULL) {
strncpy (item->name, name, XKL_MAX_CI_NAME_LENGTH-1);
- else
+ utf8_truncate (item->name, sizeof (item->name));
+ } else {
item->name[0] = '\0';
+ }
}
const gchar *
@@ -80,10 +97,12 @@ void
xkl_config_item_set_short_description(XklConfigItem * item,
const gchar * short_description)
{
- if (short_description != NULL)
+ if (short_description != NULL) {
strncpy (item->short_description, short_description, XKL_MAX_CI_SHORT_DESC_LENGTH-1);
- else
+ utf8_truncate (item->short_description, sizeof (item->short_description));
+ } else {
item->short_description[0] = '\0';
+ }
}
const gchar *
@@ -96,10 +115,12 @@ void
xkl_config_item_set_description(XklConfigItem * item,
const gchar * description)
{
- if (description != NULL)
+ if (description != NULL) {
strncpy (item->description, description, XKL_MAX_CI_DESC_LENGTH-1);
- else
+ utf8_truncate (item->description, sizeof (item->description));
+ } else {
item->description[0] = '\0';
+ }
}
G_DEFINE_TYPE(XklConfigRec, xkl_config_rec, G_TYPE_OBJECT)
--
2.43.0

1
dead.package Normal file
View File

@ -0,0 +1 @@
libxklavier package is retired on branch c10s for CS-2305

6
gating.yaml
View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

342
libxklavier.spec
View File

@ -1,342 +0,0 @@
Summary: High-level API for X Keyboard Extension
Name: libxklavier
Version: 5.4
Release: 26%{?dist}
License: LGPL-2.0-or-later
URL: http://www.freedesktop.org/wiki/Software/LibXklavier
BuildRequires: make
BuildRequires: libxml2-devel
BuildRequires: libxkbfile-devel
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libxml2-devel
BuildRequires: glib2-devel >= 2.6.0
BuildRequires: iso-codes-devel
BuildRequires: gobject-introspection-devel
Requires: iso-codes
#Source: http://download.gnome.org/sources/libxklavier/5.3/%{name}-%{version}.tar.xz
Source: http://people.freedesktop.org/~svu/libxklavier-5.4.tar.bz2
Patch01: 0001-props-fix-the-max-lengths-for-set_name-description-s.patch
Patch02: 0002-config-use-our-name-description-setter-functions.patch
Patch03: 0003-props-validate-name-and-descriptions-for-valid-UTF-8.patch
%description
libxklavier is a library providing a high-level API for the X Keyboard
Extension (XKB). This library is intended to support XFree86 and other
commercial X servers. It is useful for creating XKB-related software
(layout indicators etc).
%package devel
Summary: Development files for libxklavier
Requires: %{name} = %{version}-%{release}
Requires: libxml2-devel
%description devel
This package contains libraries, header files and developer documentation
needed to develop libxklavier applications.
%prep
%autosetup -p1
%build
%configure \
--disable-static \
--with-xkb-base='%{_datadir}/X11/xkb' \
--with-xkb-bin-base='%{_bindir}'
make V=1 %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
%ldconfig_post
%ldconfig_postun
%files
%doc AUTHORS NEWS README COPYING.LIB
%{_libdir}/libxklavier.so.16*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Xkl-1.0.typelib
%files devel
%{_libdir}/pkgconfig/libxklavier.pc
%{_libdir}/libxklavier.so
%{_includedir}/libxklavier/
%{_datadir}/gtk-doc
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/Xkl-1.0.gir
%changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.4-26
- Bump release for June 2024 mass rebuild
* Mon Jan 22 2024 Peter Hutterer <peter.hutterer@redhat.com> - 5.4-25
- Fix invalid UTF-8 truncations in XKB descriptions and names
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 5 12:21:14 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 5.4-17
- Add BuildRequires for make
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 5.4-11
- Use ldconfig scriptlet macros
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 5.4-3
- Rebuilt for gobject-introspection 1.41.4
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Oct 8 2013 Peter Robinson <pbrobinson@fedoraproject.org> 5.4-1
- Update to 5.4
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Sep 23 2012 Kalev Lember <kalevlember@gmail.com> - 5.3-1
- Update to 5.3
- Drop flags.patch and catch-more-xerrors.patch: applied upstream
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Apr 19 2012 Matthias Clasen <mclasen@redhat.com> - 5.2.1-2
- Add a runtime dependency on iso-codes (#813833)
* Thu Feb 16 2012 Ray Strode <rstrode@redhat.com> 5.2-2
- Enable gobject-introspection
* Tue Jan 17 2012 Matthias Clasen <mclasen@redhat.com> - 5.2-1
- Update to 5.2
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sun Feb 13 2011 Christopher Aillon <caillon@redhat.com> - 5.1-1
- Update to 5.1
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> 5.0-2
- Co-own /usr/share/gtk-doc (#604402)
* Sat Jan 16 2010 Matthias Clasen <mclasen@redhat.com> - 5.0-1
- Update to 5.0
* Thu Dec 10 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-7
- Catch more X errors
* Thu Oct 15 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-6
- Incorporate upstream fixes for XInput error handling
* Fri Oct 2 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-5
- Handle BadDrawable errors gracefully
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu Jul 9 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-3
- Avoid a critical warning at runtime
* Wed Jul 01 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.0-2
- %%files: track files closer, esp lib sonames
- %%build: drop --disable-doxygen, add --disable-static, add %%{?_smp_mflags}
* Tue Jun 30 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-1
- Update to 4.0
* Thu Mar 19 2009 Matthias Clasen <mclasen@redhat.com> - 3.9-1
- Update to 3.9
* Sat Mar 7 2009 Matthias Clasen <mclasen@redhat.com> - 3.8-4
- Suppress xkbcomp spew in .xsession-errors
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Nov 24 2008 Matthias Clasen <mclasen@redhat.com> - 3.8-2
- Update to 3.8
* Fri Sep 19 2008 Matthias Clasen <mclasen@redhat.com> - 3.7-3
- Plug a memory leak
* Fri Sep 5 2008 Matthias Clasen <mclasen@redhat.com> - 3.7-1
- Update to 3.7
* Fri Jun 27 2008 Ray Strode <rstrode@redhat.com> - 3.6-2
- Apply upstream patch to fix libxklavier crash (bug 452966)
* Wed Apr 30 2008 Matthias Clasen <mclasen@redhat.com> - 3.6-1
- Update to 3.6
* Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 3.5-1
- Update to 3.5
* Wed Jan 30 2008 Matthias Clasen <mclasen@redhat.com> - 3.4-1
- Update to 3.4
* Wed Sep 5 2007 Matthias Clasen <mclasen@redhat.com> - 3.3-1
- Update to 3.3
* Thu Aug 23 2007 Adam Jackson <ajax@redhat.com> - 3.2-3
- Rebuild for build ID
* Wed Aug 8 2007 Matthias Clasen <mclasen@redhat.com> - 3.2-2
- Update the license field
* Sat May 19 2007 Matthias Clasen <mclasen@redhat.com> - 3.2-1
- Update to 3.2
* Sat Nov 4 2006 Matthias Clasen <mclasen@redhat.com> - 3.1-2
- Fix a possible crash (#213419)
* Sat Nov 4 2006 Matthias Clasen <mclasen@redhat.com> - 3.1-1
- Update to 3.1
* Wed Aug 30 2006 Matthias Clasen <mclasen@redhat.com> - 3.0-1.fc6
- Update to 3.0
- Require pkgconfig in the -devel package
- Don't ship static libraries
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.91-1.1
- rebuild
* Wed Jun 14 2006 Matthias Clasen <mclasen@redhat.com> - 2.91-1
- Update to 2.91
* Thu Jun 8 2006 Jesse Keating <jkeating@redhat.com> - 2.2-3
- Add missing BR libxml2-devel
* Wed Jun 7 2006 Jeremy Katz <katzj@redhat.com> - 2.2-2
- rebuild for -devel deps
* Mon Mar 13 2006 Ray Strode <rstrode@redhat.com> - 2.2-1
- Update to 2.2
* Thu Mar 9 2006 Ray Strode <rstrode@redhat.com> - 2.1.0.2006.02.23-2
- trap X error reply to limit the damage of bug 183569.
* Thu Feb 23 2006 Ray Strode <rstrode@redhat.com> - 2.1.0.2006.02.23-1
- upgrade to latest cvs to handle xml comments (bug 178163)
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.1-3.2
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.1-3.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Thu Jan 19 2006 Christopher Aillon <caillon@redhat.com> 2.1-3
- Add missing BR: libX11-devel libxml2-devel libxkbfile-devel
* Tue Dec 27 2005 Christopher Aillon <caillon@redhat.com> 2.1-2
- Pull in latest version and get rid of the annoying XKB error dialog
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Mon Nov 21 2005 Ray Strode <rstrode@redhat.com> 2.0-3
- Don't hard code the xkb data prefix.
* Fri Nov 18 2005 Bill Nottingham <notting@redhat.com> 2.0-2
- Fix references to obsolete X11R6 paths
* Mon Mar 21 2005 David Zeuthen <davidz@redhat.com> 2.0-1
- Update to latest upstream version
* Wed Mar 16 2005 David Zeuthen <davidz@redhat.com> 1.14-2
- Rebuild
* Mon Jan 31 2005 Matthias Clasen <mclasen@redhat.com> 1.14-1
- Update to 1.14
* Wed Sep 29 2004 Jonathan Blandford <jrb@redhat.com> 1.02-3
- bump version
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue Apr 20 2004 Jeremy Katz <katzj@redhat.com> - 1.02-1
- update to 1.02 with real fixes for xorg
* Thu Apr 15 2004 Jeremy Katz <katzj@redhat.com> - 1.00-2
- patch for xorg.xml instead of xfree86.xml
* Fri Apr 2 2004 Alex Larsson <alexl@redhat.com> 1.00-1
- update to 1.00
* Mon Mar 15 2004 Bill Nottingham <notting@redhat.com>
- fix typo (#118237)
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue Jan 27 2004 Alexander Larsson <alexl@redhat.com> 0.97-1
- First version

1
sources
View File

@ -1 +0,0 @@
13af74dcb6011ecedf1e3ed122bd31fa libxklavier-5.4.tar.bz2