Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun!
2024-12-26 09:58:59 +01:00 · 2011-04-25 13:37:00 +00:00 · 2011-04-25 13:37:00 +00:00 · 75a4a592e5
commit 75a4a592e5
parent b76270bf9e
2002 changed files with 167820 additions and 195661 deletions
--- a/ANNOUNCE.13_37
+++ b/ANNOUNCE.13_37
@ -1,7 +1,7 @@
    Yes, it's that time again!  After many months of development and 
 careful testing, we are proud to announce the release of Slackware 
-version 13.1!
+version 13.37!
    We are sure you'll enjoy the many improvements.  We've done our best 
 to bring the latest technology to Slackware while still maintaining the 
@ -9,11 +9,11 @@ stability and security that you have come to expect.  Slackware is well
 known for its simplicity and the fact that we try to bring software to 
 you in the condition that the authors intended.
-    Slackware 13.1 brings many updates and enhancements, among which 
+    Slackware 13.37 brings many updates and enhancements, among which 
 you'll find two of the most advanced desktop environments available 
-today: Xfce 4.6.1, a fast and lightweight but visually appealing and 
+today: Xfce 4.6.2, a fast and lightweight but visually appealing and 
-easy to use desktop environment, and KDE 4.4.3, a recent stable release 
+easy to use desktop environment, and KDE 4.5.5, a recent stable release 
-of the new 4.4.x series of the award-winning KDE desktop environment.  
+of the 4.5.x series of the award-winning KDE desktop environment.  
 We continue to make use of HAL (Hardware Abstraction Layer) and udev, 
 which allow the system administrator to grant use of various hardware 
 devices according to users' group membership so that they will be able 
@ -28,7 +28,7 @@ for fine-grained access control, allowing a non-root user to run certain
 tasks with elevated privilege, but more securely than if the entire task 
 were simply run as root.
-    Slackware uses the 2.6.33.4 kernel bringing you advanced performance 
+    Slackware uses the 2.6.37.6 kernel bringing you advanced performance 
 features such as journaling filesystems, SCSI and ATA RAID volume 
 support, SATA support, Software RAID, LVM (the Logical Volume Manager), 
 and encrypted filesystems.  Kernel support for X DRI (the Direct 
@ -49,19 +49,22 @@ kernels come in both SMP and non-SMP types now.  The SMP kernel supports
 multiple processors, multi-core CPUs, HyperThreading, and about every 
 other optimization available.  In our own testing this kernel has proven 
 to be fast, stable, and reliable.  We recommend using the SMP kernel 
-even on single processor machines if it will run on them.
+even on single processor machines if it will run on them.  Note that on
 x86_64 (64-bit), all the kernels are SMP capable.
-Here are some of the advanced features of Slackware 13.1:
+Here are some of the advanced features of Slackware 13.37:
- Runs the 2.6.33.4 version of the Linux kernel from ftp.kernel.org.
+- Runs the 2.6.37.6 version of the Linux kernel from ftp.kernel.org.
-  Also included is a kernel patched with Speakup to support speech
+  Alternate 2.6.38.4 Linux kernels are also provided, as well as
-  synthesizers providing access to Linux for the visually impaired
+  suggested configurations for using a 2.6.39-rc4 kernel, or the
-  community.  The 2.6.x kernel series has matured into a stable
+  2.6.35.12 kernel which is supposed to be longterm supported.  These
-  kernel, and provides reliable performance for your desktop or
+  kernels will provide reliable performance for your desktop or your
-  your production server.
+  production server.  By the way, the Speakup driver, used to support
  speech synthesizers providing access to Linux for the visually impaired
  community, has now been merged into all of the provided kernels.
- System binaries are linked with the GNU C Library, version 2.11.1.
+- System binaries are linked with the GNU C Library, version 2.13.
  This version of glibc also has excellent compatibility with
  existing binaries.
@ -70,16 +73,16 @@ Here are some of the advanced features of Slackware 13.1:
  improvements in terms of performance and hardware support are
  too numerous to mention them all here.
- Installs gcc-4.4.4 as the default C, C++, Objective-C, 
+- Installs gcc-4.5.2 as the default C, C++, Objective-C, 
  Fortran-77/95, and Ada 95 compiler.
 - Support for fully encrypted network connections with OpenSSL,
  OpenSSH, OpenVPN, and GnuPG.
- Apache (httpd) 2.2.15 web server with Dynamic Shared Object 
+- Apache (httpd) 2.2.17 web server with Dynamic Shared Object 
-  support, SSL, and PHP 5.2.13.
+  support, SSL, and PHP 5.3.6.
- PCMCIA, CardBus, USB, IEE1394 (FireWire) and ACPI support.  This
+- PCMCIA, CardBus, USB, FireWire and ACPI support.  This
  makes Slackware a great operating system for your laptop.
 - The udev dynamic device management system for Linux 2.6.x.
@ -88,55 +91,54 @@ Here are some of the advanced features of Slackware 13.1:
  nodes in /dev.  It also loads the kernel modules required by
  sound cards and other hardware at boot time.
- New development tools, including Perl 5.10.1, Python 2.6.4,
+- New development tools, including Perl 5.12.3, Python 2.6.6,
-  Ruby 1.9.1-p378, Subversion 1.6.11, git-1.7.1, mercurial-1.5.2,
+  Ruby 1.9.1-p431, Subversion 1.6.16, git-1.7.4.4, mercurial-1.8.2,
  graphical tools like Qt designer and KDevelop, and much more.
 - Updated versions of the Slackware package management tools make it
  easy to add, remove, upgrade, and make your own Slackware packages.
-  Package tracking makes it easy to upgrade from Slackware 13.0 to 
+  Package tracking makes it easy to upgrade from Slackware 13.1 to 
-  Slackware 13.1 (see CHANGES_AND_HINTS.TXT).  The slackpkg tool can
+  Slackware 13.37 (see UPGRADE.TXT and CHANGES_AND_HINTS.TXT).
-  also help update from an older version of Slackware to a newer one,
+  The slackpkg tool can also help update from an older version of
-  and keep your Slackware system up to date.  In addition, the
+  Slackware to a newer one, and keep your Slackware system up to date.
-  slacktrack utility (in extra/) will help you build and maintain
+  In addition, the slacktrack utility will help you build and maintain
  your own packages.
- Web browsers galore!  Includes KDE's Konqueror 4.4.3, 
+- Web browsers galore!  Includes KDE's Konqueror 4.5.5, SeaMonkey 2.1b3
-  SeaMonkey 2.0.4 (this is the replacement for the Mozilla
+  (this is the replacement for the Mozilla Suite), and the eagerly
-  Suite), and the immensely popular Firefox 3.6.3, as well as
+  anticipated update to Mozilla's immensely popular Firefox browser,
-  the Thunderbird 3.0.4 email and news client with advanced
+  Firefox 4.0, as well as the Thunderbird 3.1.9 email and news client
-  junk mail filtering.
+  with advanced junk mail filtering.
- The KDE Software Compilation 4.4.3, a complete desktop environment.
+- The KDE Software Compilation 4.5.5, a complete desktop environment.
  This includes the KOffice productivity suite, networking tools, GUI
  development with KDevelop, multimedia tools (including the amazing
  Amarok music player and K3B disc burning software), the Konqueror web
  browser and file manager, dozens of games and utilities,
  international language support, and more.
- A collection of GTK+ based applications including pidgin-2.7.0,
+- A collection of GTK+ based applications including pidgin-2.7.11,
-   gimp-2.6.8, gkrellm-2.3.4, gxine-0.5.903, xchat-2.8.6, xsane-0.996,
+   gimp-2.6.11, gkrellm-2.3.5, xchat-2.8.8, xsane-0.998, and pan-0.134.
   and pan-0.133.
 - A repository of extra software packages compiled and ready to run.
  This includes the Java(TM) 2 Software Development Kit Standard
  Edition, an MPlayer browser plugin, and more (see the /extra directory).
 - Many more improved and upgraded packages than we can list here.  For
-  a complete list of core packages in Slackware 13.1, see this file:
+  a complete list of core packages in Slackware 13.37, see this file:
-    ftp://ftp.slackware.com/pub/slackware/slackware-13.1/PACKAGES.TXT
+    ftp://ftp.slackware.com/pub/slackware/slackware-13.37/PACKAGES.TXT
-Downloading Slackware 13.1:
+Downloading Slackware 13.37:
 ---------------------------
-    The full version of Slackware Linux 13.1 is available for download 
+    The full version of Slackware Linux 13.37 is available for download 
 from the central Slackware FTP sites hosted by our friends at 
 www.cwo.com and osuosl.org:
-   ftp://slackware.osuosl.org/pub/slackware/slackware-13.1/
+   ftp://slackware.osuosl.org/pub/slackware/slackware-13.37/
-   ftp://ftp.slackware.com/pub/slackware/slackware-13.1/
+   ftp://ftp.slackware.com/pub/slackware/slackware-13.37/
 If the sites are busy, see the list of official mirror sites here:
@ -152,27 +154,25 @@ be found in the isolinux directory.
 Purchasing Slackware on CD-ROM or DVD:
 --------------------------------------
-    Or, please consider purchasing the Slackware Linux 13.1 six CD-ROM 
+    Or, please consider purchasing the Slackware Linux 13.37 six CD-ROM 
 set or deluxe dual-sided DVD release directly from Slackware Linux, and 
 you'll be helping to support the continued development of Slackware 
 Linux!
-    The DVD release has the 32-bit x86 Slackware 13.1 release on one 
+    The DVD release has the 32-bit x86 Slackware 13.37 release on one 
-side, and the 64-bit x86_64 Slackware 13.1 release on the other.  Both 
+side, and the 64-bit x86_64 Slackware 13.37 release on the other.  Both 
 sides are bootable for easy installation, and includes everything from 
-both releases of Slackware 13.1, including the complete source code 
+both releases of Slackware 13.37, including the complete source code 
 trees.
-    The 6 CD-ROM release of Slackware 13.1 is the 32-bit x86 edition.  
+    The 6 CD-ROM release of Slackware 13.37 is the 32-bit x86 edition.  
 It includes a bootable first CD-ROM for easy installation.  The 6 
 CD-ROMs are labeled for easy reference.
-
+    The Slackware 13.37 x86 6 CD-ROM set is $49.95 plus shipping, or 
-    The Slackware 13.1 x86 6 CD-ROM set is $49.95 plus shipping, or 
+choose the Slackware 13.37 x86/x86_64 dual-sided DVD (also $49.95 plus 
 choose the Slackware 13.1 x86/x86_64 dual-sided DVD (also $49.95 plus 
 shipping).
    Slackware Linux is also available by subscription.  When we release 
 a new version of Slackware (which is normally once or twice a year) we 
 ship it to you and bill your credit card for a reduced subscription 
@ -196,7 +196,10 @@ Ordering Information:
    Other Slackware items like t-shirts, caps, pins, and stickers can 
 also be found here.  These will help you find and identify yourself to 
-your fellow Slackware users.  :-)
+your fellow Slackware users.  Check out the new limited edition 1337
 black Slackware T-shirt with the classic logo on the front and a custom
 LILO boot screen on the back (with references to a few famous fictional
 computers!  :-)
    Order inquiries (including questions about becoming a Slackware 
 reseller) may be directed to this address:  info@slackware.com
--- a/CHANGES_AND_HINTS.TXT
+++ b/CHANGES_AND_HINTS.TXT
@ -1,153 +1,88 @@
-This file documents the instructions for upgrading to Slackware 13.1, the 
+This file documents the instructions for upgrading to Slackware 13.37, the 
-packages added, removed, renamed, and/or split  during the development cycle 
+packages added, removed, renamed, and/or split during the development cycle 
-from Slackware 13.0 through 13.1, and some potential "gotchas" that users 
+from Slackware 13.1 through 13.37, and some potential "gotchas" that users 
 can avoid by arming themselves with a little knowledge.
-*** INSTRUCTIONS FOR UPGRADING FROM 13.0 ***
+*** INSTRUCTIONS FOR UPGRADING FROM 13.1 ***
 Follow the instructions detailed in the UPGRADE.TXT located in this
-  directory.  You will also need to read the "LIBATA SWITCHOVER" section
+  directory.  
  later in this document.
-Note that upgrading from a Slackware version earlier than 13.0 is NOT 
+Note that upgrading from a Slackware version earlier than 13.1 is NOT 
  supported at all and will most likely not work.
-*** PACKAGE ADDITIONS SINCE 13.0 ***
+*** PACKAGE ADDITIONS SINCE 13.1 ***
-a/cpufrequtils
+a/btrfs-progs
-a/usb_modeswitch
+a/gdisk
-ap/mpg123 (moved from /extra)
+a/libcgroup
-ap/powertop
+a/lrzip
-kde/kdepim-runtime
+a/mcelog
-kde/kopete-cryptography
+a/util-linux (renamed from util-linux-ng)
-kde/oxygen-icons
+ap/ddrescue
-kde/polkit-kde-1
+ap/lxc
-kde/polkit-qt-1
+ap/moc
-l/ConsoleKit
+d/slacktrack (moved from /extra)
-l/QScintilla
+d/yasm (moved from /extra)
-l/attica
+kde/libktorrent
-l/ebook-tools
+l/gdk-pixbuf2
 l/libdbusmenu-qt
 l/libelf
 l/libmpc
 l/liboggz
 l/libpcap (split from tcpdump package)
 l/libplist
 l/libsndfile
 l/phonon-mplayer
 n/ca-certificates
 n/idnkit
 n/iptraf-ng (replaced iptraf)
 n/iwlwifi-100-ucode
 n/iwlwifi-6xxx-ucode
 n/rfkill
 x/radeon_ucode
 x/xdg-user-dirs
 x/xf86-video-nouveau
 xap/xaos
 extra/google-chrome/*
 /testing/ includes the following:
  2.6.38.4 kernel
  mesa-7.10.2
  libdrm-2.4.25
  xf86-video-nouveau-git_20110417_8378443
 *** PACKAGE REMOVALS SINCE 13.1 ***
 a/util-linux-ng (renamed to util-linux)
 kde/guidance-power-manager
 l/eggdbus
-l/fftw
+n/iptraf (replaced by iptraf-ng)
-l/giflib
+x/libXTrap
-l/gst-plugins-good
+x/libXprintAppUtil
-l/hunspell
+x/libXprintUtil
-l/libdiscid
+x/libxkbui
-l/libiodbc
+x/rstart
-l/liblastfm
+x/trapproto
-l/libnotify
+x/xf86rushproto
-l/libsamplerate
+x/xfindproxy
-l/v4l-utils
+x/xfwp
-l/loudmouth
+x/xplsprinters
-l/notify-python
+x/xprehashprinterlist
-l/polkit
+x/xproxymanagementprotocol
-l/polkit-gnome
+x/xsetmode
-l/shared-desktop-ontologies
+x/xsetpointer
-l/system-config-printer
+x/xtrap
-l/virtuoso-ose
+extra/kde3-compat/
 n/epic5 (replaces epic4)
 n/iwlwifi-1000-ucode
 n/iwlwifi-6000-ucode
 n/bluez
 n/obex-data-server
 n/obexfs
 n/rt2860-firmware
 n/rt2870-firmware
 x/xf86-input-wacom
 x/xf86-video-nouveau-blacklist
 xap/blueman
 xap/geeqie
 xap/xfce4-notifyd
 /testing/btrfs-progs
 *** PACKAGE REMOVALS SINCE 13.0 ***
 a/device-mapper (part of lvm2 now)
 a/loadlin (mostly unneeded now)
 ap/cupsddk (part of cups now)
 ap/mpg321 (replaced by mpg123)
 l/libgtkhtml (obsolete)
 l/libungif (replaced by giflib)
 n/bluez-libs (part of bluez now)
 n/bluez-utils (part of bluez now)
 n/epic4 (replaced by epic5)
 x/lbxproxy (obsolete)
 x/liblbxutil (obsolete)
 x/proxymngr (obsolete)
 x/xf86-input-citron (does not compile)
 x/xf86-input-elographics (does not compile)
 x/xf86-input-fpit (does not compile)
 x/xf86-input-hyperpen (does not compile)
 x/xf86-input-mutouch (does not compile)
 x/xf86-video-newport (unneeded)
 x/xf86-video-xgixp (at least partially breaks X)
 xap/gqview (replaced with geeqie)
 kde/mplayerthumbs (part of kdemultimedia now)
 extra/mpg123 (moved to AP series)
 *** LIBATA SWITCHOVER ***
 The "old" ide subsystem in the the linux kernel is now deprecated in favor
  of the newer libata subsystem, and this affects the naming of device nodes
  for almost all types of disk drives -- hard drives in particular will now
  have an "sd" named node.  The following information should allow you to
  handle that changeover gracefully.
  1. Upgrade the kernel and kernel-modules packages normally.
  2. Edit /etc/fstab to reflect the change from hd* to sd*.
     If you have multiple SATA devices, and especially if you have some of
     both hd* and sd* devices present already, then you're basically going
     to be playing a guessing game right now, and you probably want to
     consider using some of the persistent symlinks in the /dev/disk/by-*/
     directories instead of raw device nodes -- for example, the links in
     /dev/disk/by-id/ should always point to the same device, even if its
     raw device node changes from e.g. sda1 to sdc1 or some such across
     reboots.
     * If you are using one of the generic kernels (requiring an initrd),
       then use the sd* name for the root device when creating the image.
     * You will almost surely want to remove the udev rules file for cdrom
       devices (it will be regenerated on the next boot with correct
       information reflecting the new libata stuff):  
         # rm -f /etc/udev/rules.d/70-persistent-cd.rules 
     * Speaking of optical devices, if you have multiple disk drives and an
       optical drive using the old ide subsystem, then be aware that the
       optical drive will get a /dev/sr* name instead of /dev/sd* -- this is
       relevant because you might see something like this (if your optical
       drive is currently /dev/hdb):
         Old Name --> New Name 
         /dev/hda     /dev/sda
         /dev/hdb     /dev/sr0
         /dev/hdc     /dev/sdb
  3. Run lilo.  Note that you have made no edits at all to it yet, unless
     you needed to edit it for the new kernel.  Specifically, do not make
     any changes with respect to hd* --> sd*.
  4. Reboot.  At the lilo prompt, press <TAB> and add an append for the
     real root device (which will no longer be /dev/hd*).  For example, if
     the old root device was /dev/hda1, and it will now be /dev/sda1, and
     the name of your kernel image is "Linux" then you would do this:
       Linux root=/dev/sda1
  5. Once the system comes back up, then fix /etc/lilo.conf, run lilo, and 
     reboot again to be sure everything is correct.
 *** OTHER NOTABLE CHANGES AND HINTS ***
-The Slackware installer now uses udev to initialize your hardware, including 
+The Slackware installer uses udev to initialize your hardware, including the
-  the network interface card(s).  This has positive consequences for network 
+  network interface card(s).  This has positive consequences for network 
  installations (using NFS, FTP, HTTP or SMB).  You no longer have to run the 
  'pcmcia' and 'network' scripts prior to running 'setup' - the network 
  interface will be created and intialized by udev.  If a DHCP server is 
@ -182,22 +117,21 @@ Use one of the provided generic kernels for daily use.  Do not report
  ATI proprietary drivers) if you use the SMP kernel.
  If you decide to use one of the non-SMP kernels, you will need to follow the
-  instructions in /extra/linux-2.6.33.4-nosmp-sdk/README.TXT to modify your
+  instructions in /extra/linux-2.6.37.6-nosmp-sdk/README.TXT to modify your
  kernel sources for non-SMP usage.  Note that this only applies if you are
  using the Slackware-provided non-SMP kernel - if you build a custom kernel,
  the symlinks at /lib/modules/$(uname -r)/{build,source} will point to the
  correct kernel source so long as you don't (re)move it.
-As usual, there are changes in udev packaging that need mentioning...
+As with 13.1, the system udev rules now reside in /lib/udev/rules.d/ instead
-  As with 13.0, the system udev rules now reside in /lib/udev/rules.d/ 
+  of /etc/udev/rules.d/ in older versions.  There should never be a reason 
-  instead of /etc/udev/rules.d/ in older versions.  There should never be 
+  to edit anything in /lib/udev/rules.d/, so if you think you have a case 
-  a reason to edit anything in /lib/udev/rules.d/, so if you think you have 
+  where this is required, either you're wrong or it needs to be addressed in 
-  a case where this is required, either you're wrong or it needs to be 
+  the upstream source.  However, you can override default rules by placing 
-  addressed in the upstream source.  However, you can override default rules 
+  one with an identical name inside /etc/udev/rules.d/  The rules files in 
-  by placing one with an identical name inside /etc/udev/rules.d/  The rules 
+  /etc/udev/rules.d/ are still intended to (maybe) be edited as needed by 
-  files in /etc/udev/rules.d/ are still intended to (maybe) be edited as 
+  local system administrators, and as such, the rules for optical and network 
-  needed by local system administrators, and as such, the rules for optical 
+  devices will still be placed there.
  and network devices will still be placed there.
 Speaking of udev, pay particular attention to 70-persistent-net.rules and
  70-persistent-cd.rules in /etc/udev/rules.d/ -- these two are automatically
@ -216,70 +150,77 @@ HAL is not new anymore, but here are a few notes related to it:
  2. User accounts with permission to do power-management tasks, such as 
     suspend, hibernate, reboot, and shutdown, via HAL methods should be in
     the "power" group.
-  3. HAL will honor settings in /etc/fstab if a device is present there, so
+  3. User accounts with permission to use network devices, such as with the
     wicd package in /extra, should be in the "netdev" group.
  4. User accounts with permission to use devices that "dial out" or connect
     over a serial port (serial console connections to plug computers, sync
     with a palm device, etcetera) will need to be in the "dialout" group.
  5. HAL will honor settings in /etc/fstab if a device is present there, so
     you could technically have removable devices defined in /etc/fstab, but 
     if the fstab settings do not allow normal users to mount them (with the
     "user" or "users" option), then HAL/dbus will not allow them to be 
     mounted either.  In other words, for example, if your fstab line for the
     cdrom/dvd drive includes the "owner" option, you will not be able to 
     mount it as a normal user.
-  4. If you find a need for modified fdi files, those should be placed in the
+  6. If you find a need for modified fdi files, those should be placed in the
     relevant directories in /etc/hal/fdi/ instead of /usr/share/hal/fdi/
-If you notice Xfce's Terminal and perhaps some other applications being drawn
+The version of Xorg in Slackware 13.37 will not (in most cases) require an 
-  very slowly in X, then you should try explicitly disabling the Composite
+  /etc/X11/xorg.conf file.  Input hotplugging is no longer done using hal; 
-  extension in /etc/X11/xorg.conf, or set XLIB_SKIP_ARGB_VISUALS=1 in your
+  instead, it now uses udev for input device detection and keyboard mapping.
  environment prior to starting X.  For more information on this, see:
    http://bugzilla.xfce.org/show_bug.cgi?id=2792
  We've also gotten a report of some other things (such as VirtualBox) that
  might benefit from this.
-Speaking of Xorg, the version of Xorg shipped with Slackware 13.1 will not
+  /usr/share/X11/xorg.conf.d/ is the "packaged" configuration directory; all
-  (in most cases) require an /etc/X11/xorg.conf file at all.  Configuration of
+  files ending with ".conf" in this directory are used by the X server 
-  input devices and such is handled by HAL, and the X server autoconfigures 
+  unless there is an identically-named file in the local sysadmin directory.
-  everything else.  You can still create an xorg.conf file if you wish, or you
+  The local sysadmin config directory is /etc/X11/xorg.conf.d/ - all files
-  can create a minimal xorg.conf with only the specific contents that you wish
+  ending with ".conf" in this directory are parsed.  
  to override (as an example, to use a binary-only video driver). 
  Due to removed drivers and other such changes, it's quite possible that your
  old xorg.conf will not work correctly with this version of Xorg.
-If you need to use a non-US keyboard layout, then copy the file located at
+  There are several default config files in /usr/share/X11/xorg.conf.d/:
-  /usr/share/hal/fdi/policy/10osvendor/10-keymap.fdi to /etc/hal/fdi/policy
+    * 10-evdev.conf
-  and edit it to suit your needs.  Have a look at the contents of that file
+        a "catchall" file for input devices using the evdev driver; this 
-  for an example and more information.  If you prefer to do this the "old" way
+        should work for most hardware in the absence of a better driver
-  using /etc/X11/xorg.conf, then you can use "X -configure" or "xorgsetup" to
+    * 50-synaptics.conf
-  generate an xorg.conf, then add the following lines to the "ServerFlags"
+        overrides the earlier 10-evdev.conf file and uses the synaptics 
-  section to disable input device hotplugging via HAL:
+        driver for all touchpads
-    Option   "AllowEmptyInput"     "false"
+    * 50-wacom.conf
-    Option   "AutoAddDevices"      "false"
+        overrides the earlier 10-evdev.conf file and uses the wacom driver 
-    Option   "AutoEnableDevices"   "false"
+        for Wacom tablets
-  This is also relevant if you prefer to disable HAL completely for whatever
+    * 90-keyboard-layout.conf
-  reason.
+        this sample ("normal" en layout) keeps the "old" default of 
        allowing Zap'ing the Xserver.
  If you need to modify any of these defaults, then copy the relevant file
  from /usr/share/X11/xorg.conf.d/ to /etc/X11/xorg.conf.d/ and edit the
  copy.
-If you are using input hotplugging via HAL and a synaptics touchpad, then you 
+  You can still create an xorg.conf file if you wish, or you can create some
-  might need to copy /usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+  minimal xorg.conf snippets with only the specific contents that you wish
-  to /etc/hal/fdi/policy/ and edit it to suit your needs.  You can also use
+  to override (as an example, to use a binary-only video driver) as separate
-  synclient(1) to make changes "on the fly."  
+  files in the /etc/X11/xorg.conf.d/ directory.
 Also note that any touchpads that include actual buttons as part of the 
  touchpad hardware will not have tap-to-click enabled by default.
-In KDE, you can access the "System Settings" menu in Administrator mode by 
+  Regardless of your chipset (though it seems more common with intel), if KDE
-  running "kdesu systemsettings" as your normal user.
+  crashes on startup, try disabling the Composite extension (which will also
  disable all of the fancy desktop effects).  Place the following content in
  a file at /etc/X11/xorg.conf.d/disable-composite.conf:
    Section "Extensions"
      Option "Composite" "Disable"
    EndSection
-If you see errors like this related to alsa during boot:
+Now that KMS (Kernel Mode Setting) for graphics cards has (mostly) stabilized,
-    Loading ALSA mixer settings:  /usr/sbin/alsactl restore
+  it is enabled by default for intel, ati, and nvidia graphics chipsets.  It
-    Unknown hardware: "HDA-Intel" ...
+  is possible to disable it use "nomodeset" as a kernel append in lilo.conf,
-    Hardware is initialized using a guess method
+  but Xorg will not work at all on intel and ati chips if you do that.
    /usr/sbin/alsactl: set_control:1256: failed to obtain info for control #31
    /usr/sbin/alsactl: set_control:1256: failed to obtain info for control #32
 then you will need to remove /etc/asound.state, reboot (so that it is 
 regenerated with correct information), and reset the volume and such.
-If you see warnings like this when logging in:
+  If you want to change the resolution of the KMS console, that can be done
-    configuration error - unknown item 'DIALUPS_CHECK_ENAB' (notify administrator)
+  with something like this as a kernel append in lilo.conf:
-    configuration error - unknown item 'NOLOGIN_STR' (notify administrator)
+    append="video=1024x768"
-  then you need to move/merge /etc/login.defs.new with /etc/login.defs (and
+
-  also move/merge the other .new files that you have obviously neglected).
+  Speaking of lilo.conf and KMS, make sure you use either vga=normal or 
  vga=extended -- some of the framebuffers don't like KMS very much...
 The (formerly) patented bytecode interpreter is now enabled in the freetype
  package, so your fonts might look a bit different.  If this is undesirable,
  you can restore the previous default with this line:
   # ln -s ../conf.avail/10-autohint.conf /etc/fonts/conf.d/
 If you are using a KVM switch, you might experience problems with the mouse
  when switching from one system to another.  If so, you probably need to be
@ -312,14 +253,6 @@ If you have permission errors when attempting to burn a cdrom or dvd image,
  recommended by k3b), use it instead of 'cdrom' in the line above, and add
  to it only the users you wish to have access to cdrecord and cdrdao.
 If you have compilation errors that look something like this:
  /usr/include/asm-generic/fcntl.h:117: error: redefinition of 'struct flock'
  /usr/include/bits/fcntl.h:142: error: previous definition of 'struct flock'
  /usr/include/asm-generic/fcntl.h:140: error: redefinition of 'struct flock64'
  /usr/include/bits/fcntl.h:157: error: previous definition of 'struct flock64'
  See the following link for some pointers on fixing it:
    http://www.mail-archive.com/blfs-dev@linuxfromscratch.org/msg08942.html
 Input methods for complex characters (CJK, which is shorthand for Chinese,
  Japanese, Korean) and other non-latin character sets have been added. These
  input methods use the SCIM (Smart Common Input Method) platform.
@ -351,13 +284,11 @@ Input methods for complex characters (CJK, which is shorthand for Chinese,
  an overview of applicable character glyphs (if you are inputting complex
  characters like Japanese).
 If you are using the pinentry-gtk2 interface (for entering passphrases with
  gpg-agent), be aware that there is a bug in the way scim-bridge and the
  pinentry-gtk2 interact.  The result is that keyboard input does not register
  with pinentry-gtk2.  For the time being, either change the /usr/bin/pinentry
  symlink to use the qt or curses frontend, or don't use scim.
 If you have an older machine (with a BIOS released prior to 2001) and it will
  not power off on shutdown, try adding this to your kernel's lilo stanza:
    append = "acpi=force"
 If you have a Thinkpad T400 or T500, you probably want to append "pci=reboot" 
  to the kernel boot parameters.  For more information about this issue, see
  https://encrypted.google.com/search?hl=&q=t400+%22pci%3Dreboot%22
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
--- a/README.TXT
+++ b/README.TXT
@ -1,18 +1,18 @@
-Welcome to Slackware 13.1!  (64-bit x86_64 edition)
+Welcome to Slackware 13.37!  (64-bit x86_64 edition)
-Slackware 13.1 is a complete distribution of the Linux operating system.
+Slackware 13.37 is a complete distribution of the Linux operating system.
-Here are some versions of major components of Slackware 13.1:
+Here are some versions of major components of Slackware 13.37:
- Linux kernel           2.6.33.4
+- Linux kernel           2.6.37.6
- C compiler             gcc-4.4.4
+                         2.6.38.4
- Binutils               2.20.51.0.8
+- C compiler             gcc-4.5.2
- GNU C Library          glibc-2.11.1
+- Binutils               2.21.51.0.6
- X Window System        Updated (but not "bleeding edge") packages
+- GNU C Library          glibc-2.13
-                         from X.Org
+- X Window System        X11R7.6 + updates
- KDE                    4.4.3
+- KDE                    4.5.5
- Xfce                   4.6.1
+- Xfce                   4.6.2
 For installation instructions, see the file 'Slackware-HOWTO'.
@ -21,11 +21,11 @@ For important hints about this release, see the file 'CHANGES_AND_HINTS.TXT'.
 These are some of the important files and directories found on the Slackware
 FTP site:
-  ftp://ftp.slackware.com/pub/slackware/slackware64-13.1/
+  ftp://ftp.slackware.com/pub/slackware/slackware64-13.37/
 There is also a newer (and faster) primary FTP site for Slackware here:
-  ftp://slackware.osuosl.org/pub/slackware/slackware64-13.1/
+  ftp://slackware.osuosl.org/pub/slackware/slackware64-13.37/
 Thanks to cwo.com for continuing to help us with hosting for our web site
 and ftp.slackware.com, and to the OSU Open Source Lab for hosting our
@ -35,10 +35,10 @@ If you're reading this on a CD-ROM, these directories will probably be
 split across several discs.
 .
-|-- ANNOUNCE.13.1        Announcement for Slackware 13.1.
+|-- ANNOUNCE.13.37        Announcement for Slackware 13.37.
 |-- BOOTING.TXT          Tips for troubleshooting boot problems.
-|-- CHANGES_AND_HINTS.TXT  A summary of major changes from Slackware 13.0
+|-- CHANGES_AND_HINTS.TXT  A summary of major changes from Slackware 13.1
-|                        to 13.1 and common pitfalls.
+|                        to 13.37 and common pitfalls.
 |-- CHECKSUMS.md5        MD5 format file checksums.
 |-- COPYING              The GNU Public License, version 2.
 |-- COPYING3             The GNU Public License, version 3.
@ -64,10 +64,9 @@ split across several discs.
 |
 |-- extra/               Extra packages for Slackware like:
 |   |                    aspell-word-lists, bash-completion, bittornado,
-|   |                    brltty, emacspeak, the Java(TM) JDK, kde3-compat,
+|   |                    brltty, emacspeak, the Java(TM) JDK,
 |   |                    mplayerplug-in, partitionmanager (GUI partitioning
-|   |                    tool for KDE4), slacktrack, tightvnc, wicd,
+|   |                    tool for KDE4), slacktrack, tightvnc, and wicd.
 |   |                    yasm assembler.
 |   |
 |   `-- source/          Source code for the extra packages.
 |
@ -81,27 +80,25 @@ split across several discs.
 |   |
 |   `-- initrd.img       Installation initrd (can also be loaded with Loadlin)
 |
-|-- kernels/             Precompiled Linux 2.6.33.4 kernel images.
+|-- kernels/             Precompiled Linux 2.6.37.6 kernel images.
 |   |
-|   |-- huge.s           The default standard install kernel for Slackware.
+|   `-- huge.s           The default standard install kernel for Slackware.
-|   |                    This supports pretty much everything in the
+|                        This supports pretty much everything in the
-|   |                    2.6.33.4 kernel.  This kernel requires an x86_64
+|                        2.6.37.6 kernel, including Speakup.  This kernel
-|   |                    (also known as AMD64, EM64T, or Intel 64) capable
+|                        requires an x86_64 (also known as AMD64, EM64T, or
-|   |                    64-bit CPU.
+|                        Intel 64) capable 64-bit CPU.
 |   |
 |   `-- speakup.s        A huge.s kernel patched to support speakup
 |                        speech output through various hardware and 
 |                        software speech synthesizers.
 |    
-|-- pasture/             Used to store packages that have been removed from
+|-- pasture/             These are packages that have been removed
-|   |                    Slackware, but are useful enough to keep around.
+|   |                    from Slackware, but are useful enough to
-|   |                    This is currently empty in x86_64 Slackware.
+|   |                    keep around.  Might not be secure.
 |   |
 |   |                    Packages currently found here include
 |   |                    gxine-0.5.905, mesa-7.8.2, and xf86-video-ati-6.13.2.
 |   |
 |   `-- source/          Source code directory for the pasture packages.
 |                        This directory is also currently empty.
 |
 |-- slackware/           This directory contains the core software packages
-|   |                    for Slackware 13.1.
+|   |                    for Slackware 13.37.
 |   |
 |   |-- a/               The A (base) package series.
 |   |-- ap/              The AP (applications) package series.
@ -141,9 +138,9 @@ split across several discs.
 |
 |-- testing/             This directory contains packages being tested
 |   |                    for possible use in future versions of Slackware.
-|   |                    You'll find amarok-2.3.0.90 (a development
+|   |                    You'll find mesa-7.10.1, which might be a better
-|   |                    release), and btrfs-progs (2010-05-18 repo pull).
+|   |                    option for some hardware.  This package should
-|   |                    These packages should not be considered supported.
+|   |                    not be considered supported.
 |   |
 |   `--- source/         This directory contains source code for the 
 |                        packages in testing.
@ -163,7 +160,7 @@ split across several discs.
 If you like Slackware, please consider supporting the project by becoming
-a Slackware subscriber.  The announcement (ANNOUNCE_13.1) in this directory
+a Slackware subscriber.  The announcement (ANNOUNCE_13.37) in this directory
 has information about ordering or subscribing to the Slackware CD-ROM or
 DVD releases.  Note that at this time the x86_64 release is only available
 as part of the DVD -- if there's interest in a CD-ROM version, let us know.
--- a/README.initrd
+++ b/README.initrd
@ -1,7 +1,7 @@
 Slackware initrd mini HOWTO
 by Patrick Volkerding, volkerdi@slackware.com
-Wed May 12 22:32:34 CDT 2010
+Thu Apr  7 06:02:26 CDT 2011
 This document describes how to create and install an initrd, which may be 
 required to use the 2.6 kernel.  Also see "man mkinitrd".
@ -33,16 +33,16 @@ flexible to ship a generic kernel and a set of kernel modules for it.
 The easiest way to make the initrd is to use the mkinitrd script included 
 in Slackware's mkinitrd package.  We'll walk through the process of 
-upgrading to the generic 2.6.33.4 Linux kernel using the packages
+upgrading to the generic 2.6.37.6 Linux kernel using the packages
 found in Slackware's slackware/a/ directory.
 First, make sure the kernel, kernel modules, and mkinitrd package are 
 installed (the current version numbers might be a little different, so 
 this is just an example):
