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

@@ -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 ---
 

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

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

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 <rene@rocklinux.org>
+
+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
+ 	}
+ 

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 ---
 

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 @@

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 ---
 

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 ---
 

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

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

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 ---
 

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 <rene@rocklinux.org>
+
+--- 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 */