Slackware 13.1slackware-13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!

7 files changed, 77 insertions, 182 deletions

diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild
index 7ac0b142..ddcd9670 100755
--- a/source/a/kbd/kbd.SlackBuild
+++ b/source/a/kbd/kbd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=kbd
-VERSION=1.15
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+VERSION=1.15.2
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:--j4}
 
@@ -40,7 +49,7 @@ cd $TMP
 
 # Extract source:
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2
+tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2 || exit 1
 cd $PKGNAM-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -59,12 +68,10 @@ find . -perm 555 -exec chmod 755 {} \;
 
 # Apply patches:
 # These are taken from Fedora's SRPM:
-zcat $CWD/sources/kbd-1.15-po.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/sources/kbd-1.15.2-po.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/sources/kbd-1.15-keycodes-man.patch | patch -p1 --verbose || exit 1
-zcat $CWD/sources/kbd-1.15-sparc.patch | patch -p1 --verbose || exit 1
 zcat $CWD/sources/kbd-1.15-unicode_start.patch | patch -p1 --verbose || exit 1
 zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch | patch -p1 --verbose || exit 1
-zcat $CWD/sources/kbd-1.15-quiet_doc.patch | patch -p1 --verbose || exit 1
 
 # This is from Fedora's spec file:
 # 7-bit maps are obsolete; so are non-euro maps
@@ -122,10 +129,18 @@ install -vpm755 $CWD/setconsolefont $PKG/usr/bin/
 # Copy docs:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  ChangeLog COPYING README doc/* \