-  installpkg kernel-generic-2.6.33.4-x86_64-1.tgz
+  installpkg kernel-generic-2.6.37.6-i686-1.tgz
-  installpkg kernel-modules-2.6.33.4-x86_64-1.tgz
+  installpkg kernel-modules-2.6.37.6-i686-1.tgz
-  installpkg mkinitrd-1.4.5-x86_64-2.txz
+  installpkg mkinitrd-1.1.0-i486-1.tgz
 Change into the /boot directory:
@ -52,7 +52,7 @@ Now you'll want to run "mkinitrd".  I'm using reiserfs for my root
 filesystem, and since it's an IDE system the reiserfs module will be
 the only one I need to load:
-  mkinitrd -c -k 2.6.33.4 -m reiserfs
+  mkinitrd -c -k 2.6.37.6 -m reiserfs
 This should do two things.  First, it will create a directory
 /boot/initrd-tree containing the initrd's filesystem.  Then it will
@ -61,10 +61,10 @@ you could make some additional changes in /boot/initrd-tree/ and
 then run mkinitrd again without options to rebuild the image.  That's
 optional, though, and only advanced users will need to think about that.
-Here's another example:  Build an initrd image using Linux 2.6.33.4
+Here's another example:  Build an initrd image using Linux 2.6.37.6
 kernel modules for a system with an ext3 root partition on /dev/sdb3:
-  mkinitrd -c -k 2.6.33.4 -m ext3 -f ext3 -r /dev/sdb3
+  mkinitrd -c -k 2.6.37.6 -m ext3 -f ext3 -r /dev/sdb3
 4.  Now that I've built an initrd, how do I use it?
@ -76,10 +76,10 @@ initrd.  Here's an example section of lilo.conf showing how this is
 done:
 # Linux bootable partition config begins
-image = /boot/vmlinuz-generic-2.6.33.4
+image = /boot/vmlinuz-generic-2.6.37.6
  initrd = /boot/initrd.gz
  root = /dev/sda6
-  label = Lnx26334
+  label = Lnx26376
  read-only
 # Linux bootable partition config ends
--- a/README_CRYPT.TXT
+++ b/README_CRYPT.TXT
@ -14,6 +14,7 @@ Contents:
 * Hibernation (suspend-to-disk)
 * Additional passphrases, keyfiles
 * A note on custom kernels
 * USB keyboards and LUKS
 * A mkinitrd helper script
@ -306,10 +307,10 @@ needed to unlock the root filesystem, so that the kernel can start the init
 program.  In the example command line below which creates the 'initrd.gz'
 image I assume that the root filesystem is 'ext3', we used the mapped device
 'cryptroot' for the root filesystem on the real partition '/dev/sdx1',
-and are running the Slackware 13.1 default SMP kernel '2.6.33.4-smp'
+and are running the Slackware 13.37 default SMP kernel '2.6.37.6-smp'
 and we did not use Logical Volumes (more about that in the next section):
-  # mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r cryptroot -C /dev/sdx1
+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r cryptroot -C /dev/sdx1
 * The resulting initrd image will be written to the file '/boot/initrd.gz'
 by default.  We still need to tell lilo about this initrd. Open the
@ -317,7 +318,7 @@ configuration file '/etc/lilo.conf' in an editor such as vi or pico -
 it should already have been generated by the 'liloconfig' part of setup.
 Look for the "Linux bootable partition config" and add a line for the initrd.
 We also need to change the kernel file to a generic kernel, because lilo
-is unable to combine the 'huge' kernels in Slackware 13.1 with an initrd
+is unable to combine the 'huge' kernels in Slackware 13.37 with an initrd
 image - it will complain about "The initial RAM disk is too big to fit
 between the kernel and the 15M-16M memory hole" if you try with a 'huge'
 kernel.  We can live with that, since the 'huge' kernels are not meant
@ -325,7 +326,7 @@ for day-to-day use anyway.  They are meant to install Slackware on a wide
 range of computers and that is why they are 'huge'.  The linux part of
 '/etc/lilo.conf' should end up looking somewhat like this:
-image = /boot/vmlinuz-generic-smp-2.6.33.4-smp
+image = /boot/vmlinuz-generic-smp-2.6.37.6-smp
  initrd = /boot/initrd.gz
  root = /dev/mapper/cryptroot
  label = linux
@ -366,7 +367,7 @@ One, you will need to enter a passphrase for every partition you have encrypted
 (except for the swap which Slackware encrypts with a random passphrase
 on every boot).  Two, the method used for encrypting the swap partition
 prohibits the use of the swap as a hibernation partition.  And since the
-initrd of Slackware 13.1 supports hibernation, it would be a shame not to be
+initrd of Slackware 13.37 supports hibernation, it would be a shame not to be
 able to use this feature on your laptop (which, because of it's portability,
 is the primary target for full disk encryption anyway).
@ -416,7 +417,7 @@ operations will therefore be '/dev/mapper/slackluks'.
 * The LVM part is next.  Create a Physical Volume (PV) on device
 '/dev/mapper/slackluks', a Volume Group (VG) called 'cryptvg' - any name will
 do - on the PV, and three Logical Volumes (LV's) in the VG, one for your
-root partition (5 GB in size), one for the /home partition (10 GB in size)
+root partition (7 GB in size), one for the /home partition (10 GB in size)
 and a third which we will use for swap (1 GB in size).  You will probably
 use different sizes depending on your environment and wishes, but keep the
 sum of the LV sizes less than the total size of the Physical Volume:
@ -425,7 +426,7 @@ sum of the LV sizes less than the total size of the Physical Volume:
  # vgcreate cryptvg /dev/mapper/slackluks
-  # lvcreate -L 5G -n root cryptvg
+  # lvcreate -L 7G -n root cryptvg
  # lvcreate -L 10G -n home cryptvg
@ -489,10 +490,10 @@ stage of booting the kernel.  The initial ramdisk (initrd) contains a small
 filesystem with the tools needed to unlock the root filesystem, so that
 the kernel can start the init program.  In the example command line below
 which creates the 'initrd.gz' image I assume that you formatted the root
-filesystem as 'ext3', and will be running the Slackware 13.1 default SMP
+filesystem as 'ext3', and will be running the Slackware 13.37 default SMP
-kernel '2.6.33.4-smp' :
+kernel '2.6.37.6-smp' :
-  # mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L
+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L
 NOTE: if you use a non-US keyboard and need to enter a passphrase during boot,
      this may be problematic if the keyboard mapping is US while Slackware
@ -508,7 +509,7 @@ configuration file '/etc/lilo.conf' in an editor such as vi or pico -
 it should already have been generated by the 'liloconfig' part of setup.
 Look for the "Linux bootable partition config" and add a line for the initrd.
 We also need to change the kernel file to a generic kernel, because lilo
-is unable to combine the 'huge' kernels in Slackware 13.1 with an initrd
+is unable to combine the 'huge' kernels in Slackware 13.37 with an initrd
 image - it will complain about "The initial RAM disk is too big to fit
 between the kernel and the 15M-16M memory hole" if you try a 'huge'
 kernel.  We can live with that, since the 'huge' kernels are not meant
@ -516,7 +517,7 @@ for day-to-day use anyway.  They are meant to install Slackware on a wide
 range of computers and that is why they are 'huge'.  The linux part of
 '/etc/lilo.conf' should end up looking somewhat like this:
-image = /boot/vmlinuz-generic-smp-2.6.33.4-smp
+image = /boot/vmlinuz-generic-smp-2.6.37.6-smp
  initrd = /boot/initrd.gz
  root = /dev/cryptvg/root
  label = linux
@ -547,22 +548,27 @@ do not mind using LVM.
 Additional passphrases, keyfiles
 --------------------------------
-The cryptsetup program assigns 7 'key slots' to any partition or volume
+    The cryptsetup program assigns 7 'key slots' to any partition or volume
 it encrypts.  Each of those seven slots can contain a key to unlock the
 partition's data.  The key can be a passphrase, but the content of a
 *keyfile* is another option.  You can then pass the name of a file as a
 parameter to cryptsetup in order to unlock an encrypted volume so that
 you won't have to type a passphrase.  This creates the possibility to
 use a keyfile on a removable USB flash disk for unlocking your Slackware
-computer.  Slackware has partial support for keyfiles: if the file can be
+computer.  Slackware supports keyfiles: if the file can be found on the file
-found, it will be used and you won't have to type a passphrase.  A file on a
+system, it will be used and you won't have to type a passphrase.
-USB stick will *not* be found on boot because the stick's filesystem is not
+
-mounted.  Future versions of Slackware may support USB sticks as unlocking
+    A keyfile on a FAT formatted USB stick can be used as well.  This scenario
-mechanism.  For now, if you encrypt your root filesystem, you will have to
+requires you to use the "-K" parameter to mkinitrd to specify the USB stick's
-enter a passphrase to boot into it.  After the root filesystem is unlocked
+FAT-label or UUID, as well as the full path to the keyfile.  An example:
  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L -K LABEL=TRAVELSTICK:/keys/alien.luks
    The mkinitrd of Slackware 13.1 introduced this support for USB sticks as
 unlocking mechanism.  Alternatively, after the root filesystem is unlocked
 and mounted, it is completely safe to have a keyfile for _additional_
-encrypted filesystems stored in for instance the '/root' directory.  That
+encrypted filesystems stored in for instance the '/root' directory.
-way, you have only one passphrase to type.
+That way, you still have only one passphrase to type.
 Hibernation (suspend-to-disk)
@ -601,10 +607,21 @@ CONFIG_DM_CRYPT=y
 Do not compile these as module! They are required in your kernel. 
 USB keyboards and LUKS
 ----------------------
    If you have set up an encrypted root partition, you will need to have
 access to your keyboard in order to type the passphrase.  This may require
 you to add the 'uhci-hcd' and 'usbhid' modules to your initrd image if you
 have a USB keyboard.  Also note that if you are using a non-US keyboard,
 you can use the '-l' parameter to the 'mkinitrd' command in order to add
 support for this keyboard to your initrd.
 A mkinitrd helper script
 ------------------------
-    The mkinitrd package in Slackware 13.1 ships with a script called
+    The mkinitrd package in Slackware 13.37 ships with a script called
 'mkinitrd_command_generator.sh'.  If you run this script, it will analyze
 your Slackware configuration and make a smart suggestion about the 'mkinitrd'
 command you have to type in order to create an initrd.gz with all the bells
@ -619,7 +636,7 @@ by yourself:
 It should emit a string like this (your system will probably give different
 parameter values):
-mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L
+mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/cryptvg/root -C /dev/sdx2 -L
 You can copy and paste this output to your command prompt, and add any other
 parameters you need such as "-h" to indicate a hibernation partition or
@ -634,6 +651,7 @@ Good luck with your fresh Slackware installion on encrypted partition(s)!
 ==============================================================================
 Author:
-  Eric Hameleers <alien@slackware.com> 23-jul-2009
+  Eric Hameleers <alien@slackware.com> 08-apr-2011
 URLs:
  http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:setup
--- a/README_LVM.TXT
+++ b/README_LVM.TXT
@ -11,7 +11,7 @@ installation to Logical Volumes.  In Slackware, the installer has never
 supported this, but the gurus usually would find a way to create logical
 volumes and install or migrate their Slackware onto those.  Having your
 Slackware installed fully on LVM was near impossible until Slackware 12.0.
-Slackware 13.1 has improved support for LVM built into the installer.
+Slackware 13.37 has improved support for LVM built into the installer.
 Preparing Logical Volumes (LV)
@ -40,14 +40,14 @@ LV's called 'root' and 'home'.  The first is going to contain the root partition
    After booting your computer from the Slackware CD/DVD/USB, and logging in
 as root, you run the following sequence of commands to create the Physical
-Volume (PV), the Volume Group (VG) within that PV and two LV's of size 5GB
+Volume (PV), the Volume Group (VG) within that PV and two LV's of size 6GB
 (root) and 3GB (home) inside the VG:
  # pvcreate /dev/sda1
  # vgcreate myvg /dev/sda1
-  # lvcreate -L 5G -n root myvg
+  # lvcreate -L 6G -n root myvg
  # lvcreate -L 3G -n home myvg
@ -60,13 +60,8 @@ Volume (PV), the Volume Group (VG) within that PV and two LV's of size 5GB
            # lvcreate -l 100%FREE -n home myvg
    ========================================================================
-    Next, we create the device nodes needed before activating the volumes, and
+    The device nodes for the logical volumes are created, and the volumes
-finally we activate the volumes (the last command is not really needed because
+will be activated automatically when running lvcreate.
 'setup' will run it anyway):
  # vgscan --mknodes
  # vgchange -ay
 This is all we need to do before running 'setup'.
@ -110,9 +105,9 @@ We are going to 'chroot' into our fresh installation:
    Next, while we are in the chroot, create the initrd with LVM support -
 in the example command line I assume that the root filesystem is 'ext3',
 we used the LV '/dev/myvg/root' as the root device, and are running the
-Slackware 13.1 default SMP kernel '2.6.33.4-smp':
+Slackware 13.37 default SMP kernel '2.6.37.6-smp':
-  # mkinitrd -c -k 2.6.33.4-smp -m ext3 -f ext3 -r /dev/myvg/root -L
+  # mkinitrd -c -k 2.6.37.6-smp -m ext3 -f ext3 -r /dev/myvg/root -L
    The resulting initrd image will be written to the file '/boot/initrd.gz'
 by default.  We still need to tell lilo about this initrd, so open the
@ -124,7 +119,7 @@ filename added by 'liloconfig' is '/boot/vmlinuz' which is a symbolic link to
 the huge SMP kernel.  Remember that we need a 'generic' kernel with the initrd.
 The end result should look somewhat like this:
-  image = /boot/vmlinuz-generic-smp-2.6.33.4-smp
+  image = /boot/vmlinuz-generic-smp-2.6.37.6-smp
    initrd = /boot/initrd.gz
    root = /dev/myvg/root
    label = linux
@ -139,9 +134,9 @@ but it is safe to ignore these.
    =====================================================================
    An alternative method of creating the commandline for mkinitrd is
-    to use the '/usr/share/mkinitrd_command_generator.sh' script that is
+    to use the '/usr/share/mkinitrd/mkinitrd_command_generator.sh' script
-    part of the mkinitrd package. This script will analyze your Slackware
+    which is part of the mkinitrd package.  This script will analyze your
-    installation and show you a useable 'mkinitrd' commandline:
+    Slackware installation and show you a useable 'mkinitrd' commandline:
    # /usr/share/mkinitrd/mkinitrd_command_generator.sh -r
@ -188,7 +183,7 @@ This is enough to get it recognized by the setup program.  Have fun!
 ========================================================
 Author:
-  Eric Hameleers <alien@slackware.com> 25-jul-2009
+  Eric Hameleers <alien@slackware.com> 08-apr-2011
 Wiki URLs:
  http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:setup
 Documentation:
--- a/README_RAID.TXT
+++ b/README_RAID.TXT
@ -1,7 +1,7 @@
 Slackware RAID HOWTO
-Version 1.00
+Version 1.01
-2008/04/29
+2011/03/15
 by Amritpal Bath <amrit@slackware.com>
@ -10,6 +10,7 @@ by Amritpal Bath <amrit@slackware.com>
 Contents
 ===============================================================================
 - Changelog
 - Introduction
 - Warnings
 - Planning
@ -22,6 +23,17 @@ Contents
 Changelog
 ===============================================================================
 1.01 (2011/03/15):
  - Added Robby Workman's --metadata edits per James Davies' tip.
 1.00 (2008/04/09):
  - Intitial release.
 Introduction
 ===============================================================================
@ -222,6 +234,10 @@ The parameters for each of these RAID commands specifies, in order:
 - the RAID level to use for this array (--level X)
 - how many devices (partitions) to use in the array (--raid-devices X)
 - the actual list of devices (/dev/sdaX /dev/sdbX /dev/sdcX)
 - this is not present on all of them, but "--metadata=0.90" tells mdadm
   to use the older version 0.90 metadata instead of the newer version;
   you must use this for any array from which LILO will be loading a 
   kernel image, or else LILO won't be able to read from it.
 Start by creating the RAID array for your root filesystem.
@ -231,7 +247,7 @@ Start by creating the RAID array for your root filesystem.
 - RAID 1:
     mdadm --create /dev/md0 --level 1 --raid-devices 2 \
-       /dev/sda1 /dev/sdb1
+       /dev/sda1 /dev/sdb1 --metadata=0.90
 - RAID 5:
     mdadm --create /dev/md0 --level 5 --raid-devices 3 \
@ -260,11 +276,11 @@ RAID 1 users do not need to do this.
 - RAID 0:
     mdadm --create /dev/md2 --level 1 --raid-devices 2 \
-       /dev/sda1 /dev/sdb1
+       /dev/sda1 /dev/sdb1 --metadata=0.90
 - RAID 5:
     mdadm --create /dev/md2 --level 1 --raid-devices 3 \
-       /dev/sda1 /dev/sdb1 /dev/sdc1
+       /dev/sda1 /dev/sdb1 /dev/sdc1 --metadata=0.90
 We're all done creating our arrays!  Yay!
--- a/READ_DVD.TXT
+++ b/READ_DVD.TXT
--- a/77
+++ b/77
@ -1,13 +1,11 @@
-Slackware 13.1 release notes.  Wed May 19 04:40:19 UTC 2010
+Slackware 13.37 release notes.  Mon Apr 25 02:43:57 UTC 2011
 Hi folks,
    Historically, the RELEASE_NOTES had been mostly technical 
 information, but once again Robby Workman has covered the important 
-technical details in CHANGES_AND_HINTS.TXT.  Thanks!  If you are 
+technical details in CHANGES_AND_HINTS.TXT.  Thanks!
 upgrading an existing installation, don't miss the section on the LIBATA 
 SWITCHOVER.
    I'll mention a few technical items here.  Slackware's userspace does 
 require a recent 2.6.x kernel (I believe 2.6.27.x is a minimum for 
@ -16,44 +14,21 @@ better off running the included kernels that we've tested things
 against. The best kernel to run (even on a one CPU/core machine) is the 
 generic SMP one, but that needs an initrd, so be sure to read the 
 instructions in /boot after installing with a huge* kernel if you plan 
-to switch. We have chosen to use the 2.6.33.4 kernel after testing the 
+to switch. We have chosen to use the 2.6.37.6 kernel after testing the 
-2.6.33.x kernel branch extensively.  I would not suggest trying to run 
+2.6.37.x kernel branch extensively (and because there are still a few
-without udev.  Consider it the userspace portion of the kernel.  It *is* 
+things that work in 2.6.37.x but not in 2.6.38.x).  But, for those who
-possible, but if you must do that you'll have to tweak a couple things 
+would like to run the latest kernel, there are 2.6.38.4 kernels included
-here and there.  The specifics are left as an exercise for the advanced 
+in /testing.  Also in the /testing/source/ directory you'll find config
-user.  Wait, an advanced user would just use udev.  Really, it works and 
+files for two other kernel versions, 2.6.35.12 (which is a longterm
-makes things a lot easier.
+supported branch), and 2.6.39-rc4, a release candidate for
 the next major kernel series.
-    Slackware 13.1 contains version 4.4.3 of the KDE Software 
+    Slackware 13.37 contains updated versions of both KDE and Xfce, but
-Compilation.  In the nearly 8 months since the release of Slackware 
+if you prefer GNOME then you'll be pleased with the work that the
-13.0, the KDE team made some huge improvements, including better 
+GNOME SlackBuild (GSB) team is doing producing a full-featured GNOME
-handling of netbook screen resolutions, a new authentication framework 
+desktop for Slackware:
 based on standards from freedesktop.org, and a new tabbing feature that 
 allows applications to be grouped in a tabbed interface.  You'll notice 
 a snappier feel, helped also by the improved performance of Qt version 
 4.6.2.
    Several Xfce components have been updated as well.  Xfce continues 
 to be a great lightweight desktop that doesn't get in your way. If you 
 haven't looked at this great desktop environment lately, you might want 
 to give it another try.  Thanks to Robby for tracking the Xfce 
 development closely and making sure everything was just exactly right in 
 the Slackware Xfce packages.
    If you prefer GNOME, there are teams online producing GNOME for 
 Slackware.  Here are a few places to look:
    http://gnomeslackbuild.org
    http://www.droplinegnome.net/
    http://www.gware.org/
    If any of these replaces some system components, using them voids 
 your warranty.  ;-)  But it should work, *if* you absolutely must have 
 GNOME.  I'd suggest Xfce instead if you want a GTK+ based desktop.  If 
 you do want to use GNOME, remember that there may be some updates needed 
 after 13.1 is released, so it might be best not to rush into it.  
 Thanks to these teams for making the GNOME desktop a viable option for 
 Slackware users.
    Need more build scripts?  Something that you wanted wasn't included 
 in Slackware?  Well, then check out slackbuilds.org. Several of the team 
@ -67,30 +42,28 @@ Robby Workman for following X.Org, udev, wicd, xfce, and tons of other
 projects, building and testing all that stuff, writing documentation, 
 his work with the team at slackbuilds.org, and lots of package upgrades 
 (like the switch to the bluez4 bluetooth stack), Piter Punk for udev and
-slackpkg work, updating the shadow password system, writing the initial 
+slackpkg work, Stuart Winter for more updates to linuxdoc-tools, slacktrack,
-patch for polkit to use a shadow authentication backend so we could 
+and for all kinds of fixes throughout the installer and system (he finds my
-consider using KDE 4.4.3, and making tap-to-click work with Synaptics 
+bugs all the time while porting packages to ARM for the ARMedslack port:
-touchpads out-of-the-box, Stuart Winter for more updates to 
+http://www.armedslack.org/), Alan Hicks for testing the installer on Apple
-linuxdoc-tools, and for all kinds of fixes throughout the installer and 
+hardware, Vincent Batts for keeping Ruby working well (difficult!) and other
-system (he finds my bugs all the time while porting packages to ARM for 
+miscellaneous fixes, Heinz Wiesinger for PHP (and other) fixes,
 the ARMedslack port:  http://www.armedslack.org/), Alan Hicks for 
 testing the installer on Apple hardware, Vincent Batts for keeping Ruby 
 working well and other miscellaneous fixes, Andrew Psaltis for work on 
 the polkit/shadow patches, Heinz Wiesinger for Qt (and other) fixes, 
 Amritpal Bath for various bugfixes and helping with release torrents, 
 mrgoblin for testing RAID, bluetooth, and well, everything (and fixing a 
 lot of it, too), other very honorable mentions go to Erik Jan Tromp, 
-Mark Post, Karl Magnus Kolstoe, Fizban, Fred Emmott, and NetrixTardis, 
+Mark Post, Karl Magnus Kolstoe, Fred Emmott, and NetrixTardis, 
 and anyone else I'm forgetting (including the other team members who 
 contributed little fixes and suggestions here and there along with 
 general moral support), and all the folks who emailed in bug reports 
 (and especially fixes).  Thanks for the technical assistance (*you* make 
 this possible), and for keeping the project a good time.  And, of 
 course, thanks *much* to the upstream developers for such nice building 
-materials.  As always, thanks to my wife Andrea and daughter Briah (who 
+materials.  As always, thanks to my wife Andrea and daughter Briah.
 is becoming a surprisingly good beta tester already!)
 Have fun!
 Pat Volkerding <volkerdi@slackware.com>
 ---
 Help keep the lights on @slackware!  Shop at http://store.slackware.com
--- a/UPGRADE.TXT
+++ b/UPGRADE.TXT
@ -1,11 +1,11 @@
-Slackware 13.0 to 13.1 Upgrade HOWTO  <volkerdi@slackware.com>
+Slackware 13.1 to 13.37 Upgrade HOWTO  <volkerdi@slackware.com>
-This document explains how to upgrade from Slackware 13.0 to Slackware 13.1.
+This document explains how to upgrade from Slackware 13.1 to Slackware 13.37.
 ----------------------------------------------------------------------------
-For details of important changes from Slackware 13.0 to 13.1, see the file
+For details of important changes from Slackware 13.1 to 13.37, see the file
 'CHANGES_AND_HINTS.TXT'.  Thanks to Robby Workman for help with this.
 If you have partitions in /etc/fstab named /dev/hd*, please take special
 note of the instructions for the changeover to /dev/sd* devices or your
@ -18,7 +18,7 @@ process is complete. Back it up, or take your chances.
 OK, now that everything is safely backed up, let's proceed. :-)
-To do this, you'll need the Slackware 13.1 packages.  If these are on a CD,
+To do this, you'll need the Slackware 13.37 packages.  If these are on a CD,
 create a new directory to mount the CD on so that it doesn't get in the way
 during the upgrade:
@ -48,7 +48,7 @@ is that you know where the slackware packages directory is.  We'll use
    upgradepkg /root/slackware/a/pkgtools-*.tgz
    upgradepkg /root/slackware/a/tar-*.tgz
-    installpkg /root/slackware/a/xz-*.tgz
+    upgradepkg /root/slackware/a/xz-*.tgz
    upgradepkg /root/slackware/a/findutils-*.txz
@ -81,13 +81,15 @@ is that you know where the slackware packages directory is.  We'll use
    You may spot some old, obsolete, or discontinued packages.  If so,
    you can remove these using 'removepkg'.  This command will get rid of
-    the packages which became obsolete since Slackware 13.0:
+    the packages which became obsolete since Slackware 13.1:
-    removepkg bluez-libs bluez-utils cupsddk device-mapper epic4 gqview \
+    removepkg util-linux-ng guidance-power-manager eggdbus iptraf \
-      kdelibs-experimental lbxproxy libgtkhtml liblbxutil libungif \
+      libXTrap libXprintAppUtil libXprintUtil libxkbui rstart trapproto \
-      libv4l loadlin mpg321 mplayerthumbs proxymngr xf86-input-citron \
+      xf86rushproto xfindproxy xfwp xplsprinters xprehashprinterlist \
-      xf86-input-elographics xf86-input-fpit xf86-input-hyperpen \
+      xproxymanagementprotocol xsetmode xsetpointer xtrap 
-      xf86-input-mutouch xf86-video-newport xf86-video-xgixp
+
    Note the removal of util-linux-ng!  You better make sure that the
    renamed util-linux package is installed before removing that.  :-)
 5.  Fix your config files.  Some of the config files in /etc are going to 
@ -132,7 +134,7 @@ is that you know where the slackware packages directory is.  We'll use
    upgradepkg *t?z
-    If your language has been added to KDE since Slackware 13.0, you'll
+    If your language has been added to KDE since Slackware 13.1, you'll
    need to install it using installpkg, or upgradepkg --install-new.
    Typically you'll need to make sure that you have installed the
@ -147,7 +149,7 @@ is that you know where the slackware packages directory is.  We'll use
    stick to boot, copy the new kernel to it in place of the old one.
    If you were using devices such as /dev/hda (IDE hard drive) with
-    Slackware 13.0, you will need to consider how to switch over to the
+    Slackware 13.1, you will need to consider how to switch over to the
    new /dev/sda type device names.  See CHANGES_AND_HINTS.TXT for complete
    instructions on how to do this.  If you have not read this yet, now
    is a great time to go look at that.  Forget about step 8 and 9 and
@ -161,7 +163,7 @@ is that you know where the slackware packages directory is.  We'll use
 9.  Reboot to start using the new kernel.
-At this point you should be running Slackware 13.1.  :-)
+At this point you should be running Slackware 13.37.  :-)
 I wish everyone good luck with this!
--- a/extra/google-chrome/README
+++ b/extra/google-chrome/README
@ -0,0 +1,54 @@
 Google Chrome (Open Source Web Browser)
 ---------------------------------------
 Here's how to install Google Chrome on Slackware.
 First, go to the Google Chrome site:
 http://www.google.com/chrome
 Click the download button, and select either:
    < >  32 bit .deb (for Debian/Ubuntu)
 OR
    < >  64 bit .deb (for Debian/Ubuntu)
 Read and accept the license terms, and download the .deb package.
 Then, with the google-chrome-stable_current_i386.deb or 
 google-chrome-stable_current_amd64.deb package in the same directory
 as the google-chrome.SlackBuild script, run the script as root to
 convert the .deb to a Slackware .txz:
 ./google-chrome.SlackBuild
 This will produce a Slackware compatible .txz package.  The exact
 version number in the package filename will depend on the version
 of Google Chrome found in the .deb package, but it will be something
 like:  google-chrome-10.0.648.151-x86_64-1.txz
 You'll find the output package in the /tmp directory.
 Then, install the package (again as root):
 cd /tmp
 upgradepkg --install-new google-chrome-10.0.648.151-x86_64-1.txz
 Finally, please note that Google Chrome requires the GConf and ORBit2
 packages found in this directory in order to run.  Be careful with these
 as they may create unintended dependencies on GConf/ORBit2 in other
 software that you compile on machines where they are installed.
 Newer beta and unstable builds may also require the PAM library libpam.so.0.
 Installing the google-chrome-pam-solibs package in this directory will
 allow these newer versions of Chrome to run without having to actually
 switch the system to using PAM.  If you need real PAM (to compile Chromium
 for example), you can find it in /extra/source/pam/.
 Enjoy!  :-)
--- a/extra/google-chrome/google-chrome.SlackBuild
+++ b/extra/google-chrome/google-chrome.SlackBuild
@ -0,0 +1,112 @@
 #!/bin/sh
 # Copyright 2009-2010  Erik Hanson, Minneapolis, MN, USA
 # Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 PKGNAM=google-chrome
 RELEASE=${RELEASE:-stable}    # stable, beta, or unstable
 case "$(uname -m)" in
  i?86) DEBARCH="i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;;
  x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;;
  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
 esac
 # Get the version from the Debian/Ubuntu .deb (thanks to Fred Richards):
 VERSION=$(ar p google-chrome-${RELEASE}_current_${DEBARCH}.deb control.tar.gz 2> /dev/null | tar zxO ./control 2> /dev/null | grep Version | awk '{print $2}' | cut -d- -f1)
 BUILD=${BUILD:-1}
 if [ ! $UID = 0 ]; then
  cat << EOF
 This script must be run as root.
 EOF
  exit 1
 fi
 if ! /bin/ls google-chrome-*.deb 1> /dev/null 2> /dev/null ; then
  cat << EOF
 This is a script to repackage a Debian/Ubuntu Google Chrome .deb package
 for Slackware.  Run this script in the same directory as one of these
 binary packages:
  google-chrome-stable_current_amd64.deb  (for 64-bit x86_64)
  google-chrome-stable_current_i386.deb   (for 32-bit x86)
 This will create a Slackware .txz package.  Install it with installpkg
 or use upgradepkg to upgrade from a previous version.
 EOF
  exit 1
 fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 ar p $CWD/google-chrome-${RELEASE}_current_${DEBARCH}.deb data.tar.lzma | lzma -d | tar xv || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 # Make sure top-level perms are correct:
 chmod 0755 .
 # This needs to be setuid root:
 chmod 4711 opt/google/chrome/chrome-sandbox
 # The cron job is for Debian/Ubuntu only:
 rm -rf etc
 # Link to the standard Mozilla library names:
 sed -i 's,libnss3.so.1d,libnss3.so\x00\x00\x00,g;
        s,libnssutil3.so.1d,libnssutil3.so\x00\x00\x00,g;
        s,libsmime3.so.1d,libsmime3.so\x00\x00\x00,g;
        s,libssl3.so.1d,libssl3.so\x00\x00\x00,g;
        s,libplds4.so.0d,libplds4.so\x00\x00\x00,g;
        s,libplc4.so.0d,libplc4.so\x00\x00\x00,g;
        s,libnspr4.so.0d,libnspr4.so\x00\x00\x00,g;' opt/google/chrome/chrome
 # --mandir=/usr/man:
 mv $PKG/usr/share/man $PKG/usr/man
 # Compress manual pages:
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do
  ln -s $( readlink $i ).gz $i.gz
  rm $i
 done
 # Install a .desktop launcher:
 sed -i -e "s#Icon=google-chrome#Icon=/opt/google/chrome/product_logo_256.png#" \
  $PKG/opt/google/chrome/google-chrome.desktop
 mkdir -p $PKG/usr/share/applications
 ln -s /opt/google/chrome/google-chrome.desktop \
  $PKG/usr/share/applications/google-chrome.desktop
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
--- a/extra/google-chrome/slack-desc
+++ b/extra/google-chrome/slack-desc
@ -0,0 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
             |-----handy-ruler----------------------------------------------------|
 google-chrome: google-chrome (Google Chrome web browser)
 google-chrome:
 google-chrome: Google Chrome is a web browser that combines a minimal design with
 google-chrome: sophisticated technology to make the web faster, safer, and easier.
 google-chrome:
 google-chrome:
 google-chrome:
 google-chrome:
 google-chrome:
 google-chrome: Homepage:  http://www.google.com/chrome
 google-chrome:
--- a/extra/source/GConf/GConf.SlackBuild
+++ b/extra/source/GConf/GConf.SlackBuild
@ -0,0 +1,113 @@
 #!/bin/sh
 # Slackware build script for GConf
 # Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
 # Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 PKGNAM=GConf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 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:--j6}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 if [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 else
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
 \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
 -exec chmod 755 {} \; -o \
 \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
 -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/usr \
  --libdir=/usr/lib${LIBDIRSUFFIX} \
  --sysconfdir=/etc \
  --localstatedir=/var \
  --mandir=/usr/man \
  --with-gtk=2.0 \
  --disable-static \
  --enable-debug=no \
  --build=$ARCH-slackware-linux || exit 1
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 mv $PKG/etc/gconf/2/path $PKG/etc/gconf/2/path.new
 mv $PKG/etc/gconf/2/evoldap.conf $PKG/etc/gconf/2/evoldap.conf.new
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a AUTHORS COPYING* NEWS README* TODO \
  $PKG/usr/doc/$PKGNAM-$VERSION
 # 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/*-$VERSION)
  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
  touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/GConf/GConf.url
+++ b/extra/source/GConf/GConf.url
@ -0,0 +1,2 @@
 http://www.gnome.org/projects/gconf/
 ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.32/GConf-2.32.0.tar.bz2
--- a/extra/source/GConf/doinst.sh
+++ b/extra/source/GConf/doinst.sh
@ -0,0 +1,16 @@
 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...
 }
 config etc/gconf/2/path.new
 config etc/gconf/2/evoldap.conf.new
--- a/extra/source/GConf/slack-desc
+++ b/extra/source/GConf/slack-desc
@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
-     |-----handy-ruler------------------------------------------------------|
+     |-----handy-ruler-------------------------------------------------------|
-mkcfm: mkcfm
+GConf: GConf (GNOME configuration library)
-mkcfm:
+GConf:
-mkcfm: mkcfm is part of X11.
+GConf: GConf is a configuration database system, functionally similar to the
-mkcfm:
+GConf: Windows registry.
-mkcfm: For more information about the X.Org Foundation (the providers of the
+GConf:
-mkcfm: X.Org implementation of the X Window System), see their website:
+GConf:
-mkcfm:
+GConf:
-mkcfm: http://www.x.org
+GConf:
-mkcfm:
+GConf: Homepage:  http://www.gnome.org/projects/gconf/
-mkcfm:
+GConf:
-mkcfm:
+GConf:
--- a/extra/source/ORBit2/ORBit2.SlackBuild
+++ b/extra/source/ORBit2/ORBit2.SlackBuild
@ -0,0 +1,104 @@
 #!/bin/sh
 # Slackware build script for ORBit2
 # Copyright 2010  Robby Workman, Northport, Alabama, USA
 # Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 PKGNAM=ORBit2
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 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:--j6}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 if [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 else
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
 \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
 -exec chmod 755 {} \; -o \
 \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
 -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/usr \
  --libdir=/usr/lib${LIBDIRSUFFIX} \
  --sysconfdir=/etc \
  --localstatedir=/var \
  --disable-static \
  --build=$ARCH-slackware-linux || exit 1
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
  AUTHORS COPYING* HACKING MAINTAINERS NEWS README* TODO \
  $PKG/usr/doc/$PKGNAM-$VERSION
 # 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/*-$VERSION)
  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
  touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/ORBit2/ORBit2.url
+++ b/extra/source/ORBit2/ORBit2.url
@ -0,0 +1,2 @@
 http://www.gnome.org/projects/ORBit2/
 ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
--- a/extra/source/ORBit2/slack-desc
+++ b/extra/source/ORBit2/slack-desc
@ -0,0 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
      |-----handy-ruler------------------------------------------------------|
 ORBit2: ORBit2 (CORBA ORB library)
 ORBit2:
 ORBit2: ORBit is a high-performance CORBA (Common Object Request Broker
 ORBit2: Architecture) ORB (object request broker).  It allows programs to
 ORBit2: send requests and receive replies from other programs, regardless
 ORBit2: of the locations of the two programs.  CORBA is an architecture that
 ORBit2: enables communication between program objects, regardless of the
 ORBit2: programming language they're written in or the operating system they
 ORBit2: run on.
 ORBit2:
 ORBit2:
--- a/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff
+++ b/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff
@ -1,12 +0,0 @@
 diff -Nur bash-completion-1.1.orig//contrib/pkgtools bash-completion-1.1//contrib/pkgtools
 --- bash-completion-1.1.orig//contrib/pkgtools	2009-10-09 07:49:31.000000000 -0500
 +++ bash-completion-1.1//contrib/pkgtools	2010-03-06 21:56:50.343715164 -0600
@@ -11,7 +11,7 @@
     COMPREPLY=( $( (cd /var/log/packages; compgen -f -- "$cur") ) )
 } &&
 complete -F _removepkg $filenames removepkg &&
 -    complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
 +    complete $dirnames -f -X '!*.t[gx]z' installpkg upgradepkg explodepkg
 # Local variables:
 # mode: shell-script
