ChangeLog revision 3fb1fa07
1commit f909259b1da70bc145f19e5ce595c8e945a2a808 2Author: Peter Hutterer <peter.hutterer@who-t.net> 3Date: Thu Nov 5 12:19:22 2015 +1000 4 5 xkbcomp 1.3.1 6 7 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 8 9commit 26d1c57a938ce5c0d4fd9d645ace25308e6a7070 10Author: Peter Hutterer <peter.hutterer@who-t.net> 11Date: Tue Nov 3 09:01:19 2015 +1000 12 13 symbols: increase the warning level for shortening a key type 14 15 Any use of the german keyboard layout or anything else using 16 level3(ralt_switch) produces the warning 17 Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols 18 Ignoring extra symbols 19 This warning is meaningless, the default definition for RALT comes from 20 pc(pc105) including altwin(meta_alt) which defines it as TWO_LEVEL 21 and { Alt_R, Meta_R }. Including level3(ralt_switch) correctly sets it as 22 ONE_LEVEL but now we get the warning. That makes users file bug reports and we 23 can't be having that, can we? 24 25 Up the warning level for this case to one past the default. The warning is 26 only useful when you're testing a new keyboard layout or trying to fix an 27 actual bug with missing symbols. And then you can run xkbcomp with -w10. 28 No need to spam the log on every server startup. 29 30 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 31 Reviewed-by: Hans de Goede <hdegoede@redhat.com> 32 33commit 511adde23a0518db0379b444580b63edcb9138a8 34Author: Matthew Green <mrg@NetBSD.org> 35Date: Tue Jul 28 17:53:48 2015 +0200 36 37 Adjust a NUL-string assignment to avoid const issues. 38 39 Signed-off-by: Thomas Klausner <wiz@NetBSD.org> 40 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 41 42commit 1ae525b3d236b59e6437b2b5433d460e18370973 43Author: Jon TURNEY <jon.turney@dronecode.org.uk> 44Date: Tue Mar 17 15:19:10 2015 +0000 45 46 Define WIN32_LEAN_AND_MEAN when building on Win32 47 48 w32api/rpcnndr.h (included by windows.h) uses TypeString as the name of a structure member. 49 50 xkbcomp.h defines it as a macro for a constant. 51 52 Define WIN32_LEAN_AND_MEAN to avoid this clash. 53 54 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> 55 Reviewed-by: David Macek <david.macek.0@gmail.com> 56 57commit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99 58Author: Alan Coopersmith <alan.coopersmith@oracle.com> 59Date: Tue Mar 3 16:24:50 2015 -0800 60 61 Stop including <X11/Xalloca.h> in parseutils.c 62 63 I can not find any point in our git history at which alloca() or the 64 Xalloca.h macros ALLOCATE_LOCAL() & DEALLOCATE_LOCAL() were actually 65 used in this source file. 66 67 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 68 69commit 1e8ee9d0aad072f04186df84752f5636340574e0 70Author: Peter Hutterer <peter.hutterer@who-t.net> 71Date: Fri Nov 21 08:18:41 2014 +1000 72 73 xkbcomp 1.3.0 74 75 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 76 77commit 978998a1fe0a78829452f5432efe1b74c5049de4 78Author: Vincent Lefevre <vincent@vinc17.net> 79Date: Mon Oct 27 10:50:30 2014 +0100 80 81 xkbcomp: Improved -w option parsing 82 83 This patch improves -w option parsing even further, for cases like 84 "xkbcomp -w6 4.xkb out.xkb" (which were not handled by the fix of 85 the warning level is still optional (set to 0 if not present), and 86 errors like "xkbcomp -wfoo in out" are detected and reported. 87 88 https://bugs.freedesktop.org/show_bug.cgi?id=66344 89 90 Signed-off-by: Vincent Lefevre <vincent@vinc17.net> 91 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 92 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 93 94commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 95Author: Alan Coopersmith <alan.coopersmith@oracle.com> 96Date: Sat Mar 8 19:04:24 2014 -0800 97 98 Initialize nMatch even if WIN32 is defined 99 100 Flagged by cppcheck 1.64: 101 Checking app/xkbcomp/listing.c: WIN32... 102 [app/xkbcomp/listing.c:335]: (error) Uninitialized variable: nMatch 103 104 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 105 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 106 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 107 108commit 7606a46b922dfdb0627f1af6ab1432ae88c79d66 109Author: Alan Coopersmith <alan.coopersmith@oracle.com> 110Date: Sat Mar 8 19:01:12 2014 -0800 111 112 Remove useless assignment to 'outline' variable 113 114 Flagged by cppcheck 1.64: 115 [app/xkbcomp/geometry.c:2426] -> [app/xkbcomp/geometry.c:2427]: 116 (performance) Variable 'outline' is reassigned a value before 117 the old one has been used. 118 119 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 120 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 121 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 122 123commit 6c2d3b0891f7be6ef4895be75188aa1c6f530bfc 124Author: Alan Coopersmith <alan.coopersmith@oracle.com> 125Date: Sat Mar 8 18:50:22 2014 -0800 126 127 Don't dereference the pointer whose allocation failed 128 129 Flagged by cppcheck 1.64: 130 [app/xkbcomp/keycodes.c:264] -> [app/xkbcomp/keycodes.c:262]: 131 (warning) Possible null pointer dereference: new - otherwise it 132 is redundant to check it against null. 133 [app/xkbcomp/keytypes.c:600] -> [app/xkbcomp/keytypes.c:597]: 134 (warning) Possible null pointer dereference: old - otherwise it 135 is redundant to check it against null. 136 137 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 138 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 139 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 140 141commit 50ebe95a32dc59b1de899ef08f72462055b04065 142Author: Alan Coopersmith <alan.coopersmith@oracle.com> 143Date: Sat Mar 8 18:46:11 2014 -0800 144 145 Remove useless checks for NULL before free in OverlayKeyCreate() 146 147 There is no need to ensure the pointers passed to free are not NULL, 148 especially right after passing them to strncpy without checking for 149 NULL. 150 151 Flagged by cppcheck 1.64: 152 [app/xkbcomp/parseutils.c:557] -> [app/xkbcomp/parseutils.c:559]: 153 (warning) Possible null pointer dereference: over - otherwise it 154 is redundant to check it against null. 155 [app/xkbcomp/parseutils.c:558] -> [app/xkbcomp/parseutils.c:561]: 156 (warning) Possible null pointer dereference: under - otherwise it 157 is redundant to check it against null. 158 159 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 160 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 161 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 162 163commit 31b90ee4ffc774e0da540277907fc5540c0b012c 164Author: Peter Hutterer <peter.hutterer@who-t.net> 165Date: Mon Feb 3 07:24:22 2014 +1000 166 167 man: replace default include directory with the one from configure 168 169 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 170 Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 171 172commit e3e6e938535532bfad175c1635256ab7fb3ac943 173Author: Alan Coopersmith <alan.coopersmith@oracle.com> 174Date: Sun Oct 20 12:36:31 2013 -0700 175 176 Fix many const char * warnings from gcc 177 178 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 179 Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 180 181commit 2458580ac95c550217b3376c46eecb2cca646241 182Author: Alan Coopersmith <alan.coopersmith@oracle.com> 183Date: Sun Oct 20 11:52:43 2013 -0700 184 185 Convert remaining sprintf calls to snprintf 186 187 Most were fixed length or length checked anyway, this just saves time 188 doublechecking that. (A few could be replaced by asprintf, but we 189 don't have a copy guaranteed to be reachable from this program yet.) 190 191 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 192 Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 193 194commit 3ed68e06cb45fb526b09e4c7b7c3d60de552b2b3 195Author: Alan Coopersmith <alan.coopersmith@oracle.com> 196Date: Sun Oct 20 12:49:31 2013 -0700 197 198 Remove unused uASSERT macro 199 200 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 201 Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 202 203commit c936bd4315a7dc78de074ac89c5a4d12813421be 204Author: Alan Coopersmith <alan.coopersmith@oracle.com> 205Date: Sun Oct 20 11:58:56 2013 -0700 206 207 Remove unused function entry/exit tracking framework 208 209 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 210 Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 211 212commit 839ccda42d8b088d94324cd77c4be954859914d3 213Author: Peter Hutterer <peter.hutterer@who-t.net> 214Date: Wed Aug 28 15:20:56 2013 +1000 215 216 compat: don't warn about redefinition when nothing is defined yet 217 218 info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that 219 is the case, otherwise any "group 2 = ..." statement will cause an error. 220 221 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 222 223commit 24d18e0a844041ef82441adb16aa18cc4b4814ae 224Author: Benno Schulenberg <bensberg@justemail.net> 225Date: Wed Aug 28 20:03:30 2013 +0200 226 227 Making sure that a copied string is always null-terminated (#66345). 228 229 A more minimalistic and formally correct solution. 230 This amends and extends the previous fix for bug #66345, 231 fixing not just yyGetKeyName() but also yyGetString(). 232 233 Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 234 235 Fixes a typo from cdcd552 (should be sizeof - 1, not sizeof -i). 236 Code flows that i is at most sizeof(scanBuf) - 1, so last is not needed. 237 238 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 239 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 240 241commit 0ebdf47fd4bc434ac3d2339544c022a869510738 242Author: Peter Hutterer <peter.hutterer@who-t.net> 243Date: Thu Jul 11 13:53:31 2013 +1000 244 245 Parse -w1 flag correctly (#66344) 246 247 if the flag is "-w", then argv[i][1] is 'w' and unlikely to be a digit. 248 Access [2] instead, which is either \0 or an actual digit. 249 250 X.Org Bug 66344 <http://bugs.freedesktop.org/show_bug.cgi?id=66344> 251 252 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 253 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 254 Reviewed-by: Matt Dew <marcoz@osource.org> 255 256commit cdcd552041fc1325a2a81e3374fadb0dd15950dc 257Author: Peter Hutterer <peter.hutterer@who-t.net> 258Date: Thu Jul 11 13:26:18 2013 +1000 259 260 Always terminate the scanBuf string (#66345) 261 262 If a key name exceeds 4 characters, the content of scanBuf is not 263 null-terminated, giving error messages like 264 265 syntax error: line 7 of test.xkb 266 last scanned symbol is: FOOBARm 267 Errors encountered in test.xkb; not compiled. 268 269 (last character of the preceding 'maximum' statement in this case) 270 271 X.Org Bug 66345 <http://bugs.freedesktop.org/show_bug.cgi?id=66345> 272 273 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 274 275commit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d 276Author: Laura <lmemsm@gmail.com> 277Date: Fri Mar 15 11:21:26 2013 +0000 278 279 Add #include <stdlib.h> to xkbscan.c 280 281 This fixes an issue with _exit not declared when building xkbcomp 282 version 1.2.4 natively on Windows using MinGW32 (version 4.7.2) 283 from www.mingw.org. 284 285 https://bugs.freedesktop.org/show_bug.cgi?id=62365 286 287 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 288 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 289 290commit ed582f4fccd4e23abcfba8b3b03649fea6414f44 291Author: Thomas Klausner <wiz@NetBSD.org> 292Date: Sun Jun 2 22:22:36 2013 +0200 293 294 Protect config.h like usual. 295 296 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 297 298commit c66de126ad10a7220ab74e52fb7cc81b6d8b0993 299Author: Peter Hutterer <peter.hutterer@who-t.net> 300Date: Tue May 21 15:19:35 2013 +1000 301 302 man: document -help/-?, -em1, -emp, -eml 303 304 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 305 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 306 307commit a4ff0f0eee046be846cc0f46edaba48b765e50d3 308Author: Peter Hutterer <peter.hutterer@who-t.net> 309Date: Tue Apr 9 11:29:15 2013 +1000 310 311 Use DEBUG, not DEBUG_ON to determine whether debugging is enabled 312 313 Nothing else looks at DEBUG_ON. 314 315 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 316 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 317 318commit 705b9bbb426410f9510601c7010da51184919b36 319Author: Alan Coopersmith <alan.coopersmith@oracle.com> 320Date: Tue Jan 22 22:39:19 2013 -0800 321 322 config: Add missing AC_CONFIG_SRCDIR 323 324 Regroup AC statements under the Autoconf initialization section. 325 Regroup AM statements under the Automake initialization section. 326 327 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 328 329commit ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa 330Author: Colin Walters <walters@verbum.org> 331Date: Wed Jan 16 13:02:57 2013 -0500 332 333 autogen.sh: Honor NOCONFIGURE=1 334 335 See http://people.gnome.org/~walters/docs/build-api.txt 336 337 Signed-off-by: Adam Jackson <ajax@redhat.com> 338 339commit 0522fab51eec0aa3e623aa17c5b7ea3aa6dfec45 340Author: Adam Jackson <ajax@redhat.com> 341Date: Wed Jan 16 13:01:21 2013 -0500 342 343 configure: Drop AM_MAINTAINER_MODE 344 345 Signed-off-by: Adam Jackson <ajax@redhat.com> 346 347commit e4f767913338052527538d429931e8abd8c3fb88 348Author: Alan Coopersmith <alan.coopersmith@oracle.com> 349Date: Fri Jan 4 18:37:45 2013 -0800 350 351 unifdef -U__UNIXOS2__ 352 353 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 354 355commit bd1103ef3cfef9cfed645566f944a69e7ca568b4 356Author: Ryan Pavlik <rpavlik@iastate.edu> 357Date: Wed Oct 26 12:17:44 2011 -0500 358 359 Include Xwindows.h rather than windows.h 360 361 Include the specially wrapped windows.h in Xwindows.h, rather than 362 including it directly to avoid compilation errors due to clashing 363 definitions 364 365 Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu> 366 Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> 367 Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 368 369commit a68c5b7b29eb1433b1be73b50c4248e10eab8e64 370Author: Daniel Stone <daniel@fooishbar.org> 371Date: Thu Nov 1 16:37:03 2012 +1100 372 373 Reset scan state when opening a new file 374 375 When we opened a new file after encountering a parse error, we weren't 376 resetting our scan state, and continued to read out of the old buffer 377 rather than that of the new file. 378 379 Fixes a regression introduced in 9887842e ('Use fread() instead of 380 getc()'). 381 382 Test case: 383 xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*" 384 The Makefiles in that tree would cause parse errors, the resulting directory 385 file is incomplete (down from ~12000 to ~230 lines). 386 387 Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 388 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 389 390commit e119cbec7e750ffc4d4bd08b577db2c697035a30 391Author: Daniel Stone <daniel@fooishbar.org> 392Date: Wed Oct 31 12:40:49 2012 +1100 393 394 Add parsing support for multiple keysyms per level 395 396 Parse, but ignore, level definitions in the form of: 397 key <FOO> { [ normal_sym, { M, U, L, T, I, S, Y, M } ] }; 398 399 normal_sym will be carried, but the latter will be turned into NoSymbol. 400 401 http://bugs.freedesktop.org/show_bug.cgi?id=25025 402 403 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 404 405commit f2eff337176551f643e35c54c1e1ca0a78df69c6 406Author: Alan Coopersmith <alan.coopersmith@oracle.com> 407Date: Thu Mar 22 22:02:56 2012 -0700 408 409 xkbcomp 1.2.4 410 411 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 412 413commit b4fafc4fa7edc4c04c3c0affae0d7f79a63e8d2f 414Author: Alan Coopersmith <alan.coopersmith@oracle.com> 415Date: Wed Dec 28 20:57:55 2011 -0800 416 417 Delete redundant redeclarations of extern Atoms in symbols.c 418 419 Fixes gcc warnings of: 420 421 symbols.c:43: warning: redundant redeclaration of 'tok_ONE_LEVEL' 422 tokens.h:99: warning: previous declaration of 'tok_ONE_LEVEL' was here 423 symbols.c:44: warning: redundant redeclaration of 'tok_TWO_LEVEL' 424 tokens.h:100: warning: previous declaration of 'tok_TWO_LEVEL' was here 425 symbols.c:45: warning: redundant redeclaration of 'tok_KEYPAD' 426 tokens.h:102: warning: previous declaration of 'tok_KEYPAD' was here 427 428 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 429 430commit 3835cae3cb1ad1073cbb2711f938beb878b4986c 431Author: Alan Coopersmith <alan.coopersmith@oracle.com> 432Date: Wed Dec 28 20:53:45 2011 -0800 433 434 Make sure to leave room for trailing nil byte in yyGetNumber 435 436 ...though really, by the time you've added 1023 digits to the number 437 you want to parse, you've got much bigger problems than an off-by-one 438 error in your buffer count. 439 440 Fixes parfait warnings: 441 Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 442 Array size is 1024 bytes, nInBuf >= 1 and nInBuf <= 1024 443 at line 625 of xkbscan.c in function 'yyGetNumber'. 444 Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 445 Array size is 1024 bytes, nInBuf <= 1025 446 at line 632 of xkbscan.c in function 'yyGetNumber'. 447 448 [ This bug was found by the Parfait 0.4.2 bug checking tool. 449 For more information see http://labs.oracle.com/projects/parfait/ ] 450 451 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 452 453commit 1447071942dbbbfc37b08417c74c8a1d302c1626 454Author: Andreas Wettstein <wettstein509@solnet.ch> 455Date: Fri Dec 2 20:10:06 2011 +0000 456 457 include resets group compatibility modifiers #43091 458 459 This change makes sure that include does not overwrite previous 460 compatibility modifier settings when the included files does not 461 explicitly specify them. 462 463 Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> 464 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 465 466commit 5fd14db5b2cc0c2c43f7a1ddefd6f9991eb1dcc2 467Author: Jeremy Huddleston <jeremyhu@apple.com> 468Date: Fri Nov 11 11:18:43 2011 -0800 469 470 Silence -Wparentheses-equality 471 472 warning: equality comparison with extraneous parentheses [-Wparentheses-equality] 473 474 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 475 476commit 6099655a4bbe1fd3e26b8afd2b91888ad2766086 477Author: Jeremy Huddleston <jeremyhu@apple.com> 478Date: Fri Nov 11 11:17:38 2011 -0800 479 480 Silence -Wshadow warnings 481 482 warning: declaration shadows a local variable [-Wshadow] 483 484 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 485 486commit b7e88debd937be147d3581b9c8720c0bfe354052 487Author: Jeremy Huddleston <jeremyhu@apple.com> 488Date: Fri Nov 11 11:13:42 2011 -0800 489 490 Correct our zeroing out of the row in InitRowInfo 491 492 geometry.c:369:20: warning: argument to 'sizeof' in '__builtin___memset_chk' call is the same 493 pointer type 'RowInfo *' (aka 'struct _RowInfo *') as the destination; expected 'RowInfo' 494 (aka 'struct _RowInfo') or an explicit length [-Wsizeof-pointer-memaccess] 495 bzero(row, sizeof(RowInfo *)); 496 ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ 497 498 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 499 500commit 33b5c9413463613d341d15184b34a4f4c4e70e56 501Author: Jeremy Huddleston <jeremyhu@apple.com> 502Date: Fri Nov 11 11:12:22 2011 -0800 503 504 Fix -Wformat warnings 505 506 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 507 508commit b9f6482d5fc413222334c2370ef8b9693f4b50fd 509Author: Jeremy Huddleston <jeremyhu@apple.com> 510Date: Fri Nov 11 11:07:30 2011 -0800 511 512 Add missing _X_NORETURN to uFatalError 513 514 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 515 516commit 8ea06128c70b07c265a217222f2a245aad4bfce4 517Author: Jeremy Huddleston <jeremyhu@apple.com> 518Date: Fri Nov 11 11:06:02 2011 -0800 519 520 Include strings.h for strcasecmp and string.h for strdup 521 522 Our minimum requirement for X11 is currently Unix98. Unix98 provides 523 strcasecmp in <strings.h>. This commit fixes implicit declarations 524 of this function on systems that closely adhere to the standard. 525 526 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 527 528commit 89c8317ad84386f69d31f38dcddbc7ff0abffb31 529Author: Peter Hutterer <peter.hutterer@who-t.net> 530Date: Tue Jul 5 08:23:37 2011 +1000 531 532 Add .pc file for version export 533 534 Exports xkbcomp version and the xkb base directory. 535 536 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 537 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 538 Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 539 540commit cdb8677f370b34a3a523a32ae0023c7e8c0c965c 541Author: Peter Hutterer <peter.hutterer@who-t.net> 542Date: Wed Jun 22 10:41:33 2011 +1000 543 544 Print version number on -version. 545 546 This commit isn't playing the WARN/M/M1 macro game. Version numbers to to 547 stdout, full stop. 548 549 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 550 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 551 552commit cef4ba4b8fdc9a5439f71437c08cf690a750bd6b 553Author: Daniel Stone <daniel@fooishbar.org> 554Date: Tue Jun 21 16:04:45 2011 +0100 555 556 Bump to 1.2.3 557 558 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 559 560commit 3caab5aa37decb7b5dc1642a0452efc3e1f5100e 561Author: Daniel Stone <daniel@fooishbar.org> 562Date: Tue Jun 21 15:55:59 2011 +0100 563 564 Interp: Allow explicit Any/NoSymbol mappings 565 566 Brown paper bag in full effect. 567 568 The previous fix, while crushing the previous problem where an unknown 569 keysym for an interp def would lead to every key matching it, also 570 ignored explicit Any+AnyOfOrNone(All) mappings. 571 572 Such as the one xkeyboard-config relied on for Control to actually 573 update the modifier state. 574 575 Fix this by allowing mappings explicitly declared as Any/NoSymbol, while 576 ignoring only those with failed keysym lookups. Unfortunately, due to 577 the structure of the parser, it's a deeply inelegant fix. 578 579 Verified with a quick check of all layouts (albeit using default 580 variants only) in xkeyboard-config that this results in no changes to 581 the output at all, compared to xkbcomp 1.1.1. 582 583 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 584 585commit b34af8b0aec3a1dfc58f9732996274cbf2646a53 586Author: Daniel Stone <daniel@fooishbar.org> 587Date: Tue Jun 21 15:55:28 2011 +0100 588 589 Constify LookupKeysym input argument 590 591 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 592 593commit e68a8ef1067f98056237d8067052e2a0d9896133 594Author: Daniel Stone <daniel@fooishbar.org> 595Date: Tue Jun 21 14:06:05 2011 +0100 596 597 Bump to 1.2.2 598 599 Emergency bugfix for the syminterp declarations. They've been broken 600 since the beginning of time, but I guess we just haven't added new 601 interpreted symbols since around then. 602 603 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 604 605commit 2a473b906943ffd807ad81960c47530ee7ae9a60 606Author: Daniel Stone <daniel@fooishbar.org> 607Date: Tue Jun 21 14:03:53 2011 +0100 608 609 Interp: Ignore NoSymbol definitions 610 611 A NoSymbol syminterp leads to a Any+AnyOfOrAll(None) definition, which 612 is never what anyone would actually ever want in a sym interp. The 613 failure mode here was: 614 interpret XF86SomeKeysymYouDontHaveYet { 615 action=Something() 616 } 617 leading to: 618 interpret Any+AnyOfOrAll(None) { 619 action=Something() 620 } 621 leading to every single non-action key triggering your shiny new action 622 that was only supposed to come from a new keysym. 623 624 At least you could VT switch or zap, I guess. 625 626 Later, more invasive, revisions will bring a more useful error message. 627 628 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 629 630commit a2816345e58c88f5806a5c6df310c7d9c62264f0 631Author: Daniel Stone <daniel@fooishbar.org> 632Date: Tue Jun 21 14:03:12 2011 +0100 633 634 Interp: Don't make modifier lookup failure fatal 635 636 If we can't look up a modifier in a SymInterp declaration, don't make 637 that fatal enough to kill the entire file, just ignore it and move on. 638 639 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 640 641commit c7a42b364f0ca06d9859945fa11664d0e0ea2742 642Author: Gaetan Nadon <memsize@videotron.ca> 643Date: Tue Mar 8 08:16:35 2011 -0500 644 645 config: move pre-processor flags to AM_CPPFLAGS 646 647 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 648 649commit 7899a1f4745c8d111dab4dd3abc2b59b40ecdcbc 650Author: Gaetan Nadon <memsize@videotron.ca> 651Date: Tue Mar 8 08:02:54 2011 -0500 652 653 config: let Automake handle Yacc dist and cleaning 654 655 BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake. 656 657 Automake generates all the rules to handle building, 658 distribution and cleaning. 659 660 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 661 662commit 137418c63d01d5db0dcaed257d7a26865efa53ae 663Author: Alan Coopersmith <alan.coopersmith@oracle.com> 664Date: Tue Jun 7 23:47:32 2011 -0700 665 666 Replace repeated checks for gcc with _X_ATTRIBUTE_PRINTF from xproto 667 668 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 669 Reviewed-by: Mark Kettenis <kettenis@openbsd.org> 670 671commit a2877e92bd9f9c1532b5cd12cc484ff3cdbc6a0a 672Author: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 673Date: Fri Apr 1 20:26:30 2011 +1100 674 675 xkbcomp: Stop possible overflow in yyGetnumber. #31647 676 677 Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=31647 678 679 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 680 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> 681 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 682 683commit 0b8527a3836cde77269461e22844857bf33e0aea 684Author: Julien Cristau <jcristau@debian.org> 685Date: Sun Feb 13 13:03:05 2011 +0100 686 687 Inline the oiText macro in the only place it's used 688 689 Gets rid of a compiler warning: 690 geometry.c: In function 'HandleOverlayDef': 691 geometry.c:2578: warning: the address of 'ol' will always evaluate as 'true' 692 693 X.Org bug#34219 <https://bugs.freedesktop.org/show_bug.cgi?id=34219> 694 695 Signed-off-by: Julien Cristau <jcristau@debian.org> 696 Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> 697 698commit c8375bcb7eb9f86ca1534cdf1143e91372d0499e 699Author: Peter Hutterer <peter.hutterer@who-t.net> 700Date: Fri Feb 11 09:06:04 2011 +1000 701 702 xkbcomp 1.2.1 703 704 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 705 706commit ab5371cefe2b7438b74338f71ff890e0e868b3df 707Author: Gaetan Nadon <memsize@videotron.ca> 708Date: Wed Jan 19 10:06:56 2011 -0500 709 710 config: move man pages into their own directory 711 712 Use services provided by XORG_MANPAGE_SECTIONS. 713 Use standard Makefile for man pages. 714 715 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 716 717commit 9ce8e2f42ab7695b5165ff0a3d892df96a3c3f01 718Author: Gaetan Nadon <memsize@videotron.ca> 719Date: Thu Jan 13 11:15:47 2011 -0500 720 721 man: remove trailing spaces and tabs 722 723 Using s/[ \t]*$// 724 725 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 726 727commit 5ecf21cc130d7a45cb5e82e9c2c3025edee5d74f 728Author: Gaetan Nadon <memsize@videotron.ca> 729Date: Wed Jan 12 16:28:02 2011 -0500 730 731 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS 732 733 This silences an Autoconf warning 734 735commit e27e8c2a15ddcf51b2ea58f8eced7f035aa1301e 736Author: Gaetan Nadon <memsize@videotron.ca> 737Date: Wed Jan 12 15:29:50 2011 -0500 738 739 config: replace deprecated AC_HELP_STRING with AS_HELP_STRING 740 741 This silences an Automake warning. 742 743 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 744 745commit f524cfae6951442c9a9da65ef317b9c04199500f 746Author: Alan Coopersmith <alan.coopersmith@oracle.com> 747Date: Tue Jan 4 00:05:18 2011 -0800 748 749 Remove out-of-date copies of README.config & README.enhancing 750 751 The up-to-date master copies of those documents are found in the 752 xorg-docs module, and posted on the X.Org website. 753 754 Also, x-docs.org no longer carries X11 docs, so point to X.Org's 755 website instead in the README. 756 757 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 758 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 759 760commit cc55d8f5ab021861308b071aab9c03016be15187 761Author: Gaetan Nadon <memsize@videotron.ca> 762Date: Sun Oct 31 20:35:24 2010 -0400 763 764 config: replace AC_CHECK_FILE with test -f as it fails to cross-compile 765 766 Testing for the presence of xkbparse.c is legitimate as this is a build 767 file, but the Autoconf macro assumes it is testing on the host system 768 and fails. 769 770 Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> 771 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 772 773commit 1d59f5b0387b18028017cfab4e55b703417dd735 774Author: Dirk Wallenstein <halsmit@t-online.de> 775Date: Fri Oct 29 13:08:25 2010 +0200 776 777 man: Improve description of device selection option 778 779 The device selection option takes effect when loading keymaps, too. 780 781 Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 782 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 783 784commit 281c7744f682c1ba4f44c0ee22f9bf7188c14fe6 785Author: Dirk Wallenstein <halsmit@t-online.de> 786Date: Fri Oct 29 11:35:10 2010 +0200 787 788 Allow uploading a keymap to a single device 789 790 Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 791 Reviewed-by: Julien Cristau <jcristau@debian.org> 792 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 793 794commit 851a5f6e0c1b2a98d4714d95e40198ab5dc61607 795Author: Alan Coopersmith <alan.coopersmith@oracle.com> 796Date: Sat Oct 30 09:59:52 2010 -0700 797 798 xkbcomp 1.2.0 799 800 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 801 802commit 87576c9ebf0f28d66833bb28a8199df1aa01f693 803Author: Alan Coopersmith <alan.coopersmith@oracle.com> 804Date: Thu Sep 23 20:29:57 2010 -0700 805 806 config: Remove unnecessary calls from configure.ac 807 808 AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now 809 PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables 810 811 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 812 813commit d083293a4e227e9dd27f74cde391fde4c5824b0c 814Author: Alan Coopersmith <alan.coopersmith@oracle.com> 815Date: Thu Sep 23 20:29:14 2010 -0700 816 817 config: upgrade to util-macros 1.8 for additional man page support 818 819 Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS 820 The value of MAN_SUBST is the same for all X.Org packages. 821 822 Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS 823 The existing statement can now be removed from the configuration file. 824 825 Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) 826 Enables silent rule and use platform appropriate version of sed. 827 828 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 829 830commit 8f13f1af68fc55b7567a4eb4462a0c911722a3c4 831Author: Gaetan Nadon <memsize@videotron.ca> 832Date: Tue Jul 20 18:45:18 2010 -0400 833 834 config: update AC_PREREQ statement to 2.60 835 836 Unrelated to the previous patches, the new value simply reflects 837 the reality that the minimum level for autoconf to configure 838 all x.org modules is 2.60 dated June 2006. 839 840 ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz 841 842 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 843 844commit 988eb0e121c0f2c992031002acb7274c2026764b 845Author: Gaetan Nadon <memsize@videotron.ca> 846Date: Mon Jul 12 10:53:34 2010 +0100 847 848 config: allow to build tarball when yacc is missing 849 850 Autoconf does not handle this scenario as well as Automake does. 851 If xkbparse.c is already there, do not abort the configuration 852 if yacc is missing as it is not needed. 853 854 If both xkbparse.c and yacc are missing, abort configuration. 855 Yacc is a required tool to build the package. 856 857 Reported-by: Julien Cristau <jcristau@debian.org> 858 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 859 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 860 861commit 446d226f85433aeb45834b65f966397ad6fbb17f 862Author: Daniel Stone <daniel@fooishbar.org> 863Date: Mon Jul 12 10:37:49 2010 +0100 864 865 limits.h is mandated by C89, no need to check for it 866 867 Alan Coopersmith pointed out that C89 mandates limits.h, so for once in 868 X's life, checking for a system header is just being unnecessarily 869 paranoid. 870 871 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 872 873commit 61b3d4b024d8146cb0e7659aa958045ceb72c482 874Author: Julien Cristau <jcristau@debian.org> 875Date: Mon Jul 12 10:28:32 2010 +0100 876 877 Fix signedness issue with getc() return value 878 879 getc() and ungetc() return and take, respectively, an int rather than a 880 char to allow for error values as well. Oops. 881 882 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 883 884commit a281386fa887e6bf4110840779aed46dd0ac89b6 885Author: Daniel Stone <daniel@fooishbar.org> 886Date: Fri Jul 9 19:34:29 2010 +0100 887 888 Fix parsing of 0x1a2b3c4d-style symbols 889 890 Raw keysyms were not getting parsed correctly, due to forgetting to add 891 the code to libX11, forgetting to add the backwards-compat code for old 892 libX11s, and then stuffing the lexing up anyway. Yeesh. 893 894 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 895 896commit 0b04ecbb7a6afb223c91d3b15baab0bc48542281 897Author: Daniel Stone <daniel@fooishbar.org> 898Date: Tue Jun 15 19:26:19 2010 +0100 899 900 Fix gcc warnings 901 902 It was right too: printf was being misused in some spots. 903 904 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 905 906commit 41b0857c8c1179b87a26888588cbfff28f8bb0d6 907Author: Daniel Stone <daniel@fooishbar.org> 908Date: Tue Jun 8 15:11:19 2010 +0100 909 910 Don't malloc() and free() most scanned symbols 911 912 Use a constant buffer. Sigh. 913 914 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 915 916commit 7f7a57c75beb5e1dfb53351e490ef00a324b2727 917Author: Daniel Stone <daniel@fooishbar.org> 918Date: Tue Jun 8 12:14:00 2010 +0100 919 920 Fix compilation with DEBUG 921 922 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 923 924commit 9887842e33174a6e98675b912e419c711dd20c0f 925Author: Daniel Stone <daniel@fooishbar.org> 926Date: Mon Jun 7 22:45:13 2010 +0100 927 928 Use fread() instead of getc() 929 930 So, it turns out that if you're parsing a fairly large amount of data, 931 using getc() to get all the input rather than, say, read(), is some kind 932 of remarkably daft and unperformant idea. 933 934 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 935 936commit 02de53d767b20bab1517b4e8a3e7eb3b9e7f15be 937Author: Daniel Stone <daniel@fooishbar.org> 938Date: Mon Jun 7 22:43:01 2010 +0100 939 940 Lazy keysym parsing (avoid XStringToKeysym) 941 942 Instead of calling XStringToKeysym on every keysym we parse, store it as 943 a string until we need to store it in an actual keymap. 944 945 Signed-off-by: Daniel Stone <daniel@fooishbar.org> 946 947commit 07cc4d60dea2b4c947fed45b082edae4a53b186a 948Author: Gaetan Nadon <memsize@videotron.ca> 949Date: Wed Jun 2 15:23:58 2010 -0400 950 951 config: add check for yacc to insure it is installed #27973 952 953 Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" 954 as a last resort, even if no programs have been found. Improve error 955 checking by issuing an error message if yacc is not found. The module 956 cannot build anyway. 957 958 Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 959 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 960 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 961 962commit 7888738047e9f1545aa1905b4a2a0654686f49a8 963Author: Gaetan Nadon <memsize@videotron.ca> 964Date: Thu Feb 11 10:08:07 2010 -0500 965 966 config: move CWARNFLAGS from configure.ac to Makefile.am 967 968 Compiler warning flags should be explicitly set in the makefile 969 rather than being merged with other packages compiler flags. 970 971 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 972 973commit ba906359da32644b40b3a8a71e77d3cabca56efe 974Author: Gaetan Nadon <memsize@videotron.ca> 975Date: Thu Nov 26 09:19:54 2009 -0500 976 977 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES 978 979 Now that the INSTALL file is generated. 980 Allows running make maintainer-clean. 981 982commit 667f0a0e5d3143533cbbe5979ef82c13cfa62c3a 983Author: Gaetan Nadon <memsize@videotron.ca> 984Date: Wed Oct 28 14:09:08 2009 -0400 985 986 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 987 988 Add missing INSTALL file. Use standard GNU file on building tarball 989 README may have been updated 990 Remove AUTHORS file as it is empty and no content available yet. 991 Remove NEWS file as it is empty and no content available yet. 992 993commit 4b7c8a8ef337614c831b2555afeb6d89dbc14fb1 994Author: Gaetan Nadon <memsize@videotron.ca> 995Date: Tue Oct 27 15:07:25 2009 -0400 996 997 Deploy the new XORG_DEFAULT_OPTIONS #24242 998 999 This macro aggregate a number of existing macros that sets commmon 1000 X.Org components configuration options. It shields the configuration file from 1001 future changes. 1002 1003commit 5fa9ef7e5e87f875dd92cc33403cebf6c60c557f 1004Author: Gaetan Nadon <memsize@videotron.ca> 1005Date: Mon Oct 26 22:08:39 2009 -0400 1006 1007 Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 1008 1009 ChangeLog filename is known to Automake and requires no further 1010 coding in the makefile. 1011 1012commit b3a52787e0dad42ea7e8da26926b9533b1ecab84 1013Author: Gaetan Nadon <memsize@videotron.ca> 1014Date: Thu Oct 22 12:34:15 2009 -0400 1015 1016 .gitignore: use common defaults with custom section # 24239 1017 1018 Using common defaults will reduce errors and maintenance. 1019 Only the very small or inexistent custom section need periodic maintenance 1020 when the structure of the component changes. Do not edit defaults. 1021 1022commit fa7e3ff7b49f76294aa14aa8bf1b8adbceb5d340 1023Author: Jeremy Huddleston <jeremyhu@freedesktop.org> 1024Date: Wed Oct 21 12:47:21 2009 -0700 1025 1026 This is not a GNU project, so declare it foreign. 1027 1028 On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: 1029 > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: 1030 > > I noticed an INSTALL file in xlsclients and libXvMC today, and it 1031 > > was quite annoying to work around since 'autoreconf -fvi' replaces 1032 > > it and git wants to commit it. Should these files even be in git? 1033 > > Can I nuke them for the betterment of humanity and since they get 1034 > > created by autoreconf anyways? 1035 > 1036 > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 1037 1038 As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with 1039 AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation 1040 of the INSTALL file. It is also part of the 24206 solution. 1041 1042 Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> 1043 1044commit a5160032d7e46473b8702b87a546071fc0c0978c 1045Author: Peter Hutterer <peter.hutterer@who-t.net> 1046Date: Sat Oct 3 21:12:47 2009 +1000 1047 1048 xkbcomp 1.1.1 1049 1050 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1051 1052commit a36ca5ba61e2b97398a79713922644fee1a263d1 1053Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 1054Date: Wed Aug 5 17:16:16 2009 +0300 1055 1056 xkbcomp: Remove output file if closing fails. 1057 1058 Without the fix xkbcomp may leave a truncated file in the filesystem 1059 if there is not enough disk space. Using the truncated file leads to 1060 problems. 1061 1062 Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 1063 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1064 1065commit 2cc1dc9a327a5100043d3d54e899b98b81cdf5f5 1066Author: Peter Hutterer <peter.hutterer@who-t.net> 1067Date: Thu Jul 9 08:34:21 2009 +1000 1068 1069 Bump to 1.1.0. 1070 1071commit eeaa4aec798ef045d0b3b9de3c25932b85b9ac3d 1072Author: Alan Coopersmith <alan.coopersmith@sun.com> 1073Date: Mon May 11 09:39:03 2009 -0700 1074 1075 Use temporary buffer for generating Uxxx names to avoid overflow 1076 1077 Instead of sprintf()'ing a 4 character string to a char [4] buffer, 1078 and leaving the trailing '\0' to overwrite into the next entry, 1079 snprintf() to a 5 character temp buffer and memcpy the 4 characters 1080 to the right place. 1081 1082 Fixes parfait errors: 1083 Error: Buffer overflow at xkbcomp-1.0.4/misc.c:393 1084 in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 1085 In sprintf related dereference of xkb->names->keys[i].name 1086 with index not less than '4' 1087 Destination array size is 4 bytes, data to be written is 4 bytes 1088 Error: Buffer overflow at xkbcomp-1.0.4/misc.c:402 1089 in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 1090 In sprintf related dereference of xkb->names->keys[i].name 1091 with index not less than '4' 1092 Destination array size is 4 bytes, data to be written is 4 bytes 1093 1094 [This bug was found by the Parfait bug checking tool. 1095 For more information see http://research.sun.com/projects/parfait ] 1096 1097 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 1098 1099commit 2fd42dae8840089727f95211abdb86316e566afd 1100Author: Dan Nicholson <dbn.lists@gmail.com> 1101Date: Sat Mar 7 16:36:51 2009 -0800 1102 1103 Allow the default XKB config root to be set from configure 1104 1105 The default was hardcoded in the Makefile as $(datadir)/share/X11/xkb. 1106 This could cause a problem if you are installing xkbcomp to an alternate 1107 location but want to continue using the system's XKB data. 1108 1109 Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> 1110 1111commit 3b816fe819bd849acdbabcfba769041bd3eab753 1112Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 1113Date: Thu Jan 22 02:45:20 2009 -0200 1114 1115 Correct a remaining of a wrong change to make some DEBUG_VAR's static. 1116 1117commit f099da35386cf63d4935ba2613409ff28b3d7ea5 1118Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 1119Date: Wed Jan 21 20:43:28 2009 -0200 1120 1121 Correct make distcheck and most gcc and sparse warnings. 1122 1123 Remaining warnings are due to macros that check address or vectors 1124 on the stack and auto generated yacc code. 1125 1126 Compiled with default flags and also as: 1127 % make CFLAGS=-DENTRY_TRACKING_ON -DDEBUG_ON -DASSERTIONS_ON 1128 to ensure the "simplification" of code like: 1129 foo.c: 1130 <hash>define DEBUG_VAR foo_VAR 1131 <hash>include "foo.h" 1132 ... 1133 foo.h: 1134 <hash>ifdef DEBUG_VAR_NOT_LOCAL 1135 extern 1136 <hash>endif 1137 int DEBUG_VAR; 1138 ... 1139 did not change the author's "intended" logic. 1140 1141commit 82cebb165b22d5409c9d4d31554a8da0c867e0d3 1142Author: Peter Hutterer <peter.hutterer@redhat.com> 1143Date: Wed Sep 10 17:48:29 2008 +0930 1144 1145 Check for NULL strings before calling strdup. 1146 1147 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> 1148 1149commit a82e1dcc8ad095581402d05e5d1ae1bbf3646954 1150Author: Alan Coopersmith <alan.coopersmith@sun.com> 1151Date: Fri Sep 5 15:07:13 2008 -0700 1152 1153 sprintf -> snprintf conversions 1154 1155commit d2d06305e1834548edd8a647564efa222a511b53 1156Author: Alan Coopersmith <alan.coopersmith@sun.com> 1157Date: Fri Sep 5 14:44:51 2008 -0700 1158 1159 Remove #if 0'd typedef that appears nowhere else. 1160 1161commit acd277d7fd48ccfd8ef2ca052b4e144ee95a5d94 1162Author: Alan Coopersmith <alan.coopersmith@sun.com> 1163Date: Fri Sep 5 14:32:15 2008 -0700 1164 1165 Remove X_NOT_POSIX #ifdefs 1166 1167 POSIX.1-1990 is well below the current minimum bar 1168 1169commit 37b62a26716d3abf2ae07dd88cf54bc04d980bd8 1170Author: Alan Coopersmith <alan.coopersmith@sun.com> 1171Date: Fri Sep 5 14:22:33 2008 -0700 1172 1173 Check for strdup & strcasecmp before assuming we need to provide our own 1174 1175commit 36fecff588199a3a6c007f09ff709f3148d40f77 1176Author: Peter Hutterer <peter.hutterer@redhat.com> 1177Date: Tue Aug 19 16:33:03 2008 +0930 1178 1179 Don't overwrite previously assigned type indices with useless ones. 1180 1181 The default type for a key with no levels is ONE_LEVEL. 1182 Let's not overwrite the kt_index with this default type if we have previously 1183 assigned a real type. 1184 1185 Reproduceable by running setxkbmap -layout "ru(phonetic),us", the first group 1186 is assigned ONE_LEVEL and shift stops working. 1187 1188 Red Hat Bug #436626 <https://bugzilla.redhat.com/show_bug.cgi?id=436626> 1189 1190commit d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c 1191Author: Peter Hutterer <peter.hutterer@redhat.com> 1192Date: Tue Aug 19 14:36:13 2008 +0930 1193 1194 Remove unused merge parameter from HandleKeyNameVar. 1195 1196commit 391ea45b2cadc7faeb6acb5d9ec7b405d67d46fd 1197Author: Peter Hutterer <peter.hutterer@redhat.com> 1198Date: Tue Aug 19 14:35:39 2008 +0930 1199 1200 Don't pass useless handlers around in HandleIncludeKeycodes. 1201 1202 What use is a handler if we only ever use one function anyway? 1203 1204commit f05f20fd203afdadbcd571023ed31638ccda1f88 1205Author: Peter Hutterer <peter.hutterer@redhat.com> 1206Date: Thu Aug 21 17:28:22 2008 +0930 1207 1208 More comments. 1209 1210commit 1aad2a5d8ede9fe5212a4e6087fbe34aa170ac54 1211Author: Peter Hutterer <peter.hutterer@redhat.com> 1212Date: Mon Aug 18 16:28:44 2008 +0930 1213 1214 Remove useless longestPath variable. 1215 1216commit 7aef93914e1d6446f64aa42eafa18375c2cb4bed 1217Author: Peter Hutterer <peter.hutterer@redhat.com> 1218Date: Mon Aug 18 14:05:33 2008 +0930 1219 1220 Silence valgrind warnings. 1221 1222 "Conditional jump or move depends on uninitialised value(s)" 1223 1224commit eb18e9176841b3ea64c497f1919686e134713eb6 1225Author: Peter Hutterer <peter.hutterer@redhat.com> 1226Date: Mon Aug 11 18:01:48 2008 +0930 1227 1228 Add some explanatory comments 1229 1230commit 9b877d83947708259252275e14f6995dcf7c29ce 1231Author: Peter Hutterer <peter.hutterer@redhat.com> 1232Date: Mon Aug 11 16:20:22 2008 +0930 1233 1234 If we're not using XkbDesc, don't require it as a parameter. 1235 1236commit ca32570cf16494fb8e0577de8b05ba18cb927ce1 1237Author: Peter Hutterer <peter.hutterer@redhat.com> 1238Date: Mon Aug 11 15:47:09 2008 +0930 1239 1240 Indent fixes. 1241 1242 indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h 1243 1244commit 12e8f5e5b3f33dbd1290c76dd0d6a4cf832993d7 1245Author: Peter Hutterer <peter.hutterer@redhat.com> 1246Date: Mon Aug 11 15:40:03 2008 +0930 1247 1248 Add a few explanatory comments. 1249 1250commit de48206e7fe2206542313a2d1d1ea3c40b06114b 1251Author: Peter Hutterer <peter.hutterer@redhat.com> 1252Date: Mon Aug 11 15:14:31 2008 +0930 1253 1254 Remove RCS tags. 1255 1256commit 8eb2e1fcd08a05f296a31dbadde1ec3cc84d8e28 1257Author: Matthieu Herrb <matthieu.herrb@laas.fr> 1258Date: Mon May 12 23:25:47 2008 +0200 1259 1260 Minimal man page addition for new -i option. 1261 1262commit 12df85eb5b08d5fb815b0965714f120b05c6c670 1263Author: Daniel Stone <daniel@fooishbar.org> 1264Date: Fri May 9 21:09:44 2008 +0300 1265 1266 Bump to 1.0.5 1267 1268commit 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d 1269Author: Daniel Stone <daniel@fooishbar.org> 1270Date: Thu Apr 17 00:52:29 2008 +0300 1271 1272 Don't scan paths which make NO SENSE WHATSOEVER TO SCAN 1273 1274 Hey, I wonder if we have XKB files in our directory! I wonder if we 1275 haven't bothered with a structure, and let's try to open a file called 1276 'misc' in someone's home directory! What a surprise, it's not a valid 1277 XKB file! Let's fail miserably! 1278 1279 SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR. 1280 1281commit a3a05fd489a9a35942a4419c537634e796dbebd1 1282Author: Daniel Stone <daniel@fooishbar.org> 1283Date: Thu Apr 17 00:50:07 2008 +0300 1284 1285 xkbcomp: Take a device ID argument 1286 1287 Allows the user to set maps (or whatever) on arbitrary devices. 1288 1289commit be084fbeba28312fc5102e98d64726464032c3e8 1290Author: Adam Jackson <ajax@redhat.com> 1291Date: Thu Mar 6 17:13:42 2008 -0500 1292 1293 xkbcomp 1.0.4 1294 1295commit c1cc023fc50ce3a4a23f4682ebefd2301fd13170 1296Author: Adam Jackson <ajax@redhat.com> 1297Date: Fri Feb 29 15:30:34 2008 -0500 1298 1299 Bug #7645: Fix a conditional that always evaluates to FALSE. 1300 1301 Since it's if (0 || foo), simplify to if (foo). 1302 1303commit 3f8bd7e68d0028bce5075124a32cc004166486c6 1304Author: Alan Coopersmith <alan.coopersmith@sun.com> 1305Date: Tue Jan 22 16:05:14 2008 -0800 1306 1307 Bug 14185: MAINTAINERCLEANFILES multiply defined in Makefile.am 1308 1309 <http://bugs.freedesktop.org/show_bug.cgi?id=14185> 1310 1311commit 2421069a3686f7bff702383675fdb77be108021e 1312Author: Matthieu Herrb <matthieu@bluenote.herrb.com> 1313Date: Sun Jan 6 11:40:30 2008 +0100 1314 1315 Revert "Also mark xkbparse.h as a generated file." 1316 Apparently only yacc generates it. 1317 1318 This reverts commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002. 1319 1320commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002 1321Author: Matthieu Herrb <matthieu@bluenote.herrb.com> 1322Date: Sun Jan 6 11:17:07 2008 +0100 1323 1324 Also mark xkbparse.h as a generated file. 1325 1326commit 686e8b6d33602f5fb7de7a768e532a4ac8090c26 1327Author: James Cloos <cloos@jhcloos.com> 1328Date: Thu Dec 6 16:37:18 2007 -0500 1329 1330 Replace static ChangeLog with dist-hook to generate from git log 1331 1332commit 6aae208fe5bd8f71757c294a441d7c599a1ec4a1 1333Author: Tilman Sauerbeck <tilman@code-monkey.de> 1334Date: Sun Sep 23 20:15:47 2007 +0200 1335 1336 Ignore *.o and ylwrap. 1337 1338commit 829cb75130d1edd88fa1d33e277f49167daedacf 1339Author: Tilman Sauerbeck <tilman@code-monkey.de> 1340Date: Sun Sep 23 20:15:13 2007 +0200 1341 1342 Fixed a bunch of const correctness bugs. 1343 1344commit e8ffa513a109209849b11a3c608356cc28314a8e 1345Author: Tilman Sauerbeck <tilman@code-monkey.de> 1346Date: Sun Sep 23 17:50:41 2007 +0200 1347 1348 Fixed an invalid memory access. 1349 1350 Some keynames are less than 3 characters long (not counting the 1351 terminator). We're now also initializing all of the keyName array. 1352 1353commit dfa65b0c8df6a6aab4f86c32a0acb41f44201e7c 1354Author: Daniel Drake <ddrake@brontes3d.com> 1355Date: Mon May 21 13:41:00 2007 -0800 1356 1357 Bug #11025: xkbcomp COPYING file 1358 1359 X.Org Bugzilla #11025 <https://bugs.freedesktop.org/show_bug.cgi?id=11025> 1360 1361commit 3ca028cf767258fd62fb7a1b0eb22d13d333a3ae 1362Author: James Cloos <cloos@jhcloos.com> 1363Date: Mon Sep 3 05:51:25 2007 -0400 1364 1365 Add *~ to .gitignore to skip patch/emacs droppings 1366 1367commit b00e474ca8dbbb0166f2108e4b08cc3f9c36c735 1368Author: James Cloos <cloos@jhcloos.com> 1369Date: Thu Aug 23 19:24:52 2007 -0400 1370 1371 Rename .cvsignore to .gitignore 1372 1373commit 313a2748d3dff872e067d515d6deabe1bbd56fbe 1374Author: Daniel Stone <daniel@fooishbar.org> 1375Date: Wed Nov 8 16:30:57 2006 +0200 1376 1377 bump to 1.0.3 1378 1379commit 337ed258a1cd3f5a16fa69ef15e98781e76f63a1 1380Author: Etsushi Kato <ek.kato@gmail.com> 1381Date: Wed Nov 8 16:29:16 2006 +0200 1382 1383 compat: avoid use of uninitialised variable (bug #8846) 1384 si.interp.match may be unused, so just clobber it, which means we don't 1385 end up with stuff like LevelOneOnlyMask wandering in. 1386 1387commit d920bbadb94684287f70e50ded2a35d65186c188 1388Author: Andriy Gapon <avg@icyb.net.ua> 1389Date: Sun Oct 29 02:59:53 2006 +0300 1390 1391 parser: accept negative numbers in geometry co-ordinates (bug #8763) 1392 Accept negative co-ordinates for geometry, per the spec. 1393 1394commit 0e8fd676de161ba52bb4544f8641be756bc580a1 1395Author: Adam Jackson <ajax@nwnk.net> 1396Date: Wed Apr 26 23:41:58 2006 +0000 1397 1398 Bump to 1.0.2 1399 1400commit 58c77c8db1bfdc739fac7b100fb813028d0449c7 1401Author: Daniel Stone <daniel@fooishbar.org> 1402Date: Mon Apr 3 11:28:43 2006 +0000 1403 1404 Bug #4851: Fix up have-no-file test. 1405 1406commit 02d32f8dbc79116d33ef428d5b064009cdd6a06e 1407Author: Kevin E Martin <kem@kem.org> 1408Date: Wed Dec 21 02:29:51 2005 +0000 1409 1410 Update package version for X11R7 release. 1411 1412commit 836db774d1f08a050af8717c4c8501f337f36281 1413Author: Adam Jackson <ajax@nwnk.net> 1414Date: Mon Dec 19 16:22:44 2005 +0000 1415 1416 Stub COPYING files 1417 1418commit e9f680c5654cd93d30b16bc4b626ae5b25f84e87 1419Author: Kevin E Martin <kem@kem.org> 1420Date: Thu Dec 15 00:24:08 2005 +0000 1421 1422 Update package version number for final X11R7 release candidate. 1423 1424commit b158f550fce661d67604f4a23d33a9f3b7bc22a1 1425Author: Kevin E Martin <kem@kem.org> 1426Date: Tue Dec 6 22:48:22 2005 +0000 1427 1428 Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 1429 1430commit f1370c50b199c3c8b2760ebf0228d741855390d7 1431Author: Kevin E Martin <kem@kem.org> 1432Date: Sat Dec 3 05:49:24 2005 +0000 1433 1434 Update package version number for X11R7 RC3 release. 1435 1436commit 8eb3737f5bce19b89c80d9ab256204f0fa62529b 1437Author: Alan Coopersmith <Alan.Coopersmith@sun.com> 1438Date: Mon Nov 28 22:01:43 2005 +0000 1439 1440 Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 1441 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 1442 1443commit f19c3028c34a0dba4ffb9ae19c13421e7ff0ff12 1444Author: Eric Anholt <anholt@freebsd.org> 1445Date: Mon Nov 21 10:35:01 2005 +0000 1446 1447 Another pass at .cvsignores for apps. 1448 1449commit 3ada747f1cb5400404e4b63430f7a817dbf0c4cb 1450Author: Eric Anholt <anholt@freebsd.org> 1451Date: Sun Nov 20 22:08:53 2005 +0000 1452 1453 Add/improve .cvsignore files for apps. 1454 1455commit 4eeb611f17bdc01f7a6cb4db3f0997ce5ecc6361 1456Author: Kevin E Martin <kem@kem.org> 1457Date: Wed Oct 19 02:47:54 2005 +0000 1458 1459 Update package version number for RC1 release. 1460 1461commit 958d09064c96cb50df6f92bfb8d4754c87451920 1462Author: Alan Coopersmith <Alan.Coopersmith@sun.com> 1463Date: Mon Oct 17 23:56:23 2005 +0000 1464 1465 Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to 1466 work better with BSD make 1467 1468commit 950fba3262905c58891773a8795305e685dc1cb3 1469Author: Kevin E Martin <kem@kem.org> 1470Date: Sat Oct 15 19:32:52 2005 +0000 1471 1472 Have generated files be cleaned by maintainer in order to pass 1473 check-tarball test. 1474 1475commit a83e4bb777d6f9b1b42a7fb3ff84a5e0d7e123c7 1476Author: Alan Coopersmith <Alan.Coopersmith@sun.com> 1477Date: Fri Oct 14 00:25:46 2005 +0000 1478 1479 Use sed to fill in variables in man page 1480 1481commit 8c0d310c1acccc424dae29554a5075f9b339e95f 1482Author: Kristian Høgsberg <krh@redhat.com> 1483Date: Thu Sep 1 19:37:02 2005 +0000 1484 1485 Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right 1486 place. 1487 1488commit fabda6a820bdccae85a7c22ad0b30f089952606b 1489Author: Keith Packard <keithp@keithp.com> 1490Date: Tue Aug 2 18:03:01 2005 +0000 1491 1492 Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are 1493 regenerated after 'make clean' and to make parallel builds work right. 1494 1495commit 35e0b7ef41ffe1f17ad8f21dbda10267961231ea 1496Author: Kevin E Martin <kem@kem.org> 1497Date: Fri Jul 29 21:22:35 2005 +0000 1498 1499 Various changes preparing packages for RC0: 1500 - Verify and update package version numbers as needed 1501 - Implement versioning scheme 1502 - Change bug address to point to bugzilla bug entry form 1503 - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 1504 reenable it) 1505 - Fix makedepend to use pkgconfig and pass distcheck 1506 - Update build script to build macros first 1507 - Update modular Xorg version 1508 1509commit e447fee50a8014b5281a5abfcc5e468f8cc130ca 1510Author: Daniel Stone <daniel@fooishbar.org> 1511Date: Fri Jul 22 15:08:19 2005 +0000 1512 1513 Use YACC to compile xkbparse.y. 1514 1515commit 34cd161f5947b4dc185356bc65653717f56ced00 1516Author: Adam Jackson <ajax@nwnk.net> 1517Date: Wed Jul 20 19:31:57 2005 +0000 1518 1519 Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global 1520 configure cache, you cache it, and the cached value is probably wrong. 1521 1522commit 8335e5fa471e25675c6a369ec2348883953fcdd0 1523Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1524Date: Sat Jul 16 20:56:47 2005 +0000 1525 1526 Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am 1527 1528commit d7b3354575f31caa9044b6c5f7aee4f010f6192a 1529Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1530Date: Fri Jul 15 18:02:35 2005 +0000 1531 1532 Build system for xkbcomp 1533 1534commit 59e48918e7c252926bb5e51a077bcbc8a7eec829 1535Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> 1536Date: Mon Nov 15 15:06:52 2004 +0000 1537 1538 Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added 1539 mingw (Win32) port 1540 1541commit 0336e043fab6f2a8828d90bc9eef2e23878f6dd1 1542Author: Kevin E Martin <kem@kem.org> 1543Date: Fri Sep 3 23:41:22 2004 +0000 1544 1545 Update formatted docs. 1546 1547commit 20240438ef9d3a6c66443ca9f095a2766ef6ed4e 1548Author: Egbert Eich <eich@suse.de> 1549Date: Fri Apr 23 19:54:50 2004 +0000 1550 1551 Merging XORG-CURRENT into trunk 1552 1553commit a3729a9f9fcda07b233f434266148c8751684347 1554Author: Egbert Eich <eich@suse.de> 1555Date: Sun Mar 14 08:35:25 2004 +0000 1556 1557 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 1558 1559commit 37a1152a4024fb799fe1272ce378e6c7c97ee951 1560Author: Egbert Eich <eich@suse.de> 1561Date: Wed Mar 3 12:13:08 2004 +0000 1562 1563 Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 1564 1565commit 55f40d0286d0e2e4b1602f983b749352188c3ec4 1566Author: Egbert Eich <eich@suse.de> 1567Date: Thu Feb 26 13:36:25 2004 +0000 1568 1569 readding XFree86's cvs IDs 1570 1571commit 2a95cda1d358fc309c78dc5201a1dbacaba9d0bf 1572Author: Egbert Eich <eich@suse.de> 1573Date: Thu Feb 26 09:24:08 2004 +0000 1574 1575 Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 1576 1577commit dbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2 1578Author: Egbert Eich <eich@suse.de> 1579Date: Thu Jan 29 08:09:12 2004 +0000 1580 1581 Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 1582 1583commit 8aa5bcfe58d3776746d7b0d627f2fb8744fb0817 1584Author: Kaleb Keithley <kaleb@freedesktop.org> 1585Date: Fri Dec 19 20:55:58 2003 +0000 1586 1587 XFree86 4.3.99.902 (RC 2) 1588 1589commit 37ebbbe7b11febaf548006a9b73db0eebf79881a 1590Author: Kaleb Keithley <kaleb@freedesktop.org> 1591Date: Tue Nov 25 19:29:13 2003 +0000 1592 1593 XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 1594 1595commit 287ac4c6af61d8f9f95cd3b3219c979e1329a2fe 1596Author: Kaleb Keithley <kaleb@freedesktop.org> 1597Date: Fri Nov 14 16:49:22 2003 +0000 1598 1599 XFree86 4.3.0.1 1600 1601commit 262961d88faf67f69f4630acb8234a4f2c5a6e80 1602Author: Kaleb Keithley <kaleb@freedesktop.org> 1603Date: Fri Nov 14 16:49:22 2003 +0000 1604 1605 Initial revision 1606 1607commit 2af3aabf0e7eb1514d39b29a6b58fcd0d4de41d1 1608Author: Kaleb Keithley <kaleb@freedesktop.org> 1609Date: Fri Nov 14 15:54:54 2003 +0000 1610 1611 R6.6 is the Xorg base-line 1612