+  COPYING* README* doc/* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 rm -f $PKG/usr/doc/$PKGNAM-$VERSION/kbd.FAQ.sgml
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Additional keymaps:
 # This is the keymap for Speakup (http://linux-speakup.org) users:
 cat $CWD/sources/speakupmap.map.gz > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakupmap.map.gz
@@ -136,7 +151,9 @@ tar xvf $CWD/sources/speakup-jfw.tar.gz
   cat readme > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakup-jfw.readme )
 
 # Create the default run control script which will set the
-# console font to the default:
+# console font to the "default"...  though this might not be
+# the same state as if setfont were not used at all.
+# For that reason, default the script to non-executable.
 mkdir -pm755 $PKG/etc/rc.d
 cat << EOF > $PKG/etc/rc.d/rc.font.new
 #!/bin/sh
@@ -146,16 +163,38 @@ cat << EOF > $PKG/etc/rc.d/rc.font.new
 #
 setfont -v
 EOF
-chmod 755 $PKG/etc/rc.d/rc.font.new
+chmod 644 $PKG/etc/rc.d/rc.font.new
 
 # Create package post-install script:
 mkdir -p $PKG/install
 cat << EOF > $PKG/install/doinst.sh
-#if [ -r etc/rc.d/rc.font ]; then
-#  rm -f etc/rc.d/rc.font.new
-#else
-#  mv etc/rc.d/rc.font.new etc/rc.d/rc.font
-#fi
+
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# Leave any new rc.font with the same permissions as the old one:
+# This is a kludge, but it's because there's no --reference option
+# on busybox's 'chmod':
+if [ -e etc/rc.d/rc.font ]; then
+  if [ -x etc/rc.d/rc.font ]; then
+    chmod 755 etc/rc.d/rc.font.new
+  else
+    chmod 644 etc/rc.d/rc.font.new
+  fi
+fi
+# Then config() it:
+config etc/rc.d/rc.font.new
+
 EOF
 
 # Compress man pages:
diff --git a/source/a/kbd/setconsolefont b/source/a/kbd/setconsolefont
index d4cfb875..fe56a34f 100644
--- a/source/a/kbd/setconsolefont
+++ b/source/a/kbd/setconsolefont
@@ -5,6 +5,8 @@
 # Run 'setfont' in a chroot.  This makes setfont work
 # correctly in the installer.
 
+# 2010-04-28, add LatKaCyrHeb-14.psfu.gz <volkerdi>
+
 if [ "$TMP" = "" ]; then
   TMP=/var/log/setup/tmp
 fi
@@ -78,6 +80,7 @@ screen font. You'll be able to try as many of these as you like." 21 65 12 \
 "LatArCyrHeb-16+.psfu.gz" "" \
 "LatArCyrHeb-16.psfu.gz" "" \
 "LatArCyrHeb-19.psfu.gz" "" \
+"LatKaCyrHeb-14.psfu.gz" "" \
 "Mik_8x16.gz" "" \
 "UniCyrExt_8x16.psf.gz" "" \
 "UniCyr_8x14.psf.gz" "" \
@@ -296,7 +299,8 @@ Cyr_a8x14.psfu.gz Cyr_a8x16.psfu.gz Cyr_a8x8.psfu.gz Goha-12.psfu.gz
 Goha-14.psfu.gz Goha-16.psfu.gz GohaClassic-12.psfu.gz GohaClassic-14.psfu.gz
 GohaClassic-16.psfu.gz Lat2-Terminus16.psfu.gz LatArCyrHeb-08.psfu.gz
 LatArCyrHeb-14.psfu.gz LatArCyrHeb-16+.psfu.gz LatArCyrHeb-16.psfu.gz
-LatArCyrHeb-19.psfu.gz Mik_8x16.gz UniCyrExt_8x16.psf.gz UniCyr_8x14.psf.gz
+LatArCyrHeb-19.psfu.gz LatKaCyrHeb-14.psfu.gz
+Mik_8x16.gz UniCyrExt_8x16.psf.gz UniCyr_8x14.psf.gz
 UniCyr_8x16.psf.gz UniCyr_8x8.psf.gz alt-8x14.gz alt-8x16.gz alt-8x8.gz
 altc-8x16.gz aply16.psf.gz arm8.fnt.gz b.fnt.gz c.fnt.gz cp1250.psfu.gz
 cp850-8x14.psfu.gz cp850-8x16.psfu.gz cp850-8x8.psfu.gz cp857.08.gz cp857.14.gz
diff --git a/source/a/kbd/sources/kbd-1.15-po.patch b/source/a/kbd/sources/kbd-1.15-po.patch
deleted file mode 100644
index 0221f60c..00000000
--- a/source/a/kbd/sources/kbd-1.15-po.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
---- kbd-1.15/po/Makefile.in_old	2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/po/Makefile.in	2008-12-09 15:35:58.000000000 +0100
-@@ -4,10 +4,10 @@ srcdir = @srcdir@
- 
- prefix        = @prefix@
- datarootdir   = @datarootdir@
--datadir       = @datadir@
--localedir     = $(DESTDIR)$(datadir)/locale
--gnulocaledir  = $(DESTDIR)$(datadir)/locale
--gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
-+datadir       = $(DESTDIR)@datadir@
-+localedir     = $(DESTDIR)@localedir@
-+gnulocaledir  = $(DESTDIR)@localedir@
-+gettextsrcdir = $(datadir)/gettext/po
- 
- FOREIGN       = @FOREIGN@
- HAVE_XGETTEXT = @HAVE_XGETTEXT@
-@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
- 
- # Enter here all .po files
--POFILES =  cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
-+POFILES =  cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
-  ro.po ru.po sv.po tr.po
- # the same but with .gmo
--GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
-+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
-  pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
- 
- CATALOGS = $(GMOFILES)
diff --git a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch b/source/a/kbd/sources/kbd-1.15-quiet_doc.patch
deleted file mode 100644
index eca867b8..00000000
--- a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in
---- kbd-1.15/man/man1/loadkeys.1.in_old	2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/man/man1/loadkeys.1.in	2009-03-05 13:11:08.000000000 +0100
-@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta
- ] [
- .I -m --mktable
- ] [
-+.I -q --quiet
-+] [
- .I -s --clearstrings
- ] [
- .I -v --verbose
-@@ -148,6 +150,10 @@ command (and does not modify the current
- .B loadkeys
- prints its version number and a short usage message to the programs
- standard error output and exits.
-+.TP
-+.B \-q \-\-quiet
-+.B loadkeys
-+suppresses all normal output.
- .SH WARNING
- Note that anyone having read access to
- .B /dev/console
-diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c
---- kbd-1.15/src/loadkeys.c_old	2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/src/loadkeys.c	2009-03-05 13:09:00.000000000 +0100
-@@ -1966,6 +1966,7 @@ usage(void) {
- "  -d --default       load \"%s\"\n"
- "  -h --help          display this help text\n"
- "  -m --mktable       output a \"defkeymap.c\" to stdout\n"
-+"  -q --quiet         suppress all normal output\n"
- "  -s --clearstrings  clear kernel string table\n"
- "  -u --unicode       implicit conversion to Unicode\n"
- "  -v --verbose       report the changes\n"), PACKAGE_VERSION, DEFMAP);
diff --git a/source/a/kbd/sources/kbd-1.15-sparc.patch b/source/a/kbd/sources/kbd-1.15-sparc.patch
deleted file mode 100644
index a858a253..00000000
--- a/source/a/kbd/sources/kbd-1.15-sparc.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
---- kbd-1.15/man/man8/kbdrate.8_old	2008-12-10 14:20:33.000000000 +0100
-+++ kbd-1.15/man/man8/kbdrate.8	2008-12-10 14:41:10.000000000 +0100
-@@ -22,7 +22,7 @@ Using
- without any options will reset the repeat rate to 10.9 characters per second (cps)
- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
--to 5 cps and the delay to 200 ms.
-+to 20 cps and the delay to 200 ms.
- 
- .SH OPTIONS
- .TP
-@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
- .I /etc/rc.local
- .br
- .I /dev/port
-+.br
-+.I /dev/kbd
-diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
---- kbd-1.15/src/kbdrate.c_old	2008-12-10 14:00:25.000000000 +0100
-+++ kbd-1.15/src/kbdrate.c	2008-12-10 14:20:11.000000000 +0100
-@@ -77,7 +77,6 @@ beats rebuilding the kernel!
- 
- #ifdef __sparc__
- #include <asm/param.h>
--#include <asm/kbio.h>
- #endif
- 
- #ifndef KDKBDREP
-@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, 
- 
- static int
- KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
-+#if defined(KDKBDREP) && !defined(__sparc__)
- 	/*
- 	 * This ioctl is defined in <linux/kd.h> but is not
- 	 * implemented anywhere - must be in some m68k patches.
-+         * We cannot blindly try unimplemented ioctls on sparc64 -
-+         * the 32<->64bit transition layer does not like it.
- 	 * Since 2.4.9 also on i386.
--	 */
-+         */
-+
- 	struct my_kbd_repeat kbdrep_s;
- 
- 	/* don't change, just test */
-@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
- 			rate, kbdrep_s.delay );
- 
- 	return 1;			/* success! */
-+#else /* no KDKBDREP or __sparc__ */
-+        return 0;
-+#endif /* KDKBDREP */
- }
- 
- static int
-@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
- int
- main( int argc, char **argv ) {
- #ifdef __sparc__
--	double      rate = 5.0;      /* Default rate */
-+        double      rate = 20.0;      /* Default rate */
- 	int         delay = 200;     /* Default delay */
- #else
- 	double      rate = 10.9;     /* Default rate */
-@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
- 
- 
- 	/* The ioport way */
-+        /* The ioport way - will crash on sparc */
- 
-+#ifndef __sparc__
- 	for (i = 0; i < RATE_COUNT; i++)
- 		if (rate * 10 >= valid_rates[i]) {
- 			value &= 0x60;
-@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
- 			valid_rates[value & 0x1f] / 10.0,
- 			valid_delays[ (value & 0x60) >> 5 ] );
- 
-+#endif
-+
- 	return 0;
- }
-diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
---- kbd-1.15/src/setleds.c_old	2008-12-10 14:00:02.000000000 +0100
-+++ kbd-1.15/src/setleds.c	2008-12-10 14:00:16.000000000 +0100
-@@ -14,10 +14,6 @@
- #include "nls.h"
- #include "version.h"
- 
--#ifdef __sparc__
--#include <asm/kbio.h>
--#endif
--
- static void
- usage(void)
- {
diff --git a/source/a/kbd/sources/kbd-1.15.2-po.patch b/source/a/kbd/sources/kbd-1.15.2-po.patch
new file mode 100644
index 00000000..a32a793f
--- /dev/null
+++ b/source/a/kbd/sources/kbd-1.15.2-po.patch
@@ -0,0 +1,14 @@
+--- ./po/Makefile.in.in.orig	2010-04-10 16:34:12.000000000 -0500
++++ ./po/Makefile.in.in	2010-04-29 00:19:10.000000000 -0500
+@@ -22,8 +22,9 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = @datadir@
+-localedir = $(datadir)/locale
++datadir       = @datadir@
++localedir     = @localedir@
++gnulocaledir  = @localedir@
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
diff --git a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign
index 39388b38..39f3c022 100644
--- a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign
+++ b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign
@@ -2,7 +2,7 @@
 Version: GnuPG v1.4.9 (GNU/Linux)
 Comment: See http://www.kernel.org/signature.html for info
 
-iD8DBQBJj684yGugalF9Dw4RAqQuAJ9fBsk3RWp6BT4UWHjceFn5YuEBygCff3dW
-qo/ACrIhyBx/eiZEpao8N4o=
-=0zxS
+iD8DBQBLwPHZyGugalF9Dw4RAhiyAJ9DdLbizzsoJi87OjQ8VzyNsRnr2QCeJ9zg
+MOKY0UbkCZyUALLyzxF2bKE=
+=Ou46
 -----END PGP SIGNATURE-----