--- a/extra/source/bash-completion/bash-completion.SlackBuild
+++ b/extra/source/bash-completion/bash-completion.SlackBuild
@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@ -22,9 +22,9 @@
 # Slackware build script for bash-completion
-VERSION=1.1
+VERSION=1.3
 ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@ -43,15 +43,15 @@ find . \
 \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
 -exec chmod 644 {} \;
-# Add support for txz packages instead of only tgz
+# Fixup sh completion for us
-zcat $CWD/bash-completion-1.1-pkgtools_tgxz.diff.gz | patch -p1 || exit 1
+zcat $CWD/fixup-sh-script-completions.diff.gz | patch -p1 --verbose || exit 1
 ./configure \
  --prefix=/usr \
  --sysconfdir=/etc \
  --mandir=/usr/man \
  --infodir=/usr/info \
-  --docdir=/usr/doc/bash_completion-$VERSION
+  --docdir=/usr/doc/bash-completion-$VERSION
 make || exit 1
 make install DESTDIR=$PKG || exit 1
@ -60,9 +60,18 @@ mkdir -p $PKG/etc/profile.d
 zcat $CWD/bash_completion.sh.gz > $PKG/etc/profile.d/bash_completion.sh
 chmod 0755 $PKG/etc/profile.d/bash_completion.sh
 # Sorry, but these contrib scripts have been causing a lot of problems.
 # If these are merged with upstream (and hopefully debugged) then we
 # will have them, but adding them at this level is IMHO a mistake.
 ## https://github.com/GArik/bash-completion
 ## GArik has a 'slackware' branch with quite a few enhancements
 #for i in pkgtools rpm2tgz sbopkg slackpkg slapt ; do
 #  cat $CWD/contrib/$i > $PKG/etc/bash_completion.d/$i ;
 #done
 mkdir -p $PKG/usr/doc/bash-completion-$VERSION
 cp -a \
-  AUTHORS COPYING README TODO \
+  AUTHORS COPYING* README* TODO \
    $PKG/usr/doc/bash-completion-$VERSION
 # If there's a ChangeLog, installing at least part of the recent history
@ -73,6 +82,12 @@ if [ -r CHANGES ]; then
  touch -r CHANGES $DOCSDIR/CHANGES
 fi
 # Contrib scripts can go in with the documentation:
 cp -a $CWD/contrib $PKG/usr/doc/bash-completion-$VERSION
 chown -R root:root $PKG/usr/doc/bash-completion-$VERSION
 chmod 755 $PKG/usr/doc/bash-completion-$VERSION/contrib
 chmod 644 $PKG/usr/doc/bash-completion-$VERSION/contrib/*
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
--- a/extra/source/bash-completion/bash_completion.sh
+++ b/extra/source/bash-completion/bash_completion.sh
@ -1,11 +1,3 @@
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+if [ "$(basename $SHELL)" = "bash" -a -f /etc/bash_completion ]; then
-if [ "$PS1" ] && [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] \
+  . /etc/bash_completion
   && [ -f /etc/bash_completion ]; then # interactive shell
        # Source completion code
        . /etc/bash_completion
 elif [ "$PS1" ] && [ $bmajor -ge 3 ] \
   && [ -f /etc/bash_completion ]; then # interactive shell
        # Source completion code
        . /etc/bash_completion
 fi
 unset bash bmajor bminor
--- a/extra/source/bash-completion/contrib/pkgtools
+++ b/extra/source/bash-completion/contrib/pkgtools
@ -0,0 +1,127 @@
 # bash completion for Slackware Linux pkgtools
 [ -f /etc/slackware-version ] &&
 {
 have pkgtool &&
 _pkgtool()
 {
    COMPREPLY=()
    local cur="${COMP_WORDS[COMP_CWORD]}"
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile \
            --source-mounted --source_dir --target_dir --source_device' \
            -- "$cur" ) )
        return 0
    fi
    local prev=${COMP_WORDS[COMP_CWORD-1]}
    case $prev in
        --source_dir|--target_dir)
            _filedir -d
            return 0
            ;;
        --sets)
            # argument required but no completions available
            return 0
            ;;
        --source_device)
            COMPREPLY=( $( compgen -f -d -- "${cur:-/dev/}" ) )
            return 0
            ;;
        --tagfile)
            _filedir
            return 0
            ;;
    esac
 } &&
 complete -F _pkgtool pkgtool
 have removepkg &&
 _removepkg()
 {
    COMPREPLY=()
    local cur=`_get_cword`
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '-copy -keep -preserve -warn' \
            -- "$cur" ) )
        return 0
    fi
    COMPREPLY=( $( cd /var/log/packages; compgen -f -- "$cur" ) )
 } &&
 complete -F _removepkg removepkg
 have upgradepkg &&
 _upgradepkg()
 {
    COMPREPLY=()
    local cur=`_get_cword`
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '--dry-run --install-new --reinstall \
            --verbose' -- "$cur") )
        return 0
    fi
    _filedir "t[bglx]z"
 } && complete -F _upgradepkg upgradepkg
 have installpkg &&
 _installpkg()
 {
    COMPREPLY=()
    local cur=`_get_cword`
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse \
            --menu --ask --priority --tagfile' -- "$cur") )
        return 0
    fi
    local prev=`_get_pword`
    case $prev in
        --root)
            _filedir -d
            return 0
            ;;
        --priority)
            COMPREPLY=( $( compgen -W 'ADD REC OPT SKP' -- "$cur" ) )
            return 0
            ;;
        --tagfile)
            _filedir
            return 0
            ;;
    esac
    _filedir "t[bglx]z"
 } && complete -F _installpkg installpkg
 have makepkg &&
 _makepkg()
 {
    COMPREPLY=()
    local cur=`_get_cword`
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend \
            -c --chown' -- "$cur") )
        return 0
    fi
    local prev=`_get_pword`
    case $prev in
        -l|--linkadd|-c|--chown)
            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
            return 0
            ;;
    esac
    _filedir
 } && complete -F _makepkg makepkg
 have explodepkg &&
 complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
 }
--- a/extra/source/bash-completion/contrib/rpm2tgz
+++ b/extra/source/bash-completion/contrib/rpm2tgz
@ -0,0 +1,14 @@
 # Slackware rpm2tgz completion.
 have rpm2tgz &&
 _rpm2tgz()
 {
    COMPREPLY=()
    local cur="${COMP_WORDS[COMP_CWORD]}"
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '-s -S -n -r -d -c' -- "$cur" ) )
        return 0
    fi
    COMPREPLY=( $(compgen -f -X "!*.rpm" -- "$cur") )
 } && complete -F _rpm2tgz -o plusdirs rpm2tgz rpm2txz rpm2targz
--- a/extra/source/bash-completion/contrib/sbopkg
+++ b/extra/source/bash-completion/contrib/sbopkg
@ -0,0 +1,76 @@
 # bash completion for sbopkg tool
 have sbopkg &&
 _sbopkg()
 {
    COMPREPLY=()
    local cur prev
    _get_comp_words_by_ref cur prev
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '-b -c -d -e -f -g -h -i -k -l \
                      -o -P -p -q -R -r -s -u -V -v' -- "$cur" ) )
        return 0
    fi
    case $prev in
        -e)
            COMPREPLY=( $( compgen -W 'ask continue stop' -- "$cur" ) )
            return 0
            ;;
        -f)
            _filedir
            return 0
            ;;
        -d)
            _filedir -d
            return 0
            ;;
        -V)
            COMPREPLY=( $( compgen -W "? \
                $(sbopkg -V ? 2>&1 | cut -s -f1)" -- "$cur" ) )
            return 0
            ;;
        -i|-b)
            ;;
        *)
            return 0
            ;;
    esac
    local config="/etc/sbopkg/sbopkg.conf"
    local words
    _get_comp_words_by_ref words
    for (( i=${#words[@]}-1; i>0; i-- )); do
        if [[ "${words[i]}" == -f ]]; then
            config="${words[i+1]}"
            break
        fi
    done
    if [ ! -r "$config" ]; then
        return 0
    fi
    . $config
    for (( i=1; i<${#words[@]}; i++ )); do
        case "${words[i]}" in
            -V)
                REPO_NAME="${words[i+1]%%/*}"
                REPO_BRANCH="${words[i+1]#*/}"
                ;;
            -d)
                REPO_ROOT="${words[i+1]}"
                ;;
        esac
    done
    if [ ! -r "$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT" ]; then
        return 0
    fi
    COMPREPLY=( $( sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}"\
        $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT )
        $( cd $QUEUEDIR; compgen -f -X "!*.sqf"  -- "$cur" ) )
 } && complete -F _sbopkg sbopkg
--- a/extra/source/bash-completion/contrib/slackpkg
+++ b/extra/source/bash-completion/contrib/slackpkg
@ -0,0 +1,95 @@
 # bash completion for slackpkg tool
 have slackpkg &&
 _slackpkg()
 {
    COMPREPLY=()
    local cur
    _get_comp_words_by_ref cur
    # based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)`
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '-delall=on -delall=off \
            -checkmd5=on -checkmd5=off \
            -checkgpg=on -checkgpg=off \
            -checksize=on -checksize=off \
            -postinst=on -postinst=off \
            -onoff=on -onoff=off \
            -download_all=on -download_all=off \
            -dialog=on -dialog=off \
            -dialog_maxargs= \
            -batch=on -batch=off \
            -only_new_dotnew=on -only_new_dotnew=off \
            -use_includes=on -use_includes=off \
            -spinning=on -spinning=off \
            -default_answer=yes -default_answer=no \
            -mirror=' -- "$cur" ) )
        return 0
    fi
    local confdir="/etc/slackpkg"
    local config="$confdir/slackpkg.conf"
    if [ ! -r "$config" ]; then
        return 0
    fi
    . "$config"
    local action words
    _get_comp_words_by_ref -n "=" words
    for (( i=1; i<${#words[@]}; i++ )); do
        if [[ "${words[i]}" != -* ]]; then
            action="${words[i]}"
            break
        fi
    done
    case $action in
        generate-template|search|file-search)
            # argument required but no completions available
            return 0
            ;;
        install-template|remove-template)
            if [ -e "$confdir/templates" ]; then
                COMPREPLY=( $( cd "$confdir/templates"; \
                    compgen -f -X "!*.template" -- "$cur" ) )
                COMPREPLY=( ${COMPREPLY[@]%.template} )
            fi
            return 0
            ;;
        remove)
            _filedir
            COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \
                xap y' -- "$cur" ) )
            COMPREPLY+=( $( cd /var/log/packages; compgen -f -- "$cur" ) )
            return 0
            ;;
        install|reinstall|upgrade|blacklist|download)
            _filedir
            COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \
                xap y' -- "$cur" ) )
            COMPREPLY+=( $( cut -f 6 -d\  ${WORKDIR}/pkglist 2> /dev/null | \
                grep "^$cur" ) )
            return 0
            ;;
        info)
            COMPREPLY+=( $( cut -f 6 -d\  ${WORKDIR}/pkglist 2> /dev/null | \
                grep "^$cur" ) )
            return 0
            ;;
        update)
            # we should complete the same as the next `list` + "gpg"
            COMPREPLY=( $( compgen -W 'gpg' -- "$cur" ) )
            ;&
        *)
            COMPREPLY+=( $( compgen -W 'install reinstall upgrade remove \
                blacklist download update install-new upgrade-all \
                clean-system new-config check-updates help generate-template \
                install-template remove-template search file-search info' -- \
                "$cur" ) )
            return 0
            ;;
    esac
 } && complete -F _slackpkg slackpkg
--- a/extra/source/bash-completion/contrib/slapt
+++ b/extra/source/bash-completion/contrib/slapt
@ -0,0 +1,136 @@
 # slapt-get and slapt-src completion
 have slapt-get &&
 _slapt_get()
 {
    COMPREPLY=()
    local cur prev
    _get_comp_words_by_ref cur prev
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '--download-only -d --simulate -s \
            --no-prompt -y --prompt -p --reinstall --ignore-excludes \
            --no-md5 --ignore-dep --no-dep --print-uris --show-stats -S \
            --config -c --remove-obsolete --retry --no-upgrade \
            --update -u --upgrade --dist-upgrade --install -i --install-set \
            --remove --show --filelist --search --list --available \
            --installed --clean --autoclean --add-keys \
            --version --help -h' -- "$cur" ) )
        return 0
    fi
    case $prev in
        --config|-c)
            _filedir
            return 0
            ;;
        --retry|--search)
            # argument required but no completions available
            return 0
            ;;
    esac
    local words t
    _get_comp_words_by_ref words
    # search for last action (--install|--install-set|--remove|--show|--filelist)
    for (( i=${#words[@]}-1; i>0; i-- )); do
        if [[ ${words[i]} == -@(i|-install|-show) ]]; then
            t="all"
            break
        elif [[ ${words[i]} == --install-set ]]; then
            t="set"
            break
        elif [[ ${words[i]} == --@(remove|filelist) ]]; then
            t="ins"
            break
        fi
    done
    case $t in
        all) # --install|-i|--show
            # slapt-get will fail to search for "^name-version"
            # it can search for names only
            local name=$( echo $cur | cut -f1 -d- )
            COMPREPLY=( $( slapt-get --search "^$name" 2> /dev/null | \
                sed -ne "/^$cur/{s/ .*$//;p}" ) )
            return 0
            ;;
        ins) # --remove|--filelist
            COMPREPLY=( $( cd /var/log/packages; compgen -f -- "$cur" ) )
            return 0
            ;;
        set) # --install-set
            COMPREPLY=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \
                xap y' -- "$cur" ) )
            return 0
            ;;
    esac
 } && complete -F _slapt_get slapt-get
 have slapt-src &&
 _slapt_src()
 {
    COMPREPLY=()
    local cur prev
    _get_comp_words_by_ref cur prev
    if [[ "$cur" == -* ]]; then
        COMPREPLY=( $( compgen -W '--update -u --list -l --clean -e \
            --search -s --show -w --install -i --build -b --fetch -f \
            --yes -y --config -c --no-dep -n --postprocess -p \
            --version -v --help -h' -- "$cur" ) )
        return 0
    fi
    case $prev in
        --config|-c)
            _filedir
            return 0
            ;;
        --search|-s|--postprocess|-p)
            # argument required but no completions available
            return 0
            ;;
    esac
    local words
    _get_comp_words_by_ref words
    local t
    # search for last action (-i|-w|-b|-f)
    for (( i=${#words[@]}-1; i>0; i-- )); do
        if [[ ${words[i]} == -@(i|w|f|b|-install|-show|-build|-fetch) ]]; then
            t="all"
            break
        fi
    done
    if [ "$t" != "all" ]; then
        return 0
    fi
    local config="/etc/slapt-get/slapt-srcrc" # default config location
    # search for config
    for (( i=${#words[@]}-1; i>0; i-- )); do
        if [[ ${words[i]} == -@(c|-config) ]]; then
            config="${words[i+1]}"
            break
        fi
    done
    if [ ! -r "$config" ]; then
        return 0
    fi
    local builddir=$( sed -ne "/^BUILDDIR=/{s/^BUILDDIR=//;p}" "$config" )
    if [ ! -d "$builddir" ]; then
        return 0
    fi
    local slck_data="${builddir}/slackbuilds_data"
    if [ ! -r "$slck_data" ]; then
        return 0
    fi
    COMPREPLY=( $( sed -ne \
        "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}" "$slck_data" ) )
 } && complete -F _slapt_src slapt-src
--- a/extra/source/bash-completion/fixup-sh-script-completions.diff
+++ b/extra/source/bash-completion/fixup-sh-script-completions.diff
@ -0,0 +1,22 @@
 The 'sh' completion file only completes on *.sh files.
 This breaks the expectation (on Slackware, at least) that
 e.g. "sh /etc/rc.d/rc.my<TAB>" will complete to rc.mysql.
 This patch fixes that, but a consequence is that "sh" will
 complete on *any* filename.  IMHO, that's not a regression
 at all, since stock bash without bash-completion does that
 already...  --rworkman
 Acked-by: volkerdi
 diff -Nur bash-completion-1.3.orig/completions/sh bash-completion-1.3/completions/sh
 --- bash-completion-1.3.orig/completions/sh	2011-01-21 03:36:11.000000000 -0600
 +++ bash-completion-1.3/completions/sh	2011-03-12 02:06:00.964938285 -0600
@@ -28,7 +28,7 @@
         return 0
     fi
 -    _filedir sh
 +    _filedir
 } &&
 complete -F _sh sh
--- a/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff
+++ b/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff
@ -1,36 +0,0 @@
 diff -u -r emacspeak-32.0.orig/servers/linux-espeak/Makefile emacspeak-32.0/servers/linux-espeak/Makefile
 --- emacspeak-32.0.orig/servers/linux-espeak/Makefile	2009-08-26 12:19:01.000000000 -0500
 +++ emacspeak-32.0/servers/linux-espeak/Makefile	2010-05-13 17:17:12.000000000 -0500
@@ -4,7 +4,7 @@
 PREFIX = /usr
 LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
 LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-espeak
 -TCL_VERSION = 8.4
 +TCL_VERSION = 8.5
 TCL_INCLUDE= /usr/include/tcl$(TCL_VERSION)
 CXXFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall -Wno-long-long -I$(TCL_INCLUDE)
 diff -u -r emacspeak-32.0.orig/servers/linux-outloud/Makefile emacspeak-32.0/servers/linux-outloud/Makefile
 --- emacspeak-32.0.orig/servers/linux-outloud/Makefile	2009-08-28 16:07:35.000000000 -0500
 +++ emacspeak-32.0/servers/linux-outloud/Makefile	2010-05-13 17:17:18.000000000 -0500
@@ -5,7 +5,7 @@
 LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
 LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-outloud
 -TCL_VERSION=8.4
 +TCL_VERSION=8.5
 TCL_INCLUDE=/usr/include/tcl$(TCL_VERSION)
 CFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
 CXXFLAGS+= $(CFLAGS)
 diff -u -r emacspeak-32.0.orig/servers/software-dtk/Makefile emacspeak-32.0/servers/software-dtk/Makefile
 --- emacspeak-32.0.orig/servers/software-dtk/Makefile	2009-08-28 16:07:35.000000000 -0500
 +++ emacspeak-32.0/servers/software-dtk/Makefile	2010-05-13 17:17:46.000000000 -0500
@@ -2,7 +2,7 @@
 #
 LABEL=1.1
 DIST=software-dtk-$(LABEL)
 -TCL_VERSION=8.4
 +TCL_VERSION=8.5
 CFLAGS+=-O3 -fpic -pedantic -ansi -Wall -I/usr/include/tcl$(TCL_VERSION)
 CPPFLAGS+=-DSTDC_HEADERS=1 -Dclock_t=long -DRETSIGTYPE=void 
 INSTALL=install
--- a/extra/source/emacspeak/emacspeak.SlackBuild
+++ b/extra/source/emacspeak/emacspeak.SlackBuild
@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006, 2008, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@ -75,7 +75,7 @@ find . -perm 711 -exec chmod 755 {} \;
 find . -perm 555 -exec chmod 755 {} \;
 # Patch to use Tcl 8.5:
-zcat $CWD/emacspeak-32.0.tcl8.5.diff.gz | patch -p1 || exit 1
+zcat $CWD/emacspeak.tcl8.5.diff.gz | patch -p1 || exit 1
 # Compile the main program against Emacs:
 make config
--- a/extra/source/emacspeak/emacspeak.tcl8.5.diff
+++ b/extra/source/emacspeak/emacspeak.tcl8.5.diff
@ -0,0 +1,33 @@
 --- ./servers/software-dtk/Makefile.orig	2009-08-28 16:07:35.000000000 -0500
 +++ ./servers/software-dtk/Makefile	2011-03-12 14:43:44.000000000 -0600
@@ -2,7 +2,7 @@
 #
 LABEL=1.1
 DIST=software-dtk-$(LABEL)
 -TCL_VERSION=8.4
 +TCL_VERSION=8.5
 CFLAGS+=-O3 -fpic -pedantic -ansi -Wall -I/usr/include/tcl$(TCL_VERSION)
 CPPFLAGS+=-DSTDC_HEADERS=1 -Dclock_t=long -DRETSIGTYPE=void 
 INSTALL=install
 --- ./servers/linux-espeak/Makefile.orig	2009-08-26 12:19:01.000000000 -0500
 +++ ./servers/linux-espeak/Makefile	2011-03-12 14:43:44.000000000 -0600
@@ -4,7 +4,7 @@
 PREFIX = /usr
 LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
 LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-espeak
 -TCL_VERSION = 8.4
 +TCL_VERSION = 8.5
 TCL_INCLUDE= /usr/include/tcl$(TCL_VERSION)
 CXXFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall -Wno-long-long -I$(TCL_INCLUDE)
 --- ./servers/linux-outloud/Makefile.orig	2010-11-23 12:57:29.000000000 -0600
 +++ ./servers/linux-outloud/Makefile	2011-03-12 14:43:44.000000000 -0600
@@ -5,7 +5,7 @@
 LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
 LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-outloud
 -TCL_VERSION=8.4
 +TCL_VERSION=8.5
 TCL_INCLUDE=/usr/include/tcl$(TCL_VERSION)
 #CFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
 CFLAGS+= -m32 -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
--- a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
+++ b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2008, 2009  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@ -26,7 +26,7 @@
 # By:           Eric Hameleers <alien@slackware.com>
 # For:          flashplayer-plugin
 # Descr:        Adobe flash player plugin for mozilla
-# URL:          http://labs.adobe.com/
+# URL:          http://labs.adobe.com/technologies/flashplayer10/
 # Needs:        
 # Changelog:    
 # 10.0.d20.7-1: 16/Dec/2008 by Eric Hameleers <alien@slackware.com>
@ -39,6 +39,14 @@
 #               * Update (plugs vulnerability).
 # 10.0.42.34-1: 14/dec/2009 by Patrick J. Volkerding <volkerdi@slackware.com>
 #               * Update (plugs vulnerability).
 # 10.091510-1:  15/sep/2010 by Eric Hameleers <alien@slackware.com>
 #               * Preview1 of "flash player square".
 # 10.092710-1:  28/sep/2010 by Eric Hameleers <alien@slackware.com>
 #               * Preview2 of "flash player square".
 # 10_2.111710-1:28/sep/2010 by Eric Hameleers <alien@slackware.com>
 #               * New preview of "flash player square" for 64-bit Linux; there
 #                 is no more 32-bit "square" version, because new developments
 #                 are being folded into regular flashplayer10.
 # 
 # Run 'sh flashplayer-plugin.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@ -49,16 +57,11 @@
 # Set initial variables:
 PRGNAM=flashplayer-plugin
-VERSION=${VERSION:-10.0.42.34}
+SRCVER=${SRCVER:-10_2}
-ARCH=${ARCH:-x86_64}
+BLDVER=${BLDVER:-111710}
 VERSION=$SRCVER.$BLDVER
 BUILD=${BUILD:-1}
 if [ "$ARCH" = "x86_64" ]; then
  LIBDIRSUFFIX="64"
 else
  LIBDIRSUFFIX=""
 fi
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@ -67,8 +70,34 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-SOURCE="$SRCDIR/libflashplayer-${VERSION}.linux-${ARCH}.so.tar.gz"
+if [ -z "$ARCH" ]; then
-SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${VERSION}.linux-${ARCH}.so.tar.gz"
+  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
 case "$ARCH" in
  x86_64)
    PREVER=${PREVER:-3}
    LIBDIRSUFFIX="64"
    ARCHBITS="64"
    ;;
  i?86)
    PREVER=${PREVER:-2}
    LIBDIRSUFFIX=""
    ARCHBITS="32"
    ;;
  *)
    echo "Unsupported architecture '$ARCH'"
    exit 1
    ;;
 esac
 SOURCE="$SRCDIR/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz"
 SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz"
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@ -124,17 +153,20 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 chown -R root:root *
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+X-s .
-if [ "$ARCH" = "x86_64" ]; then
+case "$ARCH" in
-  if ! file libflashplayer.so | grep -q "ELF 64-bit" ; then
+  x86_64)
-    echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
+    if ! file libflashplayer.so | grep -q "ELF 64-bit" ; then
-  fi
+      echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
-elif [[ "$ARCH" =~ "i?86" ]]; then
+    fi
-  if ! file libflashplayer.so | grep -q "ELF 32-bit" ; then
+    ;;
-    echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
+  i?86)
-  fi
+    if ! file libflashplayer.so | grep -q "ELF 32-bit" ; then
-fi
+      echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1
    fi
    ;;
 esac
 # Install the plugin to the package dir:
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
--- a/extra/source/fvwm-2.6.1/doinst.sh
+++ b/extra/source/fvwm-2.6.1/doinst.sh
@ -0,0 +1,14 @@
 #!/bin/sh
 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...
 }
 # Might need this later
 #config etc/X11/fvwm2/system.fvwm2rc.new
