From ada797ee9981b449bcb8806350b5f930b012ee44 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Thu, 10 Jun 2004 08:04:24 +0000 Subject: [PATCH] Rene Rebe: * merged r3172 and r3173 from branches/2.0-stable: * fixed e2fsprogs with dietlibc for at least sparc incl. copyright refresh on-the-fly * fixed kbd for sparc incl. copyright refresh on-the-fly git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3174 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/e2fsprogs/e2fsck_sync.patch | 17 +++--- package/base/e2fsprogs/e2fsprogs.conf | 2 +- package/base/e2fsprogs/e2fsprogs.desc | 2 +- package/base/e2fsprogs/et-dietlibc.patch | 54 ++++++++++++++++++ .../base/e2fsprogs/makefile-libe2p-fix.patch | 17 +++--- package/base/kbd/bg_keymaps.patch | 19 +++++++ package/base/kbd/devfs.patch | 17 +++--- package/base/kbd/devpts.patch | 17 +++--- package/base/kbd/kbd.conf | 2 +- package/base/kbd/kbd.desc | 2 +- package/base/kbd/kbdrate-nonx86.patch | 17 +++--- package/base/kbd/kbdrate-sparc.patch | 57 +++++++++++++++++++ 12 files changed, 169 insertions(+), 54 deletions(-) create mode 100644 package/base/e2fsprogs/et-dietlibc.patch create mode 100644 package/base/kbd/kbdrate-sparc.patch diff --git a/package/base/e2fsprogs/e2fsck_sync.patch b/package/base/e2fsprogs/e2fsck_sync.patch index e6b84b4a3..7efa6c314 100644 --- a/package/base/e2fsprogs/e2fsck_sync.patch +++ b/package/base/e2fsprogs/e2fsck_sync.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/e2fsprogs/e2fsck_sync.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/e2fsprogs/e2fsprogs.conf b/package/base/e2fsprogs/e2fsprogs.conf index 3173f999b..be348139b 100644 --- a/package/base/e2fsprogs/e2fsprogs.conf +++ b/package/base/e2fsprogs/e2fsprogs.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/e2fsprogs/e2fsprogs.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/base/e2fsprogs/e2fsprogs.desc b/package/base/e2fsprogs/e2fsprogs.desc index da64e4fe5..ff448484d 100644 --- a/package/base/e2fsprogs/e2fsprogs.desc +++ b/package/base/e2fsprogs/e2fsprogs.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/e2fsprogs/e2fsprogs.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/e2fsprogs/et-dietlibc.patch b/package/base/e2fsprogs/et-dietlibc.patch new file mode 100644 index 000000000..80afc67f3 --- /dev/null +++ b/package/base/e2fsprogs/et-dietlibc.patch @@ -0,0 +1,54 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/e2fsprogs/et-dietlibc.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +This patch "workarounds" table base computation problems using the dietlibc awk. +This modification is imperfect and dietlibc/awk should be fully reviewed, since +the error table base is different when this is used. This affects the distributions +ABI, but as dietlibc already is a HUGE ABI change, this is not issue, yet. +(However this only happens on soem platforms like SPARC, x86 and PowerPC also mis- +comput the base, but in another way ...) + + - Rene Rebe + +diff -ur e2fsprogs-1.34-orig/lib/et/et_c.awk e2fsprogs-1.34/lib/et/et_c.awk +--- e2fsprogs-1.34-orig/lib/et/et_c.awk 2003-05-06 05:07:31.000000000 +0200 ++++ e2fsprogs-1.34/lib/et/et_c.awk 2004-06-10 09:18:40.820000000 +0200 +@@ -89,7 +89,7 @@ + tab_base_high = (tab_base_high * 256) + \ + int(tab_base_low / mod_base) + tab_base_low = tab_base_low % mod_base +- if (tab_base_low < 0) { ++ if (tab_base_low <= 0) { + # Work around stupid bug in the ARM libm + tab_base_low = tab_base_low + mod_base + } +diff -ur e2fsprogs-1.34-orig/lib/et/et_h.awk e2fsprogs-1.34/lib/et/et_h.awk +--- e2fsprogs-1.34-orig/lib/et/et_h.awk 2003-05-06 05:07:31.000000000 +0200 ++++ e2fsprogs-1.34/lib/et/et_h.awk 2004-06-10 09:15:58.010000000 +0200 +@@ -89,7 +89,7 @@ + tab_base_high = (tab_base_high * 256) + \ + int(tab_base_low / mod_base) + tab_base_low = tab_base_low % mod_base +- if (tab_base_low < 0) { ++ if (tab_base_low <= 0) { + # Work around stupid bug in the ARM libm + tab_base_low = tab_base_low + mod_base + } + diff --git a/package/base/e2fsprogs/makefile-libe2p-fix.patch b/package/base/e2fsprogs/makefile-libe2p-fix.patch index 3d44965cd..6eb44cf67 100644 --- a/package/base/e2fsprogs/makefile-libe2p-fix.patch +++ b/package/base/e2fsprogs/makefile-libe2p-fix.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/e2fsprogs/makefile-libe2p-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/kbd/bg_keymaps.patch b/package/base/kbd/bg_keymaps.patch index d88db8ad9..c4857fb2a 100644 --- a/package/base/kbd/bg_keymaps.patch +++ b/package/base/kbd/bg_keymaps.patch @@ -1,3 +1,22 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/kbd/bg_keymaps.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + --- ./data/keymaps/i386/qwerty/bg_bds-cp1251.map.orig 2002-10-14 02:39:32.000000000 +0300 +++ ./data/keymaps/i386/qwerty/bg_bds-cp1251.map 2004-01-13 14:05:59.000000000 +0200 @@ -1,12 +1,12 @@ diff --git a/package/base/kbd/devfs.patch b/package/base/kbd/devfs.patch index e488ac745..88d30f7ef 100644 --- a/package/base/kbd/devfs.patch +++ b/package/base/kbd/devfs.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/kbd/devfs.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/kbd/devpts.patch b/package/base/kbd/devpts.patch index f50ecf7fd..4e573b4f9 100644 --- a/package/base/kbd/devpts.patch +++ b/package/base/kbd/devpts.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/kbd/devpts.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/kbd/kbd.conf b/package/base/kbd/kbd.conf index 54cde7406..9839db930 100644 --- a/package/base/kbd/kbd.conf +++ b/package/base/kbd/kbd.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/kbd/kbd.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/base/kbd/kbd.desc b/package/base/kbd/kbd.desc index c008fcc40..c03c85a71 100644 --- a/package/base/kbd/kbd.desc +++ b/package/base/kbd/kbd.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/kbd/kbd.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/kbd/kbdrate-nonx86.patch b/package/base/kbd/kbdrate-nonx86.patch index 12454ecc6..bf20e403b 100644 --- a/package/base/kbd/kbdrate-nonx86.patch +++ b/package/base/kbd/kbdrate-nonx86.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/kbd/kbdrate-nonx86.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END --- diff --git a/package/base/kbd/kbdrate-sparc.patch b/package/base/kbd/kbdrate-sparc.patch new file mode 100644 index 000000000..06dbb6f38 --- /dev/null +++ b/package/base/kbd/kbdrate-sparc.patch @@ -0,0 +1,57 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/kbd/kbdrate-sparc.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +The field is named differently on SPARC (?) ... + + - Rene Rebe + +--- kbd-1.12/src/kbdrate.c 2004-06-10 08:24:48.450000000 +0200 ++++ kbd-1.12-fixed/src/kbdrate.c 2004-06-10 08:21:57.000000000 +0200 +@@ -164,10 +164,19 @@ + exit( 1 ); + } + ++#ifdef __sparc__ ++ kbdrate_s.rate = (int) (rate + 0.5); /* round up */ ++#else + kbdrate_s.period = (int) (rate + 0.5); /* round up */ ++#endif + kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ ++#ifdef __sparc__ ++ if (kbdrate_s.rate > 50) ++ kbdrate_s.rate = 50; ++#else + if (kbdrate_s.period > 50) + kbdrate_s.period = 50; ++#endif + + if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { + perror( "ioctl(KIOCSRATE)" ); +@@ -177,7 +186,11 @@ + + if (!silent) + printf( "Typematic Rate set to %d cps (delay = %d ms)\n", ++#ifdef __sparc__ ++ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ ); ++#else + kbdrate_s.period, kbdrate_s.delay * 1000 / HZ ); ++#endif + + return 1; + #else /* no KIOCSRATE */