rpms/xorg-x11-xkb-utils/devel xkbcomp-1.0.4-open-less.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 xorg-x11-xkb-utils.spec, 1.21, 1.22

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14638/devel

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Added Files:
	xkbcomp-1.0.4-open-less.patch 
Log Message:
xkbcomp 1.0.4


xkbcomp-1.0.4-open-less.patch:

--- NEW FILE xkbcomp-1.0.4-open-less.patch ---
>From 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel at fooishbar.org>
Date: Wed, 16  Apr  2008  21:52:29  +0000
Subject: Don't scan paths which make NO SENSE WHATSOEVER TO SCAN

Hey, I wonder if we have XKB files in our directory! I wonder if we
haven't bothered with a structure, and let's try to open a file called
'misc' in someone's home directory! What a surprise, it's not a valid
XKB file! Let's fail miserably!

SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR.
---
diff --git xkbcomp-1.0.4/xkbpath.c xkbcomp-1.0.4/xkbpath.c
index 0e1beab..0a7329c 100644
--- xkbcomp-1.0.4/xkbpath.c
+++ xkbcomp-1.0.4/xkbpath.c
@@ -133,7 +133,6 @@ XkbAddDefaultDirectoriesToPath(void)
 {
     if (noDefaultPath)
 	return;
-    XkbAddDirectoryToPath(".");
     XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
 }
 
@@ -298,16 +297,7 @@ char	 buf[PATH_MAX],*typeDir;
     typeLen= strlen(typeDir);
     for (i=0;i<nPathEntries;i++) {
 	pathLen= strlen(includePath[i]);
-	if ((nameLen+pathLen+1)>=PATH_MAX) {
-	    ERROR2("File name (%s/%s) too long\n",includePath[i],name);
-	    ACTION("Ignored\n");
-	    continue;
-	}
-	sprintf(buf,"%s/%s",includePath[i],name);
-	file= fopen(buf,"r");
-	if (file!=NULL)
-	     break;
-	else if (typeLen<1)
+	if (typeLen<1)
 	     continue;
 
 	if ((nameLen+typeLen+pathLen+2)>=PATH_MAX) {
--
cgit v0.7.2-37-g538c


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Jul 2007 15:12:27 -0000	1.11
+++ .cvsignore	17 Apr 2008 17:51:05 -0000	1.12
@@ -1,5 +1,5 @@
-xkbcomp-1.0.2.tar.bz2
+setxkbmap-1.0.4.tar.bz2
 xkbevd-1.0.2.tar.bz2
 xkbprint-1.0.1.tar.bz2
 xkbutils-1.0.1.tar.bz2
-setxkbmap-1.0.4.tar.bz2
+xkbcomp-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Jul 2007 15:12:27 -0000	1.9
+++ sources	17 Apr 2008 17:51:05 -0000	1.10
@@ -1,5 +1,5 @@
-8b22a5e6d780ec70bf98d31cdbd65658  xkbcomp-1.0.2.tar.bz2
+6fab3bb176be9e510c5613d054ef1ca4  setxkbmap-1.0.4.tar.bz2
 68f2a143716c23b566f8509d9498f516  xkbevd-1.0.2.tar.bz2
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
 84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
-6fab3bb176be9e510c5613d054ef1ca4  setxkbmap-1.0.4.tar.bz2
+d5122f1d5a91725a81c843f3bd388244  xkbcomp-1.0.4.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-xkb-utils.spec	20 Feb 2008 08:16:57 -0000	1.21
+++ xorg-x11-xkb-utils.spec	17 Apr 2008 17:51:05 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
 Version: 7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,11 +10,13 @@
 # use the macro so the doc dir is changed automagically
 %define xkbutils_version 1.0.1
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.2.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.4.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.0.4.tar.bz2
 
+Patch0: xkbcomp-1.0.4-open-less.patch
+
 BuildRequires: pkgconfig
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
+%patch0 -p0 -b .open-less
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP"
@@ -79,6 +82,11 @@
 %{_mandir}/man1/xkbprint.1*
 
 %changelog
+* Wed Apr 16 2008 Adam Jackson <ajax at redhat.com> 7.2-5
+- xkbcomp 1.0.4
+- xkbcomp-1.0.4-open-less.patch: Make xkbcomp faster by removing uncredible
+  fail.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.2-4
 - Autorebuild for GCC 4.3