--- a/extra/source/fvwm-2.6.1/fvwm.SlackBuild
+++ b/extra/source/fvwm-2.6.1/fvwm.SlackBuild
@ -0,0 +1,131 @@
 #!/bin/sh
 # Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 PKGNAM=fvwm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 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:-" -j7 "}
 if [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 else
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/usr \
  --libdir=/usr/lib${LIBDIRSUFFIX} \
  --sysconfdir=/etc \
  --mandir=/usr/man \
  --docdir=/usr/doc/$PKGNAM-$VERSION \
  --disable-bidi \
  --program-prefix= \
  --program-suffix= \
  --build=$ARCH-slackware-linux
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 # Add a few more things:
 mkdir -p $PKG/etc/X11/xinit
 zcat $CWD/xinitrc.fvwm2.gz > $PKG/etc/X11/xinit/xinitrc.fvwm2
 chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm2
 #zcat $CWD/system.fvwm2rc.gz > $PKG/etc/system.fvwm2rc.new
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
  ( cd $PKG/usr/man
    for manpagedir in $(find . -type d -name "man*") ; do
      ( cd $manpagedir
        for eachpage in $( find . -type l -maxdepth 1) ; do
          ln -s $( readlink $eachpage ).gz $eachpage.gz
          rm $eachpage
        done
        gzip -9 *.?
      )
    done
  )
 fi
 # Restore a few original file timestamps:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
  AUTHORS COPYING* NEWS README* \
  $PKG/usr/doc/$PKGNAM-$VERSION
 # 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/*-$VERSION)
  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
  touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/kde3-compat/arts/slack-desc
+++ b/extra/source/kde3-compat/arts/slack-desc
@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
    |-----handy-ruler------------------------------------------------------|
-arts: arts (Analog Realtime Synthesizer)
+fvwm: fvwm (a small and fast virtual window manager for X)
-arts:
+fvwm:
-arts: aRts is the core sound system for KDE, and is short for "analog
+fvwm: Fvwm is the classic highly-configurable virtual window manager for
-arts: realtime synthesizer".  aRts is designed to create or process sound
+fvwm: X11.  It is a derivative of twm, redesigned to minimize memory
-arts: using small specialized modules.  These may create a waveform, play
+fvwm: consumption, provide a 3-D look to window frames, and provide a simple
-arts: samples, filter data, add signals, perform effects (like delay,
+fvwm: virtual desktop.
-arts: flanger or chorus), or output the data to the soundcard.
+fvwm:
-arts:
+fvwm: Homepage:  http://www.fvwm.org
-arts:
+fvwm:
-arts:
+fvwm:
-arts:
+fvwm:
--- a/extra/source/fvwm-2.6.1/xinitrc.fvwm2
+++ b/extra/source/fvwm-2.6.1/xinitrc.fvwm2
@ -0,0 +1,35 @@
 #!/bin/sh
 # $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 # merge in defaults and keymaps
 if [ -f $sysresources ]; then
    xrdb -merge $sysresources
 fi
 if [ -f $sysmodmap ]; then
    xmodmap $sysmodmap
 fi
 if [ -f $userresources ]; then
    xrdb -merge $userresources
 fi
 if [ -f $usermodmap ]; then
    xmodmap $usermodmap
 fi
 # start some nice programs
 xsetroot -solid SteelBlue
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
  ck-launch-session fvwm2
 else
  fvwm2
 fi
--- a/extra/source/jdk-6/COPYRIGHT
+++ b/extra/source/jdk-6/COPYRIGHT
@ -1,74 +1,70 @@
-Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+Copyright © 2006, 2011, Oracle and/or its affiliates. 
-California 95054, U.S.A.  All rights reserved.
+All rights reserved.
-Sun Microsystems, Inc.  has intellectual property rights relating to
+This software and related documentation are provided under a
-technology embodied in the product that is described in this document.
+license agreement containing restrictions on use and
-In particular, and without limitation, these intellectual property
+disclosure and are protected by intellectual property laws.
-rights may include one or more of the U.S.  patents listed at
+Except as expressly permitted in your license agreement or
-http://www.sun.com/patents and one or more additional patents or pending
+allowed by law, you may not use, copy, reproduce, translate,
-patent applications in the U.S.  and in other countries.
+broadcast, modify, license, transmit, distribute, exhibit,
 perform, publish, or display any part, in any form, or by
 any means.  Reverse engineering, disassembly, or
 decompilation of this software, unless required by law for
 interoperability, is prohibited.
-THIS PRODUCT CONTAINS CONFIDENTIAL INFORMATION AND TRADE SECRETS OF SUN
+The information contained herein is subject to change
-MICROSYSTEMS, INC.  USE, DISCLOSURE OR REPRODUCTION IS PROHIBITED
+without notice and is not warranted to be error-free.  If
-WITHOUT THE PRIOR EXPRESS WRITTEN PERMISSION OF SUN MICROSYSTEMS, INC.
+you find any errors, please report them to us in writing.
-U.S.  Government Rights - Commercial software.  Government users are
+If this is software or related software documentation that
-subject to the Sun Microsystems, Inc.  standard license agreement and
+is delivered to the U.S.  Government or anyone licensing it
-applicable provisions of the FAR and its supplements.
+on behalf of the U.S.  Government, the following notice is
 applicable:
-Use is subject to license terms.
+U.S.  GOVERNMENT RIGHTS Programs, software, databases, and
 related documentation and technical data delivered to U.S.
 Government customers are "commercial computer software" or
 "commercial technical data" pursuant to the applicable
 Federal Acquisition Regulation and agency-specific
 supplemental regulations.  As such, the use, duplication,
 disclosure, modification, and adaptation shall be subject to
 the restrictions and license terms set forth in the
 applicable Government contract, and, to the extent
 applicable by the terms of the Government contract, the
 additional rights set forth in FAR 52.227-19, Commercial
 Computer Software License (December 2007).  Oracle America,
 Inc., 500 Oracle Parkway, Redwood City, CA 94065.
-This distribution may include materials developed by third parties.
+This software or hardware is developed for general use in a
 variety of information management applications.  It is not
 developed or intended for use in any inherently dangerous
 applications, including applications which may create a risk
 of personal injury.  If you use this software or hardware in
 dangerous applications, then you shall be responsible to
 take all appropriate fail-safe, backup, redundancy, and
 other measures to ensure its safe use.  Oracle Corporation
 and its affiliates disclaim any liability for any damages
 caused by use of this software or hardware in dangerous
 applications.
-Sun, Sun Microsystems, the Sun logo, Java and Java SE are trademarks or
+Oracle and Java are registered trademarks of Oracle and/or
-registered trademarks of Sun Microsystems, Inc.  in the U.S.  and other
+its affiliates.  Other names may be trademarks of their
-countries.
+respective owners.
-This product is covered and controlled by U.S.  Export Control laws and
+AMD, Opteron, the AMD logo, and the AMD Opteron logo are
-may be subject to the export or import laws in other countries.
+trademarks or registered trademarks of Advanced Micro
-Nuclear, missile, chemical biological weapons or nuclear maritime end
+Devices.  Intel and Intel Xeon are trademarks or registered
-uses or end users, whether direct or indirect, are strictly prohibited.
+trademarks of Intel Corporation.  All SPARC trademarks are
-Export or reexport to countries subject to U.S.  embargo or to entities
+used under license and are trademarks or registered
-identified on U.S.  export exclusion lists, including, but not limited
+trademarks of SPARC International, Inc.  UNIX is a
-to, the denied persons and specially designated nationals lists is
+registered trademark licensed through X/Open Company, Ltd.
 strictly prohibited.
-Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+This software or hardware and documentation may provide
-California 95054, Etats-Unis.  Tous droits rservs.
+access to or information on content, products, and services
-
+from third parties.  Oracle Corporation and its affiliates
-Sun Microsystems, Inc.  dtient les droits de proprit intellectuele
+are not responsible for and expressly disclaim all
-relatifs la technologie incorpore dans le produit qui est dcrit dans ce
+warranties of any kind with respect to third-party content,
-document.  En particulier, et ce sans limitation, ces droits de proprit
+products, and services.  Oracle Corporation and its
-intellectuelle peuvent inclure un ou plusieurs des brevets amricains
+affiliates will not be responsible for any loss, costs, or
-lists l'adresse suivante:  http://www.sun.com/patents et un ou
+damages incurred due to your access to or use of third-party
-plusieures de brevet en attente aux Etats - Unis et dans les autres
+content, products, or services.
 pays.
 CE PRODUIT CONTIENT DES INFORMATIONS CONFIDENTIELLES ET DES SECRETS
 COMMERCIAUX DE SUN MICROSYSTEMS, INC.  SON UTILISATION, SA DIVULGATION
 ET SA REPRODUCTION SONT INTERDITES SANS L AUTORISATION EXPRESSE, ECRITE
 ET PREALABLE DE SUN MICROSYSTEMS, INC.
 L'utilisation est soumise aux termes du contract de licence.
 Cette distributions peut inclure des elements dvelopps par des tiers.
 Sun, Sun Microsystems, le logo Sun, Java et Java SE sont des marques de
 fabrique ou des marques dposes de Sun Microsystems, Inc.  aux Etats-Unis
 et dans d'autres pays.
 Ce produit est soumis la lgislation amricaine en matire de contrle des
 exportations et peut tre soumis la rglementation en vigueur dans
 d'autres pays dans le domaine des exportations et importations.  Les
 utilisations finales, ou utilisateurs finaux, pour des armes
 nuclaires,des missiles, des armes biologiques et chimiques ou du
 nuclaire maritime, directement ou indirectement, sont strictement
 interdites.  Les exportations ou rexportations vers les pays sous
 embargo amricain, ou vers des entits figurant sur les listes d'exclusion
 d'exportation des produits ou des services qui sont regis parla
 legislation amricaines, y compris, mais de manire non exhaustive, la
 liste de personnes qui font objet d'un ordre de ne pas participer, d'une
 faon directe ou indirecte, aux exportations des produits ou des services
 qui sont rgis par la lgislation amricaine sur le contrle des
 exportations et la liste de ressortissants spcifiquement dsigns, sont
 rigoureusement interdites.
--- a/extra/source/jdk-6/HOWTO-BUILD-TXZ
+++ b/extra/source/jdk-6/HOWTO-BUILD-TXZ
@ -1,5 +1,5 @@
-1.  Download the file jdk-6u20-linux-i586.bin from
+1.  Download the file jdk-6u*-linux-i586.bin from
-    java.sun.com and put it in the directory.
+    java.com and put it in the directory.
 2.  Run jdk.SlackBuild to package it as an installable
    .txz package.
--- a/extra/source/jdk-6/LICENSE
+++ b/extra/source/jdk-6/LICENSE
@ -1,345 +1 @@
-Sun Microsystems, Inc. Binary Code License Agreement
+Please refer to http://java.com/license
 for the JAVA SE DEVELOPMENT KIT (JDK), VERSION 6
 SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE
 SOFTWARE IDENTIFIED BELOW TO YOU ONLY UPON THE CONDITION
 THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS BINARY
 CODE LICENSE AGREEMENT AND SUPPLEMENTAL LICENSE TERMS
 (COLLECTIVELY "AGREEMENT"). PLEASE READ THE AGREEMENT
 CAREFULLY.  BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT 
 YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU ARE 
 AGREEING TO THESE TERMS ON BEHALF OF A COMPANY OR OTHER 
 LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL 
 AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS. IF 
 YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT WISH 
 TO BE BOUND BY THE TERMS, THEN YOU MUST NOT USE THE
 SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE 
 SOFTWARE IS CONTAINED.
 1. DEFINITIONS. "Software" means the identified above in
 binary form, any other machine readable materials
 (including, but not limited to, libraries, source files,
 header files, and data files), any updates or error
 corrections provided by Sun, and any user manuals,
 programming guides and other documentation provided to you
 by Sun under this Agreement.  "General Purpose Desktop
 Computers and Servers" means computers, including desktop
 and laptop computers, or servers, used for general
 computing functions under end user control (such as but not
 specifically limited to email, general purpose Internet
 browsing, and office suite productivity tools).
 The use of Software in systems and solutions that provide
 dedicated functionality (other than as mentioned above) or
 designed for use in embedded or function-specific software
 applications, for example but not limited to: Software
 embedded in or bundled with industrial control systems,
 wireless mobile telephones, wireless handheld devices,
 netbooks, kiosks, TV/STB, Blu-ray Disc devices, telematics 
 and network control switching equipment, printers and 
 storage management systems, and other related systems are 
 excluded from this definition and not licensed under this
 Agreement.  "Programs" means Java technology applets and
 applications intended to run on the Java Platform Standard
 Edition (Java SE) platform on Java-enabled General Purpose
 Desktop Computers and Servers.
 2. LICENSE TO USE. Subject to the terms and conditions of
 this Agreement, including, but not limited to the Java
 Technology Restrictions of the Supplemental License Terms,
 Sun grants you a non-exclusive, non-transferable, limited
 license without license fees to reproduce and use
 internally Software complete and unmodified for the sole
 purpose of running Programs. Additional licenses for
 developers and/or publishers are granted in the
 Supplemental License Terms.
 3. RESTRICTIONS. Software is confidential and copyrighted.
 Title to Software and all associated intellectual property
 rights is retained by Sun and/or its licensors. Unless
 enforcement is prohibited by applicable law, you may not
 modify, decompile, or reverse engineer Software. You
 acknowledge that Licensed Software is not designed or
 intended for use in the design, construction, operation or
 maintenance of any nuclear facility. Sun Microsystems, Inc.
 disclaims any express or implied warranty of fitness for
 such uses. No right, title or interest in or to any
 trademark, service mark, logo or trade name of Sun or its
 licensors is granted under this Agreement. Additional
 restrictions for developers and/or publishers licenses are
 set forth in the Supplemental License Terms.
 4. LIMITED WARRANTY. Sun warrants to you that for a period
 of ninety (90) days from the date of purchase, as evidenced
 by a copy of the receipt, the media on which Software is
 furnished (if any) will be free of defects in materials and
 workmanship under normal use. Except for the foregoing,
 Software is provided "AS IS". Your exclusive remedy and
 Sun's entire liability under this limited warranty will be
 at Sun's option to replace Software media or refund the fee
 paid for Software. Any implied warranties on the Software
 are limited to 90 days. Some states do not allow
 limitations on duration of an implied warranty, so the
 above may not apply to you. This limited warranty gives you
 specific legal rights. You may have others, which vary from
 state to state.
 5. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS
 AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
 REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
 WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
 PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE
 EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY
 INVALID.
 6. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY
 LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
 ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT,
 CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
 CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
 OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE,
 EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES. In no event will Sun's liability to you, whether
 in contract, tort (including negligence), or otherwise,
 exceed the amount paid by you for Software under this
 Agreement. The foregoing limitations will apply even if the
 above stated warranty fails of its essential purpose. Some
 states do not allow the exclusion of incidental or
 consequential damages, so some of the terms above may not
 be applicable to you.
 7. TERMINATION. This Agreement is effective until
 terminated. You may terminate this Agreement at any time by
 destroying all copies of Software. This Agreement will
 terminate immediately without notice from Sun if you fail
 to comply with any provision of this Agreement. Either
 party may terminate this Agreement immediately should any
 Software become, or in either party's opinion be likely to
 become, the subject of a claim of infringement of any
 intellectual property right. Upon Termination, you must
 destroy all copies of Software.
 8. EXPORT REGULATIONS. All Software and technical data
 delivered under this Agreement are subject to US export
 control laws and may be subject to export or import
 regulations in other countries. You agree to comply
 strictly with all such laws and regulations and acknowledge
 that you have the responsibility to obtain such licenses to
 export, re-export, or import as may be required after
 delivery to you.
 9. TRADEMARKS AND LOGOS. You acknowledge and agree as
 between you and Sun that Sun owns the SUN, SOLARIS, JAVA,
 JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS,
 JAVA, JINI, FORTE, and iPLANET-related trademarks, service
 marks, logos and other brand designations ("Sun Marks"),
 and you agree to comply with the Sun Trademark and Logo
 Usage Requirements currently located at
 http://www.sun.com/policies/trademarks. Any use you make of
 the Sun Marks inures to Sun's benefit.
 10. U.S. GOVERNMENT RESTRICTED RIGHTS. If Software is being
 acquired by or on behalf of the U.S. Government or by a
 U.S. Government prime contractor or subcontractor (at any
 tier), then the Government's rights in Software and
 accompanying documentation will be only as set forth in
 this Agreement; this is in accordance with 48 CFR 227.7201
 through 227.7202-4 (for Department of Defense (DOD)
 acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
 acquisitions).
 11. GOVERNING LAW. Any action related to this Agreement
 will be governed by California law and controlling U.S.
 federal law. No choice of law rules of any jurisdiction
 will apply.
 12. SEVERABILITY. If any provision of this Agreement is
 held to be unenforceable, this Agreement will remain in
 effect with the provision omitted, unless omission would
 frustrate the intent of the parties, in which case this
 Agreement will immediately terminate.
 13. INTEGRATION. This Agreement is the entire agreement
 between you and Sun relating to its subject matter. It
 supersedes all prior or contemporaneous oral or written
 communications, proposals, representations and warranties
 and prevails over any conflicting or additional terms of
 any quote, order, acknowledgment, or other communication
 between the parties relating to its subject matter during
 the term of this Agreement. No modification of this
 Agreement will be binding, unless in writing and signed by
 an authorized representative of each party.
 SUPPLEMENTAL LICENSE TERMS
 These Supplemental License Terms add to or modify the terms
 of the Binary Code License Agreement. Capitalized terms not
 defined in these Supplemental Terms shall have the same
 meanings ascribed to them in the Binary Code License
 Agreement . These Supplemental Terms shall supersede any
 inconsistent or conflicting terms in the Binary Code
 License Agreement, or in any license contained within the
 Software.
 A. Software Internal Use and Development License Grant.
 Subject to the terms and conditions of this Agreement and
 restrictions and exceptions set forth in the Software
 "README" file incorporated herein by reference, including,
 but not limited to the Java Technology Restrictions of
 these Supplemental Terms, Sun grants you a non-exclusive,
 non-transferable, limited license without fees to reproduce
 internally and use internally the Software complete and
 unmodified for the purpose of designing, developing, and
 testing your Programs.
 B. License to Distribute Software. Subject to the terms and
 conditions of this Agreement and restrictions and
 exceptions set forth in the Software README file,
 including, but not limited to the Java Technology
 Restrictions of these Supplemental Terms, Sun grants you a
 non-exclusive, non-transferable, limited license without
 fees to reproduce and distribute the Software, provided
 that (i) you distribute the Software complete and
 unmodified and only bundled as part of, and for the sole
 purpose of running, your Programs, (ii) the Programs add
 significant and primary functionality to the Software,
 (iii) you do not distribute additional software intended to
 replace any component(s) of the Software, (iv) you do not
 remove or alter any proprietary legends or notices
 contained in the Software, (v) you only distribute the
 Software subject to a license agreement that protects Sun's
 interests consistent with the terms contained in this
 Agreement, and (vi) you agree to defend and indemnify Sun
 and its licensors from and against any damages, costs,
 liabilities, settlement amounts and/or expenses (including
 attorneys' fees) incurred in connection with any claim,
 lawsuit or action by any third party that arises or results
 from the use or distribution of any and all Programs and/or
 Software.
 C. License to Distribute Redistributables. Subject to the
 terms and conditions of this Agreement and restrictions and
 exceptions set forth in the Software README file, including
 but not limited to the Java Technology Restrictions of
 these Supplemental Terms, Sun grants you a non-exclusive,
 non-transferable, limited license without fees to reproduce
 and distribute those files specifically identified as
 redistributable in the Software "README" file
 ("Redistributables") provided that: (i) you distribute the
 Redistributables complete and unmodified, and only bundled
 as part of Programs, (ii) the Programs add significant and
 primary functionality to the Redistributables, (iii) you do
 not distribute additional software intended to supersede
 any component(s) of the Redistributables (unless otherwise
 specified in the applicable README file), (iv) you do not
 remove or alter any proprietary legends or notices
 contained in or on the Redistributables, (v) you only
 distribute the Redistributables pursuant to a license
 agreement that protects Sun's interests consistent with the
 terms contained in the Agreement, (vi) you agree to defend
 and indemnify Sun and its licensors from and against any
 damages, costs, liabilities, settlement amounts and/or
 expenses (including attorneys' fees) incurred in connection
 with any claim, lawsuit or action by any third party that
 arises or results from the use or distribution of any and
 all Programs and/or Software.
 D. Java Technology Restrictions.  You may not create,
 modify, or change the behavior of, or authorize your
 licensees to create, modify, or change the behavior of,
 classes, interfaces, or subpackages that are in any way
 identified as "java", "javax", "sun" or similar convention
 as specified by Sun in any naming convention designation.
 E. Distribution by Publishers. This section pertains to
 your distribution of the Software with your printed book or
 magazine (as those terms are commonly used in the industry)
 relating to Java technology ("Publication"). Subject to and
 conditioned upon your compliance with the restrictions and
 obligations contained in the Agreement, in addition to the
 license granted in Paragraph 1 above, Sun hereby grants to
 you a non-exclusive, nontransferable limited right to
 reproduce complete and unmodified copies of the Software on
 electronic media (the "Media") for the sole purpose of
 inclusion and distribution with your Publication(s),
 subject to the following terms: (i) You may not distribute
 the Software on a stand-alone basis; it must be distributed
 with your Publication(s); (ii) You are responsible for
 downloading the Software from the applicable Sun web site;
 (iii) You must refer to the Software as JavaTM SE
 Development Kit 6; (iv) The Software must be reproduced in
 its entirety and without any modification whatsoever
 (including, without limitation, the Binary Code License and
 Supplemental License Terms accompanying the Software and
 proprietary rights notices contained in the Software);
 (v) The Media label shall include the following
 information: Copyright 2006, Sun Microsystems, Inc. All
 rights reserved. Use is subject to license terms. Sun, Sun
 Microsystems, the Sun logo, Solaris, Java, the Java Coffee
 Cup logo, J2SE, and all trademarks and logos based on Java
 are trademarks or registered trademarks of Sun
 Microsystems, Inc. in the U.S. and other countries. This
 information must be placed on the Media label in such a
 manner as to only apply to the Sun Software; (vi) You must
 clearly identify the Software as Sun's product on the Media
 holder or Media label, and you may not state or imply that
 Sun is responsible for any third-party software contained
 on the Media; (vii) You may not include any third party
 software on the Media which is intended to be a replacement
 or substitute for the Software; (viii) You shall indemnify
 Sun for all damages arising from your failure to comply
 with the requirements of this Agreement. In addition, you
 shall defend, at your expense, any and all claims brought
 against Sun by third parties, and shall pay all damages
 awarded by a court of competent jurisdiction, or such
 settlement amount negotiated by you, arising out of or in
 connection with your use, reproduction or distribution of
 the Software and/or the Publication. Your obligation to
 provide indemnification under this section shall arise
 provided that Sun: (a) provides you prompt notice of the
 claim; (b) gives you sole control of the defense and
 settlement of the claim; (c) provides you, at your expense,
 with all available information, assistance and authority to
 defend; and (d) has not compromised or settled such claim
 without your prior written consent; and (ix) You shall
 provide Sun with a written notice for each Publication;
 such notice shall include the following information: (1)
 title of Publication, (2) author(s), (3) date of
 Publication, and (4) ISBN or ISSN numbers. Such notice
 shall be sent to Sun Microsystems, Inc., 4150 Network
 Circle, M/S USCA12-110, Santa Clara, California 95054,
 U.S.A , Attention: Contracts Administration.
 F. Source Code. Software may contain source code that,
 unless expressly licensed for other purposes, is provided
 solely for reference purposes pursuant to the terms of this
 Agreement. Source code may not be redistributed unless
 expressly provided for in this Agreement.
 G. Third Party Code. Additional copyright notices and
 license terms applicable to portions of the Software are
 set forth in the THIRDPARTYLICENSEREADME.txt file. In
 addition to any terms and conditions of any third party
 opensource/freeware license identified in the
 THIRDPARTYLICENSEREADME.txt file, the disclaimer of
 warranty and limitation of liability provisions in
 paragraphs 5 and 6 of the  Binary Code License Agreement
 shall apply to all Software in this distribution.
 H. Termination for Infringement. Either party may terminate
 this Agreement immediately should any Software become, or
 in either party's opinion be likely to become, the subject
 of a claim of infringement of any intellectual property
 right.
 I. Installation and Auto-Update.  The Software's
 installation and auto-update processes transmit a limited
 amount of data to Sun (or its service provider) about those
 specific processes to help Sun understand and optimize
 them.  Sun does not associate the data with personally
 identifiable information.  You can find more information
 about the data Sun collects at http://java.com/data/.
 For inquiries please contact: Sun Microsystems, Inc., 4150
 Network Circle, Santa  Clara, California 95054, U.S.A.
--- a/extra/source/jdk-6/README.html
+++ b/extra/source/jdk-6/README.html
@ -1,714 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=us-ascii">
+<title>README
-  <meta name="collection" content="reference">
+</title>
  <title>README -- Java Platform, Standard Edition Development Kit</title>
 </head>
-
+<body>
-<body lang="en-US" bgcolor="#FFFFFF">
+Please refer to http://java.com/licensereadme
  <h1 align="center">README</h1>
  <h2 align="center">Java<sup><font size="-2">TM</font></sup> Platform,
  Standard Edition 6<br>
  Development Kit</h2>
  <p align="center"><b>JDK<sup><font size="-2">TM</font></sup> 6</b></p>
  <h2>Contents</h2>
  <ul>
    <li><a href="#introduction">Introduction</a></li>
    <li><a href="#install">System Requirements &amp; Installation</a></li>
    <li><a href="#docs">JDK Documentation</a></li>
    <li><a href="#relnotes">Release Notes</a></li>
    <li><a href="#compatibility">Compatibility</a></li>
    <li><a href="#bugs">Bug Reports and Feedback</a></li>
    <li><a href="#contents">Contents of the JDK</a></li>
    <li><a href="#jre">Java Runtime Environment</a></li>
    <li><a href="#redistribution">Redistribution</a></li>
    <li><a href="#endorsed">Java Endorsed Standards Override
    Mechanism</a></li>
    <li><a href="#javadb">Java DB</a></li>
    <li><a href="#webpages">Web Pages</a></li>
  </ul>
  <h2><a name="introduction" id="introduction"></a>Introduction</h2>
  <blockquote>
    Thank you for downloading this release of the Java<sup><font size=
    "-2">TM</font></sup> Platform, Standard Edition Development Kit
    (JDK<sup><font size="-2">TM</font></sup>). The JDK is a development
    environment for building applications, applets, and components using the
    Java programming language.
  </blockquote>
  <blockquote>
    The JDK includes tools useful for developing and testing programs written
    in the Java programming language and running on the Java<sup><font size=
    "-2">TM</font></sup> platform.
  </blockquote>
  <h2><a name="install" id="install"></a>System Requirements &amp;
  Installation</h2>
  <blockquote>
    System requirements, installation instructions and troubleshooting tips
    are located on the Java Software web site at:
  </blockquote>
  <blockquote>
    <a href="http://java.sun.com/javase/6/webnotes/install/">JDK 6
    Installation Instructions</a>
  </blockquote>
  <h2><a name="docs" id="docs"></a>JDK<sup><font size="-2">TM</font></sup>
  Documentation</h2>
  <blockquote>
    The on-line <a href=
    "http://java.sun.com/javase/6/docs/">Java<sup><font size=
    "-2">TM</font></sup> Platform, Standard Edition (Java SE)
    Documentation</a> contains API specifications, feature descriptions,
    developer guides, reference pages for JDK<sup><font size=
    "-2">TM</font></sup> tools and utilities, demos, and links to related
    information. This documentation is also available in a download bundle
    which you can install on your machine. To obtain the documentation bundle,
    see the <a href="http://java.sun.com/javase/6/download.jsp">download
    page</a>. For API documentation, refer to the <a href=
    "http://java.sun.com/javase/6/docs/api/index.html">The
    Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition API
    Specification</a> This provides brief descriptions of the API with an
    emphasis on specifications, not on code examples.
  </blockquote>
  <h2><a name="relnotes" id="relnotes"></a>Release Notes</h2>
  <blockquote>
    See the <a href="http://java.sun.com/javase/6/webnotes/">Java SE 6 Release
    Notes</a> on the Java Software web site for additional information
    pertaining to this release. Please check the on-line release notes
    occasionally for the latest information as they will be updated as needed.
  </blockquote>
  <h2><a name="compatibility" id="compatibility"></a>Compatibility</h2>
  <blockquote>
    See <a href=
    "http://java.sun.com/javase/6/webnotes/compatibility.html">Compatibility
    with Previous Releases</a> on the Java Software web site for the list of
    known compatibility issues. Every effort has been made to support programs
    written for previous versions of the Java<sup><font size=
    "-2">TM</font></sup> platform. Although some incompatible changes were
    necessary, most software should migrate to the current version with no
    reprogramming. Any failure to do so is considered a bug, except for a
    small number of cases where compatibility was deliberately broken, as
    described on our compatibility web page. Some compatibility-breaking
    changes were required to close potential security holes or to fix
    implementation or design bugs.
  </blockquote>
  <h2><a name="bugs" id="bugs"></a>Bug Reports and Feedback</h2>
  <blockquote>
    The <a href="http://bugs.sun.com/bugdatabase/index.jsp">Bug Database</a>
    web site lets you search for and examine existing bug reports, submit your
    own bug reports, and tell us which bug fixes matter most to you. To
    directly submit a bug or request a feature, fill out this form:
  </blockquote>
  <blockquote>
    <a href=
    "http://bugs.sun.com/services/bugreport/index.jsp">http://bugs.sun.com/services/bugreport/index.jsp</a>
  </blockquote>
  <blockquote>
    You can send feedback to the <a href=
    "http://developers.sun.com/contact/feedback.jsp?&category=docteam">Java SE documentation
    team</a>. You can also send comments directly to <a href=
    "http://developers.sun.com/contact/index.jsp">Java Software engineering
    team email addresses</a>.
  </blockquote>
  <blockquote>
    <b>Note</b> - Please do not seek technical support through the Bug
    Database or our development teams. For support options, see <a href=
    "http://java.sun.com/developer/support/">Support and Services</a> on the
    Java Software web site.
  </blockquote>
  <h2><a name="contents" id="contents"></a>Contents of the JDK<sup><font size=
  "-2">TM</font></sup></h2>
  <blockquote>
    This section contains a general summary of the files and directories in
    the JDK<sup><font size="-2">TM</font></sup>. For details on the files and
    directories, see the <a href=
    "http://java.sun.com/javase/6/docs/technotes/tools/index.html#general">JDK
    File Structure</a> section of the Java SE documentation for your platform.
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><b>Development Tools</b></dt>
        <dd>(In the <code>bin/</code> subdirectory) Tools and utilities that
        will help you develop, execute, debug, and document programs written
        in the Java<sup><font size="-2">TM</font></sup> programming language.
        For further information, see the <a href=
        "http://java.sun.com/javase/6/docs/technotes/tools/index.html">tool
        documentation</a>.<br>
        <br></dd>
        <dt><b>Runtime Environment</b></dt>
        <dd>(In the <code>jre/</code> subdirectory) An implementation of the
        Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) for
        use by the JDK. The JRE includes a Java<sup><font size=
        "-2">TM</font></sup> Virtual Machine (JVM<sup><font size=
        "-2">TM</font></sup>), class libraries, and other files that support
        the execution of programs written in the Java<sup><font size=
        "-2">TM</font></sup> programming language.<br>
        <br></dd>
        <dt><b>Additional Libraries</b></dt>
        <dd>(In the <code>lib/</code> subdirectory) Additional class libraries
        and support files required by the development tools.<br>
        <br></dd>
        <dt><b>Demo Applets and Applications</b></dt>
        <dd>(In the <code>demo/</code> subdirectory) Examples, with source
        code, of programming for the Java<sup><font size="-2">TM</font></sup>
        platform. These include examples that use Swing and other
        Java<sup><font size="-2">TM</font></sup> Foundation Classes, and the
        Java<sup><font size="-2">TM</font></sup> Platform Debugger
        Architecture.<br>
        <br></dd>
        <dt><b>Sample Code</b></dt>
        <dd>(In the <code>sample</code> subdirectory) Samples, with source
        code, of programming for certain Java API's.<br>
        <br></dd>
        <dt><b>C header Files</b></dt>
        <dd>(In the <code>include/</code> subdirectory) Header files that
        support native-code programming using the <a href=
        "http://java.sun.com/javase/6/docs/technotes/guides/jni/">Java Native
        Interface</a>, the <a href=
        "http://java.sun.com/javase/6/docs/technotes/guides/jvmti/">JVM<sup><font size="-2">TM</font></sup>
        Tool Interface</a>, and other functionality of the
        Java<sup><font size="-2">TM</font></sup> platform.<br>
        <br></dd>
        <dt><b>Source Code</b></dt>
        <dd>(In <code>src.zip</code>) Java<sup><font size="-2">TM</font></sup>
        programming language source files for all classes that make up the
        Java&nbsp;core API (that is, sources files for the java.*, javax.* and
        some org.* packages, but not for com.sun.* packages). This source code
        is provided for informational purposes only, to help developers learn
        and use the Java<sup><font size="-2">TM</font></sup> programming
        language. These files do not include platform-specific implementation
        code and cannot be used to rebuild the class libraries. To extract
        these file, use any common zip utility. Or, you may use the Jar
        utility in the JDK's <code>bin/</code> directory:<br>
        <br>
        <code>jar xvf src.zip</code></dd>
      </dl>
    </dd>
  </dl>
  <h2><a name="jre" id="jre"></a>The Java Runtime Environment
  (JRE<sup><font size="-2">TM</font></sup>)</h2>
  <blockquote>
    The Java<sup><font size="-2">TM</font></sup> Runtime Environment
    (JRE<sup><font size="-2">TM</font></sup>) is available as a separately
    downloadable product. See the <a href=
    "http://java.sun.com/javase/6/download.jsp">download web site</a>.
  </blockquote>
  <blockquote>
    The JRE allows you to run applications written in the Java<sup><font size=
    "-2">TM</font></sup> programming language. Like the JDK<sup><font size=
    "-2">TM</font></sup>, it contains the Java<sup><font size=
    "-2">TM</font></sup> Virtual Machine (JVM<sup><font size=
    "-2">TM</font></sup>), classes comprising the Java<sup><font size=
    "-2">TM</font></sup> platform API, and supporting files. Unlike the JDK,
    it does not contain development tools such as compilers and debuggers.
  </blockquote>
  <blockquote>
    You can freely redistribute the JRE with your application, according to
    the terms of the JRE license. Once you have developed your application
    using the JDK, you can ship it with the JRE so your end-users will have a
    Java<sup><font size="-2">TM</font></sup> platform on which to run your
    software.
  </blockquote>
  <h2><a name="redistribution" id="redistribution"></a>Redistribution</h2>
  <blockquote>
    <blockquote>
      <hr>
      NOTE - The license for this software does not allow the redistribution
      of beta and other pre-release versions.
      <hr>
    </blockquote>
  </blockquote>
  <blockquote>
    Subject to the terms and conditions of the Software License Agreement and
    the obligations, restrictions, and exceptions set forth below, You may
    reproduce and distribute the Software (and also portions of Software
    identified below as Redistributable), provided that:
  </blockquote>
  <blockquote>
    <ol type="a">
      <li>you distribute the Software complete and unmodified and only bundled
      as part of Your applets and applications ("Programs"),</li>
      <li>your Programs add significant and primary functionality to the
      Software,</li>
      <li>your Programs are only intended to run on Java-enabled general
      purpose desktop computers and servers,</li>
      <li>you distribute Software for the sole purpose of running your
      Programs,</li>
      <li>you do not distribute additional software intended to replace any
      component(s) of the Software,</li>
      <li>you do not remove or alter any proprietary legends or notices
      contained in or on the Software,</li>
      <li>you only distribute the Software subject to a license agreement that
      protects Sun's interests consistent with the terms contained in this
      Agreement, and</li>
      <li>you agree to defend and indemnify Sun and its licensors from and
      against any damages, costs, liabilities, settlement amounts and/or
      expenses (including attorneys' fees) incurred in connection with any
      claim, lawsuit or action by any third party that arises or results from
      the use or distribution of any and all Programs and/or Software.</li>
    </ol>
  </blockquote>
  <blockquote>
    The term "vendors" used here refers to licensees, developers, and
    independent software vendors (ISVs) who license and distribute the
    Java<sup><font size="-2">TM</font></sup> Development Kit
    (JDK<sup><font size="-2">TM</font></sup>) with their programs.
  </blockquote>
  <blockquote>
    Vendors must follow the terms of the Java Development Kit Binary Code
    License agreement.
  </blockquote>
  <h3>Required vs. Optional Files</h3>
  <blockquote>
    The files that make up the Java<sup><font size="-2">TM</font></sup>
    Development Kit (JDK<sup><font size="-2">TM</font></sup>) are divided into
    two categories: required and optional. Optional files may be excluded from
    redistributions of the JDK at the vendor's discretion.
  </blockquote>
  <blockquote>
    The following section contains a list of the files and directories that
    may optionally be omitted from redistributions of the JDK. All files not
    in these lists of optional files must be included in redistributions of
    the JDK.
  </blockquote>
  <h3>Optional Files and Directories</h3>
  <blockquote>
    The following files may be optionally excluded from redistributions. These
    files are located in the jdk1.6.0_&lt;version&gt; directory, where
    &lt;version&gt; is the update version number. Solaris<sup><font size=
    "-2">TM</font></sup> and Linux filenames and separators are shown. Windows
    executables have the ".exe" suffix. Corresponding files with
    <code>_g</code> in the name can also be excluded. The corresponding man
    pages should be excluded for any excluded executables (with paths listed
    below beginning with <code>bin/</code>, for the Solaris<sup><font size=
    "-2">TM</font></sup> Operating System and Linux).
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><code>jre/lib/charsets.jar</code></dt>
        <dd>Character conversion classes</dd>
        <dt><code>jre/lib/ext/</code></dt>
        <dd><code>sunjce_provider.jar</code> - the SunJCE provider for Java
        Cryptography APIs<br>
        <code>localedata.jar</code> - contains many of the resources needed
        for non US English locales<br>
        <code>ldapsec.jar</code> - contains security features supported by the
        LDAP service provider<br>
        <code>dnsns.jar</code> - for the InetAddress wrapper of JNDI DNS
        provider</dd>
        <dt><code>bin/rmid</code> and <code>jre/bin/rmid</code></dt>
        <dd>Java RMI Activation System Daemon</dd>
        <dt><code>bin/rmiregistry</code> and
        <code>jre/bin/rmiregistry</code></dt>
        <dd>Java Remote Object Registry</dd>
        <dt><code>bin/tnameserv</code> and <code>jre/bin/tnameserv</code></dt>
        <dd>Java IDL Name Server</dd>
        <dt><code>bin/keytool</code> and <code>jre/bin/keytool</code></dt>
        <dd>Key and Certificate Management Tool</dd>
        <dt><code>bin/kinit</code> and <code>jre/bin/kinit</code></dt>
        <dd>Used to obtain and cache Kerberos ticket-granting tickets</dd>
        <dt><code>bin/klist</code> and <code>jre/bin/klist</code></dt>
        <dd>Kerberos display entries in credentials cache and keytab</dd>
        <dt><code>bin/ktab</code> and <code>jre/bin/ktab</code></dt>
        <dd>Kerberos key table manager</dd>
        <dt><code>bin/policytool</code> and
        <code>jre/bin/policytool</code></dt>
        <dd>Policy File Creation and Management Tool</dd>
        <dt><code>bin/orbd</code> and <code>jre/bin/orbd</code></dt>
        <dd>Object Request Broker Daemon</dd>
        <dt><code>bin/servertool</code> and
        <code>jre/bin/servertool</code></dt>
        <dd>Java IDL Server Tool</dd>
        <dt><code>bin/javaws</code>, <code>jre/bin/javaws</code>,
        <code>jre/lib/javaws/</code> and <code>jre/lib/javaws.jar</code></dt>
        <dd>Java Web Start</dd>
        <dt><code>db/</code></dt>
        <dd>
          Java DB, Sun Microsystems's distribution of the Apache Derby
          database (only with file based distributions of the JDK). 
        </dd>
        <dt><code>demo/</code></dt>
        <dd>Demo Applets and Applications</dd>
        <dt><code>sample/</code></dt>
        <dd>Sample Code</dd>
        <dt><code>src.zip</code></dt>
        <dd>Archive of source files</dd>
      </dl>
    </dd>
  </dl>
  <h3><a name="redistributablejdkfiles" id=
  "redistributablejdkfiles"></a>Redistributable JDK<sup><font size=
  "-2">TM</font></sup> Files</h3>
  <blockquote>
    The limited set of files and directories from the JDK listed below may be
    included in vendor redistributions of the Java<sup><font size=
    "-2">TM</font></sup> Runtime Environment (JRE<sup><font size=
    "-2">TM</font></sup>). They cannot be redistributed separately, and must
    accompany an identically versioned JRE distribution. All paths are
    relative to the top-level directory of the JDK. The corresponding man
    pages should be included for any included executables (with paths listed
    below beginning with <code>bin/</code>, for the Solaris<sup><font size=
    "-2">TM</font></sup> Operating System and Linux).
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><code>jre/lib/cmm/PYCC.pf</code></dt>
        <dd>Color profile. This file is required only if one wishes to convert
        between the PYCC color space and another color space.</dd>
        <dt>All <code>.ttf</code> font files in the
        <code>jre/lib/fonts/</code> directory.</dt>
        <dd>Note that the LucidaSansRegular.ttf font is already contained in
        the JRE, so there is no need to bring that file over from the
        JDK.</dd>
        <dt><code>jre/lib/audio/soundbank.gm</code></dt>
        <dd>This MIDI soundbank is present in the JDK, but it has been removed
        from the JRE in order to reduce the size of the JRE download bundle.
        However, a soundbank file is necessary for MIDI playback, and
        therefore the JDK's <code>soundbank.gm</code> file may be included in
        redistributions of the JRE at the vendor's discretion. Several
        versions of enhanced MIDI soundbanks are available from the Java Sound
        web site: <a href=
        "http://java.sun.com/products/java-media/sound/">http://java.sun.com/products/java-media/sound/</a>.
        These alternative soundbanks may be included in redistributions of the
        JRE.</dd>
        <dt>The javac bytecode compiler, consisting of the following
        files:</dt>
        <dd><code>bin/javac</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System and Linux]<br>
        <code>bin/sparcv9/javac</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition)]<br>
        <code>bin/amd64/javac</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (AMD)]<br>
        <code>bin/javac.exe</code> [Microsoft Windows]<br>
        <code>lib/tools.jar</code> [All platforms]</dd>
        <dt>The Annotation Processing Tool, consisting of the following
        files:</dt>
        <dd><code>lib/tools.jar</code> [All platforms]<br>
        <code>bin/apt</code> [Solaris<sup><font size="-2">TM</font></sup>
        Operating System and Linux]<br>
        <code>bin/sparcv9/apt</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition)]<br>
        <code>bin/amd64/apt</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (AMD)]<br>
        <code>bin/apt.exe</code> [Microsoft Windows]</dd>
        <dt><code>lib/jconsole.jar</code></dt>
        <dd>The Jconsole application. NOTE: The Jconsole application requires
        the dynamic attach mechanism.</dd>
        <dt>The dynamic attach mechanism consisting of the following
        files:</dt>
        <dd><code>lib/tools.jar</code> [All platforms]<br>
        <code>jre/lib/sparc/libattach.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
        Linux]<br>
        <code>jre/lib/sparcv9/libattach.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
        Linux]<br>
        <code>jre/lib/i386/libattach.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (x86) and Linux]<br>
        <code>jre/lib/amd64/libattach.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (AMD) and Linux]<br>
        <code>jre\bin\attach.dll</code> [Microsoft Windows]<br></dd>
        <dt>The Java Platform Debugger Architecture implementation consisting
        of the files shown in the dynamic attach section above, and the
        following files:</dt>
        <dd><code>lib/tools.jar</code> [All platforms]<br>
        <code>lib/sa-jdi.jar</code> [All platforms]<br>
        <code>jre/lib/sparc/libsaproc.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
        Linux]<br>
        <code>jre/lib/sparcv9/libsaproc.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (SPARC(R) Platform Edition) and
        Linux]<br>
        <code>jre/lib/i386/libsaproc.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (x86) and Linux]<br>
        <code>jre/lib/amd64/libsaproc.so</code> [Solaris<sup><font size=
        "-2">TM</font></sup> Operating System (AMD) and Linux]<br></dd>
        <dt><code>jre\bin\server\</code></dt>
        <dd>On Microsoft Windows platforms, the JDK includes both the Java
        HotSpot<sup><font size="-2">TM</font></sup> Server VM and Java
        HotSpot<sup><font size="-2">TM</font></sup> Client VM. However, the
        JRE for Microsoft Windows platforms includes only the Java
        HotSpot<sup><font size="-2">TM</font></sup> Client VM. Those wishing
        to use the Java HotSpot<sup><font size="-2">TM</font></sup> Server VM
        with the JRE may copy the JDK's <code>jre\bin\server</code> folder to
        a <code>bin\server</code> directory in the JRE. Software vendors may
        redistribute the Java HotSpot<sup><font size="-2">TM</font></sup>
        Server VM with their redistributions of the JRE.</dd>
      </dl>
    </dd>
  </dl>
  <h3>Unlimited Strength Java Cryptography Extension</h3>
  <blockquote>
    Due to import control restrictions for some countries, the Java
    Cryptography Extension (JCE) policy files shipped with the JDK and the JRE
    allow strong but limited cryptography to be used. These files are located
    at<br>
    <br>
    <code>&lt;java-home&gt;/lib/security/local_policy.jar</code><br>
    <code>&lt;java-home&gt;/lib/security/US_export_policy.jar</code><br>
    <br>
    where <code>&lt;java-home&gt;</code> is the <code>jre</code> directory of
    the JDK or the top-level directory of the JRE.
  </blockquote>
  <blockquote>
    An unlimited strength version of these files indicating no restrictions on
    cryptographic strengths is available on the JDK web site for those living
    in eligible countries. Those living in eligible countries may download the
    unlimited strength version and replace the strong cryptography jar files
    with the unlimited strength files.
  </blockquote>
  <h3>The cacerts Certificates File</h3>
  <blockquote>
    Root CA certificates may be added to or removed from the Java SE
    certificate file located at
  </blockquote>
  <blockquote>
    <code>&lt;java-home&gt;/lib/security/cacerts</code>
  </blockquote>
  <blockquote>
    For more information, see <a href=
    "http://java.sun.com/javase/6/docs/technotes/tools/solaris/keytool.html#cacerts">
    The cacerts Certificates File</a> section in the keytool documentation.
  </blockquote>
  <h2><a name="endorsed" id="endorsed"></a> Java Endorsed Standards Override
  Mechanism</h2>
  <blockquote>
    From time to time it is necessary to update the Java platform in order to
    incorporate newer versions of standards that are created outside of the
    Java Community Process<font size="-2"><sup>SM</sup></font> (JCP<font size=
    "-2"><sup>SM</sup></font> <a href=
    "http://www.jcp.org/">http://www.jcp.org/</a>) (<i>Endorsed
    Standards</i>), or in order to update the version of a technology included
    in the platform to correspond to a later standalone version of that
    technology (<i>Standalone Technologies</i>).
  </blockquote>
  <blockquote>
    The <i>Endorsed Standards Override Mechanism</i> provides a means whereby
    later versions of classes and interfaces that implement Endorsed Standards
    or Standalone Technologies may be incorporated into the Java Platform.
  </blockquote>
  <blockquote>
    For more information on the Endorsed Standards Override Mechanism,
    including the list of platform packages that it may be used to override,
    see
  </blockquote>
  <blockquote>
    <a href=
    "http://java.sun.com/javase/6/docs/technotes/guides/standards/">http://java.sun.com/javase/6/docs/technotes/guides/standards/</a>
  </blockquote>
  <h2><a name="javadb" id="javadb"></a>Java DB</h2>
  <blockquote>
    This distribution bundles Java DB, Sun Microsystems' distribution of the
    Apache Derby pure Java database technology. Default installation locations
    are:
    <ul>
      <li>Solaris: <code>/opt/SUNWjavadb</code></li>
      <li>Linux: <code>/opt/sun/javadb</code></li>
      <li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
    </ul>
    <p>For information on Java DB and Derby, including user and API
    documentation, the capabilities of Java DB and further resources, see the
    index.html file in the above directories.</p>
 <p>
 Note that file based distributions of the JDK on Solaris and Linux
 include Java DB in the ${JAVA_HOME}/db directory.
 </p>
  </blockquote>
  <h2><a name="webpages" id="webpages"></a>Web Pages</h2>
  <blockquote>
    For additional information, refer to these Sun Microsystems pages on the
    World Wide Web:
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><a href="http://java.sun.com/">http://java.sun.com/</a></dt>
        <dd>The Java Software web site, with the latest information on Java
        technology, product information, news, and features.</dd>
        <dt><a href=
        "http://java.sun.com/docs">http://java.sun.com/docs</a></dt>
        <dd>Java<sup><font size="-2">TM</font></sup> platform Documentation
        provides access to white papers, the Java Tutorial and other
        documents.</dd>
        <dt><a href=
        "http://developer.java.sun.com/">http://developer.java.sun.com</a></dt>
        <dd>Developer Services web site (Free registration required).
        Additional technical information, news, and features; user forums;
        support information, and much more.</dd>
        <dt><a href=
        "http://java.sun.com/products/">http://java.sun.com/products/</a></dt>
        <dd>Java Technology Products &amp; API</dd>
      </dl>
    </dd>
  </dl>
  <hr>
  <p><font size="2">The Java<sup><font size="-2">TM</font></sup> Development
  Kit (JDK<sup><font size="-2">TM</font></sup>) is a product of Sun
  Microsystems<sup><font size="-2">TM</font></sup>, Inc.<br>
  <br>
  Copyright &copy; 2010 Sun Microsystems, Inc.<br>
  4150 Network Circle, Santa Clara, California 95054, U.S.A.<br>
  All rights reserved.</font></p>
 <script type="text/javascript" language="JavaScript" src="/js/omi/jsc/s_code_remote.js">
 </script>
 </body>
 </html>
--- a/extra/source/jdk-6/README_ja.html
+++ b/extra/source/jdk-6/README_ja.html
@ -1,438 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=EUC-JP">
  <meta name="collection" content="reference">
 <title>README -- Java Platform, Standard Edition Development Kit</title>
 </head>
 <body lang="en-US" bgcolor="#FFFFFF">
 <h1 align="center">README</h1>
 <h2 align="center">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition 6<br> Development Kit</h2>
 <p align="center"><b>JDK<sup><font size="-2">TM</font></sup> 6</b></p>
 <h2>目次</h2>
  <ul>
 <li><a href="#introduction">はじめに</a></li>
 <li><a href="#install">システム要件およびインストール</a></li>
 <li><a href="#docs">JDK ドキュメント</a></li>
 <li><a href="#relnotes">リリースノート</a></li>
 <li><a href="#compatibility">互換性</a></li>
 <li><a href="#bugs">バグ報告とフィードバック</a></li>
 <li><a href="#contents">JDK の内容</a></li>
 <li><a href="#jre">Java Runtime Environment</a></li>
 <li><a href="#redistribution">再配布</a></li>
 <li><a href="#endorsed">推奨規格オーバーライド機構</a></li>
 <li><a href="#javadb">Java DB</a></li>
 <li><a href="#webpages">Web ページ</a></li>
  </ul>
 <h2><a name="introduction"></a>はじめに</h2>
  <blockquote>
    Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition Development Kit (JDK<sup><font size="-2">TM</font></sup>) のこのリリースをダウンロードいただきありがとうございます。JDK は、Java プログラミング言語を使用してアプリケーション、アプレット、およびコンポーネントを構築するための開発環境です。
  </blockquote>
  <blockquote>
    JDK には、Java プログラミング言語で記述されたプログラムの開発とテスト、および Java<sup><font size="-2">TM</font></sup> プラットフォームでの実行に使用できる各種ツールが付属しています。
  </blockquote>
 <h2><a name="install"></a>システム要件およびインストール</h2>
  <blockquote>
 システム要件、インストール手順、およびトラブルシューティングのヒントについては、次の Java Software Web サイトを参照してください。
  </blockquote>
  <blockquote>
 <a href="http://java.sun.com/javase/ja/6/webnotes/install/">JDK 6 インストール手順</a>
  </blockquote>
 <h2><a name="docs"></a>JDK<sup><font size="-2">TM</font></sup> ドキュメント</h2>
  <blockquote>
    <a href="http://java.sun.com/javase/ja/6/docs/ja/index.html">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition (Java SE) のオンラインドキュメント</a>には、API 仕様、機能説明、開発者ガイド、JDK<sup><font size="-2">TM</font></sup> ツールおよびユーティリティーのリファレンスページ、デモ、および関連情報へのリンクが含まれています。JDK ドキュメントは、使用しているマシンにインストール可能なダウンロードバンドルでも入手できます。 ドキュメントバンドルを入手するには、<a  href="../download.html">ダウンロードページ</a>を参照してください。 API については、<a href="http://java.sun.com/javase/ja/6/docs/ja/api/index.html">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition の API 仕様</a>を参照してください。 API について、コード例よりも仕様に重点をおいた簡単な説明を読むことができます。
  </blockquote>
 <h2><a name="relnotes"></a>リリースノート</h2>
  <blockquote>
    このリリースに関する追加情報については、Java Software Web サイトの <a  href="index.html">Java SE 6 リリースノート</a>を参照してください。オンライン版のリリースノートは随時更新されるので、定期的にアクセスして最新の情報を確認してください。
  </blockquote>
 <h2><a name="compatibility"></a>互換性</h2>
  <blockquote>
    互換性に関する既知の問題については、Java Software Web サイトで<a href="compatibility.html">以前のリリースとの互換性</a>を参照してください。 以前のバージョンの Java<sup><font size="-2">TM</font></sup> プラットフォーム用に記述されたプログラムのサポートについては万全を期しています。互換性を失う変更が必要な箇所もありましたが、ほとんどのソフトウェアはプログラミングをやり直すことなく現在のバージョンに移行できます。互換性に関する Web ページで説明しているような意図的に互換性を排除したわずかな場合を除いて、プログラミングをやり直さないと移行できない場合はバグであるとみなされます。潜在的なセキュリティーホールをふさぐため、または実装や設計上のバグを修正するために必要な変更によって、一部の互換性が失われています。
  </blockquote>
 <h2><a name="bugs"></a>バグ報告とフィードバック</h2>
  <blockquote>
    <a href="http://bugs.sun.com/bugdatabase/index.jsp">バグデータベース</a> Web サイトでは、既存のバグ報告の検索と調査、バグ報告の送信、バグ修正の重要度の報告を行うことができます。バグ報告や機能に関する要望を直接送信するには、次のフォームに記入してください。
  </blockquote>
  <blockquote>
    <a href=     "http://bugs.sun.com/services/bugreport/index.jsp">http://bugs.sun.com/services/bugreport/index.jsp</a>
  </blockquote>
  <blockquote>
    フィードバックは、<a href="http://java.sun.com/docs/forms/sendusmail.html">Java SE ドキュメントチーム</a>に送信してください。 また、<a href="http://java.sun.com/mail/">Java Software エンジニアリングチームの電子メールアドレス</a>にコメントを直接送信していただくこともできます。
  </blockquote>
  <blockquote>
 <b>注</b> - Bug Database や弊社開発チームからテクニカルサポートを受けることはできません。 サポートオプションについては、Java Software Web サイトの<a  href="http://java.sun.com/support/">サポートとサービス</a>を参照してください。
  </blockquote>
  <h2><a name="contents"></a>JDK<sup><font size="-2">TM</font></sup> の内容</h2>
  <blockquote>
 ここでは、JDK<sup><font size="-2">TM</font></sup> のファイルとディレクトリの概要を説明します。 ファイルとディレクトリの詳細については、お使いのプラットフォームの Java SE ドキュメントの「<a href="http://java.sun.com/javase/ja/6/docs/ja/technotes/tools/index.html#general">JDK ファイル構造</a>」を参照してください。
  </blockquote>
  <dl>
    <dd>
      <dl>
 <dt><b>開発ツール</b></dt>
 <dd><code>bin</code> サブディレクトリに格納されています。 Java<sup><font size="-2">TM</font></sup> プログラミング言語で記述されたプログラムの開発、実行、デバッグ、およびドキュメント作成を支援するツールとユーティリティーです。 詳細については、<a  href="http://java.sun.com/javase/ja/6/docs/ja/technotes/tools/index.html">各ツールのマニュアル</a>を参照してください。<br> <br></dd>
 <dt><b>Runtime Environment</b></dt>
 <dd><code>jre</code> サブディレクトリに格納されています。JDK で使用される Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) 実行環境の実装です。 JREには、Java<sup><font size="-2">TM</font></sup> 仮想マシン、クラスライブラリ、および Java<sup><font size="-2">TM</font></sup> プログラミング言語で記述されたプログラムの実行をサポートするその他のファイルが含まれます。<br> <br></dd>
 <dt><b>追加ライブラリ</b></dt>
        <dd><code>lib</code> サブディレクトリに格納されています。 開発ツールに必要な追加のクラスライブラリとサポートファイルです。<br> <br></dd>
 <dt><b>デモアプレットとアプリケーション</b></dt>
 <dd><code>demo</code> サブディレクトリに格納されています。 Java<sup><font size="-2">TM</font></sup> プラットフォーム用のプログラミング例で、ソースコードが含まれます。 Swing やその他の Java<sup><font size="-2">TM</font></sup> Foundation Classes、および Java<sup><font size="-2">TM</font></sup> Platform Debugger Architecture を使用する例も含まれます。<br> <br></dd>
 <dt><b>サンプルコード</b></dt>
        <dd><code>sample</code> サブディレクトリに格納されています。 特定の Java API のプログラミングのソースコード付きサンプルです。</dd>
 <dt><b>C ヘッダーファイル</b></dt>
        <dd><code>include</code> サブディレクトリに格納されています。 <a  href="http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/jni/index.html">Java Native Interface</a>、<a  href="http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/jvmti/index.html">JVM<sup><font size="-2">TM</font></sup> Tool Interface</a>、およびその他の Java<sup><font size="-2">TM</font></sup> Platform の機能を使用するネイティブコードプログラミングをサポートするヘッダーファイルです。<br> <br></dd>
 <dt><b>ソースコード</b></dt>
        <dd><code>src.zip</code> に格納されています。Java&nbsp;コア API を構成するすべてのクラスに対する Java<sup><font size="-2">TM</font></sup> プログラミング言語のソースファイルです (java.*、javax.*、および一部の org.* パッケージのソースファイル。com.sun.* パッケージは対象外)。このソースコードは情報提供のみを目的としており、開発者が Java<sup><font size="-2">TM</font></sup> プログラミング言語を理解し活用するのに役立ちます。これらのファイルには、プラットフォーム固有の実装コードは含まれません。これらのファイルを使用して、クラスライブラリを再構築することはできません。これらのファイルを展開するには、一般的な zip ユーティリティーを使用します。 また、次のように、JDK の <code>bin/</code> ディレクトリに用意されている Jar ユーティリティーを使用することもできます。<br> <br> <code>jar xvf src.zip</code></dd>
      </dl>
    </dd>
  </dl>
 <h2><a name="jre"></a>Java SE Runtime Environment (JRE<sup><font size="-2">TM</font></sup>)</h2>
  <blockquote>
 Java<sup><font size="-2">TM</font></sup> Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) は、単独でダウンロードできる製品として提供されています。 <a  href="../download.html">ダウンロード Web サイト</a>を参照 してください。
  </blockquote>
  <blockquote>
    JRE を使用すると、Java<sup><font size="-2">TM</font></sup> プログラミング言語で記述されたアプリケーションを実行できます。 JDK<sup><font size="-2">TM</font></sup> と同様に、Java<sup><font size="-2">TM</font></sup> 仮想マシン、Java<sup><font size="-2">TM</font></sup> プラットフォーム API を構成するクラス、およびサポートファイルが含まれます。JDK とは異なり、コンパイラやデバッガなどの開発ツールは含まれません。
  </blockquote>
  <blockquote>
 JRE は、JRE のライセンス条項に従って、独自に開発したアプリケーションとともに自由に再配布することができます。JDK を使用してアプリケーションを開発したのち、エンドユーザーがそのソフトウェアを Java<sup><font size="-2">TM</font></sup> プラットフォームで実行できるように、JRE とともに出荷することができます。
  </blockquote>
 <h2><a name="redistribution"></a>再配布</h2>
  <blockquote>
    <blockquote>
      <hr>
 注 - このソフトウェアのライセンスは、ベータ版およびその他のプレリリース版の再配布を許可するものではありません。
      <hr>
    </blockquote>
  </blockquote>
  <blockquote>
 ソフトウェアライセンス契約の条項、および以下で規定される義務、制限、および例外事項に従い、ソフトウェア (および以下で再配布可能と見なされる、ソフトウェアの一部) を複製および配布できます。
  </blockquote>
  <blockquote>
    <ol type="a">
 <li>ソフトウェアを完全な改変されていない状態で、かつアプレットおよびアプリケーション (「プログラム」) の一部としてバンドルされた状態でのみ配布する。</li>
 <li>プログラムが重要かつ主要な機能をソフトウェアに追加する。</li>
 <li>プログラムが Java 対応の汎用デスクトップコンピュータおよびサーバーで実行されることのみを目的とする。</li>
 <li>プログラムの実行のみを目的として、ソフトウェアを配布する。</li>
 <li>ソフトウェアのコンポーネントと置き換えることを目的として追加のソフトウェアを配布しない。</li>
 <li>ソフトウェアに記載されているいかなる所有権表示や告知も除去または変更しない。</li>
 <li>本契約に含まれる条項と合致した、Sun の利益を保護するライセンス契約に従ってのみソフトウェアを配布する。</li>
 <li>プログラムおよびソフトウェアの一部またはすべての使用あるいは配布に起因した第三者からの請求、訴訟、または措置に関連して生じるいかなる損害、費用、債務、和解金、および出費 (弁護士費用を含む) から、Sun とそのライセンサを擁護し、補償することに同意する。</li>
    </ol>
  </blockquote>
  <blockquote>
 ここで使用されている「ベンダー」という用語は、自らのプログラムとともに Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) をライセンス供与および配布するライセンシ、開発者、および独立系ソフトウェアベンダー (ISV) を指します。
  </blockquote>
  <blockquote>
 ベンダーは、Java Development Kit バイナリコードライセンス契約の条項に従う必要があります。
  </blockquote>
 <h3>必須ファイルとオプションファイル</h3>
  <blockquote>
 Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) を構成するファイルは、必須とオプションの 2 つに分類されます。オプションファイルは、ベンダーの判断により JDK の再配布から除外することができます。
  </blockquote>
  <blockquote>
 JDK の再配布から任意で除外できるファイルおよびディレクトリを次に示します。これらのオプションファイル一覧に含まれないファイルは、すべて JDK の再配布に含める必要があります。
  </blockquote>
 <h3>オプションのファイルとディレクトリ</h3>
  <blockquote>
 次のファイルは再配布から任意に除外できます。 これらのファイルは、jdk1.6.0_&lt;version&gt; ディレクトリにあります。&lt;version&gt; は、アップデートバージョン番号です。 Solaris<sup><font size=     "-2">TM</font></sup> および Linux のファイル名と区切り記号が示されています。Windows の実行可能ファイルには末尾に「.exe」が付きます。名前に <code>_g</code> が付く対応するファイルも除外できます。 除外された実行可能ファイル （Solaris<sup><font size="-2">TM</font></sup> オペレーティングシステムおよび Linux の場合、以下の一覧でパスが bin/ から始まる) に対応するマニュアルページは除外する必要があります。
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><code>jre/lib/charsets.jar</code></dt>
 <dd>文字変換クラス</dd>
 <dt><code>jre/lib/ext/</code></dt>
        <dd><code>sunjce_provider.jar</code> - Java 暗号化 API の SunJCE プロバイダ<br> <code>localedata.jar</code> - 米国英語以外のロケールに必要なリソースの多くを含む<br> <code>ldapsec.jar</code> - LDAP サービスプロバイダがサポートするセキュリティー機能を含む<br> <code>dnsns.jar</code> - JNDI DNS プロバイダの InetAddress ラッパー用</dd>
 <dt><tt>bin/rmid</tt> および <tt>jre/bin/rmid</tt></dt>
 <dd>Java RMI 起動システムデーモン</dd>
 <dt><tt>bin/rmiregistry</tt> および <tt>jre/bin/rmiregistry</tt></dt>
 <dd>Java リモートオブジェクトレジストリ</dd>
 <dt><tt>bin/tnameserv</tt> および <tt>jre/bin/tnameserv</tt></dt>
 <dd>Java IDL ネームサーバー</dd>
 <dt><tt>bin/keytool</tt> および <tt>jre/bin/keytool</tt></dt>
 <dd>鍵および証明書の管理ツール</dd>
 <dt><tt>bin/kinit</tt> および <tt>jre/bin/kinit</tt></dt>
 <dd>Kerberos チケット認可チケットの取得およびキャッシュに使用</dd>
 <dt><tt>bin/klist</tt> および <tt>jre/bin/klist</tt></dt>
 <dd>資格キャッシュおよびキータブ内の Kerberos 表示エントリ</dd>
 <dt><tt>bin/ktab</tt> および <tt>jre/bin/ktab</tt></dt>
 <dd>Kerberos キーテーブルマネージャー</dd>
 <dt><tt>bin/policytool</tt> および <tt>jre/bin/policytool</tt></dt>
 <dd>ポリシーファイルの作成および管理ツール</dd>
 <dt><tt>bin/orbd</tt> および <tt>jre/bin/orbd</tt></dt>
 <dd>Object Request Broker Daemon</dd>
 <dt><tt>bin/servertool</tt> および <tt>jre/bin/servertool</tt></dt>
 <dd>Java IDL サーバーツール</dd>
        <dt><tt>bin/javaws</tt>、<tt>jre/bin/javaws</tt>、<tt>jre/lib/javaws/</tt> および <tt>jre/lib/javaws.jar</tt></dt>
 <dd>Java Web Start</dd>
        <dt><code>db/</code></dt>
        <dd>
          Java DB。Sun Microsystems が配布する Apache Derby データベーステクノロジーです。デフォルトでは以下にインストールされます。
          <ul>
 <li>Solaris: <code>/opt/SUNWjavadb</code></li>
 <li>Linux: <code>/opt/sun/javadb</code></li>
 <li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
          </ul>ユーザードキュメントや API ドキュメント、Java DB の機能やその他リソースなどの Java DB と Derby の情報については、上記ディレクトリの index.html ファイルを参照してください。
        </dd>
 <dt><code>demo/</code></dt>
 <dd>デモアプレットとアプリケーション</dd>
 <dt><code>sample/</code></dt>
 <dd>サンプルコード</dd>
        <dt><code>src.zip</code></dt>
 <dd>ソースファイルのアーカイブ</dd>
      </dl>
    </dd>
  </dl>
  <h3>再配布可能な JDK<sup><font size="-2">TM</font></sup> ファイル</h3>
  <blockquote>
    次に示す JDK のファイル／ディレクトリセットは、ベンダーの提供する Java<sup><font size="-2">TM</font></sup> Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) の再配布に含めることができます。 これらを個別に再配布することはできません。バージョンが一致する JRE とともに配布する必要があります。次のパスは、すべて JDK の最上位ディレクトリからの相対パスです。 含められる実行可能ファイル （Solaris<sup><font size="-2">TM</font></sup> オペレーティングシステムおよび Linux の場合、以下の一覧でパスが bin/ から始まる) に対応するマニュアルページは含める必要があります。
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><code>jre/lib/cmm/PYCC.pf</code></dt>
 <dd>カラープロファイル。このファイルは、PYCC カラー領域とその他のカラー領域の間で変換を行う場合にのみ必要です。</dd>
 <dt><tt>jre/lib/fonts</tt> ディレクトリ内のすべての <tt>.ttf</tt> フォントファイル</dt>
        <dd>LucidaSansRegular.ttf フォントはすでに JRE に含まれているため、JDK から取得する必要はありません。</dd>
        <dt><code>jre/lib/audio/soundbank.gm</code></dt>
 <dd>この MIDI サウンドバンクは JDK に含まれますが、JRE から削除されています。これは JRE のダウンロードバンドルのサイズを減らすことが目的です。 ただし、サウンドバンクファイルは MIDI の再生に必要なため、ベンダーの判断で JDK の <tt>soundbank.gm</tt> ファイルを JRE の再配布に含めることができます。 拡張 MIDI サウンドバンクのいくつかのバージョンを Java Sound Web サイト <a  href="http://java.sun.com/products/java-media/sound/">http://java.sun.com/products/java-media/sound/</a> で入手できます。これらの代替のサウンドバンクはどれも、JRE の再配布に含めることができます。</dd>
 <dt>javac バイトコードコンパイラ。以下のファイルで構成されます。</dt>
        <dd><tt>bin/javac</tt> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステムおよび Linux]<br> <tt>bin/sparcv9/javac</tt> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (SPARC(R) プラットフォーム版)]<br> <tt>bin/amd64/javac</tt> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (AMD)]<br> <tt>bin/javac.exe</tt> [Microsoft Windows]<br> <tt>lib/tools.jar</tt> [すべてのプラットフォーム]</dd>
 <dt>Annotation Processing Tool。以下のファイルで構成されます。<br></dt>
        <dd><code>lib/tools.jar</code> [すべてのプラットフォーム]<br> <code>bin/apt</code> [Solaris<sup><font size="-2">TM</font></sup> オペレーティングシステムおよび Linux]<br> <code>bin/sparcv9/apt</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (SPARC(R) プラットフォーム版)]<br> <code>bin/amd64/apt</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (AMD)]<br> <code>bin/apt.exe</code> [Microsoft Windows]</dd>
        <dt><code>lib/jconsole.jar</code></dt>
 <dd>Jconsole アプリケーション。注: Jconsole アプリケーションには動的アタッチ機構が必要です。</dd>
        <dt>動的アタッチ機構は、以下のファイルで構成されます。</dt>
        <dd><code>lib/tools.jar</code> [すべてのプラットフォーム]<br> <code>jre/lib/sparc/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (SPARC(R) プラットフォーム版) および Linux]<br> <code>jre/lib/sparcv9/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (SPARC(R) プラットフォーム版) および Linux]<br> <code>jre/lib/i386/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (x86) および Linux]<br> <code>jre/lib/amd64/libattach.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (AMD) および Linux]<br> <code>jre\bin\attach.dll</code> [Microsoft Windows]<br></dd>
        <dt>Java Platform Debugger Architecture の実装は、上の動的アタッチで示されたファイル、および以下のファイルで構成されます。</dt>
        <dd><code>lib/tools.jar</code> [すべてのプラットフォーム]<br> <code>lib/sa-jdi.jar</code> [すべてのプラットフォーム]<br> <code>jre/lib/sparc/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (SPARC(R) プラットフォーム版) および Linux]<br> <code>jre/lib/sparcv9/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (SPARC(R) プラットフォーム版) および Linux]<br> <code>jre/lib/i386/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (x86) および Linux]<br> <code>jre/lib/amd64/libsaproc.so</code> [Solaris<sup><font size=         "-2">TM</font></sup> オペレーティングシステム (AMD) および Linux]<br></dd>
 <dt><code>jre\bin\server\</code></dt>
 <dd>Microsoft Windows プラットフォームでは、JDK に Java HotSpot<sup><font size="-2">TM</font></sup> Server VM と Java HotSpot<sup><font size="-2">TM</font></sup> Client VM の両方が含まれます。ただし、Microsoft Windows プラットフォーム版の JRE には Java HotSpot<sup><font size="-2">TM</font></sup> Client VM しか含まれていません。Java HotSpot<sup><font size="-2">TM</font></sup> Server VM を JRE で使用する場合は、JDK の <tt>jre\bin\server</tt> フォルダを JRE の <tt>bin\server</tt> ディレクトリにコピーしてください。ソフトウェアベンダーは、JRE の再配布の際に、Java HotSpot<sup><font size="-2">TM</font></sup> Server VM を再配布することができます。</dd>
      </dl>
    </dd>
  </dl>
 <h3>無制限強度 Java 暗号化拡張機能</h3>
  <blockquote>
 一部の国の輸入規制に対応するため、JDK および JRE とともに出荷される Java 暗号化拡張機能 (JCE) のポリシーファイルは、強力ではあっても制限付きの暗号方式の使用しか許可していません。 これらのファイルは次の場所に格納されています。<br>
 <br> <code>&lt;java-home&gt;/lib/security/local_policy.jar</code><br> <code>&lt;java-home&gt;/lib/security/US_export_policy.jar</code><br> <br><code>&lt;java-home&gt;</code> は、JDK の <code>jre</code> ディレクトリまたは JRE の最上位ディレクトリです。  </blockquote>
  <blockquote>
 規制を受けない国のユーザーのために、暗号化強度に制限のない無制限強度バージョンのファイルが JDK Web サイトに用意されています。これらの国のユーザーは、無制限強度バージョンをダウンロードし、強力暗号化 jar ファイルを無制限強度ファイルで置き換えることができます。
  </blockquote>
 <h3>cacerts 証明書ファイル</h3>
  <blockquote>
 以下にある Java SE 証明書ファイルでルート認証局証明書を追加または削除することができます。
  </blockquote>
  <blockquote>
 <code>&lt;java-home&gt;/lib/security/cacerts</code>
  </blockquote>
  <blockquote>
    詳細は keytool ドキュメントの <a href="http://java.sun.com/javase/ja/6/docs/ja/technotes/tools/solaris/keytool.html#cacerts">cacerts 証明書ファイル</a> を参照してください。
  </blockquote>
 <h2><a name="endorsed"></a>Java 推奨規格オーバーライド機構</h2>
  <blockquote>
    Java プラットフォームは、Java Community Process<sup><font size="-1">SM</font></sup> (JCP<sup><font size="-1">SM</font></sup><a href="http://www.jcp.org/">http://www.jcp.org/</a>) 以外で作成された標準 (推奨標準) の最新バージョンを組み込むため、またはプラットフォームに含まれるテクノロジーのバージョンを、そのテクノロジーの新しいスタンドアロンバージョン (標準テクノロジー) に対応させるため、適宜更新が必要です。
  </blockquote>
  <blockquote>
 推奨規格オーバーライド機構を使用すれば、Java プラットフォームに組み込まれる可能性のある推奨標準やスタンドアロンテクノロジーを実装する、新しいバージョンのクラスやインタフェースを提供できます。
  </blockquote>
  <blockquote>
 推奨規格オーバーライド機構の詳細については、次のサイトを参照してください。優先指定に使用できるプラットフォームパッケージの一覧も掲載されています。
  </blockquote>
  <blockquote>
    <a href=     "http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/standards/">http://java.sun.com/javase/ja/6/docs/ja/technotes/guides/standards/</a>
  </blockquote>
 <h2><a name="javadb" id="javadb"></a>Java DB</h2>
  <blockquote>
 この配布は、Sun Microsystems が配布する Apache Derby pure Java データベーステクノロジーである Java DB をバンドルしています。デフォルトでは以下にインストールされます。
    <ul>
 <li>Solaris: <code>/opt/SUNWjavadb</code></li>
 <li>Linux: <code>/opt/sun/javadb</code></li>
 <li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
    </ul>
    <p>ユーザードキュメントや API ドキュメント、Java DB の機能やその他リソースなどの Java DB と Derby の情報については、上記ディレクトリの index.html ファイルを参照してください。</p>
  </blockquote>
 <h2><a name="webpages"></a>Web ページ</h2>
  <blockquote>
 詳細については、次の Sun Microsystems の Web ページを参照してください。
  </blockquote>
  <dl>
    <dd>
      <dl>
        <dt><a href="http://java.sun.com/">http://java.sun.com/</a></dt>
 <dd>Java Software Web サイト。Java テクノロジ、製品情報、ニュース、および機能についての最新情報が掲載されています。</dd>
        <dt><a href=         "http://java.sun.com/docs">http://java.sun.com/docs</a></dt>
 <dd>Java<sup><font size="-2">TM</font></sup> プラットフォームのドキュメント。ホワイトペーパーや Java チュートリアルなどのドキュメントにアクセスできます。</dd>
        <dt><a href=         "http://developer.java.sun.com/">http://developer.java.sun.com</a></dt>
 <dd>Developer Services Web サイト。(無料の登録が必要。) 技術情報、ニュース、および機能の詳細情報、ユーザーフォーラム、サポート情報などが提供されています。</dd>
        <dt><a href=         "http://java.sun.com/products/">http://java.sun.com/products/</a></dt>
        <dd>Java テクノロジ製品と API</dd>
      </dl>
    </dd>
  </dl>
  <hr>
 <p><font size="2">Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) は Sun Microsystems<sup><small>TM</small></sup>, Inc. の製品です。<br> <br> Copyright &copy; 2010 Sun Microsystems, Inc.<br> 4150 Network Circle, Santa Clara, California 95054, U.S.A.<br> All rights reserved.</font></p>
 <script type="text/javascript" language="JavaScript" src="/js/omi/jsc/s_code_remote.js">
 </script>
 </body>
 </html>
--- a/extra/source/jdk-6/README_zh_CN.html
+++ b/extra/source/jdk-6/README_zh_CN.html
@ -1,507 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=GB2312">
 <title>自述文件 -- Java Platform, Standard Edition Development Kit</title>
 </head>
 <body lang="en-US" bgcolor="#FFFFFF">
 <h1 align="center">自述文件</h1>
 <h2 align="center">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition 6<br> Development Kit</h2>
 <p align="center"><b>JDK<sup><font size="-2">TM</font></sup> 6</b></p>
 <h2>目录</h2>
  <ul>
 <li><a href="#introduction">简介</a></li>
 <li><a href="#install">系统要求与安装</a></li>
 <li><a href="#docs">JDK 文档</a></li>
 <li><a href="#relnotes">发行说明</a></li>
 <li><a href="#compatibility">兼容性</a></li>
 <li><a href="#bugs">错误报告与反馈</a></li>
 <li><a href="#contents">JDK 的内容</a></li>
 <li><a href="#jre">Java Runtime Environment</a></li>
 <li><a href="#redistribution">再分发</a></li>
 <li><a href="#endorsed">Java 签名标准覆盖机制</a></li>
 <li><a href="#javadb">Java DB</a></li>
 <li><a href="#webpages">Web 页</a></li>
  </ul>
 <h2><a name="introduction" id="introduction"></a>简介</h2>
  <blockquote>
 感谢您下载此版本的 Java<sup><font size=
    "-2">TM</font></sup> Platform, Standard Edition Development Kit (JDK<sup><font size="-2">TM</font></sup>)。JDK 是一种开发环境，用于使用 Java 编程语言生成应用程序、applet 和组件。
  </blockquote>
  <blockquote>
 JDK 包含的工具可用于开发和测试以 Java 编程语言编写并在 Java<sup><font size=
    "-2">TM</font></sup> 平台上运行的程序。
  </blockquote>
 <h2><a name="install" id="install"></a>系统要求与安装</h2>
  <blockquote>
 系统要求、安装说明和故障排除提示位于 Java 软件 Web 站点上的以下位置：
  </blockquote>
  <blockquote>
 <a href="http://java.sun.com/javase/6/webnotes/install/">JDK 6 安装说明</a>
  </blockquote>
 <h2><a name="docs" id="docs"></a>JDK<sup><font size="-2">TM</font></sup> 文档</h2>
  <blockquote>
 联机 <a href=
    "http://java.sun.com/javase/6/docs/">Java<sup><font size=
    "-2">TM</font></sup> Platform, Standard Edition (Java SE) 文档</a>包含 API 说明、功能介绍、开发者指南、JDK<sup><font size=
    "-2">TM</font></sup> 工具和实用程序的参考页面、演示程序以及指向相关信息的链接。此文档还以下载包的形式提供，您可以将此包安装在计算机上。要获得该文档包，请参见<a href="http://java.sun.com/javase/downloads/index.jsp">下载页面</a>。有关 API 文档的信息，请参阅 <a href=
    "http://java.sun.com/javase/6/docs/api/index.html">Java<sup><font size="-2">TM</font></sup> Platform, Standard Edition API 说明</a>。该页面提供了 API 的简要介绍，其中重点介绍了 API 说明而非代码示例。
  </blockquote>
 <h2><a name="relnotes" id="relnotes"></a>发行说明</h2>
  <blockquote>
 有关此版本的其他信息，请参见 Java 软件 Web 站点上的 <a href="http://java.sun.com/javase/6/webnotes/">Java SE 6 发行说明</a>。由于联机发行说明将根据需要进行更新，因此请不定期查看联机发行说明以了解最新信息。
  </blockquote>
 <h2><a name="compatibility" id="compatibility"></a>兼容性</h2>
  <blockquote>
 有关已知的兼容性问题列表，请参见 Java 软件 Web 站点上<a href=
    "http://java.sun.com/javase/6/webnotes/compatibility.html">与早期版本的兼容性</a>。我们已尽力支持为早期版本的 Java<sup><font size=
    "-2">TM</font></sup> 平台编写的程序。尽管必然会有某些不兼容的更改，但大部分软件都能够在不重新编程的情况下迁移到当前版本。除了在极少数情况下有意不保持兼容（如我们的兼容性 Web 页中所述）以外，如果做不到这一点，将被认为是一个错误。之所以存在一些破坏兼容性的更改，是因为需要弥补潜在的安全漏洞或修复实现或设计错误。
  </blockquote>
 <h2><a name="bugs" id="bugs"></a>错误报告与反馈</h2>
  <blockquote>
 <a href="http://bugs.sun.com/bugdatabase/index.jsp">错误数据库</a> Web 站点使您可以搜索和检查现有的错误报告、提交您自己的错误报告以及通知我们您最希望修复哪些错误。要直接提交错误或请求功能，请填写以下表单：
  </blockquote>
  <blockquote>
 <a href=
    "http://bugs.sun.com/services/bugreport/index.jsp">http://bugs.sun.com/services/bugreport/index.jsp</a>
  </blockquote>
  <blockquote>
 您可以向 <a href=
    "http://java.sun.com/docs/forms/sendusmail.html">Java SE 文档小组</a>发送反馈，也可以直接向 <a href=
    "http://developers.sun.com/contact/index.jsp">Java 软件工程小组的电子邮件地址</a>发送意见。
  </blockquote>
  <blockquote>
 <b>注</b> - 请不要通过错误数据库或我们的开发团队寻求技术支持。有关可以选择的支持方式，请参见 Java 软件 Web 站点上的<a href=
    "http://java.sun.com/developer/support/">支持与服务</a>。
  </blockquote>
 <h2><a name="contents" id="contents"></a>JDK<sup><font size=   "-2">TM</font></sup> 的内容</h2>
  <blockquote>
 本部分概括介绍了 JDK<sup><font size="-2">TM</font></sup> 中的文件和目录。有关这些文件和目录的详细信息，请参见适用于您的平台的 Java SE 文档的 <a href=
    "http://java.sun.com/javase/6/docs/technotes/tools/index.html#general">JDK 文件结构</a>部分。
  </blockquote>
  <dl>
    <dd>
      <dl>
 <dt><b>开发工具</b></dt>
 <dd>（位于 <code>bin/</code> 子目录中）指工具和实用程序，可帮助您开发、执行、调试和保存以 Java<sup><font size="-2">TM</font></sup> 编程语言编写的程序。有关详细信息，请参见<a href=
        "http://java.sun.com/javase/6/docs/technotes/tools/index.html">工具文档</a>。<br> <br></dd>
 <dt><b>运行时环境</b></dt>
 <dd>（位于 <code>jre/</code> 子目录中）由 JDK 使用的 Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) 的实现。JRE 包括 Java<sup><font size=
        "-2">TM</font></sup> 虚拟机 (JVM<sup><font size=
        "-2">TM</font></sup>)、类库以及其他支持执行以 Java<sup><font size=
        "-2">TM</font></sup> 编程语言编写的程序的文件。<br> <br></dd>
 <dt><b>附加库</b></dt>
 <dd>（位于 <code>lib/</code> 子目录中）开发工具所需的其他类库和支持文件。<br> <br></dd>
 <dt><b>演示 applet 和应用程序</b></dt>
 <dd>（位于 <code>demo/</code> 子目录中）Java<sup><font size="-2">TM</font></sup> 平台的编程示例（带源代码）。这些示例包括使用 Swing 和其他 Java<sup><font size="-2">TM</font></sup> 基类以及 Java<sup><font size="-2">TM</font></sup> 平台调试器体系结构的示例。<br> <br></dd>
 <dt><b>样例代码</b></dt>
 <dd>（位于 <code>sample</code> 子目录中）某些 Java API 的编程样例（带源代码）。<br> <br></dd>
 <dt><b>C 头文件</b></dt>
 <dd>（位于 <code>include/</code> 子目录中）支持使用 <a href=
        "http://java.sun.com/javase/6/docs/technotes/guides/jni/">Java 本机界面</a>、<a href=
        "http://java.sun.com/javase/6/docs/technotes/guides/jvmti/">JVM<sup><font size="-2">TM</font></sup> 工具界面</a>以及 Java<sup><font size="-2">TM</font></sup> 平台的其他功能进行本机代码编程的头文件。<br> <br></dd>
 <dt><b>源代码</b></dt>
 <dd>（位于 <code>src.zip</code> 中）组成 Java 核心 API 的所有类的 Java<sup><font size="-2">TM</font></sup> 编程语言源文件（即，java.*、javax.* 和某些 org.* 包的源文件，但不包括 com.sun.* 包的源文件）。此源代码仅供参考，以便帮助开发者学习和使用 Java<sup><font size="-2">TM</font></sup> 编程语言。这些文件不包含特定于平台的实现代码，且不能用于重新生成类库。要对这些文件进行解压，请使用任一常用的 zip 实用程序；或者也可以使用位于 JDK 的 <code>bin/</code> 目录中的 Jar 实用程序：<br><br><code>jar xvf src.zip</code></dd>
      </dl>
    </dd>
  </dl>
 <h2><a name="jre" id="jre"></a>Java Runtime Environment (JRE<sup><font size="-2">TM</font></sup>)</h2>
  <blockquote>
 Java<sup><font size="-2">TM</font></sup> Runtime Environment (JRE<sup><font size="-2">TM</font></sup>) 是一款可单独下载的产品。请参见<a href=
    "http://java.sun.com/javase/downloads/index.jsp">下载 Web 站点</a>。
  </blockquote>
  <blockquote>
 通过 JRE，您可以运行以 Java<sup><font size=
    "-2">TM</font></sup> 编程语言编写的应用程序。与 JDK<sup><font size=
    "-2">TM</font></sup> 相似，JRE 包含 Java<sup><font size=
    "-2">TM</font></sup> 虚拟机 (JVM<sup><font size=
    "-2">TM</font></sup>)、组成 Java<sup><font size=
    "-2">TM</font></sup> 平台 API 的类及支持文件。与 JDK 不同的是，它不包含诸如编译器和调试器这样的开发工具。
  </blockquote>
  <blockquote>
 依照 JRE 许可证条款，您可以随意地将 JRE 随应用程序一起进行再分发。使用 JDK 开发应用程序后，可将其与 JRE 一起发行，以便最终用户具有可运行软件的 Java<sup><font size="-2">TM</font></sup> 平台。
  </blockquote>
 <h2><a name="redistribution" id="redistribution"></a>再分发</h2>
  <blockquote>
    <blockquote>
      <hr>
 注 - 本软件的许可证不允许再分发测试版和其他预发行版本。
      <hr>
    </blockquote>
  </blockquote>
  <blockquote>
 必须遵守软件许可协议的条款和条件以及下面提出的义务、限制和例外。在下列情况下，您可以复制和分发本软件（以及在下面标识为&ldquo;可再分发&rdquo;的软件部分）：
  </blockquote>
  <blockquote>
    <ol type="a">
 <li>您将完整地分发软件而不能进行修改，并仅作为您的 applet 和应用程序（程序）的一部分打包；</li>
 <li>您的程序将向本软件添加重要的主要功能；</li>
 <li>您的程序仅用于在启用了 Java 的普通桌面计算机和服务器上运行；</li>
 <li>您分发软件只是为了运行您的程序；</li>
 <li>您不分发其他软件来替换本软件的任何组件；</li>
 <li>您不删除或更改本软件中包含的任何专用图例或声明；</li>
 <li>您只按照旨在保护 Sun 的利益的许可协议中的条款来分发本软件；</li>
 <li>您同意维护和保障 Sun 及其许可方的利益，不使其承担因第三方使用或分发任意和全部程序和/或软件而引起的赔偿、诉讼或冲突所导致的赔偿金、诉讼费、债务和/或调解费（包括律师费）。</li>
    </ol>
  </blockquote>
  <blockquote>
 此处使用的&ldquo;供应商&rdquo;一词是指许可证持有人、开发者以及将 Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) 与其程序一起许可和分发的独立软件供应商 (ISV)。
  </blockquote>
  <blockquote>
 供应商必须遵守 Java Development Kit 二进制代码许可协议的条款。
  </blockquote>
 <h3>必要文件与可选文件</h3>
  <blockquote>
 组成 Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) 的文件分为两类：必要的和可选的。可选文件可以不包含在 JDK 的再分发中（由供应商决定）。
  </blockquote>
  <blockquote>
 下面一节列出了可以选择从 JDK 的再分发中省略的文件和目录。没有列为可选文件的所有文件都必须包含在 JDK 的再分发中。
  </blockquote>
 <h3>可选文件和目录</h3>
  <blockquote>
 下列文件可以从再分发中排除。这些文件位于 jdk1.6.0_&lt;版本&gt; 目录中，其中 &lt;版本&gt; 是最新的版本号。将显示 Solaris<sup><font size="-2">TM</font></sup> 和 Linux 的文件名和分隔符。Windows 可执行文件具有 &quot;.exe&quot; 后缀。还可以排除名称中带有 <code>_g</code> 的相应文件。对于任何已排除的可执行文件，应排除相应的手册页（包含下面列出的以 <code>bin/</code> 开头的路径，适用于 Solaris<sup><font size="-2">TM</font></sup> 操作系统和 Linux）。
  </blockquote>
  <dl>
    <dd>
      <dl>
 <dt><code>jre/lib/charsets.jar</code></dt>
 <dd>字符转换类</dd>
 <dt><code>jre/lib/ext/</code></dt>
 <dd><code>sunjce_provider.jar</code> - SunJCE 的 Java 加密法 API 提供者<br> <code>localedata.jar</code> - 包含非美式英语语言环境所需的许多资源<br> <code>ldapsec.jar</code> - 包含 LDAP 服务提供者所支持的安全特征<br> <code>dnsns.jar</code> - 用于 JNDI DNS 提供者的 InetAddress 包装</dd>
 <dt><code>bin/rmid</code> 和 <code>jre/bin/rmid</code></dt>
 <dd>Java RMI 活化系统守护进程</dd>
 <dt><code>bin/rmiregistry</code> 和 <code>jre/bin/rmiregistry</code></dt>
 <dd>Java 远程对象注册表</dd>
 <dt><code>bin/tnameserv</code> 和 <code>jre/bin/tnameserv</code></dt>
 <dd>Java IDL 名称服务器</dd>
 <dt><code>bin/keytool</code> 和 <code>jre/bin/keytool</code></dt>
 <dd>密钥和证书管理工具</dd>
 <dt><code>bin/kinit</code> 和 <code>jre/bin/kinit</code></dt>
 <dd>用于获取和高速缓存 Kerberos 票证的授予票证</dd>
 <dt><code>bin/klist</code> 和 <code>jre/bin/klist</code></dt>
 <dd>凭据高速缓存和密钥表中的 Kerberos 显示条目</dd>
 <dt><code>bin/ktab</code> 和 <code>jre/bin/ktab</code></dt>
 <dd>Kerberos 密钥表管理器</dd>
 <dt><code>bin/policytool</code> 和 <code>jre/bin/policytool</code></dt>
 <dd>策略文件创建和管理工具</dd>
 <dt><code>bin/orbd</code> 和 <code>jre/bin/orbd</code></dt>
 <dd>对象请求代理守护进程</dd>
 <dt><code>bin/servertool</code> 和 <code>jre/bin/servertool</code></dt>
 <dd>Java IDL 服务器工具</dd>
 <dt><code>bin/javaws</code>、<code>jre/bin/javaws</code>、<code>jre/lib/javaws/</code> 和 <code>jre/lib/javaws.jar</code></dt>
 <dd>Java Web Start</dd>
 <dt><code>db/</code></dt>
 <dd>
 Java DB，它是 Sun Microsystems 的 Apache Derby 数据库技术的分发。
 默认安装位置为：
 <ul>
 <li>Solaris：<code>/opt/SUNWjavadb</code></li>
 <li>Linux：<code>/opt/sun/javadb</code></li>
 <li>Windows：<code>C:\Program Files\Sun\JavaDB</code></li>
 </ul>有关 Java DB 和 Derby 的信息（包括用户
 和 API 文档、Java DB 的功能以及更多资源），
 请参见上述目录中的 index.html 文件。
 </dd>
 <dd>Java<sup><font size="-2">TM</font></sup>DB，Sun Microsystems 的 Apache Derby 数据库技术分发。</dd>
 <dt><code>demo/</code></dt>
 <dd>演示 applet 和应用程序</dd>
 <dt><code>sample/</code></dt>
 <dd>样例代码</dd>
 <dt><code>src.zip</code></dt>
 <dd>源文件归档</dd>
      </dl>
    </dd>
  </dl>
 <h3><a name="redistributablejdkfiles" id=
  "redistributablejdkfiles"></a>可再分发的 JDK<sup><font size=
  "-2">TM</font></sup> 文件</h3>
  <blockquote>
 下面列出了有限几组 JDK 文件和目录，供应商在再分发 Java<sup><font size=
    "-2">TM</font></sup> Runtime Environment (JRE<sup><font size=
    "-2">TM</font></sup>) 时，可能会将这些文件和目录随附其中。不能单独对它们进行再分发，而必须随相同版本的 JRE 一起分发。所有路径都是相对 JDK 的顶层目录而言的。对于任何已包含的可执行文件，应包含相应的手册页（包含下面列出的以 <code>bin/</code> 开头的路径，适用于 Solaris<sup><font size="-2">TM</font></sup> 操作系统和 Linux）。
  </blockquote>
  <dl>
    <dd>
      <dl>
 <dt><code>jre/lib/cmm/PYCC.pf</code></dt>
 <dd>颜色配置文件。仅当用户希望在 PYCC 颜色区间与另一个颜色区间之间进行转换时才需要用到此文件。</dd>
 <dt>位于 <code>jre/lib/fonts/</code> 目录中的所有 <code>.ttf</code> 字体文件。</dt>
 <dd>请注意，JRE 中已包含 LucidaSansRegular.ttf 字体，因此无需从 JDK 中引入该文件。</dd>
 <dt><code>jre/lib/audio/soundbank.gm</code></dt>
 <dd>JDK 中具有该 MIDI 声音库，但为了减小 JRE 下载包所占的空间，已从 JRE 中删除该库。但是，对于 MIDI 回放，声音库文件是必需的，因此在再分发 JRE 时可能将 JDK 的 <code>soundbank.gm</code> 文件随附其中（由供应商决定）。可从 Java Sound Web 站点获得若干加强的 MIDI 声音库版本，该站点如下：<a href=
        "http://java.sun.com/products/java-media/sound/">http://java.sun.com/products/java-media/sound/</a>。在再分发 JRE 时，可能将这些备用声音库随附其中。</dd>
 <dt>javac 字节码编译器由下列文件组成：</dt>
 <dd><code>bin/javac</code> [Solaris<sup><font size="-2">TM</font></sup> 操作系统和 Linux]<br> <code>bin/sparcv9/javac</code> [Solaris<sup><font size="-2">TM</font></sup> 操作系统（SPARC(R) 平台版）]<br> <code>bin/amd64/javac</code> [Solaris<sup><font size="-2">TM</font></sup> 操作系统 (AMD)]<br> <code>bin/javac.exe</code> [Microsoft Windows]<br> <code>lib/tools.jar</code> [所有平台]</dd>
 <dt>注释处理工具由下列文件组成：</dt>
 <dd><code>lib/tools.jar</code> [所有平台]<br>
 <dd><code>bin/apt</code> [Solaris<sup><font size="-2">TM</font></sup> 操作系统和 Linux]<br> <code>bin/sparcv9/apt</code> [Solaris<sup><font size="-2">TM</font></sup> 操作系统（SPARC(R) 平台版）]<br> <code>bin/amd64/apt</code> [Solaris<sup><font size="-2">TM</font></sup> 操作系统 (AMD)]<br> <code>bin/apt.exe</code> [Microsoft Windows]</dd>
 <dt><code>lib/jconsole.jar</code></dt>
 <dd>Jconsole 应用程序。注意：</dd>
 Jconsole 应用程序要求使用动态连接机制。</dd>
 <dt>动态连接机制由下列文件组成：</dt>
 <dd><code>lib/tools.jar</code> [所有平台]<br>
 <code>jre/lib/sparc/libattach.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统（SPARC(R) 平台版）和 Linux]
 <br>
 <code>jre/lib/sparcv9/libattach.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统（SPARC(R) 平台版）和 Linux]
 <br>
 <code>jre/lib/i386/libattach.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统 (x86) 和 Linux]<br>
 <code>jre/lib/amd64/libattach.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统 (AMD) 和 Linux]
 <code>jre\bin\attach.dll</code> [Microsoft Windows]<br></dd>
 <dt>Java 平台调试器体系结构实现由
 在上述动态连接部分中显示的文件和
 下列文件组成：</dt>
 <dd><code>lib/tools.jar</code> [所有平台]<br>
 <code>lib/sa-jdi.jar</code> [所有平台]<br>
 <code>jre/lib/sparc/libsaproc.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统（SPARC(R) 平台版）和 Linux]
 <br>
 <code>jre/lib/sparcv9/libsaproc.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统（SPARC(R) 平台版）和 Linux]
 <br>
 <code>jre/lib/i386/libsaproc.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统 (x86) 和 Linux]<br>
 <code>jre/lib/amd64/libsaproc.so</code> [Solaris<sup><font size=
 "-2">TM</font></sup> 操作系统 (AMD) 和 Linux]<br></dd>
 <dt><code>jre\bin\server\</code></dt>
 <dd>在 Microsoft Windows 平台上，JDK 同时包含 Java HotSpot<sup><font size="-2">TM</font></sup> 服务器 VM 和 Java HotSpot<sup><font size="-2">TM</font></sup> 客户机 VM。但是，Microsoft Windows 平台上的 JRE 仅包含 Java HotSpot<sup><font size="-2">TM</font></sup> 客户机 VM。如果用户希望和 JRE 一起使用 Java HotSpot<sup><font size="-2">TM</font></sup> 服务器 VM，可以将 JDK 的 <code>jre\bin\server</code> 文件夹复制到 JRE 的 <code>bin\server</code> 目录中。软件供应商可将 Java HotSpot<sup><font size="-2">TM</font></sup> 服务器 VM 随 JRE 一起再分发。</dd>
      </dl>
    </dd>
  </dl>
 <h3>无限加强的 Java 加密法扩展</h3>
  <blockquote>
 由于某些国家/地区存在进口控制限制，因此 JDK 和 JRE 随附的 Java 加密法扩展 (JCE) 策略文件允许使用强大但有限的加密法。这些文件位于<br> <br> <code>&lt;java-home&gt;/lib/security/local_policy.jar</code><br> <code>&lt;java-home&gt;/lib/security/US_export_policy.jar</code><br> <br>其中 <code>&lt;java-home&gt;</code> 是 JDK 的 <code>jre</code> 目录或 JRE 的顶层目录。
  </blockquote>
  <blockquote>
 对于那些位于符合条件的国家/地区的用户，可以从 JDK Web 站点获取不对加密技术的强度指定任何限制的无限加强版文件。位于符合条件的国家/地区的用户可以下载无限加强版文件，并用这些文件替换强度有限的 jar 文件。
  </blockquote>
 <h3>Cacerts 证书文件</h3>
  <blockquote>
 可以在位于以下位置的 Java SE 证书文件中添加或删除根 CA 证书
  </blockquote>
  <blockquote>
 <code>&lt;java-home&gt;/lib/security/cacerts</code>
  </blockquote>
  <blockquote>
 有关详细信息，请参见 keytool 文档中的 <a href=
    "http://java.sun.com/javase/6/docs/technotes/tools/solaris/keytool.html#cacerts">cacerts 证书文件</a>一节。
  </blockquote>
 <h2><a name="endorsed" id="endorsed"></a>Java 签名标准覆盖机制</h2>
  <blockquote>
 需时常更新 Java 平台，以便并入在 Java Community Process <font size="-2"><sup>SM</sup></font> (JCP<font size=
    "-2"><sup>SM</sup></font> <a href=
    "http://www.jcp.org/">http://www.jcp.org/</a>) 之外创建的较新版本的标准（<i>签名标准</i>），或将该平台中所包含的技术版本更新为该技术相应的较新的独立版本（<i>独立技术</i>）。
  </blockquote>
  <blockquote>
 <i>签名标准覆盖机制</i>提供了一种方法，可将执行签名标准或独立技术的较新版本的类和界面并入 Java 平台中。
  </blockquote>
  <blockquote>
 有关签名标准覆盖机制的详细信息，包括该机制进行覆盖时可能用到的平台包的列表，请参见
  </blockquote>
  <blockquote>
 <a href=
    "http://java.sun.com/javase/6/docs/technotes/guides/standards/">http://java.sun.com/javase/6/docs/technotes/guides/standards/</a>
  </blockquote>
  <h2><a name="javadb" id="javadb"></a>Java DB</h2>
  <blockquote>
  分发包 Java DB，它是 Sun Microsystems 
  的 Apache Derby 纯 Java 数据库技术的分发。
  默认安装位置为：
  <ul>
  <li>Solaris: <code>/opt/SUNWjavadb</code></li>
  <li>Linux: <code>/opt/sun/javadb</code></li>
  <li>Windows: <code>C:\Program Files\Sun\JavaDB</code></li>
  </ul>
  <p>有关 Java DB 和 Derby 的信息（包括用户和 API 文档、Java DB 
  的功能以及更多资源），
  请参见上述目录中的 index.html 文件。</p>
  </blockquote>
 <h2><a name="webpages" id="webpages"></a>Web 页</h2>
  <blockquote>
 有关详细信息，请参阅万维网上的下列 Sun Microsystems 页面：
  </blockquote>
  <dl>
    <dd>
      <dl>
 <dt><a href="http://java.sun.com/">http://java.sun.com/</a></dt>
 <dd>Java 软件 Web 站点，包含有关 Java 技术、产品信息、新闻和软件特性的最新信息。</dd>
 <dt><a href=
        "http://java.sun.com/docs">http://java.sun.com/docs</a></dt>
 <dd>Java<sup><font size="-2">TM</font></sup> 平台文档，包含白皮书、Java 教程以及其他文档。</dd>
 <dt><a href=
        "http://developer.java.sun.com/">http://developer.java.sun.com</a></dt>
 <dd>开发者服务 Web 站点（需要进行免费注册）。其他技术信息、新闻和软件特性；用户论坛；支持信息等等。</dd>
 <dt><a href=
        "http://java.sun.com/products/">http://java.sun.com/products/</a></dt>
 <dd>Java 技术产品和 API</dd>
      </dl>
    </dd>
  </dl>
  <hr>
 <p><font size="2">Java<sup><font size="-2">TM</font></sup> Development Kit (JDK<sup><font size="-2">TM</font></sup>) 是 Sun Microsystems<sup><font size="-2">TM</font></sup>, Inc. 的产品。<br> <br> 版权所有 (C) 2010 Sun Microsystems, Inc.<br> 4150 Network Circle, Santa Clara, California 95054, U.S.A.<br> 保留所有权利。</font></p>
 <script type="text/javascript" language="JavaScript" src="/js/omi/jsc/s_code_remote.js">
 </script>
 </body>
 </html>
--- a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
+++ b/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt
--- a/extra/source/jdk-6/jdk.SlackBuild
+++ b/extra/source/jdk-6/jdk.SlackBuild
@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=6u20
+VERSION=6u25
-DVER=1.6.0_20
+DVER=1.6.0_25
 ARCH=x86_64                  # only determines the lib path locations
 JAVA_ARCH=${JAVA_ARCH:-x64}  # or i586 if you want the 32bit version
 BUILD=${BUILD:-1}
--- a/extra/source/jdk-6/register.html
+++ b/extra/source/jdk-6/register.html
@ -23,30 +23,30 @@ a:visited,a:visited code{color:#917E9C}
  <tr>
    <td width="7" height="78">&nbsp;</td>
    <td width="794" align="left" valign="top">
-        <img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre/lib/servicetag/jdk_header.png" width="783" height="63"></td>
+        <img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" width="783" height="63"></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
    <td><p class="style1">Thank you for installing the 
-        <strong> Java Development Kit Version 6 Update 20 </strong>
+        <strong> Java Development Kit Version 6 Update 25 </strong>
-        from Sun Microsystems. </p>
+        from Oracle Corporation. </p>
        <p class="style1">Registering your product will give you the following benefits:</p>
        <ul class="style1">
          <li> Notification of new versions, patches, and updates</li>
-          <li> Special offers on Sun developer products, services and training </li>
+          <li> Special offers on Oracle developer products, services and training </li>
          <li> Access to early releases and documentation </li>
        </ul>
        <p class="style1">Product registration is FREE, quick and easy!</p>
        <blockquote>
-          <p class="style1">All you need is a Sun Developer Network or other Sun Online account. If you don't already have one, you will be prompted to create one. </p>
+          <p class="style1">All you need is an Oracle.com account. If you don't already have one, you will be prompted to create one. </p>
          <table width="708" border="0" cellspacing="0" cellpadding="3">
            <tr valign="top">
              <td width="126" height="35">
-              <form name="form1" method="post" action="https://inventory.sun.com/RegistrationWeb/register/urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b?product=jdk&locale=en" enctype="text/xml">
+              <form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=en" enctype="text/xml">
-                <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>a8c0265d</hostId><osName>Linux</osName><osVersion>2.6.33.3</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b%22 version=%221.0%22><service_tag><instance_urn>urn:st:4f6e7c38-ac6f-41da-8ebe-4d438a23e936</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_20</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_20-b02 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2010-05-09 01:43:40 GMT</timestamp><container>global</container><source>jdk-6u20-fcs-bin-b02-linux-amd64-12_apr_2010.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
+                <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
                <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';"  value="Register My JDK">
              </form></td>
-              <td width="570"><span class="style3">You need to be connected to the Internet to register this Sun product. </span></td>
+              <td width="570"><span class="style3">You need to be connected to the Internet to register this Oracle product. </span></td>
            </tr>
          </table>
        </blockquote>
@ -55,16 +55,16 @@ a:visited,a:visited code{color:#917E9C}
    <tr>
       <td>&nbsp;</td>
       <td bgcolor="#f1f7df">
-       <p class="style3">Sun Microsystems, Inc. respects your privacy. 
+       <p class="style3">Oracle Corporation respects your privacy. 
    We will use your personal information for communications 
-    and management of your Sun Online Account, the services 
+    and management of your Oracle.com account, the services 
-    and applications you access using your Sun Online Account, 
+    and applications you access using your Oracle.com account, 
-    and the products and systems you register with your Sun Online Account.</p>
+    and the products and systems you register with your Oracle.com account.</p>
                <p class="style3">For more information on the data that will be collected as 
          part of the registration process and how it will be managed <br>
          see <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>. <br>      
          <br>
-          For more information on Sun's Privacy Policy see <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com.</a></p></td>
+          For more information on Oracle's Privacy Policy see <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com.</a></p></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
--- a/extra/source/jdk-6/register_ja.html
+++ b/extra/source/jdk-6/register_ja.html
@ -5,6 +5,31 @@ g/TR/html4/loose.dtd">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>JDK 製品登録</title>
 <!--
 Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 This code is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License version 2 only, as
 published by the Free Software Foundation.  Oracle designates this
 particular file as subject to the "Classpath" exception as provided
 by Oracle in the LICENSE file that accompanied this code.
 This code is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 version 2 for more details (a copy is included in the LICENSE file that
 accompanied this code).
 You should have received a copy of the GNU General Public License version
 2 along with this work; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
 <style type="text/css">
 <!--
 .style1 {font-family: Arial, Helvetica, sans-serif}
@ -20,28 +45,28 @@ a:visited,a:visited code{color:#917E9C}
 <table border="0" cellpadding="3" cellspacing="0" width="813">
  <tbody><tr>
    <td height="78" width="7">&nbsp;</td>
-    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
+    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
-    <td><p class="style1">Sun Microsystems の<strong> Java Development Kit Version 6 Update 20 </strong>をインストールしていただき、ありがとうございます。 </p>
+    <td><p class="style1">Oracle Corporation の<strong> Java Development Kit Version 6 Update 25 </strong>をインストールしていただき、ありがとうございます。 </p>
        <p class="style1">製品登録をすると、次のような特典を受けることができます。</p>
        <ul class="style1">
          <li> 最新のバージョン、パッチ、および更新についての通知</li>
-          <li> Sun の開発者向け製品、サービス、およびトレーニングの特別販売 </li>
+          <li> Oracle の開発者向け製品、サービス、およびトレーニングの特別販売 </li>
          <li> アーリーリリースおよびドキュメントへのアクセス </li>
        </ul>
        <p class="style1">製品登録は無料であり、迅速で簡単です。</p>
        <blockquote>
-          <p class="style1">必要になるのは、Sun 開発者向けネットワークアカウントまたはその他の Sun オンラインアカウントだけです。 まだアカウントがない場合は、アカウントの作成が求められます。 </p>
+          <p class="style1">必要になるのは、Oracle.com アカウントだけです。 まだアカウントがない場合は、アカウントの作成が求められます。 </p>
          <table width="708" border="0" cellspacing="0" cellpadding="3">
            <tr valign="top">
-              <td width="126" height="35"><form name="form1" method="post" action="https://inventory.sun.com/RegistrationWeb/register/urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b?product=jdk&locale=ja" enctype="text/xml">
+              <td width="126" height="35"><form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=ja" enctype="text/xml">
-			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>a8c0265d</hostId><osName>Linux</osName><osVersion>2.6.33.3</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b%22 version=%221.0%22><service_tag><instance_urn>urn:st:4f6e7c38-ac6f-41da-8ebe-4d438a23e936</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_20</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_20-b02 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2010-05-09 01:43:40 GMT</timestamp><container>global</container><source>jdk-6u20-fcs-bin-b02-linux-amd64-12_apr_2010.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
+			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
                <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';"  value="JDK 製品登録">
              </form></td>
-              <td width="570"><span class="style3">この Sun 製品を登録するには、インターネットに接続している必要があります。 </span></td>
+              <td width="570"><span class="style3">この Oracle 製品を登録するには、インターネットに接続している必要があります。 </span></td>
            </tr>
 	  </table>
 	</blockquote>
@ -50,8 +75,8 @@ a:visited,a:visited code{color:#917E9C}
   <tr>
       <td>&nbsp;</td>
 	<td bgcolor="#f1f7df">
-        <p class="style3">Sun Microsystems, Inc. は、お客様のプライバシーを尊重します。 お客様の個人情報は、お客様の Sun オンラインアカウント、お客様が Sun オンラインアカウントを使用してアクセスするサービスとアプリケーション、およびお客様が Sun オンラインアカウントで登録する製品とシステムの通信と管理に使用します。</p>
+        <p class="style3">Oracle Corporation は、お客様のプライバシーを尊重します。 お客様の個人情報は、お客様の Oracle.com アカウント、お客様が Oracle.com アカウントを使用してアクセスするサービスとアプリケーション、およびお客様が Oracle.com アカウントで登録する製品とシステムの通信と管理に使用します。</p>
-                <p class="style3">登録の際に収集されるデータや、それらがどのように管理されるかについての詳細は、<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を参照してください。 <br> <br> Sun のプライバシーポリシーについての詳細は、<a href="http://jp.sun.com/privacy/">http://jp.sun.com/privacy/</a> を参照するか、<a class="moz-txt-link-rfc2396E" href="http://jp.sun.com/cgi-bin/contact/comment.cgi?url=http://jp.sun.com/privacy/">お問い合わせフォーム</a>からお問い合わせください。</p></td>
+                <p class="style3">登録の際に収集されるデータや、それらがどのように管理されるかについての詳細は、<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を参照してください。 <br> <br> Oracle のプライバシーポリシーについての詳細は、<a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> を参照するか、<a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">お問い合わせフォーム</a>からお問い合わせください。</p></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
--- a/extra/source/jdk-6/register_zh_CN.html
+++ b/extra/source/jdk-6/register_zh_CN.html
@ -19,29 +19,29 @@ a:visited,a:visited code{color:#917E9C}
 <table border="0" cellpadding="3" cellspacing="0" width="813">
  <tbody><tr>
    <td height="78" width="7">&nbsp;</td>
-    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
+    <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
-<td><p class="style1">感谢您安装 Sun Microsystems 的 <strong>Java Development Kit Version 6 Update 20</strong>。 </p>
+<td><p class="style1">感谢您安装 Oracle Corporation 的 <strong>Java Development Kit Version 6 Update 25</strong>。 </p>
 <p class="style1">注册产品后您将获得如下增值服务：</p>
        <ul class="style1">
 <li> 获得新版本、修补程序和更新的通知服务</li>
-<li> 获得有关 Sun 开发者产品、服务和培训的优惠 </li>
+<li> 获得有关 Oracle 开发者产品、服务和培训的优惠 </li>
 <li> 获得对早期版本和文档的访问权限 </li>
        </ul>
 <p class="style1">产品注册是免费的，即快速又轻松！</p>
        <blockquote>
-<p class="style1">您需要具有 Sun 开发者网络或其他 Sun 联机帐户。如果您没有，系统将提示您创建一个。 </p>
+<p class="style1">您需要具有 Oracle.com 帐户。如果您没有，系统将提示您创建一个。 </p>
          <table width="708" border="0" cellspacing="0" cellpadding="3">
            <tr valign="top">
-              <td width="126" height="35"><form name="form1" method="post" action="https://inventory.sun.com/RegistrationWeb/register/urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b?product=jdk&locale=zh_CN" enctype="text/xml">
+              <td width="126" height="35"><form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=zh_CN" enctype="text/xml">
-			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>a8c0265d</hostId><osName>Linux</osName><osVersion>2.6.33.3</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:b1330404-f0ee-4a41-a965-2f4bd7482e3b%22 version=%221.0%22><service_tag><instance_urn>urn:st:4f6e7c38-ac6f-41da-8ebe-4d438a23e936</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_20</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_20-b02 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_20/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2010-05-09 01:43:40 GMT</timestamp><container>global</container><source>jdk-6u20-fcs-bin-b02-linux-amd64-12_apr_2010.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
+			  <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>">
 <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';"  value="注册我的 JDK">
              </form></td>
-<td width="570"><span class="style3">您需要连接到 Internet 来注册此 Sun 产品。 </span></td>
+<td width="570"><span class="style3">您需要连接到 Internet 来注册此 Oracle 产品。 </span></td>
            </tr>
 	  </table>
 	</blockquote>
@ -50,8 +50,8 @@ a:visited,a:visited code{color:#917E9C}
    <tr>
       <td>&nbsp;</td>
 	<td bgcolor="#f1f7df">
-        <p class="style3">Sun Microsystems, Inc. 尊重您的隐私。我们会将您的个人信息用于通信和 Sun 联机帐户的管理、Sun 联机帐户访问的服务和应用程序以及用于使用 Sun 联机帐户注册的产品和系统。</p>
+        <p class="style3">Oracle 尊重您的隐私。我们会将您的个人信息用于通信和 Oracle.com 帐户的管理、Oracle.com 帐户访问的服务和应用程序以及用于使用 Oracle.com 帐户注册的产品和系统。</p>
-<p class="style3">有关注册过程中收集的数据以及这些数据的管理方式的更多信息，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Sun 隐私政策的更多信息，请访问 <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com</a> 联系。</p></td>
+<p class="style3">有关注册过程中收集的数据以及这些数据的管理方式的更多信息，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Oracle 隐私政策的更多信息，请访问 <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com</a> 联系。</p></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
--- a/extra/source/jdk-6/slack-desc
+++ b/extra/source/jdk-6/slack-desc
@ -5,14 +5,14 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
     |-----handy-ruler------------------------------------------------------|
-jdk: Java(TM) 2 Platform Standard Edition Development Kit 6.0 update 20.
+jdk: Java(TM) 2 Platform Standard Edition Development Kit.
 jdk:
 jdk: The Java 2 SDK software includes tools for developing, testing, and
 jdk: running programs written in the Java programming language.  This
 jdk: package contains everything you need to run Java(TM).
 jdk:
-jdk: For additional information, refer to this Sun Microsystems web page:
+jdk: For additional information, refer to this web page:
-jdk:   http://java.sun.com/
+jdk:   http://java.com/
 jdk:
 jdk:
 jdk:
--- a/extra/source/kde3-compat/arts/arts.SlackBuild
+++ b/extra/source/kde3-compat/arts/arts.SlackBuild
@ -1,57 +0,0 @@
 #!/bin/sh
 CWD=`pwd`
 TMP=/tmp
 PKG=$TMP/package-arts
 VERSION=${VERSION:-1.5.10}
 ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-opt1}
 rm -rf $PKG
 mkdir -p $PKG/opt/kde3
 # Avoid a version number in .la files:
 if [ -d /opt/kde3/lib64/qt3 ]; then
  QTDIR=/opt/kde3/lib64/qt3
 fi
 cd $TMP
 echo "Building arts-$VERSION.tar.bz2..."
 tar xjvf $CWD/arts-$VERSION.tar.bz2
 cd arts-$VERSION
 QTDIR=/opt/kde3/lib64/qt3
 zcat $CWD/arts.tmpdir.diff.gz | patch -p1 --verbose || exit 1
 chown -R root:root .
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
 ./configure \
  --prefix=/opt/kde3 \
  --libdir=/opt/kde3/lib64 \
  --sysconfdir=/opt/kde3/etc \
  --with-xinerama \
  --disable-debug \
  --program-prefix="" \
  --program-suffix="" \
  --build=$ARCH-slackware-linux
 make -j4 || exit 1
 make install DESTDIR=$PKG
 mkdir -p $PKG/usr/doc/arts-$VERSION
 cp -a \
  COPYING* INSTALL doc/NEWS doc/README doc/TODO \
  $PKG/usr/doc/arts-$VERSION
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 ( cd $PKG
  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 if [ -d $PKG/usr/man ]; then
  gzip -9 $PKG/usr/man/man?/*
 fi
 cd $PKG
 makepkg -l y -c n ../arts-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/kde3-compat/arts/arts.tmpdir.diff
+++ b/extra/source/kde3-compat/arts/arts.tmpdir.diff
@ -1,17 +0,0 @@
 --- ./mcop/mcoputils.cc.orig	2006-01-19 10:16:08.000000000 -0600
 +++ ./mcop/mcoputils.cc	2006-09-19 17:07:50.000000000 -0500
@@ -47,7 +47,13 @@
   result = lstat(tmp_dir, &stat_buf);
   if ((result == -1) && (errno == ENOENT))
   {
 -    return 1;
 +    result = mkdir(tmp_dir, 0700);
 +    if (result == -1)
 +    {
 +       arts_warning("Error: Can not create directory \"%s\".\n", tmp_dir);
 +       return 1;
 +    }
 +    result = stat(tmp_dir, &stat_buf);
   }
   if ((result == -1) || (!S_ISDIR(stat_buf.st_mode)))
   {
--- a/extra/source/kde3-compat/k3b3/k3b3.SlackBuild
+++ b/extra/source/kde3-compat/k3b3/k3b3.SlackBuild
@ -1,67 +0,0 @@
 #!/bin/sh
 CWD=`pwd`
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-k3b3
 VERSION=1.0.5
 ARCH=${ARCH:-x86_64}
 BUILD=opt1
 if [ "$ARCH" = "i386" ]; then
  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
 elif [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
  SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2"
 fi
 if [ ! -d $TMP ]; then
  mkdir -p $TMP
 fi
 rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
 rm -rf k3b-$VERSION
 tar xjvf $CWD/k3b-$VERSION.tar.bz2 || exit 1
 cd k3b-$VERSION
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
 QTDIR=/opt/kde3/lib64/qt3
 # ./configure --help lists --docdir, but it is ignored.  Oh well.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/opt/kde3 \
  --libdir=/opt/kde3/lib64 \
  --sysconfdir=/etc/kde \
  --docdir=/usr/doc \
  --without-cdrecord-suid-root \
  --program-prefix="" \
  --program-suffix="" \
  --build=$ARCH-slackware-linux
 make -j4 || exit 1
 make install DESTDIR=$PKG
 # Add a .desktop in the compatible location:
 mkdir -p $PKG/usr/share/applications/kde4
 ( cd $PKG/usr/share/applications/kde4 ; ln -sf /opt/kde3/share/applications/kde/k3b.desktop k3b3.desktop )
 ( cd $PKG
  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 mkdir -p $PKG/usr/doc/k3b-$VERSION
 cp -a \
  AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL KNOWNBUGS PERMISSIONS README RELEASE_HOWTO TODO k3b.lsm \
  $PKG/usr/doc/k3b-$VERSION
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 makepkg -l y -c n $TMP/k3b3-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/kde3-compat/k3b3/slack-desc
+++ b/extra/source/kde3-compat/k3b3/slack-desc
@ -1,19 +0,0 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|' on
 # the right side marks the last column you can put a character in.  You must make
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
    |-----handy-ruler------------------------------------------------------|
 k3b3: k3b3 (The CD Creator, KDE3 version)
 k3b3:
 k3b3: K3b makes writing cds under Linux easy.  It has an easy to use
 k3b3: interface and supports CD burning (including on-the-fly), copying,
 k3b3: erasing, ripping, and more.
 k3b3:
 k3b3: K3b was written by Sebastian Trueg, Thomas Froescher,
 k3b3: Christian Kvasny, and Klaus-Dieter Krannich.
 k3b3:
 k3b3: For more information, visit:  http://www.k3b.org
 k3b3:
--- a/extra/source/kde3-compat/kdelibs3/apply-patches.sh
+++ b/extra/source/kde3-compat/kdelibs3/apply-patches.sh
@ -1,3 +0,0 @@
 zcat $CWD/kdelibs-utempter.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 zcat $CWD/kdelibs.inotify.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 zcat $CWD/kdelibs.no.inotify.externs.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
--- a/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff
+++ b/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff
@ -1,23 +0,0 @@
 diff -Naur kdelibs-3.5.7.orig/kdecore/kpty.cpp kdelibs-3.5.7/kdecore/kpty.cpp
 --- kdelibs-3.5.7.orig/kdecore/kpty.cpp	2006-05-22 19:14:21.000000000 +0100
 +++ kdelibs-3.5.7/kdecore/kpty.cpp	2007-06-10 14:08:18.000000000 +0100
@@ -401,7 +401,9 @@
 #ifdef HAVE_UTEMPTER
     KProcess_Utmp utmp;
     utmp.cmdFd = d->masterFd;
 -    utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << "";
 +    utmp << "/usr/lib/utempter/utempter" << "add";
 +    if (remotehost)
 +      utmp << remotehost;
     utmp.start(KProcess::Block);
     Q_UNUSED(user);
     Q_UNUSED(remotehost);
@@ -444,7 +446,7 @@
 #ifdef HAVE_UTEMPTER
     KProcess_Utmp utmp;
     utmp.cmdFd = d->masterFd;
 -    utmp << "/usr/sbin/utempter" << "-d" << d->ttyName;
 +    utmp << "/usr/lib/utempter/utempter" << "del";
     utmp.start(KProcess::Block);
 #elif defined(USE_LOGIN)
     const char *str_ptr = d->ttyName.data();
--- a/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff
+++ b/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff
@ -1,11 +0,0 @@
 --- ./kio/kio/kdirwatch.cpp.orig	2006-07-22 03:16:37.000000000 -0500
 +++ ./kio/kio/kdirwatch.cpp	2009-06-18 19:27:38.000000000 -0500
@@ -71,7 +71,7 @@
 #include <linux/types.h>
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
 -#include <linux/inotify.h>
 +#include <sys/inotify.h>
 static inline int inotify_init (void)
 {
--- a/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff
+++ b/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff
@ -1,37 +0,0 @@
 --- ./kio/kio/kdirwatch.cpp.orig	2009-06-18 19:29:01.000000000 -0500
 +++ ./kio/kio/kdirwatch.cpp	2009-06-18 19:32:41.000000000 -0500
@@ -73,20 +73,20 @@
 #define _S390_BITOPS_H
 #include <sys/inotify.h>
 -static inline int inotify_init (void)
 -{
 -  return syscall (__NR_inotify_init);
 -}
 -
 -static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
 -{
 -  return syscall (__NR_inotify_add_watch, fd, name, mask);
 -}
 -
 -static inline int inotify_rm_watch (int fd, __u32 wd)
 -{
 -  return syscall (__NR_inotify_rm_watch, fd, wd);
 -}
 +// static inline int inotify_init (void)
 +// {
 +//   return syscall (__NR_inotify_init);
 +// }
 +
 +// static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
 +// {
 +//   return syscall (__NR_inotify_add_watch, fd, name, mask);
 +// }
 +
 +// static inline int inotify_rm_watch (int fd, __u32 wd)
 +// {
 +//   return syscall (__NR_inotify_rm_watch, fd, wd);
 +// }
 #ifndef  IN_ONLYDIR
 #define  IN_ONLYDIR 0x01000000 
--- a/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild
+++ b/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild
@ -1,68 +0,0 @@
 #!/bin/sh
 CWD=`pwd`
 TMP=/tmp
 PKG=$TMP/package-kdelibs
 # Set the config option variables if they are not already set:
 if [ -r ../KDE.options ]; then
  . ../KDE.options
 fi
 # The global options may be overridden here (if needed):
 if [ -r ./local.options ]; then
  . ./local.options
 fi
 rm -rf $PKG
 mkdir -p $PKG/usr
 # Avoid a version number in .la files:
 if [ -d /opt/kde3/lib64/qt ]; then
  QTDIR=/opt/kde3/lib64/qt3
 fi
 cd $TMP
 echo "Building kdelibs-$VERSION.tar.bz2..."
 tar xjvf $CWD/kdelibs-$VERSION.tar.bz2 || exit 1
 cd kdelibs-$VERSION || exit 1
 if [ -r $CWD/apply-patches.sh ]; then
  . $CWD/apply-patches.sh
 fi
 chown -R root:root .
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
 ./configure \
  --prefix=/opt/kde3 \
  --libdir=/opt/kde3/lib64 \
  --sysconfdir=/opt/kde3/etc \
  --with-ssl-dir=/usr \
  --with-xinerama \
  --disable-debug \
  --enable-dnotify \
  --program-prefix="" \
  --program-suffix="" \
  --build=$TARGET-slackware-linux
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG
 mkdir -p $PKG/usr/doc/kdelibs-$VERSION
 cp -a \
  AUTHORS COMPILING COMPILING.html COPYING* DEBUG INSTALL KDE2PORTING.html KDE3PORTING.html NAMING README  kdelibs.lsm \
  $PKG/usr/doc/kdelibs-$VERSION
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 ( cd $PKG
  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 if [ -d $PKG/usr/man ]; then
  gzip -9 $PKG/usr/man/man?/*
 fi
 cd $PKG
 makepkg -l y -c n ../kdelibs3-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/kde3-compat/kdelibs3/local.options
+++ b/extra/source/kde3-compat/kdelibs3/local.options
@ -1,4 +0,0 @@
 VERSION=3.5.10
 ARCH=x86_64
 TARGET=x86_64
 BUILD=opt1
--- a/extra/source/kde3-compat/kdelibs3/slack-desc
+++ b/extra/source/kde3-compat/kdelibs3/slack-desc
@ -1,19 +0,0 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|' on
 # the right side marks the last column you can put a character in.  You must make
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
        |-----handy-ruler------------------------------------------------------|
 kdelibs3: kdelibs3 (KDE3 runtime libraries)
 kdelibs3:
 kdelibs3: System libraries and other resources required by KDE3.
 kdelibs3:
 kdelibs3:
 kdelibs3:
 kdelibs3:
 kdelibs3:
 kdelibs3:
 kdelibs3:
 kdelibs3:
--- a/extra/source/kde3-compat/qt3/doinst.sh
+++ b/extra/source/kde3-compat/qt3/doinst.sh
@ -1,9 +0,0 @@
 ## This was causing problems compiling KDE for unknown reasons.
 ## So, we'll symlink the libraries into /opt/kde3 again...
 # Add QT library directory to /etc/ld.so.conf:
 if ! grep /opt/kde3/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
  echo "/opt/kde3/lib" >> etc/ld.so.conf
 fi
 if [ -x /sbin/ldconfig ]; then
  /sbin/ldconfig 2> /dev/null
 fi
--- a/extra/source/kde3-compat/qt3/profile.d/qt.csh
+++ b/extra/source/kde3-compat/qt3/profile.d/qt.csh
@ -1,22 +0,0 @@
 #!/bin/csh
 # Environment path variables for the Qt package:
 if ( ! $?QTDIR ) then
    # It's best to use the generic directory to avoid
    # compiling in a version-containing path:
    if ( -d /opt/kde3/lib/qt3 ) then
        setenv QTDIR /opt/kde3/lib/qt3
    else
        # Find the newest Qt directory and set $QTDIR to that:
        foreach qtd ( /opt/kde3/lib/qt-* )
            if ( -d $qtd ) then
                setenv QTDIR $qtd
            endif
        end
    endif
 endif
 set path = ( $path $QTDIR/bin /opt/kde3/bin )
 if ( $?CPLUS_INCLUDE_PATH ) then
    setenv CPLUS_INCLUDE_PATH $QTDIR/include:$CPLUS_INCLUDE_PATH
 else
    setenv CPLUS_INCLUDE_PATH $QTDIR/include
 endif
--- a/extra/source/kde3-compat/qt3/profile.d/qt.sh
+++ b/extra/source/kde3-compat/qt3/profile.d/qt.sh
@ -1,23 +0,0 @@
 #!/bin/sh
 # Environment variables for the Qt package.
 #
 # It's best to use the generic directory to avoid
 # compiling in a version-containing path:
 if [ -d /opt/kde3/lib/qt3 ]; then
  QTDIR=/opt/kde3/lib/qt3
 else
  # Find the newest Qt directory and set $QTDIR to that:
  for qtd in /opt/kde3/lib/qt-* ; do
    if [ -d $qtd ]; then
      QTDIR=$qtd
    fi
  done
 fi
 if [ ! "$CPLUS_INCLUDE_PATH" = "" ]; then
  CPLUS_INCLUDE_PATH=$QTDIR/include:$CPLUS_INCLUDE_PATH
 else
  CPLUS_INCLUDE_PATH=$QTDIR/include
 fi
 PATH="$PATH:$QTDIR/bin:/opt/kde3/bin"
 export QTDIR
 export CPLUS_INCLUDE_PATH
--- a/extra/source/kde3-compat/qt3/qt-x11.diff
+++ b/extra/source/kde3-compat/qt3/qt-x11.diff
@ -1,11 +0,0 @@
 --- ./src/kernel/qgif.h.orig	Tue Mar 19 02:31:42 2002
 +++ ./src/kernel/qgif.h	Sun Mar 24 22:14:19 2002
@@ -47,7 +47,7 @@
 #endif // QT_H
 #ifndef QT_BUILTIN_GIF_READER
 -#define QT_BUILTIN_GIF_READER 0
 +#define QT_BUILTIN_GIF_READER 1
 #endif
 bool qt_builtin_gif_reader();
--- a/extra/source/kde3-compat/qt3/qt.mysql.h.diff
+++ b/extra/source/kde3-compat/qt3/qt.mysql.h.diff
@ -1,11 +0,0 @@
 --- ./src/sql/drivers/mysql/qsql_mysql.h.orig	2002-04-15 03:05:53.000000000 -0700
 +++ ./src/sql/drivers/mysql/qsql_mysql.h	2002-10-14 14:59:36.000000000 -0700
@@ -46,7 +46,7 @@
 #include <qt_windows.h>
 #endif
 -#include <mysql.h>
 +#include <mysql/mysql.h>
 #ifdef QT_PLUGIN
 #define Q_EXPORT_SQLDRIVER_MYSQL
--- a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff
+++ b/extra/source/kde3-compat/qt3/qt.x86.cflags.diff
@ -1,11 +0,0 @@
 --- ./mkspecs/linux-g++/qmake.conf.orig	Fri Apr 26 00:48:00 2002
 +++ ./mkspecs/linux-g++/qmake.conf	Tue May  7 12:05:04 2002
@@ -18,7 +18,7 @@
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
 -QMAKE_CFLAGS_RELEASE	= -O2
 +QMAKE_CFLAGS_RELEASE	= -O2 -march=i486 -mtune=i686
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
--- a/extra/source/kde3-compat/qt3/qt3.SlackBuild
+++ b/extra/source/kde3-compat/qt3/qt3.SlackBuild
@ -1,192 +0,0 @@
 #!/bin/sh
 # Copyright 2006, 2007, 2008  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # Build with NODEVEL=<something> after building the other deps to get rid of
 # the .so, include, and other files not needed for runtime.
 PKGNAM=qt3
 VERSION=${VERSION:-3.3.8b}
 ARCH=${ARCH:-x86_64}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-opt2}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 # Don't build a devel package (but put a devel SYSTEM on this machine...)
 NODEVEL=true
 if [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 fi
 #cd $TMP
 # I have *many* times tried building this package in /tmp, and it always
 # ends up with a "/tmp" directory embedded in some wrong place.  Hopefully
 # the next time I see this comment I'll remember that and not make the
 # same mistake again just for the sake of doing things "right" (but having
 # the package come out wrong...)
 #rm -rf ${PKGNAM}-${VERSION}
 mkdir -p /opt/kde3/lib${LIBDIRSUFFIX}
 cd /opt/kde3/lib${LIBDIRSUFFIX}
 rm -rf qt-3* qt3 qt-3.* qt3-*
 tar xvf $CWD/qt-x11-free-$VERSION.tar.bz2 || exit 1
 mv qt-x11-free-$VERSION qt3
 cd qt3
 if [ $ARCH = "i486" ]; then
  zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1
 fi
 zcat $CWD/qt-x11.diff.gz | patch -p1 || exit 1
 zcat $CWD/qt.mysql.h.diff.gz | patch -p1 || exit 1
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 QTDIR=/opt/kde3/lib${LIBDIRSUFFIX}/qt3
 # And here's what we are currently using.  The "yes" agrees to the GPL, so don't run this script if you
 # don't agree.  :-)
 echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure \
 -prefix /opt/kde3/lib${LIBDIRSUFFIX}/qt3-${VERSION} \
 -release \
 -system-zlib \
 -system-libpng \
 -qt-imgfmt-png \
 -system-libmng \
 -qt-imgfmt-mng \
 -system-libjpeg \
 -qt-imgfmt-jpeg \
 -qt-gif \
 -thread \
 -stl \
 -no-g++-exceptions \
 -xft \
 -plugin-sql-mysql \
 -plugin-style-cde \
 -plugin-style-compact \
 -qt-style-motif \
 -plugin-style-motifplus \
 -plugin-style-platinum \
 -plugin-style-sgi \
 -plugin-style-windows \
 -enable-opengl
 # We're using '-i' to work around a bug where the build tries to strip html files.
 # Build the important stuff:
 make $NUMJOBS -i
 make install || exit 1
 make $NUMJOBS -i symlinks sub-src sub-tools
 make install || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 # Link the shared libraries into /opt/kde3/lib.
 ( cd /opt/kde3/lib${LIBDIRSUFFIX}
  for file in qt3/lib/*.so* ; do
    ln -sf $file .
  done
 )
 # Leave these out so as not to interfere with Qt4:
 if [ -z "$NODEVEL" ]; then
  # Add man pages:
  mkdir -p $PKG/usr/man
  cp -a doc/man/* $PKG/usr/man
  find $PKG/usr/man -type f -exec gzip -9 "{}" \;
 fi
 if [ $ARCH = "i486" ]; then
  # Put this back as shipped:
  ( cd $PKG/opt/kde3/lib/qt3-${VERSION}
    zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 -R )
 fi
 mkdir -p $PKG/etc/profile.d
 cat $CWD/profile.d/qt.sh  | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
  > $PKG/etc/profile.d/qt.sh
 cat $CWD/profile.d/qt.csh | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
  > $PKG/etc/profile.d/qt.csh
 chmod 755 $PKG/etc/profile.d/*
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 # Put a ton of links to more "normal" places.  I'd just use a prefix of /usr, but it
 # creates a ton of new (and ambiguously named) /usr directories...
 mkdir -p $PKG/opt/kde3/bin
 ( cd $PKG/opt/kde3/bin
  for file in assistant designer linguist lrelease lupdate moc qm2ts qmake qtconfig uic ; do
    ln -sf /opt/kde3/lib${LIBDIRSUFFIX}/qt3/bin/$file .
  done
 )
 sed -i -e "s#/lib\$#/lib${LIBDIRSUFFIX}#" \
  $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3-$VERSION/lib/pkgconfig/qt-mt.pc || exit 1
 mkdir -p $PKG/opt/kde3/lib${LIBDIRSUFFIX}/pkgconfig
 ( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX}/pkgconfig
  ln -sf /opt/kde3/lib${LIBDIRSUFFIX}/qt3/lib/pkgconfig/qt-mt.pc .
 )
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
  FAQ INSTALL LICENSE.GPL* LICENSE.QPL MANIFEST PLATFORMS README* changes* \
  $PKG/usr/doc/${PKGNAM}-$VERSION
 # Put the actual file tree in /opt/kde3/lib/qt3:
 mv $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3-${VERSION} $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3
 ( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX} ; ln -sf qt3 qt3-${VERSION})
 ( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX}
  for file in qt3/lib/*.so* ; do
    ln -sf $file .
  done
 )
 # This much documentation isn't needed for the compat qt3 package -- look in the
 # source if you need it.
 rm -rf $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3/doc
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
  > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
--- a/extra/source/kde3-compat/qt3/slack-desc
+++ b/extra/source/kde3-compat/qt3/slack-desc
@ -1,19 +0,0 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
   |-----handy-ruler------------------------------------------------------|
 qt3: Qt3 (a multi-platform C++ graphical user interface toolkit, version 3)
 qt3:
 qt3: Qt is a complete and well-developed object-oriented framework for
 qt3: developing graphical user interface (GUI) applications using C++.
 qt3:
 qt3: This release is free only for development of free software for the X
 qt3: Window System.  If you use Qt for developing commercial or other
 qt3: non-free software, you must have a professional license.  Please see
 qt3: http://www.trolltech.com/purchase.html for information on how to
 qt3: obtain a professional license.
 qt3:
--- a/extra/source/pam/make-pam-solibs-for-chrome.sh
+++ b/extra/source/pam/make-pam-solibs-for-chrome.sh
@ -0,0 +1,84 @@
 #!/bin/sh
 # Copyright 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # This expects to find a file pam-*.txz in the local directory that
 # will contain a usable PAM shared library to satify the requirement
 # for that library.  To get whatever is actually using PAM working is
 # going to need more PAM structure installed, but luckily I've yet to
 # encounter what needs it and everything works fine with only the
 # libpam.so.0 installed.
 if ! ls pam-*-*-*.txz 1> /dev/null 2> /dev/null ; then
  echo "FAIL:  no Slackware pam txz package found."
  exit 1
 fi
 PKGNAM=google-chrome-pam-solibs
 VERSION=${VERSION:-$(echo pam-*-*-*.txz | cut -f 2 -d -)}
 ARCH=${ARCH:-$(echo pam-*-*-*.txz | cut -f 3 -d -)}
 BUILD=${BUILD:-$(echo pam-*-*-*.txz | cut -f 4 -d - | cut -f 1 -d .)}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $PKG
 mkdir tmp
 ( cd tmp
  explodepkg $CWD/pam-$VERSION-$ARCH-$BUILD.txz
  sh install/doinst.sh
 )
 mkdir -p $PKG/opt/google/chrome
 if [ -d tmp/lib64 ]; then
  cp -a tmp/lib64/libpam.so.0* $PKG/opt/google/chrome
 else
  cp -a tmp/lib/libpam.so.0* $PKG/opt/google/chrome
 fi
 rm -rf $PKG/tmp
 mkdir -p $PKG/install
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
                        |-----handy-ruler------------------------------------------------------|
 google-chrome-pam-solibs: google-chrome-pam-solibs (libpam.so.0)
 google-chrome-pam-solibs:
 google-chrome-pam-solibs: This is a package that provides libpam.so.0 to satisfy the library
 google-chrome-pam-solibs: requirement for Google Chrome when that is installed in the
 google-chrome-pam-solibs: usual /opt/google/chrome directory.  It does not provide any other
 google-chrome-pam-solibs: PAM features, and cannot be used to compile against or by other
 google-chrome-pam-solibs: programs.  If you need real PAM for some reason (like to compile
 google-chrome-pam-solibs: Chromium), please see the pam.SlackBuild in the source directory.
 google-chrome-pam-solibs:
 google-chrome-pam-solibs:
 google-chrome-pam-solibs:
 EOF
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
--- a/extra/source/pam/pam.SlackBuild
+++ b/extra/source/pam/pam.SlackBuild
@ -0,0 +1,173 @@
 #!/bin/sh
 # Copyright 2010  Vincent Batts, vbatts@hashbangbash.com
 # Copyright 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # Call the church police!  ;-)
 SRCNAM=Linux-PAM
 PKGNAM=pam
 PAMRHVER=${PAMRHVER:-$(echo pam-redhat-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 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:--j7}
 if [ "$ARCH" = "i386" ]; then
  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 else
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
 cd $SRCNAM-$VERSION || exit 1
 # Better take the Red Hat added modules and patches, because that's very
 # likely to be the most standard as far as PAM goes:
 tar xvf $CWD/pam-redhat-$PAMRHVER.tar.?z* || exit 1
 mv pam-redhat-$PAMRHVER/{CHANGELOG*,COPYING*,README*} .
 mv pam-redhat-$PAMRHVER/* modules
 zcat $CWD/patches/pam-1.0.90-redhat-modules.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.0.91-std-noclose.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.0-notally.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.1-faillock.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.2-noflex.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.3-faillock-screensaver.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.3-limits-nosetreuid.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.3-limits-range.patch.gz | patch -p0 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.3-nouserenv.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.3-pwhistory-incomplete.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/pam-1.1.3-securetty-console.patch.gz | patch -p0 --verbose || exit 1
 # Churn some patches from .am -> .in:
 autoreconf -f
 # Make these 2 man pages or the build falls over later on:
 ( cd modules/pam_faillock
  xmlto man faillock.8.xml
  xmlto man pam_faillock.8.xml
 )
 chown -R root:root .
 find . \
 \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
 -exec chmod 755 {} \; -o \
 \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
 -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/ \
  --libdir=/lib${LIBDIRSUFFIX} \
  --sysconfdir=/etc \
  --includedir=/usr/include/security \
  --datarootdir=/usr/share \
  --localstatedir=/var \
  --mandir=/usr/man \
  --docdir=/usr/doc/$PKGNAM-$VERSION \
  --enable-read-both-confs \
  --disable-prelude \
  --disable-selinux \
  --build=$ARCH-slackware-linux || exit 1
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 # this is a pam helper, that can only be called from pam
 chown root:shadow $PKG/sbin/unix_chkpwd
 chmod g+s $PKG/sbin/unix_chkpwd
 # Strip binaries:
 ( cd $PKG
  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
  ( cd $PKG/usr/man
    for manpagedir in $(find . -type d -name "man*") ; do
      ( cd $manpagedir
        for eachpage in $( find . -type l -maxdepth 1) ; do
          ln -s $( readlink $eachpage ).gz $eachpage.gz
          rm $eachpage
        done
        gzip -9 *.?
      )
    done
  )
 fi
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
  AUTHORS COPYING* Copyright NEWS README* \
  $PKG/usr/doc/$PKGNAM-$VERSION
 # 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
 if [ -r CHANGELOG ]; then
  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
  cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG
  touch -r CHANGELOG $DOCSDIR/CHANGELOG
 fi
 rm -f $PKG/usr/doc/$PKGNAM-$VERSION/index.html
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
--- a/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch
+++ b/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch
@ -0,0 +1,23 @@
 diff -up Linux-PAM-1.0.90/modules/Makefile.am.redhat-modules Linux-PAM-1.0.90/modules/Makefile.am
 --- Linux-PAM-1.0.90/modules/Makefile.am.redhat-modules	2008-11-29 08:27:35.000000000 +0100
 +++ Linux-PAM-1.0.90/modules/Makefile.am	2008-12-16 13:40:16.000000000 +0100
@@ -3,6 +3,7 @@
 #
 SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
 +	pam_chroot pam_console pam_postgresok \
 	pam_env pam_exec pam_faildelay pam_filter pam_ftp \
 	pam_group pam_issue pam_keyinit pam_lastlog pam_limits \
 	pam_listfile pam_localuser pam_loginuid pam_mail \
 diff -up Linux-PAM-1.0.90/configure.in.redhat-modules Linux-PAM-1.0.90/configure.in
 --- Linux-PAM-1.0.90/configure.in.redhat-modules	2008-12-02 16:25:01.000000000 +0100
 +++ Linux-PAM-1.0.90/configure.in	2008-12-16 13:39:11.000000000 +0100
@@ -531,6 +531,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
 	libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
 	po/Makefile.in \
 	modules/Makefile \
 +	modules/pam_chroot/Makefile modules/pam_console/Makefile \
 +	modules/pam_postgresok/Makefile \
 	modules/pam_access/Makefile modules/pam_cracklib/Makefile \
         modules/pam_debug/Makefile modules/pam_deny/Makefile \
 	modules/pam_echo/Makefile modules/pam_env/Makefile \
--- a/extra/source/pam/patches/pam-1.0.91-std-noclose.patch
+++ b/extra/source/pam/patches/pam-1.0.91-std-noclose.patch
@ -0,0 +1,98 @@
 diff -up Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c.std-noclose Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c
 --- Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
 +++ Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c	2009-03-26 10:02:15.000000000 +0100
@@ -131,13 +131,21 @@ create_homedir (pam_handle_t *pamh, int 
    if (child == 0) {
         int i;
         struct rlimit rlim;
 +	int dummyfds[2];
 	static char *envp[] = { NULL };
 	char *args[] = { NULL, NULL, NULL, NULL, NULL };
 +	/* replace std file descriptors with a dummy pipe */
 +	if (pipe(dummyfds) == 0) {
 +		dup2(dummyfds[0], STDIN_FILENO);
 +		dup2(dummyfds[1], STDOUT_FILENO);
 +		dup2(dummyfds[1], STDERR_FILENO);
 +	}
 +
 	if (getrlimit(RLIMIT_NOFILE, &rlim)==0) {
           if (rlim.rlim_max >= MAX_FD_NO)
                 rlim.rlim_max = MAX_FD_NO;
 -	  for (i=0; i < (int)rlim.rlim_max; i++) {
 +	  for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
 	  	close(i);
 	  }
 	}
 diff -up Linux-PAM-1.0.91/modules/pam_unix/support.c.std-noclose Linux-PAM-1.0.91/modules/pam_unix/support.c
 --- Linux-PAM-1.0.91/modules/pam_unix/support.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
 +++ Linux-PAM-1.0.91/modules/pam_unix/support.c	2009-03-26 10:08:59.000000000 +0100
@@ -443,13 +443,16 @@ static int _unix_run_helper_binary(pam_h
 	/* reopen stdin as pipe */
 	dup2(fds[0], STDIN_FILENO);
 +	/* and replace also the stdout/err as the helper will
 +           not write anything there */
 +	dup2(fds[1], STDOUT_FILENO);
 +	dup2(fds[1], STDERR_FILENO);
 	if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
           if (rlim.rlim_max >= MAX_FD_NO)
                 rlim.rlim_max = MAX_FD_NO;
 -	  for (i=0; i < (int)rlim.rlim_max; i++) {
 -		if (i != STDIN_FILENO)
 -	  	   close(i);
 +	  for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
 +	  	close(i);
 	  }
 	}
 diff -up Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c.std-noclose Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c
 --- Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
 +++ Linux-PAM-1.0.91/modules/pam_unix/pam_unix_passwd.c	2009-03-26 10:07:06.000000000 +0100
@@ -175,13 +175,16 @@ static int _unix_run_update_binary(pam_h
 	/* reopen stdin as pipe */
 	dup2(fds[0], STDIN_FILENO);
 +	/* and replace also the stdout/err as the helper will
 +           not write anything there */
 +	dup2(fds[1], STDOUT_FILENO);
 +	dup2(fds[1], STDERR_FILENO);
 	if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
 	  if (rlim.rlim_max >= MAX_FD_NO)
 	    rlim.rlim_max = MAX_FD_NO;
 -	  for (i=0; i < (int)rlim.rlim_max; i++) {
 -	    if (i != STDIN_FILENO)
 -	  	   close(i);
 +	  for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
 +	    close(i);
 	  }
 	}
 diff -up Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c.std-noclose Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c
 --- Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c.std-noclose	2009-03-03 14:56:01.000000000 +0100
 +++ Linux-PAM-1.0.91/modules/pam_unix/pam_unix_acct.c	2009-03-26 10:05:41.000000000 +0100
@@ -100,16 +100,18 @@ int _unix_run_verify_binary(pam_handle_t
     /* reopen stdout as pipe */
     dup2(fds[1], STDOUT_FILENO);
 +    /* and replace also the stdin, stderr so we do not exec the helper with
 +       tty as stdin, it will not read anything from there anyway */
 +    dup2(fds[0], STDIN_FILENO);
 +    dup2(fds[1], STDERR_FILENO);
     /* XXX - should really tidy up PAM here too */
     if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
       if (rlim.rlim_max >= MAX_FD_NO)
         rlim.rlim_max = MAX_FD_NO;
 -      for (i=0; i < (int)rlim.rlim_max; i++) {
 -	if (i != STDOUT_FILENO) {
 -	  close(i);
 -	}
 +      for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
 +	close(i);
       }
     }
--- a/extra/source/pam/patches/pam-1.1.0-notally.patch
+++ b/extra/source/pam/patches/pam-1.1.0-notally.patch
@ -0,0 +1,12 @@
 diff -up Linux-PAM-1.1.0/modules/Makefile.am.notally Linux-PAM-1.1.0/modules/Makefile.am
 --- Linux-PAM-1.1.0/modules/Makefile.am.notally	2009-07-27 17:39:25.000000000 +0200
 +++ Linux-PAM-1.1.0/modules/Makefile.am	2009-09-01 17:40:16.000000000 +0200
@@ -10,7 +10,7 @@ SUBDIRS = pam_access pam_cracklib pam_de
 	pam_mkhomedir pam_motd pam_namespace pam_nologin \
 	pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \
 	pam_selinux pam_sepermit pam_shells pam_stress \
 -	pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \
 +	pam_succeed_if pam_tally2 pam_time pam_timestamp \
 	pam_tty_audit pam_umask \
 	pam_unix pam_userdb pam_warn pam_wheel pam_xauth
--- a/extra/source/pam/patches/pam-1.1.1-faillock.patch
+++ b/extra/source/pam/patches/pam-1.1.1-faillock.patch
--- a/extra/source/pam/patches/pam-1.1.2-noflex.patch
+++ b/extra/source/pam/patches/pam-1.1.2-noflex.patch
@ -0,0 +1,27 @@
 diff -up Linux-PAM-1.1.2/doc/Makefile.am.noflex Linux-PAM-1.1.2/doc/Makefile.am
 --- Linux-PAM-1.1.2/doc/Makefile.am.noflex	2008-02-04 16:05:51.000000000 +0100
 +++ Linux-PAM-1.1.2/doc/Makefile.am	2010-09-20 10:40:59.000000000 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
 #
 -SUBDIRS = man specs sag adg mwg
 +SUBDIRS = man sag adg mwg
 CLEANFILES = *~
 diff -up Linux-PAM-1.1.2/Makefile.am.noflex Linux-PAM-1.1.2/Makefile.am
 --- Linux-PAM-1.1.2/Makefile.am.noflex	2010-07-08 14:04:19.000000000 +0200
 +++ Linux-PAM-1.1.2/Makefile.am	2010-09-20 10:04:56.000000000 +0200
@@ -5,9 +5,9 @@
 AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
 if STATIC_MODULES
 -SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
 +SUBDIRS = modules libpam libpamc libpam_misc tests po doc examples xtests
 else
 -SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
 +SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests
 endif
 CLEANFILES = *~
--- a/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch
+++ b/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch
@ -0,0 +1,167 @@
 diff -up Linux-PAM-1.1.3/modules/pam_faillock/faillock.c.screensaver Linux-PAM-1.1.3/modules/pam_faillock/faillock.c
 --- Linux-PAM-1.1.3/modules/pam_faillock/faillock.c.screensaver	2010-11-10 11:46:07.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_faillock/faillock.c	2010-11-10 11:46:07.000000000 +0100
@@ -41,13 +41,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 +#include <sys/stat.h>
 #include <fcntl.h>
 #include <security/pam_modutil.h>
 #include "faillock.h"
 int
 -open_tally (const char *dir, const char *user, int create)
 +open_tally (const char *dir, const char *user, uid_t uid, int create)
 {
 	char *path;
 	int flags = O_RDWR;
@@ -69,8 +70,18 @@ open_tally (const char *dir, const char 
 	fd = open(path, flags, 0600);
 -	if (fd != -1)
 +	free(path);
 +
 +	if (fd != -1) {
 +		struct stat st;
 +
 		while (flock(fd, LOCK_EX) == -1 && errno == EINTR);
 +		if (fstat(fd, &st) == 0) {
 +			if (st.st_uid != uid) {
 +				fchown(fd, uid, -1);
 +			}
 +		}
 +	}
 	return fd;
 }
 diff -up Linux-PAM-1.1.3/modules/pam_faillock/faillock.h.screensaver Linux-PAM-1.1.3/modules/pam_faillock/faillock.h
 --- Linux-PAM-1.1.3/modules/pam_faillock/faillock.h.screensaver	2010-11-10 11:46:07.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_faillock/faillock.h	2010-11-10 11:46:07.000000000 +0100
@@ -45,6 +45,7 @@
 #define _FAILLOCK_H
 #include <stdint.h>
 +#include <sys/types.h>
 #define TALLY_STATUS_VALID     0x1       /* the tally file entry is valid */
 #define TALLY_STATUS_RHOST     0x2       /* the source is rhost */
@@ -65,7 +66,7 @@ struct tally_data {
 #define FAILLOCK_DEFAULT_TALLYDIR "/var/run/faillock"
 -int open_tally(const char *dir, const char *user, int create);
 +int open_tally(const char *dir, const char *user, uid_t uid, int create);
 int read_tally(int fd, struct tally_data *tallies);
 int update_tally(int fd, struct tally_data *tallies);
 #endif
 diff -up Linux-PAM-1.1.3/modules/pam_faillock/main.c.screensaver Linux-PAM-1.1.3/modules/pam_faillock/main.c
 --- Linux-PAM-1.1.3/modules/pam_faillock/main.c.screensaver	2010-11-10 11:46:07.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_faillock/main.c	2010-11-10 11:46:07.000000000 +0100
@@ -106,8 +106,11 @@ do_user(struct options *opts, const char
 	int fd;
 	int rv;
 	struct tally_data tallies;
 +	struct passwd *pwd;
 -	fd = open_tally(opts->dir, user, 0);
 +	pwd = getpwnam(user);
 +
 +	fd = open_tally(opts->dir, user, pwd != NULL ? pwd->pw_uid : 0, 0);
 	if (fd == -1) {
 		if (errno == ENOENT) {
@@ -134,9 +137,8 @@ do_user(struct options *opts, const char
 #ifdef HAVE_LIBAUDIT
 		}
 		if ((audit_fd=audit_open()) >= 0) {
 -			struct passwd *pwd;
 -			if ((pwd=getpwnam(user)) != NULL) {
 +			if (pwd != NULL) {
 				snprintf(buf, sizeof(buf), "faillock reset uid=%u",
 					pwd->pw_uid);
 				audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
 diff -up Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c.screensaver Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c
 --- Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c.screensaver	2010-11-10 11:46:07.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.c	2010-11-10 11:46:07.000000000 +0100
@@ -213,7 +213,7 @@ check_tally(pam_handle_t *pamh, struct o
 	opts->now = time(NULL);
 -	tfd = open_tally(opts->dir, opts->user, 0);
 +	tfd = open_tally(opts->dir, opts->user, opts->uid, 0);
 	*fd = tfd;
@@ -289,9 +289,14 @@ reset_tally(pam_handle_t *pamh, struct o
 {
 	int rv;
 -	while ((rv=ftruncate(*fd, 0)) == -1 && errno == EINTR);
 -	if (rv == -1) {
 -		pam_syslog(pamh, LOG_ERR, "Error clearing the tally file for %s: %m", opts->user);
 +	if (*fd == -1) {
 +		*fd = open_tally(opts->dir, opts->user, opts->uid, 1);
 +	}
 +	else {
 +		while ((rv=ftruncate(*fd, 0)) == -1 && errno == EINTR);
 +		if (rv == -1) {
 +			pam_syslog(pamh, LOG_ERR, "Error clearing the tally file for %s: %m", opts->user);
 +		}
 	}
 }
@@ -306,7 +311,7 @@ write_tally(pam_handle_t *pamh, struct o
 	const void *source = NULL;
 	if (*fd == -1) {
 -		*fd = open_tally(opts->dir, opts->user, 1);
 +		*fd = open_tally(opts->dir, opts->user, opts->uid, 1);
 	}
 	if (*fd == -1) {
 		if (errno == EACCES) {
@@ -463,7 +468,7 @@ pam_sm_authenticate(pam_handle_t *pamh, 
 		case FAILLOCK_ACTION_AUTHSUCC:
 			rv = check_tally(pamh, &opts, &tallies, &fd);
 -			if (rv == PAM_SUCCESS && fd != -1) {
 +			if (rv == PAM_SUCCESS) {
 				reset_tally(pamh, &opts, &fd);
 			}
                         break;
@@ -511,10 +516,8 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int
 		return rv;
 	}
 -	check_tally(pamh, &opts, &tallies, &fd);
 -	if (fd != -1) {
 -		reset_tally(pamh, &opts, &fd);
 -	}
 +	check_tally(pamh, &opts, &tallies, &fd); /* for auditing */
 +	reset_tally(pamh, &opts, &fd);
 	tally_cleanup(&tallies, fd);
 diff -up Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml.screensaver Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml
 --- Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml.screensaver	2010-11-10 11:46:07.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_faillock/pam_faillock.8.xml	2010-11-10 11:47:14.000000000 +0100
@@ -277,13 +277,9 @@
       from the <emphasis>pam_tally2</emphasis> module setup.
     </para>
     <para>
 -      There is no setuid wrapper for access to the data file such as when the
 -      <emphasis remap='B'>pam_faillock.so</emphasis> module is called from
 -      a screensaver. As this would make it impossible to share PAM configuration
 -      with such services the following workaround is used: If the data file
 -      cannot be opened because of insufficient permissions
 -      (<errorcode>EACCES</errorcode>) the module returns
 -      <errorcode>PAM_SUCCESS</errorcode>.
 +      The individual files with the failure records are created as owned by
 +      the user. This allows <emphasis remap='B'>pam_faillock.so</emphasis> module
 +      to work correctly when it is called from a screensaver.
     </para>
     <para>
       Note that using the module in <option>preauth</option> without the
--- a/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch
+++ b/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch
@ -0,0 +1,64 @@
 diff -up Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c.nosetreuid Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c
 --- Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c.nosetreuid	2009-02-20 14:27:14.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_limits/pam_limits.c	2010-11-11 12:31:04.000000000 +0100
@@ -103,7 +103,6 @@ struct pam_limit_s {
 /* argument parsing */
 #define PAM_DEBUG_ARG       0x0001
 -#define PAM_DO_SETREUID     0x0002
 #define PAM_UTMP_EARLY      0x0004
 #define PAM_NO_AUDIT        0x0008
@@ -127,8 +126,6 @@ _pam_parse (const pam_handle_t *pamh, in
 	    ctrl |= PAM_DEBUG_ARG;
 	} else if (!strncmp(*argv,"conf=",5)) {
 	    pl->conf_file = *argv+5;
 -	} else if (!strncmp(*argv,"change_uid",10)) {
 -	    ctrl |= PAM_DO_SETREUID;
 	} else if (!strcmp(*argv,"utmp_early")) {
 	    ctrl |= PAM_UTMP_EARLY;
 	} else if (!strcmp(*argv,"noaudit")) {
@@ -777,10 +774,6 @@ out:
 	return retval;
     }
 -    if (ctrl & PAM_DO_SETREUID) {
 -	setreuid(pwd->pw_uid, -1);
 -    }
 -
     retval = setup_limits(pamh, pwd->pw_name, pwd->pw_uid, ctrl, pl);
     if (retval & LOGIN_ERR)
 	pam_error(pamh, _("Too many logins for '%s'."), pwd->pw_name);
 diff -up Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml.nosetreuid Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml
 --- Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml.nosetreuid	2009-06-01 09:03:20.000000000 +0200
 +++ Linux-PAM-1.1.3/modules/pam_limits/pam_limits.8.xml	2010-11-11 12:32:35.000000000 +0100
@@ -23,9 +23,6 @@
     <cmdsynopsis id="pam_limits-cmdsynopsis">
       <command>pam_limits.so</command>
       <arg choice="opt">
 -        change_uid
 -      </arg>
 -      <arg choice="opt">
         conf=<replaceable>/path/to/limits.conf</replaceable>
       </arg>
       <arg choice="opt">
@@ -72,19 +69,6 @@
     <variablelist>
       <varlistentry>
         <term>
 -          <option>change_uid</option>
 -        </term>
 -        <listitem>
 -          <para>
 -            Change real uid to the user for who the limits are set up. Use this
 -            option if you have problems like login not forking a shell for user
 -            who has no processes. Be warned that something else may break when
 -            you do this.
 -          </para>
 -        </listitem>
 -      </varlistentry>
 -      <varlistentry>
 -        <term>
           <option>conf=<replaceable>/path/to/limits.conf</replaceable></option>
         </term>
         <listitem>
--- a/extra/source/pam/patches/pam-1.1.3-limits-range.patch
+++ b/extra/source/pam/patches/pam-1.1.3-limits-range.patch
@ -0,0 +1,351 @@
 Index: modules/pam_limits/limits.conf.5.xml
 ===================================================================
 RCS file: /cvsroot/pam/Linux-PAM/modules/pam_limits/limits.conf.5.xml,v
 retrieving revision 1.9
 retrieving revision 1.11
 diff -u -p -r1.9 -r1.11
 --- modules/pam_limits/limits.conf.5.xml	20 Feb 2009 13:27:14 -0000	1.9
 +++ modules/pam_limits/limits.conf.5.xml	14 Dec 2010 08:40:40 -0000	1.11
@@ -53,7 +53,38 @@
             <listitem>
               <para>
                 the wildcard <emphasis remap='B'>%</emphasis>, for maxlogins limit only,
 -                can also be used with <emphasis remap='b'>%group</emphasis> syntax.
 +                can also be used with <emphasis remap='B'>%group</emphasis> syntax. If the
 +                <emphasis remap='B'>%</emphasis> wildcard is used alone it is identical
 +                to using <emphasis remap='B'>*</emphasis> with maxsyslogins limit. With
 +                a group specified after <emphasis remap='B'>%</emphasis> it limits the total
 +                number of logins of all users that are member of the group.
 +              </para>
 +            </listitem>
 +            <listitem>
 +              <para>
 +                an uid range specified as <replaceable>&lt;min_uid&gt;</replaceable><emphasis
 +                remap='B'>:</emphasis><replaceable>&lt;max_uid&gt;</replaceable>. If min_uid
 +                is omitted, the match is exact for the max_uid. If max_uid is omitted, all
 +                uids greater than or equal min_uid match.
 +              </para>
 +            </listitem>
 +            <listitem>
 +              <para>
 +                a gid range specified as <emphasis
 +                remap='B'>@</emphasis><replaceable>&lt;min_gid&gt;</replaceable><emphasis
 +                remap='B'>:</emphasis><replaceable>&lt;max_gid&gt;</replaceable>. If min_gid
 +                is omitted, the match is exact for the max_gid. If max_gid is omitted, all
 +                gids greater than or equal min_gid match. For the exact match all groups including
 +                the user's supplementary groups are examined. For the range matches only
 +                the user's primary group is examined.
 +              </para>
 +            </listitem>
 +            <listitem>
 +              <para>
 +                a gid specified as <emphasis
 +                remap='B'>%:</emphasis><replaceable>&lt;gid&gt;</replaceable> applicable
 +                to maxlogins limit only. It limits the total number of logins of all users
 +                that are member of the group with the specified gid.
               </para>
             </listitem>
           </itemizedlist>
@@ -182,7 +213,7 @@
             <varlistentry>
               <term><option>maxsyslogins</option></term>
               <listitem>
 -                <para>maximum number of logins on system</para>
 +                <para>maximum number of all logins on system</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -272,12 +303,15 @@
     </para>
     <programlisting>
 *               soft    core            0
 -*               hard    rss             10000
 +*               hard    nofile          512
 @student        hard    nproc           20
 @faculty        soft    nproc           20
 @faculty        hard    nproc           50
 ftp             hard    nproc           0
 @student        -       maxlogins       4
 +:123            hard    cpu             5000
 +@500:           soft    cpu             10000
 +600:700         hard    locks           10
     </programlisting>
   </refsect1>
 Index: modules/pam_limits/pam_limits.c
 ===================================================================
 RCS file: /cvsroot/pam/Linux-PAM/modules/pam_limits/pam_limits.c,v
 retrieving revision 1.48
 retrieving revision 1.49
 diff -u -p -r1.48 -r1.49
 --- modules/pam_limits/pam_limits.c	18 Nov 2010 09:37:32 -0000	1.48
 +++ modules/pam_limits/pam_limits.c	14 Dec 2010 08:40:40 -0000	1.49
@@ -55,6 +55,12 @@
 #define LIMITS_DEF_DEFAULT  4 /* limit was set by an default entry */
 #define LIMITS_DEF_NONE     5 /* this limit was not set yet */
 +#define LIMIT_RANGE_ERR    -1 /* error in specified uid/gid range */
 +#define LIMIT_RANGE_NONE    0 /* no range specified */
 +#define LIMIT_RANGE_ONE     1 /* exact uid/gid specified (:max_uid)*/
 +#define LIMIT_RANGE_MIN     2 /* only minimum uid/gid specified (min_uid:) */
 +#define LIMIT_RANGE_MM      3 /* both min and max uid/gid specified (min_uid:max_uid) */
 +
 static const char *limits_def_names[] = {
        "USER",
        "GROUP",
@@ -520,8 +526,57 @@ process_limit (const pam_handle_t *pamh,
     return;
 }
 -static int parse_config_file(pam_handle_t *pamh, const char *uname, int ctrl,
 -			     struct pam_limit_s *pl)
 +static int
 +parse_uid_range(pam_handle_t *pamh, const char *domain,
 +		uid_t *min_uid, uid_t *max_uid)
 +{
 +    const char *range = domain;
 +    char *pmax;
 +    char *endptr;
 +    int rv = LIMIT_RANGE_MM;
 +
 +    if ((pmax=strchr(range, ':')) == NULL)
 +	return LIMIT_RANGE_NONE;
 +    ++pmax;
 +
 +    if (range[0] == '@' || range[0] == '%')
 +	++range;
 +
 +    if (range[0] == ':')
 +	rv = LIMIT_RANGE_ONE;
 +    else {
 +	    errno = 0;
 +	    *min_uid = strtoul (range, &endptr, 10);
 +	    if (errno != 0 || (range == endptr) || *endptr != ':') {
 +		pam_syslog(pamh, LOG_DEBUG,
 +			   "wrong min_uid/gid value in '%s'", domain);
 +		return LIMIT_RANGE_ERR;
 +	    }
 +    }
 +
 +    if (*pmax == '\0') {
 +	if (rv == LIMIT_RANGE_ONE)
 +	    return LIMIT_RANGE_ERR;
 +	else
 +	    return LIMIT_RANGE_MIN;
 +    }
 +
 +    errno = 0;
 +    *max_uid = strtoul (pmax, &endptr, 10);
 +    if (errno != 0 || (pmax == endptr) || *endptr != '\0') {
 +	pam_syslog(pamh, LOG_DEBUG,
 +		   "wrong max_uid/gid value in '%s'", domain);
 +	return LIMIT_RANGE_ERR;
 +    }
 +
 +    if (rv == LIMIT_RANGE_ONE)
 +	*min_uid = *max_uid;
 +    return rv;
 +}
 +
 +static int
 +parse_config_file(pam_handle_t *pamh, const char *uname, uid_t uid, gid_t gid,
 +			     int ctrl, struct pam_limit_s *pl)
 {
     FILE *fil;
     char buf[LINE_LENGTH];
@@ -543,8 +598,10 @@ static int parse_config_file(pam_handle_
         char item[LINE_LENGTH];
         char value[LINE_LENGTH];
         int i;
 +        int rngtype;
         size_t j;
         char *tptr,*line;
 +        uid_t min_uid = (uid_t)-1, max_uid = (uid_t)-1;
         line = buf;
         /* skip the leading white space */
@@ -572,6 +629,11 @@ static int parse_config_file(pam_handle_
         for(j=0; j < strlen(ltype); j++)
             ltype[j]=tolower(ltype[j]);
 +	if ((rngtype=parse_uid_range(pamh, domain, &min_uid, &max_uid)) < 0) {
 +	    pam_syslog(pamh, LOG_WARNING, "invalid uid range '%s' - skipped", domain);
 +	    continue;
 +	}
 +
         if (i == 4) { /* a complete line */
 	    for(j=0; j < strlen(item); j++)
 		item[j]=tolower(item[j]);
@@ -581,47 +643,133 @@ static int parse_config_file(pam_handle_
             if (strcmp(uname, domain) == 0) /* this user have a limit */
                 process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl);
             else if (domain[0]=='@') {
 -		    if (ctrl & PAM_DEBUG_ARG) {
 +		if (ctrl & PAM_DEBUG_ARG) {
 			pam_syslog(pamh, LOG_DEBUG,
 				   "checking if %s is in group %s",
 				   uname, domain + 1);
 -		    }
 -                if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
 -                    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
 +		}
 +		switch(rngtype) {
 +		    case LIMIT_RANGE_NONE:
 +			if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
 +			    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
 +					  pl);
 +			break;
 +		    case LIMIT_RANGE_ONE:
 +			if (pam_modutil_user_in_group_nam_gid(pamh, uname, (gid_t)max_uid))
 +			    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
 				  pl);
 +			break;
 +		    case LIMIT_RANGE_MM:
 +			if (gid > (gid_t)max_uid)
 +			    break;
 +			/* fallthrough */
 +		    case LIMIT_RANGE_MIN:
 +			if (gid >= (gid_t)min_uid)
 +			    process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
 +					  pl);
 +		}
             } else if (domain[0]=='%') {
 -		    if (ctrl & PAM_DEBUG_ARG) {
 +		if (ctrl & PAM_DEBUG_ARG) {
 			pam_syslog(pamh, LOG_DEBUG,
 				   "checking if %s is in group %s",
 				   uname, domain + 1);
 -		    }
 -		if (strcmp(domain,"%") == 0)
 -		    process_limit(pamh, LIMITS_DEF_ALL, ltype, item, value, ctrl,
 -				  pl);
 -		else if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) {
 -		    strcpy(pl->login_group, domain+1);
 -                    process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
 -				  pl);
 		}
 -            } else if (strcmp(domain, "*") == 0)
 -                process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl,
 -			      pl);
 +		switch(rngtype) {
 +		    case LIMIT_RANGE_NONE:
 +			if (strcmp(domain,"%") == 0)
 +			    process_limit(pamh, LIMITS_DEF_ALL, ltype, item, value, ctrl,
 +					  pl);
 +			else if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) {
 +			    strcpy(pl->login_group, domain+1);
 +			    process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
 +					  pl);
 +			}
 +			break;
 +		    case LIMIT_RANGE_ONE:
 +			if (pam_modutil_user_in_group_nam_gid(pamh, uname, (gid_t)max_uid)) {
 +			    struct group *grp;
 +			    grp = pam_modutil_getgrgid(pamh, (gid_t)max_uid);
 +			    strncpy(pl->login_group, grp->gr_name, sizeof(pl->login_group));
 +			    pl->login_group[sizeof(pl->login_group)-1] = '\0';
 +			    process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
 +					  pl);
 +			}
 +			break;
 +		    case LIMIT_RANGE_MIN:
 +		    case LIMIT_RANGE_MM:
 +			pam_syslog(pamh, LOG_WARNING, "range unsupported for %%group matching - ignored");
 +		}
 +            } else {
 +		switch(rngtype) {
 +		    case LIMIT_RANGE_NONE:
 +			if (strcmp(domain, "*") == 0)
 +			    process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl,
 +					  pl);
 +			break;
 +		    case LIMIT_RANGE_ONE:
 +			if (uid != max_uid)
 +			    break;
 +			/* fallthrough */
 +		    case LIMIT_RANGE_MM:
 +			if (uid > max_uid)
 +			    break;
 +			/* fallthrough */
 +		    case LIMIT_RANGE_MIN:
 +			if (uid >= min_uid)
 +			    process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl);
 +		}
 +	    }
 	} else if (i == 2 && ltype[0] == '-') { /* Probably a no-limit line */
 	    if (strcmp(uname, domain) == 0) {
 		if (ctrl & PAM_DEBUG_ARG) {
 		    pam_syslog(pamh, LOG_DEBUG, "no limits for '%s'", uname);
 		}
 -		fclose(fil);
 -		return PAM_IGNORE;
 -	    } else if (domain[0] == '@' && pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) {
 +	    } else if (domain[0] == '@') {
 +		switch(rngtype) {
 +		    case LIMIT_RANGE_NONE:
 +			if (!pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
 +			    continue; /* next line */
 +			break;
 +		    case LIMIT_RANGE_ONE:
 +			if (!pam_modutil_user_in_group_nam_gid(pamh, uname, (gid_t)max_uid))
 +			    continue; /* next line */
 +			break;
 +		    case LIMIT_RANGE_MM:
 +			if (gid > (gid_t)max_uid)
 +			    continue;  /* next line */
 +			/* fallthrough */
 +		    case LIMIT_RANGE_MIN:
 +			if (gid < (gid_t)min_uid)
 +			    continue;  /* next line */
 +		}
 		if (ctrl & PAM_DEBUG_ARG) {
 		    pam_syslog(pamh, LOG_DEBUG,
 			       "no limits for '%s' in group '%s'",
 			       uname, domain+1);
 		}
 -		fclose(fil);
 -		return PAM_IGNORE;
 +	    } else {
 +		switch(rngtype) {
 +		    case LIMIT_RANGE_NONE:
 +			continue;  /* next line */
 +		    case LIMIT_RANGE_ONE:
 +			if (uid != max_uid)
 +			    continue;  /* next line */
 +			break;
 +		    case LIMIT_RANGE_MM:
 +			if (uid > max_uid)
 +			    continue;  /* next line */
 +			/* fallthrough */
 +		    case LIMIT_RANGE_MIN:
 +			if (uid >= min_uid)
 +			    break;
 +			continue;  /* next line */
 +		}
 +		if (ctrl & PAM_DEBUG_ARG) {
 +		    pam_syslog(pamh, LOG_DEBUG, "no limits for '%s'", uname);
 +		}
 	    }
 +	    fclose(fil);
 +	    return PAM_IGNORE;
         } else {
             pam_syslog(pamh, LOG_WARNING, "invalid line '%s' - skipped", line);
 	}
@@ -731,7 +879,7 @@ pam_sm_open_session (pam_handle_t *pamh,
         return PAM_ABORT;
     }
 -    retval = parse_config_file(pamh, pwd->pw_name, ctrl, pl);
 +    retval = parse_config_file(pamh, pwd->pw_name, pwd->pw_uid, pwd->pw_gid, ctrl, pl);
     if (retval == PAM_IGNORE) {
 	D(("the configuration file ('%s') has an applicable '<domain> -' entry", CONF_FILE));
 	return PAM_SUCCESS;
@@ -755,7 +903,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 	/* Parse the *.conf files. */
 	for (i = 0; globbuf.gl_pathv[i] != NULL; i++) {
 	    pl->conf_file = globbuf.gl_pathv[i];
 -    	    retval = parse_config_file(pamh, pwd->pw_name, ctrl, pl);
 +    	    retval = parse_config_file(pamh, pwd->pw_name, pwd->pw_uid, pwd->pw_gid, ctrl, pl);
     	    if (retval == PAM_IGNORE) {
 		D(("the configuration file ('%s') has an applicable '<domain> -' entry", pl->conf_file));
 		globfree(&globbuf);
--- a/extra/source/pam/patches/pam-1.1.3-nouserenv.patch
+++ b/extra/source/pam/patches/pam-1.1.3-nouserenv.patch
@ -0,0 +1,27 @@
 diff -up pam/modules/pam_env/pam_env.c.nouserenv pam/modules/pam_env/pam_env.c
 --- pam/modules/pam_env/pam_env.c.nouserenv	2010-10-20 09:59:30.000000000 +0200
 +++ pam/modules/pam_env/pam_env.c	2010-11-01 14:42:01.000000000 +0100
@@ -10,7 +10,7 @@
 #define DEFAULT_READ_ENVFILE    1
 #define DEFAULT_USER_ENVFILE    ".pam_environment"
 -#define DEFAULT_USER_READ_ENVFILE 1
 +#define DEFAULT_USER_READ_ENVFILE 0
 #include "config.h"
 diff -up pam/modules/pam_env/pam_env.8.xml.nouserenv pam/modules/pam_env/pam_env.8.xml
 --- pam/modules/pam_env/pam_env.8.xml.nouserenv	2010-10-20 09:59:30.000000000 +0200
 +++ pam/modules/pam_env/pam_env.8.xml	2010-11-01 14:42:01.000000000 +0100
@@ -147,7 +147,10 @@
         <listitem>
           <para>
             Turns on or off the reading of the user specific environment
 -            file. 0 is off, 1 is on. By default this option is on.
 +            file. 0 is off, 1 is on. By default this option is off as user
 +            supplied environment variables in the PAM environment could affect
 +            behavior of subsequent modules in the stack without the consent
 +            of the system administrator.
           </para>
         </listitem>
       </varlistentry>
--- a/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch
+++ b/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch
@ -0,0 +1,54 @@
 diff -up Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c.incomplete Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c
 --- Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c.incomplete	2008-12-18 14:09:36.000000000 +0100
 +++ Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c	2010-11-11 14:45:02.000000000 +0100
@@ -187,12 +187,13 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
     {
       retval = pam_get_authtok (pamh, PAM_AUTHTOK, &newpass, NULL);
       if (retval != PAM_SUCCESS && retval != PAM_TRY_AGAIN)
 -	return retval;
 +	{
 +	  if (retval == PAM_CONV_AGAIN)
 +	    retval = PAM_INCOMPLETE;
 +	  return retval;
 +	}
       tries++;
 -      if (newpass == NULL || retval == PAM_TRY_AGAIN)
 -	continue;
 -
       if (options.debug)
 	{
 	  if (newpass)
@@ -201,12 +202,8 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
 	    pam_syslog (pamh, LOG_DEBUG, "got no auth token");
 	}
 -      if (retval != PAM_SUCCESS || newpass == NULL)
 -	{
 -	  if (retval == PAM_CONV_AGAIN)
 -	    retval = PAM_INCOMPLETE;
 -	  return retval;
 -	}
 +      if (newpass == NULL || retval == PAM_TRY_AGAIN)
 +	continue;
       if (options.debug)
 	pam_syslog (pamh, LOG_DEBUG, "check against old password file");
@@ -219,7 +216,6 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
 	  newpass = NULL;
 	  /* Remove password item, else following module will use it */
           pam_set_item (pamh, PAM_AUTHTOK, (void *) NULL);
 -	  continue;
 	}
     }
@@ -230,8 +226,7 @@ pam_sm_chauthtok (pam_handle_t *pamh, in
       return PAM_MAXTRIES;
     }
 -  /* Remember new password */
 -  return pam_set_item (pamh, PAM_AUTHTOK, newpass);
 +  return PAM_SUCCESS;
 }
--- a/extra/source/pam/patches/pam-1.1.3-securetty-console.patch
+++ b/extra/source/pam/patches/pam-1.1.3-securetty-console.patch
@ -0,0 +1,120 @@
 Index: modules/pam_securetty/pam_securetty.8.xml
 ===================================================================
 RCS file: /cvsroot/pam/Linux-PAM/modules/pam_securetty/pam_securetty.8.xml,v
 retrieving revision 1.4
 retrieving revision 1.6
 diff -u -p -r1.4 -r1.6
 --- modules/pam_securetty/pam_securetty.8.xml	18 Aug 2008 13:29:25 -0000	1.4
 +++ modules/pam_securetty/pam_securetty.8.xml	25 Nov 2010 16:58:59 -0000	1.6
@@ -33,7 +33,9 @@
       user is logging in on a "secure" tty, as defined by the listing
       in <filename>/etc/securetty</filename>. pam_securetty also checks
       to make sure that <filename>/etc/securetty</filename> is a plain
 -      file and not world writable.
 +      file and not world writable. It will also allow root logins on
 +      the tty specified with <option>console=</option> switch on the
 +      kernel command line.
     </para>
     <para>
       This module has no effect on non-root users and requires that the
@@ -61,6 +63,18 @@
           </para>
         </listitem>
       </varlistentry>
 +      <varlistentry>
 +        <term>
 +          <option>noconsole</option>
 +        </term>
 +        <listitem>
 +          <para>
 +            Do not automatically allow root logins on the kernel console
 +            device, as specified on the kernel command line, if it is
 +            not also specified in the <filename>/etc/securetty</filename> file.
 +          </para>
 +        </listitem>
 +      </varlistentry>
     </variablelist>
   </refsect1>
 Index: modules/pam_securetty/pam_securetty.c
 ===================================================================
 RCS file: /cvsroot/pam/Linux-PAM/modules/pam_securetty/pam_securetty.c,v
 retrieving revision 1.14
 retrieving revision 1.15
 diff -u -p -r1.14 -r1.15
 --- modules/pam_securetty/pam_securetty.c	10 Sep 2009 10:19:58 -0000	1.14
 +++ modules/pam_securetty/pam_securetty.c	24 Nov 2010 12:28:01 -0000	1.15
@@ -2,6 +2,7 @@
 #define SECURETTY_FILE "/etc/securetty"
 #define TTY_PREFIX     "/dev/"
 +#define CMDLINE_FILE   "/proc/cmdline"
 /*
  * by Elliot Lee <sopwith@redhat.com>, Red Hat Software.
@@ -22,6 +23,7 @@
 #include <pwd.h>
 #include <string.h>
 #include <ctype.h>
 +#include <limits.h>
 /*
  * here, we make a definition for the externally accessible function
@@ -38,6 +40,7 @@
 #include <security/pam_ext.h>
 #define PAM_DEBUG_ARG       0x0001
 +#define PAM_NOCONSOLE_ARG   0x0002
 static int
 _pam_parse (const pam_handle_t *pamh, int argc, const char **argv)
@@ -51,6 +54,8 @@ _pam_parse (const pam_handle_t *pamh, in
 	if (!strcmp(*argv,"debug"))
 	    ctrl |= PAM_DEBUG_ARG;
 +        else if (!strcmp(*argv, "noconsole"))
 +            ctrl |= PAM_NOCONSOLE_ARG;
 	else {
 	    pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
 	}
@@ -144,6 +149,40 @@ securetty_perform_check (pam_handle_t *p
     }
     fclose(ttyfile);
 +    if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) {
 +        FILE *cmdlinefile;
 +
 +        /* Allow access from the kernel console, if enabled */
 +        cmdlinefile = fopen(CMDLINE_FILE, "r");
 +
 +        if (cmdlinefile != NULL) {
 +            char line[LINE_MAX], *p;
 +
 +            line[0] = 0;
 +            fgets(line, sizeof(line), cmdlinefile);
 +            fclose(cmdlinefile);
 +
 +            for (p = line; p; p = strstr(p+1, "console=")) {
 +                char *e;
 +
 +                /* Test whether this is a beginning of a word? */
 +                if (p > line && p[-1] != ' ')
 +                    continue;
 +
 +                /* Ist this our console? */
 +                if (strncmp(p + 8, uttyname, strlen(uttyname)))
 +                    continue;
 +
 +                /* Is there any garbage after the TTY name? */
 +                e = p + 8 + strlen(uttyname);
 +                if (*e == ',' || *e == ' ' || *e == '\n' || *e == 0) {
 +                    retval = 0;
 +                    break;
 +                }
 +            }
 +        }
 +    }
 +
     if (retval) {
 	    pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !",
 		     uttyname);
--- a/extra/source/pam/slack-desc
+++ b/extra/source/pam/slack-desc
@ -0,0 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
   |-----handy-ruler------------------------------------------------------|
 pam: pam (Pluggable Authentication Modules)
 pam:
 pam: PAM = Pluggable Authentication Modules.  Basically, it is a flexible
 pam: mechanism for authenticating users.  PAM provides a way to develop
 pam: programs that are independent of authentication scheme.  However,
 pam: these programs will need "authentication modules" (and libpam) at
 pam: run-time in order to work.
 pam:
 pam:
 pam: Homepage:  http://www.kernel.org/pub/linux/libs/pam/
 pam:
--- a/isolinux/README.TXT
+++ b/isolinux/README.TXT
@ -13,6 +13,7 @@ mkisofs -o /tmp/slackware-dvd.iso \
  -sort isolinux/iso.sort \
  -b isolinux/isolinux.bin \
  -c isolinux/isolinux.boot \
  -m 'kde-l10n-*.tar.bz2' \
  -V "SlackDVD" .
 On my system, here's the command I'd use to burn the resulting DVD ISO:
@ -38,9 +39,16 @@ growisofs \
  -sort isolinux/iso.sort \
  -b isolinux/isolinux.bin \
  -c isolinux/isolinux.boot \
  -m 'kde-l10n-*.tar.bz2' \
  -dvd-compat \
  -V "SlackDVD" .
 Note that the source files for the KDE language translations will not be
 included on these DVD images in order to keep them under the limit for
 a single-layer disc.  If you are using double layer DVD media and want to
 burn the complete tree to your disc, remove the -m option line from the
 command.
 HOW TO MAKE A SET OF BOOTABLE / INSTALLABLE CDROMS
--- a/isolinux/f2.txt
+++ b/isolinux/f2.txt
@ -3,14 +3,13 @@
 You'll need one kernel to get Linux started on your system so that you can
 install it.  The default kernel is huge.s, which requires at least a
-Pentium Pro processor.  There is also a "speakup.s" kernel, which supports
+Pentium Pro processor.  This kernel now includes Speakup support as well.
 various speech synthesizers.
 ***************************************************************************
 * Tip:  If you have no idea which kernel to use, go with huge.s!          *
 ***************************************************************************
 To boot the chosen kernel put the name of the kernel and press enter.
 boot: huge.s  "For example, boot the 'huge.s' kernel!"
 To check your system memory with memtest86+, use 'memtest':
 boot: memtest
--- a/isolinux/isolinux.boot
+++ b/isolinux/isolinux.boot
--- a/isolinux/isolinux.cfg
+++ b/isolinux/isolinux.cfg
@ -6,7 +6,9 @@ F1 message.txt
 F2 f2.txt
 label huge.s
  kernel /kernels/huge.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw SLACK_KERNEL=huge.s
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
 label speakup.s
-  kernel /kernels/speakup.s/bzImage
+  kernel /kernels/huge.s/bzImage
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw SLACK_KERNEL=speakup.s
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 SLACK_KERNEL=huge.s
 label memtest
  kernel /kernels/memtest/memtest
--- a/isolinux/message.txt
+++ b/isolinux/message.txt
@ -1,5 +1,5 @@
-Welcome to 09Slackware6407 version 13.1 (Linux kernel 2.6.33.4)!
+Welcome to 09Slackware6407 version 13.37 (Linux kernel 2.6.37.6)!
 If you need to pass extra parameters to the kernel, enter them at the prompt
 below after the name of the kernel to boot (huge.s etc).
@ -10,6 +10,8 @@ boot: huge.s root=/dev/sda1 rdinit= ro
 In the example above, /dev/sda1 is the / Linux partition.
 To test your memory with memtest86+, enter memtest on the boot line below.
 This prompt is just for entering extra parameters.  If you don't need to enter
 any parameters, hit ENTER to boot the default kernel "huge.s" or press [F2] 
 for a listing of more kernel choices.
--- a/kernels/VERSIONS.TXT
+++ b/kernels/VERSIONS.TXT
@ -1,3 +1,3 @@
-These kernels are version 2.6.33.4.
+These kernels are version 2.6.37.6.
--- a/kernels/memtest/README
+++ b/kernels/memtest/README
@ -0,0 +1 @@
 This "kernel" is really the memtest86+ RAM testing utility.
--- a/kernels/memtest/memtest
+++ b/kernels/memtest/memtest
--- a/pasture/source/gxine/gxine.SlackBuild
+++ b/pasture/source/gxine/gxine.SlackBuild
@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@ -20,11 +20,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=0.5.903
+VERSION=0.5.905
-ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-1}
 BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+# 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
 if [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@ -35,8 +42,13 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 else
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 fi
 NUMJOBS=${NUMJOBS:-" -j7 "}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-gxine
--- a/pasture/source/gxine/gxine.desktop
+++ b/pasture/source/gxine/gxine.desktop
--- a/pasture/source/gxine/slack-desc
+++ b/pasture/source/gxine/slack-desc
--- a/pasture/source/make/make.SlackBuild
+++ b/pasture/source/make/make.SlackBuild
@ -0,0 +1,98 @@
 #!/bin/sh
 # Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 VERSION=3.81
 BUILD=${BUILD:-3}
 # 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
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-make
 if [ "$ARCH" = "i386" ]; then
  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
 elif [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
  SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
 else
  SLKCFLAGS="-O2"
 fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf make-$VERSION
 tar xjvf $CWD/make-$VERSION.tar.bz2 || exit 1
 cd make-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/usr \
  --libdir=/usr/lib${LIBDIRSUFFIX} \
  --mandir=/usr/man \
  --infodir=/usr/info \
  --build=$ARCH-slackware-linux
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 ( cd $PKG
  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 gzip -9 $PKG/usr/man/man1/*
 rm $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 # This has been here so long that it should probably stay.
 # Trying to get rid of ginstall didn't go well, so...  :-)
 ( cd $PKG/usr/bin
  rm -f gmake
  ln -sf make gmake )
 mkdir -p $PKG/usr/doc/make-$VERSION
 cp -a \
  ABOUT-NLS AUTHORS COPYING NEWS README* \
  $PKG/usr/doc/make-$VERSION/
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 # Build the package:
 cd $PKG
 makepkg -l y -c n $TMP/make-$VERSION-$ARCH-$BUILD.txz
--- a/pasture/source/make/slack-desc
+++ b/pasture/source/make/slack-desc
@ -0,0 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
    |-----handy-ruler------------------------------------------------------|
 make: make (GNU make utility to maintain groups of programs)
 make:
 make: This is the GNU implementation of make, which was written by Richard
 make: Stallman and Roland McGrath.  The purpose of the make utility is to
 make: determine automatically which pieces of a large program need to be 
 make: recompiled, and issue the commands to recompile them.  
 make:
 make: This is needed to compile just about any major C program, including
 make: the Linux kernel.
 make:
 make:
--- a/pasture/source/mesa-7.8.2/README.GIT
+++ b/pasture/source/mesa-7.8.2/README.GIT
@ -0,0 +1,16 @@
 Anonymous git Access
   To get the Mesa sources anonymously (read-only):
    1. Install the git software on your computer if needed.
    2. Get an initial, local copy of the repository with:
     git clone git://anongit.freedesktop.org/git/mesa/mesa
    3. Later, you can update your tree from the master repository with:
     git pull origin
--- a/pasture/source/mesa-7.8.2/get-mesa.sh
+++ b/pasture/source/mesa-7.8.2/get-mesa.sh
@ -0,0 +1,8 @@
 rm -rf mesa
 git clone git://anongit.freedesktop.org/git/mesa/mesa
 # package the source archive and clean up:
 ( cd mesa ; find . -type d -name .git -exec rm -rf {} \; 2> /dev/null )
 DATE=$(date +%Y%m%d)
 mv mesa mesa-${DATE}_git
 tar cjf mesa-${DATE}_git.tar.bz2 mesa-${DATE}_git
 rm -rf mesa-${DATE}_git
--- a/pasture/source/mesa-7.8.2/mesa.SlackBuild
+++ b/pasture/source/mesa-7.8.2/mesa.SlackBuild
@ -0,0 +1,145 @@
 #!/bin/sh
 # Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 PKGNAM=mesa
 VERSION=${VERSION:-$(echo MesaLib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 PKG_VERSION=${VERSION}
 # 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
 # Be sure this list is up-to-date:
 DRI_DRIVERS="i810,i915,i965,mach64,mga,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
 NUMJOBS=${NUMJOBS:--j8}
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mesa
 if [ "$ARCH" = "i486" ]; then
  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
  SLKCFLAGS="-O2 -fPIC"
  LIBDIRSUFFIX="64"
 else
  SLKCFLAGS="-O2"
  LIBDIRSUFFIX=""
 fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf Mesa-${VERSION}
 tar xvf $CWD/MesaLib-${PKG_VERSION}.tar.?z* || exit 1
 tar xvf $CWD/MesaGLUT-${PKG_VERSION}.tar.?z* || exit 1
 tar xvf $CWD/MesaDemos-${PKG_VERSION}.tar.?z* || exit 1
 cd Mesa-$VERSION
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 CFLAGS="$SLKCFLAGS" \
 ./configure \
  --prefix=/usr \
  --sysconfdir=/etc \
  --libdir=/usr/lib${LIBDIRSUFFIX} \
  --mandir=/usr/man \
  --docdir=/usr/doc/mesa-$VERSION \
  --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
  --with-dri-drivers="$DRI_DRIVERS" \
  --build=$ARCH-slackware-linux
 # Nobody else is enabling this.  Seems like it's asking for trouble.
 #  --enable-xcb
 # This doesn't seem to build - maybe it needs something else...
 #  --enable-gallium-nouveau 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 # Install gears and glinfo:
 mkdir -p $PKG/usr/bin
 cp -a progs/demos/gears $PKG/usr/bin/gears
 cp -a progs/demos/glinfo $PKG/usr/bin/glinfo
 # Install some "demos":
 ( cd progs/xdemos
  cp glthreads glxcontexts glxdemo glxgears glxgears_fbconfig glxheads \
    glxinfo glxpbdemo glxpixmap \
    $PKG/usr/bin
 )
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
  ( cd $PKG/usr/man
    for manpagedir in $(find . -type d -name "man*") ; do
      ( cd $manpagedir
        for eachpage in $( find . -type l -maxdepth 1) ; do
          ln -s $( readlink $eachpage ).gz $eachpage.gz
          rm $eachpage
        done
        gzip -9 *.?
      )
    done
  )
 fi
 # Compress info files, if any:
 if [ -d $PKG/usr/info ]; then
  ( cd $PKG/usr/info
    rm -f dir
    gzip -9 *
  )
 fi
 mkdir -p $PKG/usr/doc/Mesa-$PKG_VERSION/html
 cp -a COPYING docs/relnotes-$VERSION.html $PKG/usr/doc/Mesa-$PKG_VERSION
 rm -f docs/relnotes*.html docs/RELNOTES*
 cp -a docs/*.html $PKG/usr/doc/Mesa-$PKG_VERSION/html
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$PKG_VERSION-$ARCH-$BUILD.txz
--- a/Show more
+++ b/Show more
		`@ -0,0 +1,2 @@`
							`http://www.gnome.org/projects/gconf/`
							`ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.32/GConf-2.32.0.tar.bz2`
		`@ -0,0 +1,2 @@`
							`http://www.gnome.org/projects/ORBit2/`
							`ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2`
`@ -1,3 +1,3 @@`

	`These kernels are version 2.6.33.4.`	`These kernels are version 2.6.37.6.`
		`@ -0,0 +1 @@`
							`This "kernel" is really the memtest86+ RAM testing utility.`